diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f0f9aa1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,55 @@ +# Miscellaneous +*.java.hsp +*.sonarj +*.sw* +.DS_Store +build.sh +integration-repo +ivy-cache +argfile* +activemq-data/ +classes/ + +# Log files +jxl.log +jmx.log +derby.log + +# Gradle artifacts +.gradle +.gradletasknamecache +/build +buildSrc/build +/spring-*/build +/framework-bom/build +/framework-docs/build +/integration-tests/build +/src/asciidoc/build +spring-test/test-output/ + +# Maven artifacts +pom.xml +/target/ + +# Eclipse artifacts, including WTP generated manifests +bin +.classpath +.project +.settings +.springBeans +spring-*/src/main/java/META-INF/MANIFEST.MF + +# IDEA artifacts and output dirs +*.iml +*.ipr +*.iws +.idea +out +test-output +atlassian-ide-plugin.xml + +# VS Code +.vscode/ + +# Application +src/main/resources/application-dev.yaml \ No newline at end of file diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..c176371 --- /dev/null +++ b/HELP.md @@ -0,0 +1,30 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.1.0/gradle-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.1.0/gradle-plugin/reference/html/#build-image) +* [Spring Reactive Web](https://docs.spring.io/spring-boot/docs/3.1.0/reference/htmlsingle/#web.reactive) +* [Spring Data R2DBC](https://docs.spring.io/spring-boot/docs/3.1.0/reference/htmlsingle/#data.sql.r2dbc) +* [Liquibase Migration](https://docs.spring.io/spring-boot/docs/3.1.0/reference/htmlsingle/#howto.data-initialization.migration-tool.liquibase) +* [Spring Security](https://docs.spring.io/spring-boot/docs/3.1.0/reference/htmlsingle/#web.security) +* [Spring for GraphQL](https://docs.spring.io/spring-boot/docs/3.1.0/reference/html/web.html#web.graphql) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a Reactive RESTful Web Service](https://spring.io/guides/gs/reactive-rest-service/) +* [Accessing data with R2DBC](https://spring.io/guides/gs/accessing-data-r2dbc/) +* [Securing a Web Application](https://spring.io/guides/gs/securing-web/) +* [Spring Boot and OAuth2](https://spring.io/guides/tutorials/spring-boot-oauth2/) +* [Authenticating a User with LDAP](https://spring.io/guides/gs/authenticating-ldap/) +* [Building a GraphQL service](https://spring.io/guides/gs/graphql-server/) + +### Additional Links +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) +* [R2DBC Homepage](https://r2dbc.io) + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..4981a12 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,40 @@ +plugins { + java + id("org.springframework.boot") version "3.1.0" + id("io.spring.dependency-management") version "1.1.0" +} + +group = "ru.rupikz" +version = "0.0.1-SNAPSHOT" +java.sourceCompatibility = JavaVersion.VERSION_17 + +configurations { + compileOnly { + extendsFrom(configurations.annotationProcessor.get()) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-data-r2dbc") + implementation("org.springframework.boot:spring-boot-starter-graphql") + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-webflux") + implementation("org.liquibase:liquibase-core") + implementation("org.springframework:spring-jdbc") + compileOnly("org.projectlombok:lombok") + runtimeOnly("org.postgresql:postgresql") + runtimeOnly("org.postgresql:r2dbc-postgresql") + annotationProcessor("org.projectlombok:lombok") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("io.projectreactor:reactor-test") + testImplementation("org.springframework.graphql:spring-graphql-test") + testImplementation("org.springframework.security:spring-security-test") +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..a69d9cb --- /dev/null +++ b/gradlew @@ -0,0 +1,240 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..53a6b23 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/schema.graphql b/schema.graphql new file mode 100644 index 0000000..ad3b0c8 --- /dev/null +++ b/schema.graphql @@ -0,0 +1,272 @@ +type Query { + schedule(filter: ScheduleFilter!): [GroupByLesson!]! + + educators(filter: EducatorFilter!): EducatorPageable! + educationSubjects(filter: EducationSubjectFilter!): EducationSubjectPageable! +} + +type Mutation { + createSchedule(input: CreateScheduleInput!): Schedule! + updateSchedule(input: UpdateScheduleInput!): Schedule! + removeSchedule(id: ID!): Boolean! + + createLesson(input: CreateLessonInput!): Lesson! + updateLesson(input: UpdateLessonInput!): Lesson! + removeLesson(id: ID!): Boolean! + + createEducationSubject(input: CreateEducationSubjectInput!): EducationSubject! + updateEducationSubject(input: UpdateEducationSubjectInput!): EducationSubject! + removeEducationSubject(id: ID!): Boolean! + + createEducator(input: CreateEducatorInput!): Educator! + updateEducator(input: UpdateEducatorInput!): Educator! + removeEducator(id: ID!): Boolean! + + createGroup(input: CreateGroupInput!): Group! + updateGroup(input: UpdateGroupInput!): Group! + removeGroup(id: ID!): Boolean! + + createUniversity(input: CreateUniversityInput!): University! + updateUniversity(input: UpdateUniversityInput!): University! + removeUniversity(id: ID!): Boolean! +} + +# Filters +type ScheduleFilter { + dateStart: Date! + dateEnd: Date! + weekDay: [WeekDay!] + weekType: WeekType + groupId: ID + educationSubjectId: ID + educatorId: ID + educationSubjectType: EducationSubjectType + room: String +} + +type EducatorFilter { + firstname: String + lastname: String + patronymic: String + universityId: ID +} + +type EducationSubjectFilter { + name: String + universityId: ID +} + +# Inputs +type CreateScheduleInput { + name: String! + dateStart: Date! + dateEnd: Date! + universityId: ID! + groupId: ID! +} + +type UpdateScheduleInput { + id: ID! + name: String + dateStart: Date + dateEnd: Date + universityId: ID + groupId: ID +} + +# При создании или изменении урока, нужно проверять чтоб +# Schedule.universityId == Group.universityId == EducationSubject.universityId == educator.universityId +type CreateLessonInput { + timeStart: Time! + timeEnd: Time! + weekDay: WeekDay! + weekType: WeekType! + educationSubjectId: ID! + educationSubjectType: EducationSubjectType! + educatorId: ID! + room: String! + groupId: ID! + scheduleId: ID! +} + +type UpdateLessonInput { + id: ID! + timeStart: Time + timeEnd: Time + weekDay: WeekDay + weekType: WeekType + educationSubjectId: ID + educationSubjectType: EducationSubjectType + educatorId: ID + room: String + groupId: ID + scheduleId: ID +} + +type CreateEducationSubjectInput { + name: String! + universityId: ID! +} + +type UpdateEducationSubjectInput { + id: ID! + name: String + universityId: ID! +} + +type CreateEducatorInput { + firstname: String + lastname: String! + patronymic: String + universityId: ID! +} + +type UpdateEducatorInput { + id: ID! + firstname: String + lastname: String + patronymic: String + universityId: ID +} + +type CreateGroupInput { + name: String! + studyType: StudyType! + educationType: EducationType! + year: Int! + universityId: ID! +} + +type UpdateGroupInput { + id: ID! + name: String + studyType: StudyType + educationType: EducationType + year: Int + universityId: ID +} + +type CreateUniversityInput { + name: String! + address: String! +} + +type UpdateUniversityInput { + id: ID! + name: String + address: String +} + +# Outputs +type EducatorPageable { + context: [Educator!]! + nextCursor: String! + previousCursor: String! +} + +type EducationSubjectPageable { + context: [EducationSubject!]! + nextCursor: String! + previousCursor: String! +} + +# Types +type Schedule { + id: ID! + name: String! + dateStart: Date! + dateEnd: Date! + university: University! + group: Group! + groupByLesson: [GroupByLesson!]! +} + +type GroupByLesson { + weekDay: WeekDay! + weekType: WeekType! + lessons: [Lesson!]! +} + +type Lesson { + id: ID! + timeStart: Time! + timeEnd: Time! + weekDay: WeekDay! + weekType: WeekType! + educationSubject: EducationSubject! + educationSubjectType: EducationSubjectType! + educator: Educator! + room: String! + group: Group! + schedule: Schedule! +} + +type EducationSubject { + id: ID! + name: String! + university: University! +} + +type Educator { + id: ID! + firstname: String! + lastname: String! + patronymic: String! + university: University! +} + +type Group { + id: ID! + name: String! + studyType: StudyType! + educationType: EducationType! + admission: Date! + graduation: Date! + university: University! +} + +type University { + id: ID! + name: String! + address: [Address!]! +} + +type Address { + id: ID! + value: String! + university: University! +} + +# Enums +enum EducationSubjectType { + LECTURE + PRACTICE + LABORATORY +} + +enum WeekDay { + MONDAY + TUESDAY + WEDNESDAY + THURSDAY + FRIDAY + SATURDAY + SUNDAY +} + +enum WeekType { + EVEN + ODD + REGULAR +} + +enum StudyType { + FULL_TIME + PART_TIME +} + +enum EducationType { + BAKALAVRIAT + MAGISTRACY + SPECIALITET +} diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..3e6cd7e --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "scheduler" diff --git a/src/main/java/ru/rupikz/scheduler/SchedulerApplication.java b/src/main/java/ru/rupikz/scheduler/SchedulerApplication.java new file mode 100644 index 0000000..ce5e5c0 --- /dev/null +++ b/src/main/java/ru/rupikz/scheduler/SchedulerApplication.java @@ -0,0 +1,13 @@ +package ru.rupikz.scheduler; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SchedulerApplication { + + public static void main(String[] args) { + SpringApplication.run(SchedulerApplication.class, args); + } + +} diff --git a/src/main/resources/application-dev.yaml.example b/src/main/resources/application-dev.yaml.example new file mode 100644 index 0000000..6a91189 --- /dev/null +++ b/src/main/resources/application-dev.yaml.example @@ -0,0 +1,11 @@ +spring: + r2dbc: + url: "r2dbc:postgresql://localhost:5442/scheduler" + username: admin + password: admin + initialization-mode: always + liquibase: + url: "jdbc:postgresql://localhost:5442/scheduler" + user: admin + password: admin + change-log: classpath:changelog.yaml diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..e71b29e --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,8 @@ +server: + port: 8081 + +spring: + graphql: + schema: + locations: classpath:graphql/**/ + fileExtensions: .graphqls, .gqls \ No newline at end of file diff --git a/src/test/java/ru/rupikz/scheduler/SchedulerApplicationTests.java b/src/test/java/ru/rupikz/scheduler/SchedulerApplicationTests.java new file mode 100644 index 0000000..e480fb7 --- /dev/null +++ b/src/test/java/ru/rupikz/scheduler/SchedulerApplicationTests.java @@ -0,0 +1,13 @@ +package ru.rupikz.scheduler; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SchedulerApplicationTests { + + @Test + void contextLoads() { + } + +}