commit d8c0698713428bb982f5bc633981e49592c172b9 Author: s461998 Date: Fri Jan 27 20:15:32 2023 +0100 initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..c1dd12f Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b74bf7f --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..d0a6ff2 --- /dev/null +++ b/HELP.md @@ -0,0 +1,21 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.7.5/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.7.5/maven-plugin/reference/html/#build-image) +* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.7.5/reference/htmlsingle/#using.devtools) +* [Spring Configuration Processor](https://docs.spring.io/spring-boot/docs/2.7.5/reference/htmlsingle/#appendix.configuration-metadata.annotation-processor) +* [Spring Web](https://docs.spring.io/spring-boot/docs/2.7.5/reference/htmlsingle/#web) +* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.7.5/reference/htmlsingle/#data.sql.jpa-and-spring-data) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) + diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. 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, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9e9513d --- /dev/null +++ b/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.5 + + + com.example + demo + 0.0.1-SNAPSHOT + demo + Demo project for Spring Boot + + 11 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.postgresql + postgresql + runtime + + + com.microsoft.sqlserver + mssql-jdbc + 6.1.0.jre8 + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + 2.13.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..64b538a --- /dev/null +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/src/main/java/com/example/demo/controller/Controller.java b/src/main/java/com/example/demo/controller/Controller.java new file mode 100644 index 0000000..d1bff84 --- /dev/null +++ b/src/main/java/com/example/demo/controller/Controller.java @@ -0,0 +1,94 @@ +package com.example.demo.controller; + +import com.example.demo.dto.*; +import com.example.demo.service.ImportExportService; +import com.example.demo.service.PersonService; +import com.example.demo.service.StudentsGroupService; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +@RestController +public class Controller { + + private final PersonService personService; + + private final StudentsGroupService studentsGroupService; + + private final ImportExportService importExportService; + + public Controller(PersonService personService, StudentsGroupService studentsGroupService, ImportExportService importExportService) { + this.personService = personService; + this.studentsGroupService = studentsGroupService; + this.importExportService = importExportService; + } + + @GetMapping("/person/{id}") + PersonDto getPerson(@PathVariable Long id) { + return personService.get(id); + } + + @PostMapping("/person") + PersonDto createPerson(@RequestBody PersonDto personDto) { + return personService.create(personDto); + } + + @PutMapping("/person") + PersonDto updatePerson(@RequestBody PersonDto personDto) { + return personService.update(personDto); + } + + @DeleteMapping("/person/{id}") + void deletePerson(@PathVariable Long id) { + personService.delete(id); + } + + @GetMapping("/group/{id}") + GroupDto getGroup(@PathVariable Long id) { + return studentsGroupService.get(id); + } + + @PostMapping("/group") + GroupDto createGroup(@RequestBody GroupDto groupDto) { + return studentsGroupService.create(groupDto); + } + + @PutMapping("/group") + GroupDto updateGroup(@RequestBody GroupDto groupDto) { + return studentsGroupService.update(groupDto); + } + + @DeleteMapping("/group/{id}") + void deleteGroup(@PathVariable Long id) { + studentsGroupService.delete(id); + } + + @PutMapping("/group/{id}/member") + public GroupMemberDto addGroupMember(@PathVariable Long id, @RequestBody GroupMemberDto groupMemberDto) { + return this.studentsGroupService.addGroupMember(id, groupMemberDto); + } + + @DeleteMapping("/group/{id}/member/{memberId}") + public void removeGroupMember(@PathVariable Long id, @PathVariable Long memberId) { + this.studentsGroupService.removeGroupMember(id, memberId); + } + + @PutMapping("/group/{id}/leader") + public GroupLeaderDto addGroupLeader(@PathVariable Long id, @RequestBody GroupLeaderDto groupLeaderDto) { + return this.studentsGroupService.addGroupLeader(id, groupLeaderDto); + } + + @DeleteMapping("/group/{id}/leader/{leaderId}") + public void removeGroupLeader(@PathVariable Long id, @PathVariable Long leaderId) { + this.studentsGroupService.removeGroupLeader(id, leaderId); + } + + @GetMapping(path = "/exportDatabase", produces = { MediaType.APPLICATION_XML_VALUE }) + public DataImportExportDto exportDatabase() { + return importExportService.exportDatabase(); + } + + @PostMapping(path = "/importDatabase", consumes = { MediaType.APPLICATION_XML_VALUE}) + public void importDatabase( + @RequestBody DataImportExportDto dataImportExportDto + ) { importExportService.importDatabase(dataImportExportDto); } +} diff --git a/src/main/java/com/example/demo/dto/DataImportExportDto.java b/src/main/java/com/example/demo/dto/DataImportExportDto.java new file mode 100644 index 0000000..d86339d --- /dev/null +++ b/src/main/java/com/example/demo/dto/DataImportExportDto.java @@ -0,0 +1,41 @@ +package com.example.demo.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class DataImportExportDto implements Serializable { + + private List people; + private List students; + + private List studentsGroups; + + private List groupLeaders; + + private List groupMembers; + + public DataImportExportDto( + List people, + List students, + List studentsGroups, + List groupLeaders, + List groupMembers + ) { + this.people = people; + this.students = students; + this.studentsGroups = studentsGroups; + this.groupLeaders = groupLeaders; + this.groupMembers = groupMembers; + } + + public DataImportExportDto() { + this.people = null; + this.students = null; + this.studentsGroups = null; + this.groupLeaders = null; + this.groupMembers = null; + } +} diff --git a/src/main/java/com/example/demo/dto/GroupDto.java b/src/main/java/com/example/demo/dto/GroupDto.java new file mode 100644 index 0000000..66242eb --- /dev/null +++ b/src/main/java/com/example/demo/dto/GroupDto.java @@ -0,0 +1,25 @@ +package com.example.demo.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class GroupDto implements Serializable { + private final Long id; + private final List groupLeaders; + private final List groupMembers; + + public GroupDto(Long id, List groupLeaders, List groupMembers) { + this.id = id; + this.groupLeaders = groupLeaders; + this.groupMembers = groupMembers; + } + + public GroupDto() { + this.id = null; + this.groupLeaders = null; + this.groupMembers = null; + } +} diff --git a/src/main/java/com/example/demo/dto/GroupLeaderDto.java b/src/main/java/com/example/demo/dto/GroupLeaderDto.java new file mode 100644 index 0000000..d0a955f --- /dev/null +++ b/src/main/java/com/example/demo/dto/GroupLeaderDto.java @@ -0,0 +1,25 @@ +package com.example.demo.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class GroupLeaderDto implements Serializable { + + public GroupLeaderDto(Long id, Long personId, Long groupId) { + this.id = id; + this.personId = personId; + this.groupId = groupId; + } + + public GroupLeaderDto() { + this.id = null; + this.personId = null; + this.groupId = null; + } + + private final Long id; + private final Long personId; + private final Long groupId; +} diff --git a/src/main/java/com/example/demo/dto/GroupMemberDto.java b/src/main/java/com/example/demo/dto/GroupMemberDto.java new file mode 100644 index 0000000..581b191 --- /dev/null +++ b/src/main/java/com/example/demo/dto/GroupMemberDto.java @@ -0,0 +1,25 @@ +package com.example.demo.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class GroupMemberDto implements Serializable { + + public GroupMemberDto(Long id, Long studentId, Long groupId) { + this.id = id; + this.studentId = studentId; + this.groupId = groupId; + } + + public GroupMemberDto() { + this.id = null; + this.studentId = null; + this.groupId = null; + } + + private final Long id; + private final Long studentId; + private final Long groupId; +} diff --git a/src/main/java/com/example/demo/dto/PersonDto.java b/src/main/java/com/example/demo/dto/PersonDto.java new file mode 100644 index 0000000..94d8526 --- /dev/null +++ b/src/main/java/com/example/demo/dto/PersonDto.java @@ -0,0 +1,28 @@ +package com.example.demo.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PersonDto implements Serializable { + + public PersonDto(Long id, String name, String surname, StudentDto student) { + this.id = id; + this.name = name; + this.surname = surname; + this.student = student; + } + + public PersonDto() { + this.id = null; + this.name = null; + this.surname = null; + this.student = null; + } + + private final Long id; + private final String name; + private final String surname; + private final StudentDto student; +} diff --git a/src/main/java/com/example/demo/dto/StudentDto.java b/src/main/java/com/example/demo/dto/StudentDto.java new file mode 100644 index 0000000..a4b500b --- /dev/null +++ b/src/main/java/com/example/demo/dto/StudentDto.java @@ -0,0 +1,27 @@ +package com.example.demo.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +public class StudentDto implements Serializable { + + public StudentDto(Long id, Long personId, String index) { + this.id = id; + this.personId = personId; + this.index = index; + } + + public StudentDto() { + this.id = null; + this.personId = null; + this.index = null; + } + + private final Long id; + private final Long personId; + private final String index; +} diff --git a/src/main/java/com/example/demo/model/GroupLeader.java b/src/main/java/com/example/demo/model/GroupLeader.java new file mode 100644 index 0000000..b0ebec0 --- /dev/null +++ b/src/main/java/com/example/demo/model/GroupLeader.java @@ -0,0 +1,62 @@ +package com.example.demo.model; + +import com.example.demo.dto.GroupLeaderDto; + +import javax.persistence.*; + +@Entity +public class GroupLeader { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id = null; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(referencedColumnName = "id") + private Person person = null; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(referencedColumnName = "id") + private StudentsGroup studentsGroup = null; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Person getPerson() { + return person; + } + + public void setPerson(Person person) { + this.person = person; + } + + public StudentsGroup getGroup() { + return studentsGroup; + } + + public void setGroup(StudentsGroup studentsGroup) { + this.studentsGroup = studentsGroup; + } + + public GroupLeader() { + } + + public GroupLeader(Long id, Person person, StudentsGroup studentsGroup) { + this.id = id; + this.person = person; + this.studentsGroup = studentsGroup; + } + + public GroupLeaderDto toDto() { + return new GroupLeaderDto( + getId(), + getPerson().getId(), + getGroup().getId() + ); + } +} diff --git a/src/main/java/com/example/demo/model/GroupMember.java b/src/main/java/com/example/demo/model/GroupMember.java new file mode 100644 index 0000000..75745eb --- /dev/null +++ b/src/main/java/com/example/demo/model/GroupMember.java @@ -0,0 +1,60 @@ +package com.example.demo.model; + +import com.example.demo.dto.GroupMemberDto; + +import javax.persistence.*; + +@Entity +public class GroupMember { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id = null; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(referencedColumnName = "id") + private Student student; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(referencedColumnName = "id") + private StudentsGroup studentsGroup; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Student getStudent() { + return student; + } + + public void setStudent(Student student) { + this.student = student; + } + + public StudentsGroup getGroup() { + return studentsGroup; + } + + public void setGroup(StudentsGroup studentsGroup) { + this.studentsGroup = studentsGroup; + } + + public GroupMember() {} + + public GroupMember(Long id, Student student, StudentsGroup studentsGroup) { + this.id = id; + this.student = student; + this.studentsGroup = studentsGroup; + } + + public GroupMemberDto toDto() { + return new GroupMemberDto( + getId(), + getStudent().getId(), + getGroup().getId() + ); + } +} diff --git a/src/main/java/com/example/demo/model/Person.java b/src/main/java/com/example/demo/model/Person.java new file mode 100644 index 0000000..673e588 --- /dev/null +++ b/src/main/java/com/example/demo/model/Person.java @@ -0,0 +1,101 @@ +package com.example.demo.model; + +import com.example.demo.dto.PersonDto; +import com.example.demo.dto.StudentDto; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class Person { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id = null; + + private String name = null; + + private String surname = null; + + @OneToOne(mappedBy = "person", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) + private Student student = null; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSurname() { + return surname; + } + + public void setSurname(String surname) { + this.surname = surname; + } + + public Student getStudent() { + return student; + } + + public void setStudent(Student student) { + this.student = student; + } + + @OneToMany(mappedBy = "person", fetch = FetchType.LAZY, orphanRemoval = true) + private final List groupLeaders = new ArrayList<>(); + + public List getGroupLeaders() { + return groupLeaders; + } + + public void addGroupLeader(GroupLeader groupLeader) { + groupLeader.setPerson(this); + this.groupLeaders.add(groupLeader); + } + + public Person() {} + + public Person(Long id, String name, String surname, Student student) { + this.id = id; + this.name = name; + this.surname = surname; + this.student = student; + } + + public PersonDto toDto() { + StudentDto studentDto = null; + Student student = getStudent(); + if (student != null) { + studentDto = new StudentDto(student.getId(), getId(), student.getIndex()); + } + System.out.println("StudentDto: "+studentDto); + return new PersonDto( + getId(), + getName(), + getSurname(), + studentDto + ); + } + + @Override + public String toString() { + return "Person{" + + "id=" + id + + ", name='" + name + '\'' + + ", surname='" + surname + '\'' + + ", student=" + student + + '}'; + } +} diff --git a/src/main/java/com/example/demo/model/Student.java b/src/main/java/com/example/demo/model/Student.java new file mode 100644 index 0000000..27a0da0 --- /dev/null +++ b/src/main/java/com/example/demo/model/Student.java @@ -0,0 +1,78 @@ +package com.example.demo.model; + +import com.example.demo.dto.StudentDto; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class Student { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id = null; + + @OneToOne + @JoinColumn(referencedColumnName = "id") + private Person person = null; + + @OneToMany(mappedBy = "student", fetch = FetchType.LAZY) + private final List groupMembers = new ArrayList<>(); + + private String index; + + public Student() {} + + public Student(Long id, Person person, String index) { + this.id = id; + this.person = person; + this.index = index; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Person getPerson() { + return person; + } + + public void setPerson(Person person) { + this.person = person; + } + + public String getIndex() { + return index; + } + + public void setIndex(String index) { + this.index = index; + } + + public List getGroupMembers() { + return groupMembers; + } + + public void addGroupMember(GroupMember groupMember) { + groupMember.setStudent(this); + this.groupMembers.add(groupMember); + } + + public StudentDto toDto() { + Person p = getPerson(); + Long pid = null; + if (p != null) { + pid = p.getId(); + } + return new StudentDto( + this.id, + pid, + this.index + ); + } +} diff --git a/src/main/java/com/example/demo/model/StudentsGroup.java b/src/main/java/com/example/demo/model/StudentsGroup.java new file mode 100644 index 0000000..f1f1415 --- /dev/null +++ b/src/main/java/com/example/demo/model/StudentsGroup.java @@ -0,0 +1,94 @@ +package com.example.demo.model; + +import com.example.demo.dto.GroupDto; +import com.example.demo.dto.GroupLeaderDto; +import com.example.demo.dto.GroupMemberDto; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class StudentsGroup { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id = null; + + @OneToMany(mappedBy = "studentsGroup", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true) + private List groupLeaders = new ArrayList<>(); + + @OneToMany(mappedBy = "studentsGroup", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true) + private List groupMembers = new ArrayList<>(); + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public List getGroupLeaders() { + return groupLeaders; + } + + public List getGroupMembers() { + return groupMembers; + } + + public StudentsGroup() {} + + public StudentsGroup(Long id, List groupLeaders, List groupMembers) { + this.id = id; + this.groupLeaders = groupLeaders; + this.groupMembers = groupMembers; + } + + public void addGroupLeader(GroupLeader groupLeader) { + groupLeader.setGroup(this); + this.groupLeaders.add(groupLeader); + } + + public void addGroupMember(GroupMember groupMember) { + groupMember.setGroup(this); + this.groupMembers.add(groupMember); + } + + public void removeGroupLeader(GroupLeader groupLeader) { + groupLeader.setGroup(null); + this.groupLeaders.remove(groupLeader); + } + + public void removeGroupMember(GroupMember groupMember) { + groupMember.setGroup(null); + this.groupMembers.remove(groupMember); + } + + public GroupDto toDto() { + GroupDto studentsGroupDto = new GroupDto( + getId(), + new ArrayList<>(), + new ArrayList<>() + ); + List groupLeaders = getGroupLeaders(); + List groupMembers = getGroupMembers(); + groupLeaders.forEach(groupLeader -> { + GroupLeaderDto groupLeaderDto = new GroupLeaderDto( + groupLeader.getId(), + groupLeader.getPerson().getId(), + getId() + ); + studentsGroupDto.getGroupLeaders().add(groupLeaderDto); + }); + groupMembers.forEach(groupMember -> { + GroupMemberDto groupMemberDto = new GroupMemberDto( + groupMember.getId(), + groupMember.getStudent().getId(), + getId() + ); + studentsGroupDto.getGroupMembers().add(groupMemberDto); + }); + return studentsGroupDto; + } +} diff --git a/src/main/java/com/example/demo/repository/GroupLeaderRepository.java b/src/main/java/com/example/demo/repository/GroupLeaderRepository.java new file mode 100644 index 0000000..4f2d1e1 --- /dev/null +++ b/src/main/java/com/example/demo/repository/GroupLeaderRepository.java @@ -0,0 +1,7 @@ +package com.example.demo.repository; + +import com.example.demo.model.GroupLeader; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface GroupLeaderRepository extends JpaRepository { +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/GroupMemberRepository.java b/src/main/java/com/example/demo/repository/GroupMemberRepository.java new file mode 100644 index 0000000..19be32e --- /dev/null +++ b/src/main/java/com/example/demo/repository/GroupMemberRepository.java @@ -0,0 +1,7 @@ +package com.example.demo.repository; + +import com.example.demo.model.GroupMember; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface GroupMemberRepository extends JpaRepository { +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/PersonRepository.java b/src/main/java/com/example/demo/repository/PersonRepository.java new file mode 100644 index 0000000..40acb9f --- /dev/null +++ b/src/main/java/com/example/demo/repository/PersonRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.repository; + +import com.example.demo.model.Person; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +public interface PersonRepository extends JpaRepository { +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/StudentRepository.java b/src/main/java/com/example/demo/repository/StudentRepository.java new file mode 100644 index 0000000..935dd7e --- /dev/null +++ b/src/main/java/com/example/demo/repository/StudentRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.repository; + +import com.example.demo.model.Student; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +public interface StudentRepository extends JpaRepository { + + @Query("select s from Student s where s.id not in (select gm.student.id from GroupMember gm)") + List findStudentsByNotInGroup(); +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/StudentsGroupRepository.java b/src/main/java/com/example/demo/repository/StudentsGroupRepository.java new file mode 100644 index 0000000..95f137a --- /dev/null +++ b/src/main/java/com/example/demo/repository/StudentsGroupRepository.java @@ -0,0 +1,7 @@ +package com.example.demo.repository; + +import com.example.demo.model.StudentsGroup; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StudentsGroupRepository extends JpaRepository { +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/ImportExportService.java b/src/main/java/com/example/demo/service/ImportExportService.java new file mode 100644 index 0000000..7b497df --- /dev/null +++ b/src/main/java/com/example/demo/service/ImportExportService.java @@ -0,0 +1,91 @@ +package com.example.demo.service; + +import com.example.demo.dto.*; +import com.example.demo.model.*; +import com.example.demo.repository.*; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ImportExportService { + + private final PersonRepository personRepository; + + private final StudentRepository studentRepository; + + private final StudentsGroupRepository studentsGroupRepository; + + private final GroupMemberRepository groupMemberRepository; + + private final GroupLeaderRepository groupLeaderRepository; + + ImportExportService( + PersonRepository personRepository, + StudentRepository studentRepository, StudentsGroupRepository studentsGroupRepository, GroupMemberRepository groupMemberRepository, GroupLeaderRepository groupLeaderRepository) { + this.personRepository = personRepository; + this.studentRepository = studentRepository; + this.studentsGroupRepository = studentsGroupRepository; + this.groupMemberRepository = groupMemberRepository; + this.groupLeaderRepository = groupLeaderRepository; + } + public DataImportExportDto exportDatabase() { + List people = personRepository.findAll().stream().map(Person::toDto).collect(Collectors.toList()); + List students = studentRepository.findAll().stream().map(Student::toDto).collect(Collectors.toList()); + List studentGroups = studentsGroupRepository.findAll().stream().map(StudentsGroup::toDto).collect(Collectors.toList()); + + List groupLeaders = groupLeaderRepository.findAll().stream().map(GroupLeader::toDto).collect(Collectors.toList()); + List groupMembers = groupMemberRepository.findAll().stream().map(GroupMember::toDto).collect(Collectors.toList()); + return new DataImportExportDto( + people, + students, + studentGroups, + groupLeaders, + groupMembers + ); + } + + public void importDatabase(DataImportExportDto dataImportExportDto) { + List people = dataImportExportDto.getPeople().stream().map(personDto -> new Person( + personDto.getId(), personDto.getName(), personDto.getSurname(), null + )).collect(Collectors.toList()); + + personRepository.saveAll(people); + + List students = dataImportExportDto.getStudents().stream().map(studentDto -> new Student( + studentDto.getId(), personRepository.getReferenceById(studentDto.getPersonId()), studentDto.getIndex() + )).collect(Collectors.toList()); + + studentRepository.saveAll(students); + + List studentsGroups = dataImportExportDto.getStudentsGroups().stream().map(groupDto -> + new StudentsGroup(groupDto.getId(), new ArrayList<>(), new ArrayList<>()) + ).collect(Collectors.toList()); + + studentsGroupRepository.saveAll(studentsGroups); + + List groupLeaders = dataImportExportDto + .getGroupLeaders() + .stream() + .map(groupLeaderDto -> new GroupLeader( + groupLeaderDto.getId(), + personRepository.getReferenceById(groupLeaderDto.getPersonId()), + studentsGroupRepository.getReferenceById(groupLeaderDto.getGroupId()) + )) + .collect(Collectors.toList()); + groupLeaderRepository.saveAll(groupLeaders); + + List groupMembers = dataImportExportDto + .getGroupMembers() + .stream() + .map(groupMemberDto -> new GroupMember( + groupMemberDto.getId(), + studentRepository.getReferenceById(groupMemberDto.getStudentId()), + studentsGroupRepository.getReferenceById(groupMemberDto.getGroupId()) + )) + .collect(Collectors.toList()); + groupMemberRepository.saveAll(groupMembers); + } +} diff --git a/src/main/java/com/example/demo/service/PersonService.java b/src/main/java/com/example/demo/service/PersonService.java new file mode 100644 index 0000000..271675b --- /dev/null +++ b/src/main/java/com/example/demo/service/PersonService.java @@ -0,0 +1,105 @@ +package com.example.demo.service; + +import com.example.demo.dto.PersonDto; +import com.example.demo.dto.StudentDto; +import com.example.demo.model.Person; +import com.example.demo.model.Student; +import com.example.demo.repository.PersonRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.web.server.ResponseStatusException; + +import javax.transaction.Transactional; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +@Service +@Transactional +public class PersonService { + + private final PersonRepository personRepository; + + private final Logger logger = LoggerFactory.getLogger(PersonService.class); + + private final Pattern indexPattern = Pattern.compile("^[0-9]*$"); + + public PersonService(PersonRepository personRepository) { + this.personRepository = personRepository; + } + + public PersonDto get(Long id) { + logger.info("Szukam osoby"); + Person person = personRepository.findById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + Student student = person.getStudent(); + StudentDto studentDto = null; + if (student != null) { + studentDto = new StudentDto( + student.getId(), + person.getId(), + student.getIndex() + ); + } + return new PersonDto( + person.getId(), + person.getName(), + person.getSurname(), + studentDto + ); + } + + public PersonDto create(PersonDto personDto) { + logger.info("Tworzę osobę"); + Person person = new Person( + null, + personDto.getName(), + personDto.getSurname(), + null + ); + if (personDto.getStudent() != null) { + logger.info("Tworzę studenta"); + Matcher matcher = indexPattern.matcher(personDto.getStudent().getIndex()); + if (!matcher.matches()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Indeks musi składać się tylko z liczb."); + } + Student student = new Student(null,null,personDto.getStudent().getIndex()); + student.setPerson(person); + person.setStudent(student); + } + logger.info("Zapisuję osobę"); + return personRepository.save(person).toDto(); + } + + public PersonDto update(PersonDto personDto) { + logger.info("Szukam osoby"); + Person person = personRepository.findById(personDto.getId()).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + person.setName(personDto.getName()); + person.setSurname(personDto.getSurname()); + if (personDto.getStudent() != null) { + logger.info("Aktualizuję studenta"); + Matcher matcher = indexPattern.matcher(personDto.getStudent().getIndex()); + if (!matcher.matches()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Indeks musi składać się tylko z liczb."); + } + Student student = person.getStudent(); + if (student != null) { + student.setIndex(personDto.getStudent().getIndex()); + } else { + person.setStudent(new Student( + null, + person, + personDto.getStudent().getIndex() + )); + } + } else { + person.setStudent(null); + } + return person.toDto(); + } + + public void delete(Long id) { + logger.info("Usuwam osobę"); + personRepository.deleteById(id); + } +} diff --git a/src/main/java/com/example/demo/service/StudentsGroupService.java b/src/main/java/com/example/demo/service/StudentsGroupService.java new file mode 100644 index 0000000..0c63813 --- /dev/null +++ b/src/main/java/com/example/demo/service/StudentsGroupService.java @@ -0,0 +1,152 @@ +package com.example.demo.service; + +import com.example.demo.dto.GroupDto; +import com.example.demo.dto.GroupLeaderDto; +import com.example.demo.dto.GroupMemberDto; +import com.example.demo.model.GroupLeader; +import com.example.demo.model.GroupMember; +import com.example.demo.model.StudentsGroup; +import com.example.demo.repository.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.web.server.ResponseStatusException; + +import javax.transaction.Transactional; +import java.util.ArrayList; + +@Service +@Transactional(rollbackOn = Exception.class) +public class StudentsGroupService { + + private final Logger logger = LoggerFactory.getLogger(StudentsGroupService.class); + + private final StudentsGroupRepository studentsGroupRepository; + + private final PersonRepository personRepository; + + private final StudentRepository studentRepository; + + private final GroupMemberRepository groupMemberRepository; + + private final GroupLeaderRepository groupLeaderRepository; + + public StudentsGroupService( + StudentsGroupRepository studentsGroupRepository, + PersonRepository personRepository, + StudentRepository studentRepository, + GroupMemberRepository groupMemberRepository, + GroupLeaderRepository groupLeaderRepository + ) { + this.studentsGroupRepository = studentsGroupRepository; + this.personRepository = personRepository; + this.studentRepository = studentRepository; + this.groupMemberRepository = groupMemberRepository; + this.groupLeaderRepository = groupLeaderRepository; + } + + public GroupDto get(Long id) { + logger.info("Szukam grupy"); + StudentsGroup studentsGroup = studentsGroupRepository.findById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + return studentsGroup.toDto(); + } + + public GroupDto create(GroupDto groupDto) { + logger.info("Tworzę grupę"); + if (groupDto.getGroupMembers().size() > 20) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Grupa nie może mieć więcej niż 20 osób."); + } + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + groupDto.getGroupLeaders().forEach(groupLeaderDto -> studentsGroup.addGroupLeader( + new GroupLeader( + null, + personRepository.findById(groupLeaderDto.getPersonId()).orElseThrow(), + null + ) + )); + groupDto.getGroupMembers().forEach(groupMemberDto -> studentsGroup.addGroupMember( + new GroupMember( + null, + studentRepository.findById(groupMemberDto.getStudentId()).orElseThrow(), + null + ) + )); + return studentsGroupRepository.save(studentsGroup).toDto(); + } + + public GroupDto update(GroupDto groupDto) { + logger.info("Szukam grupy {}", groupDto); + if (groupDto.getGroupMembers().size() > 20) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Grupa nie może mieć więcej niż 20 osób."); + } + StudentsGroup studentsGroup = studentsGroupRepository.findById(groupDto.getId()).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + studentsGroup.getGroupLeaders().clear(); + studentsGroup.getGroupMembers().clear(); + groupDto.getGroupLeaders().forEach(groupLeaderDto -> studentsGroup.addGroupLeader( + new GroupLeader( + null, + personRepository.findById(groupLeaderDto.getPersonId()).orElseThrow(), + null + ) + )); + groupDto.getGroupMembers().forEach(groupMemberDto -> studentsGroup.addGroupMember( + new GroupMember( + null, + studentRepository.findById(groupMemberDto.getStudentId()).orElseThrow(), + null + ) + )); + return studentsGroupRepository.save(studentsGroup).toDto(); + } + + public void delete(Long id) { + logger.info("Usuwam grupę id: {}",id); + studentsGroupRepository.deleteById(id); + } + + public GroupMemberDto addGroupMember(Long groupId, GroupMemberDto groupMemberDto) { + StudentsGroup studentsGroup = studentsGroupRepository.findById(groupId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + if (studentsGroup.getGroupMembers().size()+1 > 20) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Grupa nie może mieć więcej niż 20 osób."); + } + GroupMember groupMember = new GroupMember( + null, + studentRepository.findById(groupMemberDto.getStudentId()).orElseThrow(), + studentsGroup + ); + studentsGroup.addGroupMember(groupMember); + logger.info("Zapisuję nowego członka grupy. {}", groupMember); + return groupMemberRepository.save(groupMember).toDto(); + } + + public void removeGroupMember(Long groupId, Long memberId) { + StudentsGroup studentsGroup = studentsGroupRepository.findById(groupId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + GroupMember groupMember = groupMemberRepository.findById(memberId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + logger.info("Usuwam członka grupy. {}", groupMember); + studentsGroup.removeGroupMember(groupMember); + } + + public GroupLeaderDto addGroupLeader(Long groupId, GroupLeaderDto groupLeaderDto) { + StudentsGroup studentsGroup = studentsGroupRepository.findById(groupId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + GroupLeader groupLeader = new GroupLeader( + null, + personRepository.findById(groupLeaderDto.getPersonId()).orElseThrow(), + studentsGroup + ); + studentsGroup.addGroupLeader(groupLeader); + logger.info("Zapisuję nowego lidera grupy. {}", groupLeader); + return groupLeaderRepository.save(groupLeader).toDto(); + } + + public void removeGroupLeader(Long groupId, Long leaderId) { + StudentsGroup studentsGroup = studentsGroupRepository.findById(groupId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + GroupLeader groupLeader = groupLeaderRepository.findById(leaderId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + logger.info("Usuwam lidera grupy. {}", groupLeader); + studentsGroup.removeGroupLeader(groupLeader); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..f3db924 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,7 @@ +spring.datasource.driverClassName=org.postgresql.Driver +spring.datasource.url=jdbc:postgresql://psql.wmi.amu.edu.pl:5432/s461998 +spring.datasource.username=s461998 +spring.datasource.password=llarapshwantaro +spring.jpa.hibernate.ddl-auto=create-drop +spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.show-sql=true \ No newline at end of file diff --git a/src/test/java/com/example/demo/DemoApplicationTests.java b/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..a98cad0 --- /dev/null +++ b/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,529 @@ +package com.example.demo; + +import com.example.demo.dto.*; +import com.example.demo.model.*; +import com.example.demo.repository.PersonRepository; +import com.example.demo.repository.StudentsGroupRepository; +import com.example.demo.service.ImportExportService; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import static org.springframework.http.MediaType.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@SpringBootTest +@AutoConfigureMockMvc +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +class DemoApplicationTests { + + @Autowired + PersonRepository personRepository; + + @Autowired + StudentsGroupRepository studentsGroupRepository; + + @Autowired + ImportExportService importExportService; + + @Autowired + ObjectMapper mapper; + + @Autowired + private MockMvc mvc; + + @Test + @Order(1) + void shouldImportDatabase() throws Exception { + this.mvc.perform(post("/importDatabase").contentType(APPLICATION_XML_VALUE).content("1IgaBartosz Collins2JaninaKowalska126543213AnnaNowak231236454KatarzynaAdamska346451235IgaBartosz Collins6JaninaKowalska466543217AnnaNowak571236458KatarzynaAdamska686451239JaninaKowalska7965432110IgaBartosz Collins11JaninaKowalska81165432112AnnaNowak91212364513KatarzynaAdamska101364512314IgaBartosz Collins111412345615IgaBartosz Collins16JaninaKowalska121665432117AnnaNowak131712364518KatarzynaAdamska141864512319BeataBielicka151964512320CecyliaCzerwiÅ\u0084ska162064512321IgaBartosz Collins22JaninaKowalska182265432123AnnaNowak192312364512654321231236453464512346654321571236456864512379654321811654321912123645101364512311141234561216654321131712364514186451231519645123162064512317 51234561822654321192312364511112411212212352352452562461941216457214131841419411124135261947214121221352452562121641318414194")) + .andDo(print()) + .andExpect(status().isOk()); + } + + @Test + @Order(2) + void shouldExportDatabase() throws Exception { + this.mvc.perform(get("/exportDatabase")) + .andDo(print()) + .andExpect(status().isOk()); + } + + @Test + void shouldGetPerson() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", new Student(null, null, "123456")); + person.getStudent().setPerson(person); + person = personRepository.save(person); + this.mvc.perform(get("/person/"+person.getId())).andDo(print()).andExpect(status().isOk()) + .andExpect(content().json("{\"name\": \"Iga\", \"surname\": \"Bartosz Collins\", \"student\": {\"personId\": "+person.getId()+", \"index\": \"123456\"}}")); + } + + @Test + void shouldUpdatePerson() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", new Student(null, null, "123456")); + person.getStudent().setPerson(person); + person = personRepository.save(person); + PersonDto personDto = new PersonDto(person.getId(), "Janina", "Kowalska", new StudentDto(null, null, "654321")); + + String requestJson = mapper.writeValueAsString(personDto); + + this.mvc.perform(put("/person").contentType(APPLICATION_JSON).content(requestJson)).andDo(print()).andExpect(status().isOk()) + .andExpect(content().json("{\"name\": \"Janina\", \"surname\": \"Kowalska\", \"student\": {\"personId\": "+person.getId()+", \"index\": \"654321\"}}")); + } + + @Test + void shouldCreatePerson() throws Exception { + PersonDto personDto = new PersonDto(null, "Janina", "Kowalska", new StudentDto(null, null, "654321")); + + String requestJson = mapper.writeValueAsString(personDto); + this.mvc.perform(post("/person").contentType(APPLICATION_JSON).content(requestJson)).andDo(print()) + .andExpect(status().isOk()) + .andExpect(content().json("{\"name\": \"Janina\", \"surname\": \"Kowalska\", \"student\": {\"index\": \"654321\"}}")); + } + + @Test + void shouldThrowBadRequestForStudentWithBadIndexNumberOnUpdatePerson() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", new Student(null, null, "123456")); + person.getStudent().setPerson(person); + person = personRepository.save(person); + PersonDto personDto = new PersonDto(person.getId(), "Janina", "Kowalska", new StudentDto(null, null, "fd654321")); + + String requestJson = mapper.writeValueAsString(personDto); + + this.mvc.perform(put("/person").contentType(APPLICATION_JSON).content(requestJson)) + .andDo(print()) + .andExpect(status().isBadRequest()); + } + + @Test + void shouldThrowBadRequestForStudentWithBadIndexNumberOnCreatePerson() throws Exception { + PersonDto personDto = new PersonDto(null, "Janina", "Kowalska", new StudentDto(null, null, "ert654321")); + + String requestJson = mapper.writeValueAsString(personDto); + this.mvc.perform(post("/person").contentType(APPLICATION_JSON).content(requestJson)) + .andDo(print()) + .andExpect(status().isBadRequest()); + } + + @Test + void shouldDeletePerson() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", new Student(null, null, "123456")); + person.getStudent().setPerson(person); + personRepository.save(person); + this.mvc.perform(delete("/person/"+person.getId())).andDo(print()).andExpect(status().isOk()); + } + + @Test + void shouldGetGroup() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", null); + person = personRepository.save(person); + GroupLeader groupLeader = new GroupLeader(null, person, null); + person.addGroupLeader(groupLeader); + + Person person2 = new Person(null, "Janina", "Kowalska", new Student(null, null, "654321")); + person2.getStudent().setPerson(person2); + person2 = personRepository.save(person2); + GroupMember groupMember = new GroupMember(null, person2.getStudent(), null); + person2.getStudent().addGroupMember(groupMember); + + Person person3 = new Person(null, "Anna", "Nowak", new Student(null, null, "123645")); + person3.getStudent().setPerson(person3); + person3 = personRepository.save(person3); + GroupMember groupMember2 = new GroupMember(null, person3.getStudent(), null); + person3.getStudent().addGroupMember(groupMember2); + + Person person4 = new Person(null, "Katarzyna", "Adamska", new Student(null, null, "645123")); + person4.getStudent().setPerson(person4); + person4 = personRepository.save(person4); + GroupMember groupMember3 = new GroupMember(null, person4.getStudent(), null); + person4.getStudent().addGroupMember(groupMember3); + + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + studentsGroup.addGroupLeader(groupLeader); + studentsGroup.addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember2); + studentsGroup.addGroupMember(groupMember3); + studentsGroup = studentsGroupRepository.save(studentsGroup); + this.mvc.perform(get("/group/"+studentsGroup.getId())).andDo(print()).andExpect(status().isOk()) + .andExpect(content().json("{\"id\":"+studentsGroup.getId()+",\"groupLeaders\":[{\"id\":"+studentsGroup.getGroupLeaders().get(0).getId()+",\"personId\":"+studentsGroup.getGroupLeaders().get(0).getPerson().getId()+",\"groupId\":"+studentsGroup.getId()+"}],\"groupMembers\":[{\"id\":"+studentsGroup.getGroupMembers().get(0).getId()+",\"studentId\":"+studentsGroup.getGroupMembers().get(0).getStudent().getId()+",\"groupId\":"+studentsGroup.getId()+"},{\"id\":"+studentsGroup.getGroupMembers().get(1).getId()+",\"studentId\":"+studentsGroup.getGroupMembers().get(1).getStudent().getId()+",\"groupId\":"+studentsGroup.getId()+"},{\"id\":"+studentsGroup.getGroupMembers().get(2).getId()+",\"studentId\":"+studentsGroup.getGroupMembers().get(2).getStudent().getId()+",\"groupId\":"+studentsGroup.getId()+"}]}")); + } + + @Test + void shouldUpdateGroup() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins",null); + person = personRepository.save(person); + GroupLeader groupLeader = new GroupLeader(null, person, null); + person.addGroupLeader(groupLeader); + + Person person2 = new Person(null, "Janina", "Kowalska", new Student(null, null, "654321")); + person2.getStudent().setPerson(person2); + person2 = personRepository.save(person2); + GroupMember groupMember = new GroupMember(null, person2.getStudent(), null); + person2.getStudent().addGroupMember(groupMember); + + Person person3 = new Person(null, "Anna", "Nowak", new Student(null, null, "123645")); + person3.getStudent().setPerson(person3); + person3 = personRepository.save(person3); + GroupMember groupMember2 = new GroupMember(null, person3.getStudent(), null); + person3.getStudent().addGroupMember(groupMember2); + + Person person4 = new Person(null, "Katarzyna", "Adamska", new Student(null, null, "645123")); + person4.getStudent().setPerson(person4); + person4 = personRepository.save(person4); + GroupMember groupMember3 = new GroupMember(null, person4.getStudent(), null); + person4.getStudent().addGroupMember(groupMember3); + + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + studentsGroup.addGroupLeader(groupLeader); + studentsGroup.addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember2); + studentsGroup.addGroupMember(groupMember3); + studentsGroup = studentsGroupRepository.save(studentsGroup); + + Person person5 = new Person(null, "Beata", "Bielicka", new Student(null, null, "645123")); + person5.getStudent().setPerson(person5); + person5 = personRepository.save(person5); + GroupLeader groupLeader2 = new GroupLeader(null, person5, studentsGroup); + person5.addGroupLeader(groupLeader2); + + Person person6 = new Person(null, "Cecylia", "Czerwińska", new Student(null, null, "645123")); + person6.getStudent().setPerson(person6); + person6 = personRepository.save(person6); + GroupMember groupMember5 = new GroupMember(null, person6.getStudent(), studentsGroup); + person6.getStudent().addGroupMember(groupMember5); + + GroupDto groupDto = studentsGroup.toDto(); + + groupDto.getGroupLeaders().clear(); + groupDto.getGroupLeaders().add(groupLeader2.toDto()); + + groupDto.getGroupMembers().clear(); + groupDto.getGroupMembers().add(groupMember5.toDto()); + + String requestJson = mapper.writeValueAsString(groupDto); + + this.mvc.perform(put("/group").contentType(APPLICATION_JSON).content(requestJson)).andDo(print()).andExpect(status().isOk()) + .andExpect(content().json("{\"id\":"+studentsGroup.getId()+",\"groupLeaders\":[{\"personId\":"+person5.getId()+",\"groupId\":"+studentsGroup.getId()+"}],\"groupMembers\":[{\"studentId\":"+person6.getStudent().getId()+",\"groupId\":"+studentsGroup.getId()+"}]}")); + } + + @Test + void shouldThrowBadRequestOnUpdateGroupWithToManyMembers() throws Exception { + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + for (int i = 0; i < 20; i++) { + Person person = new Person(null, "Imie"+i, "Nazwisko"+i, new Student(null, null, "54654654"+i)); + person = personRepository.save(person); + GroupMember groupMember = new GroupMember(null, person.getStudent(), null); + person.getStudent().addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember); + } + + studentsGroup = studentsGroupRepository.save(studentsGroup); + + Person person21 = new Person(null, "Imie21", "Nazwisko21",new Student(null, null, "54654654")); + person21 = personRepository.save(person21); + GroupMember groupMember21 = new GroupMember(null, person21.getStudent(), null); + groupMember21.setGroup(studentsGroup); + + GroupDto groupDto = studentsGroup.toDto(); + + groupDto.getGroupMembers().add(groupMember21.toDto()); + + String requestJson = mapper.writeValueAsString(groupDto); + + this.mvc.perform(put("/group").contentType(APPLICATION_JSON).content(requestJson)) + .andDo(print()) + .andExpect(status().isBadRequest()); + } + + @Test + void shouldThrowBadRequestOnCreateGroupWithToManyMembers() throws Exception { + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + for (int i = 0; i < 21; i++) { + Person person = new Person(null, "Imie"+i, "Nazwisko"+i, new Student(null, null, "54654654"+i)); + person = personRepository.save(person); + GroupMember groupMember = new GroupMember(null, person.getStudent(), null); + person.getStudent().addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember); + } + + GroupDto groupDto = studentsGroup.toDto(); + + String requestJson = mapper.writeValueAsString(groupDto); + + this.mvc.perform(post("/group").contentType(APPLICATION_JSON).content(requestJson)) + .andDo(print()) + .andExpect(status().isBadRequest()); + } + + @Test + void shouldCreateGroup() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", new Student(null, null, "123456")); + person = personRepository.save(person); + + Person person2 = new Person(null, "Janina", "Kowalska", new Student(null, null, "654321")); + person2.getStudent().setPerson(person2); + person2 = personRepository.save(person2); + + Person person3 = new Person(null, "Anna", "Nowak", new Student(null, null, "123645")); + person3.getStudent().setPerson(person3); + person3 = personRepository.save(person3); + + GroupDto groupDto = new GroupDto( + null, + List.of(new GroupLeaderDto(null, person.getId(), null)), + List.of(new GroupMemberDto(null, person2.getStudent().getId(), null), new GroupMemberDto(null, person3.getStudent().getId(), null)) + ); + + String requestJson = mapper.writeValueAsString(groupDto); + this.mvc.perform(post("/group").contentType(APPLICATION_JSON).content(requestJson)).andDo(print()) + .andExpect(status().isOk()) + .andExpect(content().json("{\"groupLeaders\":[{\"personId\":"+person.getId()+"}],\"groupMembers\":[{\"studentId\":"+person2.getStudent().getId()+"},{\"studentId\":"+person3.getStudent().getId()+"}]}")); + } + + @Test + void shouldDeleteGroup() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", null); + person = personRepository.save(person); + GroupLeader groupLeader = new GroupLeader(null, person, null); + person.addGroupLeader(groupLeader); + + Person person2 = new Person(null, "Janina", "Kowalska", new Student(null, null, "654321")); + person2.getStudent().setPerson(person2); + person2 = personRepository.save(person2); + GroupMember groupMember = new GroupMember(null, person2.getStudent(), null); + person2.getStudent().addGroupMember(groupMember); + + Person person3 = new Person(null, "Anna", "Nowak", new Student(null, null, "123645")); + person3.getStudent().setPerson(person3); + person3 = personRepository.save(person3); + GroupMember groupMember2 = new GroupMember(null, person3.getStudent(), null); + person3.getStudent().addGroupMember(groupMember2); + + Person person4 = new Person(null, "Katarzyna", "Adamska", new Student(null, null, "645123")); + person4.getStudent().setPerson(person4); + person4 = personRepository.save(person4); + GroupMember groupMember3 = new GroupMember(null, person4.getStudent(), null); + person4.getStudent().addGroupMember(groupMember3); + + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + studentsGroup.addGroupLeader(groupLeader); + studentsGroup.addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember2); + studentsGroup.addGroupMember(groupMember3); + studentsGroup = studentsGroupRepository.save(studentsGroup); + this.mvc.perform(delete("/group/"+studentsGroup.getId())).andDo(print()).andExpect(status().isOk()); + } + + @Test + void shouldAddMember() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", null); + person = personRepository.save(person); + GroupLeader groupLeader = new GroupLeader(null, person, null); + person.addGroupLeader(groupLeader); + + Person person2 = new Person(null, "Janina", "Kowalska", new Student(null, null, "654321")); + person2.getStudent().setPerson(person2); + person2 = personRepository.save(person2); + GroupMember groupMember = new GroupMember(null, person2.getStudent(), null); + person2.getStudent().addGroupMember(groupMember); + + Person person3 = new Person(null, "Anna", "Nowak", new Student(null, null, "123645")); + person3.getStudent().setPerson(person3); + person3 = personRepository.save(person3); + GroupMember groupMember2 = new GroupMember(null, person3.getStudent(), null); + person3.getStudent().addGroupMember(groupMember2); + + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + studentsGroup.addGroupLeader(groupLeader); + studentsGroup.addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember2); + studentsGroup = studentsGroupRepository.save(studentsGroup); + + Person person4 = new Person(null, "Katarzyna", "Adamska", new Student(null, null, "645123")); + person4.getStudent().setPerson(person4); + person4 = personRepository.save(person4); + GroupMemberDto groupMemberDto = new GroupMemberDto(null, person4.getStudent().getId(), studentsGroup.getId()); + + String requestJson = mapper.writeValueAsString(groupMemberDto); + + this.mvc.perform(put("/group/"+studentsGroup.getId()+"/member").contentType(APPLICATION_JSON).content(requestJson)) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(content().json("{\"studentId\":"+person4.getStudent().getId()+",\"groupId\":"+studentsGroup.getId()+"}")); + } + + @Test + void shouldThrowBadRequestOnAddMemberWithToManyMembers() throws Exception { + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + for (int i = 0; i < 20; i++) { + Person person = new Person(null, "Imie"+i, "Nazwisko"+i, new Student(null, null, "54654654"+i)); + person = personRepository.save(person); + GroupMember groupMember = new GroupMember(null, person.getStudent(), null); + person.getStudent().addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember); + + } + studentsGroup = studentsGroupRepository.save(studentsGroup); + + Person person21 = new Person(null, "Imię21", "Nazwisko21", new Student(null, null, "645123")); + person21.getStudent().setPerson(person21); + person21 = personRepository.save(person21); + GroupMemberDto groupMemberDto = new GroupMemberDto(null, person21.getStudent().getId(), studentsGroup.getId()); + + String requestJson = mapper.writeValueAsString(groupMemberDto); + + this.mvc.perform(put("/group/"+studentsGroup.getId()+"/member").contentType(APPLICATION_JSON).content(requestJson)) + .andDo(print()) + .andExpect(status().isBadRequest()); + } + + @Test + void shouldAddLeader() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", null); + person = personRepository.save(person); + GroupLeader groupLeader = new GroupLeader(null, person, null); + person.addGroupLeader(groupLeader); + + Person person2 = new Person(null, "Janina", "Kowalska", new Student(null, null, "654321")); + person2.getStudent().setPerson(person2); + person2 = personRepository.save(person2); + GroupMember groupMember = new GroupMember(null, person2.getStudent(), null); + person2.getStudent().addGroupMember(groupMember); + + Person person3 = new Person(null, "Anna", "Nowak", new Student(null, null, "123645")); + person3.getStudent().setPerson(person3); + person3 = personRepository.save(person3); + GroupMember groupMember2 = new GroupMember(null, person3.getStudent(), null); + person3.getStudent().addGroupMember(groupMember2); + + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + studentsGroup.addGroupLeader(groupLeader); + studentsGroup.addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember2); + studentsGroup = studentsGroupRepository.save(studentsGroup); + + Person person4 = new Person(null, "Katarzyna", "Adamska", new Student(null, null, "645123")); + person4.getStudent().setPerson(person4); + person4 = personRepository.save(person4); + GroupLeaderDto groupLeaderDto = new GroupLeaderDto(null, person4.getId(), studentsGroup.getId()); + + String requestJson = mapper.writeValueAsString(groupLeaderDto); + + this.mvc.perform(put("/group/"+studentsGroup.getId()+"/leader").contentType(APPLICATION_JSON).content(requestJson)) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(content().json("{\"personId\":"+person4.getId()+",\"groupId\":"+studentsGroup.getId()+"}")); + } + + @Test + void shouldRemoveMember() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", null); + person = personRepository.save(person); + GroupLeader groupLeader = new GroupLeader(null, person, null); + person.addGroupLeader(groupLeader); + + Person person2 = new Person(null, "Janina", "Kowalska", new Student(null, null, "654321")); + person2.getStudent().setPerson(person2); + person2 = personRepository.save(person2); + GroupMember groupMember = new GroupMember(null, person2.getStudent(), null); + person2.getStudent().addGroupMember(groupMember); + + Person person3 = new Person(null, "Anna", "Nowak", new Student(null, null, "123645")); + person3.getStudent().setPerson(person3); + person3 = personRepository.save(person3); + GroupMember groupMember2 = new GroupMember(null, person3.getStudent(), null); + person3.getStudent().addGroupMember(groupMember2); + + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + studentsGroup.addGroupLeader(groupLeader); + studentsGroup.addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember2); + studentsGroup = studentsGroupRepository.save(studentsGroup); + + this.mvc.perform(delete("/group/"+studentsGroup.getId()+"/member/"+studentsGroup.getGroupMembers().get(0).getId())) + .andDo(print()) + .andExpect(status().isOk()); + } + + @Test + void shouldRemoveLeader() throws Exception { + Person person = new Person(null, "Iga", "Bartosz Collins", null); + person = personRepository.save(person); + GroupLeader groupLeader = new GroupLeader(null, person, null); + person.addGroupLeader(groupLeader); + + Person person2 = new Person(null, "Janina", "Kowalska", new Student(null, null, "654321")); + person2.getStudent().setPerson(person2); + person2 = personRepository.save(person2); + GroupMember groupMember = new GroupMember(null, person2.getStudent(), null); + person2.getStudent().addGroupMember(groupMember); + + Person person3 = new Person(null, "Anna", "Nowak", new Student(null, null, "123645")); + person3.getStudent().setPerson(person3); + person3 = personRepository.save(person3); + GroupMember groupMember2 = new GroupMember(null, person3.getStudent(), null); + person3.getStudent().addGroupMember(groupMember2); + + StudentsGroup studentsGroup = new StudentsGroup( + null, + new ArrayList<>(), + new ArrayList<>() + ); + studentsGroup.addGroupLeader(groupLeader); + studentsGroup.addGroupMember(groupMember); + studentsGroup.addGroupMember(groupMember2); + studentsGroup = studentsGroupRepository.save(studentsGroup); + + this.mvc.perform(delete("/group/"+studentsGroup.getId()+"/leader/"+studentsGroup.getGroupLeaders().get(0).getId())) + .andDo(print()) + .andExpect(status().isOk()); + } +}