diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b7867b9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.3' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'org.modelmapper:modelmapper:3.2.0' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +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..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' 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..e91afe6 --- /dev/null +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,71 @@ +package com.example.demo; + +import java.util.Objects; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import com.example.demo.ageRatings.model.AgeRatingEntity; +import com.example.demo.ageRatings.service.AgeRatingService; +import com.example.demo.movies.model.MovieEntity; +import com.example.demo.movies.service.MovieService; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootApplication +public class DemoApplication implements CommandLineRunner { + private final Logger log = LoggerFactory.getLogger(DemoApplication.class); + + private final TypeService typeService; + private final AgeRatingService ageRatingService; + private final MovieService movieService; + + public DemoApplication(TypeService typeService, AgeRatingService ageRatingService, MovieService movieService) { + this.typeService = typeService; + this.ageRatingService = ageRatingService; + this.movieService = movieService; + } + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + + @Override + public void run(String... args) throws Exception { + if (args.length > 0 && Objects.equals("--populate", args[0])) { + log.info("Create default types values"); + final var type1 = typeService.create(new TypeEntity(null, "Фильм")); + final var type2 = typeService.create(new TypeEntity(null, "Сериал")); + + log.info("Create default ageRatings values"); + // final var ageRating1 = ageRatingService.create(new AgeRatingEntity(null, + // "0+")); + // final var ageRating2 = ageRatingService.create(new AgeRatingEntity(null, + // "6+")); + // final var ageRating3 = ageRatingService.create(new AgeRatingEntity(null, + // "12+")); + final var ageRating4 = ageRatingService.create(new AgeRatingEntity(null, "16+")); + final var ageRating5 = ageRatingService.create(new AgeRatingEntity(null, "18+")); + + log.info("Create default movies values"); + movieService.create(new MovieEntity(null, "Бойцовский клуб", type1, false, + "src/assets/main-page/posters/PeakyBlinders.png", + "Сотрудник страховой компании страдает хронической бессонницей и отчаянно пытается вырваться из мучительно скучной жизни...", + 1999, "США", "Интриги. Хаос. Мыло", "Дэвид Финчер", ageRating5, + "https://www.youtube.com/embed/dfeUzm6KF4g?si=U2D-2WNsJzkcxlBX")); + movieService.create(new MovieEntity(null, "Американский психопат", type1, true, + "src/assets/main-page/posters/AmericanPsycho.jpg", + "Днем он ничем не отличается от окружающих, и в толпе вы не обратите на него внимания...", + 2000, "США, Канада", "Респектабельная внешность дьявола", "Мэри Хэррон", ageRating5, + "https://www.youtube.com/embed/PpUWjff_OcM?si=e7tSm4V6qYkz406B")); + movieService.create(new MovieEntity(null, "Острые козырьки", type2, false, + "src/assets/main-page/posters/PeakyBlinders.png", + "Сериал рассказывает историю восхождения одной ирландской семьи...", + 2013, "Великобритания", "The streets are theirs", "Энтони Бирн, Колм МакКарти", ageRating4, + "https://www.youtube.com/embed/7cOfn_sjlXM?si=fxNoZjlUon1SZd70")); + } + } +} diff --git a/src/main/java/com/example/demo/ageRatings/api/AgeRatingController.java b/src/main/java/com/example/demo/ageRatings/api/AgeRatingController.java new file mode 100644 index 0000000..7474601 --- /dev/null +++ b/src/main/java/com/example/demo/ageRatings/api/AgeRatingController.java @@ -0,0 +1,64 @@ +package com.example.demo.ageRatings.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.ageRatings.model.AgeRatingEntity; +import com.example.demo.ageRatings.service.AgeRatingService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/ageRating") +public class AgeRatingController { + private final AgeRatingService ageRatingService; + private final ModelMapper modelMapper; + + public AgeRatingController(AgeRatingService ageRatingService, ModelMapper modelMapper) { + this.ageRatingService = ageRatingService; + this.modelMapper = modelMapper; + } + + private AgeRatingDto toDto(AgeRatingEntity entity) { + return modelMapper.map(entity, AgeRatingDto.class); + } + + private AgeRatingEntity toEntity(AgeRatingDto dto) { + return modelMapper.map(dto, AgeRatingEntity.class); + } + + @GetMapping + public List getAll() { + return ageRatingService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public AgeRatingDto get(@PathVariable(name = "id") Long id) { + return toDto(ageRatingService.get(id)); + } + + @PostMapping + public AgeRatingDto create(@RequestBody @Valid AgeRatingDto dto) { + return toDto(ageRatingService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public AgeRatingDto update(@PathVariable(name = "id") Long id, @RequestBody AgeRatingDto dto) { + return toDto(ageRatingService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public AgeRatingDto delete(@PathVariable(name = "id") Long id) { + return toDto(ageRatingService.delete(id)); + } +} diff --git a/src/main/java/com/example/demo/ageRatings/api/AgeRatingDto.java b/src/main/java/com/example/demo/ageRatings/api/AgeRatingDto.java new file mode 100644 index 0000000..6f46e6c --- /dev/null +++ b/src/main/java/com/example/demo/ageRatings/api/AgeRatingDto.java @@ -0,0 +1,28 @@ +package com.example.demo.ageRatings.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; + +public class AgeRatingDto { + private Long id; + @NotBlank + private String name; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + 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; + } +} diff --git a/src/main/java/com/example/demo/ageRatings/model/AgeRatingEntity.java b/src/main/java/com/example/demo/ageRatings/model/AgeRatingEntity.java new file mode 100644 index 0000000..8defbe8 --- /dev/null +++ b/src/main/java/com/example/demo/ageRatings/model/AgeRatingEntity.java @@ -0,0 +1,43 @@ +package com.example.demo.ageRatings.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class AgeRatingEntity extends BaseEntity { + private String name; + + public AgeRatingEntity() { + super(); + } + + public AgeRatingEntity(Long id, String name) { + super(id); + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final AgeRatingEntity other = (AgeRatingEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } + +} diff --git a/src/main/java/com/example/demo/ageRatings/repository/AgeRatingRepository.java b/src/main/java/com/example/demo/ageRatings/repository/AgeRatingRepository.java new file mode 100644 index 0000000..a781772 --- /dev/null +++ b/src/main/java/com/example/demo/ageRatings/repository/AgeRatingRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.ageRatings.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.ageRatings.model.AgeRatingEntity; + +@Repository +public class AgeRatingRepository extends MapRepository { +} diff --git a/src/main/java/com/example/demo/ageRatings/service/AgeRatingService.java b/src/main/java/com/example/demo/ageRatings/service/AgeRatingService.java new file mode 100644 index 0000000..afd262e --- /dev/null +++ b/src/main/java/com/example/demo/ageRatings/service/AgeRatingService.java @@ -0,0 +1,47 @@ +package com.example.demo.ageRatings.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.ageRatings.model.AgeRatingEntity; +import com.example.demo.ageRatings.repository.AgeRatingRepository; +import com.example.demo.core.error.NotFoundException; + +@Service +public class AgeRatingService { + private final AgeRatingRepository repository; + + public AgeRatingService(AgeRatingRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public AgeRatingEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public AgeRatingEntity create(AgeRatingEntity entity) { + return repository.create(entity); + } + + public AgeRatingEntity update(Long id, AgeRatingEntity entity) { + final AgeRatingEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + return repository.update(existsEntity); + } + + public AgeRatingEntity delete(Long id) { + final AgeRatingEntity existsEntity = get(id); + return repository.delete(existsEntity); + } + + public void deleteAll() { + repository.deleteAll(); + } +} diff --git a/src/main/java/com/example/demo/core/configuration/Constants.java b/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..d9c6b7c --- /dev/null +++ b/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,8 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String API_URL = "/api/1.0"; + + private Constants() { + } +} diff --git a/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..a5ad6f3 --- /dev/null +++ b/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -0,0 +1,13 @@ +package com.example.demo.core.configuration; + +import org.modelmapper.ModelMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MapperConfiguration { + @Bean + ModelMapper modelMapper() { + return new ModelMapper(); + } +} diff --git a/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/src/main/java/com/example/demo/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..762e85a --- /dev/null +++ b/src/main/java/com/example/demo/core/configuration/WebConfiguration.java @@ -0,0 +1,15 @@ +package com.example.demo.core.configuration; + +import org.springframework.context.annotation.Configuration; +import org.springframework.lang.NonNull; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfiguration implements WebMvcConfigurer { + @Override + public void addCorsMappings(@NonNull CorsRegistry registry) { + registry.addMapping("/**") + .allowedMethods("GET", "POST", "PUT", "DELETE"); + } +} diff --git a/src/main/java/com/example/demo/core/error/NotFoundException.java b/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..586af3c --- /dev/null +++ b/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.demo.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Long id) { + super(String.format("Entity with id [%s] is not found or not exists", id)); + } +} diff --git a/src/main/java/com/example/demo/core/model/BaseEntity.java b/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..674ddfb --- /dev/null +++ b/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -0,0 +1,20 @@ +package com.example.demo.core.model; + +public abstract class BaseEntity { + protected Long id; + + protected BaseEntity() { + } + + protected BaseEntity(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/src/main/java/com/example/demo/core/repository/CommonRepository.java b/src/main/java/com/example/demo/core/repository/CommonRepository.java new file mode 100644 index 0000000..85e1e6d --- /dev/null +++ b/src/main/java/com/example/demo/core/repository/CommonRepository.java @@ -0,0 +1,17 @@ +package com.example.demo.core.repository; + +import java.util.List; + +public interface CommonRepository { + List getAll(); + + E get(T id); + + E create(E entity); + + E update(E entity); + + E delete(E entity); + + void deleteAll(); +} diff --git a/src/main/java/com/example/demo/core/repository/MapRepository.java b/src/main/java/com/example/demo/core/repository/MapRepository.java new file mode 100644 index 0000000..6809ac2 --- /dev/null +++ b/src/main/java/com/example/demo/core/repository/MapRepository.java @@ -0,0 +1,57 @@ +package com.example.demo.core.repository; + +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import com.example.demo.core.model.BaseEntity; + +public abstract class MapRepository implements CommonRepository { + private final Map entities = new TreeMap<>(); + private Long lastId = 0L; + + protected MapRepository() { + } + + @Override + public List getAll() { + return entities.values().stream().toList(); + } + + @Override + public E get(Long id) { + return entities.get(id); + } + + @Override + public E create(E entity) { + lastId++; + entity.setId(lastId); + entities.put(lastId, entity); + return entity; + } + + @Override + public E update(E entity) { + if (get(entity.getId()) == null) { + return null; + } + entities.put(entity.getId(), entity); + return entity; + } + + @Override + public E delete(E entity) { + if (get(entity.getId()) == null) { + return null; + } + entities.remove(entity.getId()); + return entity; + } + + @Override + public void deleteAll() { + lastId = 0L; + entities.clear(); + } +} diff --git a/src/main/java/com/example/demo/movies/api/MovieController.java b/src/main/java/com/example/demo/movies/api/MovieController.java new file mode 100644 index 0000000..c8b3727 --- /dev/null +++ b/src/main/java/com/example/demo/movies/api/MovieController.java @@ -0,0 +1,70 @@ +package com.example.demo.movies.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.movies.model.MovieEntity; +import com.example.demo.movies.service.MovieService; +import com.example.demo.types.service.TypeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/movie") +public class MovieController { + private final MovieService itemService; + private final TypeService typeService; + private final ModelMapper modelMapper; + + public MovieController(MovieService itemService, TypeService typeService, ModelMapper modelMapper) { + this.itemService = itemService; + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private MovieDto toDto(MovieEntity entity) { + return modelMapper.map(entity, MovieDto.class); + } + + private MovieEntity toEntity(MovieDto dto) { + final MovieEntity entity = modelMapper.map(dto, MovieEntity.class); + entity.setType(typeService.get(dto.getTypeId())); + return entity; + } + + @GetMapping + public List getAll(@RequestParam(name = "typeId", defaultValue = "0") Long typeId) { + return itemService.getAll(typeId).stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public MovieDto get(@PathVariable(name = "id") Long id) { + return toDto(itemService.get(id)); + } + + @PostMapping + public MovieDto create(@RequestBody @Valid MovieDto dto) { + return toDto(itemService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public MovieDto update(@PathVariable(name = "id") Long id, @RequestBody MovieDto dto) { + return toDto(itemService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public MovieDto delete(@PathVariable(name = "id") Long id) { + return toDto(itemService.delete(id)); + } +} diff --git a/src/main/java/com/example/demo/movies/api/MovieDto.java b/src/main/java/com/example/demo/movies/api/MovieDto.java new file mode 100644 index 0000000..5ddfd0c --- /dev/null +++ b/src/main/java/com/example/demo/movies/api/MovieDto.java @@ -0,0 +1,148 @@ +package com.example.demo.movies.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public class MovieDto { + private Long id; + + @NotNull + @NotBlank + private String title; + + @NotNull + @Min(1) + private Long typeId; + + @NotNull + private boolean requiresSubscription; + + private String poster; + + @NotNull + @NotBlank + private String description; + + @NotNull + private Integer releaseDate; + + @NotNull + @NotBlank + private String country; + + @NotNull + @NotBlank + private String tagline; + + @NotNull + @NotBlank + private String director; + + @NotNull + @Min(1) + private Long ageRatingId; + + @NotNull + @NotBlank + private String video; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTypeId() { + return typeId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public void setTypeId(Long typeId) { + this.typeId = typeId; + } + + public boolean getRequiresSubscription() { + return requiresSubscription; + } + + public void setRequiresSubscription(boolean requiresSubscription) { + this.requiresSubscription = requiresSubscription; + } + + public String getPoster() { + return poster; + } + + public void setPoster(String poster) { + this.poster = poster; + } + + public String getDescription() { + return description; + } + + public void getDescription(String description) { + this.description = description; + } + + public Integer getReleaseDate() { + return releaseDate; + } + + public void setReleaseDate(Integer releaseDate) { + this.releaseDate = releaseDate; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getTagline() { + return tagline; + } + + public void setTagline(String tagline) { + this.tagline = tagline; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public Long getAgeRatingId() { + return ageRatingId; + } + + public void setAgeRatingId(Long ageRatingId) { + this.ageRatingId = ageRatingId; + } + + public String getVideo() { + return video; + } + + public void setVideo(String video) { + this.video = video; + } +} diff --git a/src/main/java/com/example/demo/movies/model/MovieEntity.java b/src/main/java/com/example/demo/movies/model/MovieEntity.java new file mode 100644 index 0000000..0f41d5b --- /dev/null +++ b/src/main/java/com/example/demo/movies/model/MovieEntity.java @@ -0,0 +1,158 @@ +package com.example.demo.movies.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.ageRatings.model.AgeRatingEntity; + +public class MovieEntity extends BaseEntity { + private String title; + private TypeEntity type; + private boolean requiresSubscription; + private String poster; + private String description; + private Integer releaseDate; + private String country; + private String tagline; + private String director; + private AgeRatingEntity ageRating; + private String video; + + public MovieEntity() { + super(); + } + + public MovieEntity(Long id, String title, TypeEntity type, boolean requiresSubscription, String poster, + String description, Integer releaseDate, String country, String tagline, String director, + AgeRatingEntity ageRating, String video) { + super(id); + + this.title = title; + this.type = type; + this.requiresSubscription = requiresSubscription; + this.poster = poster; + this.description = description; + this.releaseDate = releaseDate; + this.country = country; + this.tagline = tagline; + this.director = director; + this.ageRating = ageRating; + this.video = video; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public TypeEntity getType() { + return type; + } + + public void setType(TypeEntity type) { + this.type = type; + } + + public boolean getRequiresSubscription() { + return requiresSubscription; + } + + public void setRequiresSubscription(boolean requiresSubscription) { + this.requiresSubscription = requiresSubscription; + } + + public String getPoster() { + return poster; + } + + public void setPoster(String poster) { + this.poster = poster; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Integer getReleaseDate() { + return releaseDate; + } + + public void setReleaseDate(Integer releaseDate) { + this.releaseDate = releaseDate; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getTagline() { + return tagline; + } + + public void setTagline(String tagline) { + this.tagline = tagline; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public AgeRatingEntity getAgeRating() { + return ageRating; + } + + public void setAgeRating(AgeRatingEntity ageRating) { + this.ageRating = ageRating; + } + + public String getVideo() { + return video; + } + + public void setVideo(String video) { + this.video = video; + } + + @Override + public int hashCode() { + return Objects.hash(id, title, type, requiresSubscription, poster, description, releaseDate, country, tagline, + director, ageRating, video); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final MovieEntity other = (MovieEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getTitle(), title) + && Objects.equals(other.getType(), type) + && Objects.equals(other.getRequiresSubscription(), requiresSubscription) + && Objects.equals(other.getPoster(), poster) + && Objects.equals(other.getDescription(), description) + && Objects.equals(other.getReleaseDate(), releaseDate) + && Objects.equals(other.getCountry(), country) + && Objects.equals(other.getTagline(), tagline) + && Objects.equals(other.getDirector(), director) + && Objects.equals(other.getAgeRating(), ageRating) + && Objects.equals(other.getVideo(), video); + } +} diff --git a/src/main/java/com/example/demo/movies/repository/MovieRepository.java b/src/main/java/com/example/demo/movies/repository/MovieRepository.java new file mode 100644 index 0000000..10db0ab --- /dev/null +++ b/src/main/java/com/example/demo/movies/repository/MovieRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.movies.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.movies.model.MovieEntity; + +@Repository +public class MovieRepository extends MapRepository { +} diff --git a/src/main/java/com/example/demo/movies/service/MovieService.java b/src/main/java/com/example/demo/movies/service/MovieService.java new file mode 100644 index 0000000..9c497a9 --- /dev/null +++ b/src/main/java/com/example/demo/movies/service/MovieService.java @@ -0,0 +1,63 @@ +package com.example.demo.movies.service; + +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.movies.model.MovieEntity; +import com.example.demo.movies.repository.MovieRepository; + +@Service +public class MovieService { + private final MovieRepository repository; + + public MovieService(MovieRepository repository) { + this.repository = repository; + } + + public List getAll(Long typeId) { + if (Objects.equals(typeId, 0L)) { + return repository.getAll(); + } + return repository.getAll().stream() + .filter(item -> item.getType().getId().equals(typeId)) + .toList(); + } + + public MovieEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public MovieEntity create(MovieEntity entity) { + return repository.create(entity); + } + + public MovieEntity update(Long id, MovieEntity entity) { + final MovieEntity existsEntity = get(id); + existsEntity.setTitle(entity.getTitle()); + existsEntity.setType(entity.getType()); + existsEntity.setRequiresSubscription(entity.getRequiresSubscription()); + existsEntity.setPoster(entity.getPoster()); + existsEntity.setDescription(entity.getDescription()); + existsEntity.setReleaseDate(entity.getReleaseDate()); + existsEntity.setCountry(entity.getCountry()); + existsEntity.setTagline(entity.getTagline()); + existsEntity.setDirector(entity.getDirector()); + existsEntity.setAgeRating(entity.getAgeRating()); + existsEntity.setVideo(entity.getVideo()); + return repository.update(existsEntity); + } + + public MovieEntity delete(Long id) { + final MovieEntity existsEntity = get(id); + return repository.delete(existsEntity); + } + + public void deleteAll() { + repository.deleteAll(); + } +} diff --git a/src/main/java/com/example/demo/types/api/TypeController.java b/src/main/java/com/example/demo/types/api/TypeController.java new file mode 100644 index 0000000..81f07cf --- /dev/null +++ b/src/main/java/com/example/demo/types/api/TypeController.java @@ -0,0 +1,64 @@ +package com.example.demo.types.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/type") +public class TypeController { + private final TypeService typeService; + private final ModelMapper modelMapper; + + public TypeController(TypeService typeService, ModelMapper modelMapper) { + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private TypeDto toDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private TypeEntity toEntity(TypeDto dto) { + return modelMapper.map(dto, TypeEntity.class); + } + + @GetMapping + public List getAll() { + return typeService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public TypeDto get(@PathVariable(name = "id") Long id) { + return toDto(typeService.get(id)); + } + + @PostMapping + public TypeDto create(@RequestBody @Valid TypeDto dto) { + return toDto(typeService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public TypeDto update(@PathVariable(name = "id") Long id, @RequestBody TypeDto dto) { + return toDto(typeService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public TypeDto delete(@PathVariable(name = "id") Long id) { + return toDto(typeService.delete(id)); + } +} diff --git a/src/main/java/com/example/demo/types/api/TypeDto.java b/src/main/java/com/example/demo/types/api/TypeDto.java new file mode 100644 index 0000000..3b2f3dd --- /dev/null +++ b/src/main/java/com/example/demo/types/api/TypeDto.java @@ -0,0 +1,29 @@ +package com.example.demo.types.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; + +public class TypeDto { + private Long id; + + @NotBlank + private String name; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + 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; + } +} diff --git a/src/main/java/com/example/demo/types/model/TypeEntity.java b/src/main/java/com/example/demo/types/model/TypeEntity.java new file mode 100644 index 0000000..fd90bdb --- /dev/null +++ b/src/main/java/com/example/demo/types/model/TypeEntity.java @@ -0,0 +1,43 @@ +package com.example.demo.types.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class TypeEntity extends BaseEntity { + private String name; + + public TypeEntity() { + super(); + } + + public TypeEntity(Long id, String name) { + super(id); + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final TypeEntity other = (TypeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } + +} diff --git a/src/main/java/com/example/demo/types/repository/TypeRepository.java b/src/main/java/com/example/demo/types/repository/TypeRepository.java new file mode 100644 index 0000000..1c29ea2 --- /dev/null +++ b/src/main/java/com/example/demo/types/repository/TypeRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.types.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.types.model.TypeEntity; + +@Repository +public class TypeRepository extends MapRepository { +} diff --git a/src/main/java/com/example/demo/types/service/TypeService.java b/src/main/java/com/example/demo/types/service/TypeService.java new file mode 100644 index 0000000..a594bab --- /dev/null +++ b/src/main/java/com/example/demo/types/service/TypeService.java @@ -0,0 +1,47 @@ +package com.example.demo.types.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.repository.TypeRepository; + +@Service +public class TypeService { + private final TypeRepository repository; + + public TypeService(TypeRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public TypeEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public TypeEntity create(TypeEntity entity) { + return repository.create(entity); + } + + public TypeEntity update(Long id, TypeEntity entity) { + final TypeEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + return repository.update(existsEntity); + } + + public TypeEntity delete(Long id) { + final TypeEntity existsEntity = get(id); + return repository.delete(existsEntity); + } + + public void deleteAll() { + repository.deleteAll(); + } +} diff --git a/src/main/java/com/example/demo/users/api/UserController.java b/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..10414e8 --- /dev/null +++ b/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,79 @@ +package com.example.demo.users.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.movies.model.MovieEntity; +import com.example.demo.movies.service.MovieService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user") +public class UserController { + private final UserService userService; + private final MovieService movieService; + + private final ModelMapper modelMapper; + + public UserController(UserService userService, MovieService movieService, ModelMapper modelMapper) { + this.userService = userService; + this.movieService = movieService; + + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public List getAll() { + return userService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public UserDto get(@PathVariable(name = "id") Long id) { + return toDto(userService.get(id)); + } + + @PostMapping + public UserDto create(@RequestBody @Valid UserDto dto) { + return toDto(userService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public UserDto update(@PathVariable(name = "id") Long id, @RequestBody UserDto dto) { + return toDto(userService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public UserDto delete(@PathVariable(name = "id") Long id) { + return toDto(userService.delete(id)); + } + + @PutMapping("/{id}/movie/{movieId}") + public UserDto addMovie(@PathVariable(name = "id") Long id, @RequestBody UserDto dto, + @PathVariable(name = "movieId") Long movieId) { + MovieEntity movie = movieService.get(movieId); + userService.addMovie(id, movie.getId()); + + return toDto(userService.update(id, toEntity(dto))); + } +} diff --git a/src/main/java/com/example/demo/users/api/UserDto.java b/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..d93fe5f --- /dev/null +++ b/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,66 @@ +package com.example.demo.users.api; + +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public class UserDto { + private Long id; + + @NotNull + @NotBlank + private String email; + + @NotNull + @NotBlank + private String password; + + private Date expirationDate; + + private List watchLater; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public Date getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(Date expirationDate) { + this.expirationDate = expirationDate; + } + + public List getWatchLater() { + return watchLater; + } + + public void setWatchLater(List watchLater) { + this.watchLater = watchLater; + } +} diff --git a/src/main/java/com/example/demo/users/model/UserEntity.java b/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..8c2bbb3 --- /dev/null +++ b/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,78 @@ +package com.example.demo.users.model; + +import java.util.Date; +import java.util.List; +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class UserEntity extends BaseEntity { + private String email; + private String password; + private Date expirationDate; + private List watchLater; + + public UserEntity() { + super(); + } + + public UserEntity(Long id, String email, String password, Date expirationDate, List watchLater) { + super(id); + + this.email = email; + this.password = password; + this.expirationDate = expirationDate; + this.watchLater = watchLater; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public Date getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(Date expirationDate) { + this.expirationDate = expirationDate; + } + + public List getWatchLater() { + return watchLater; + } + + public void setWatchLater(List watchLater) { + this.watchLater = watchLater; + } + + @Override + public int hashCode() { + return Objects.hash(id, email, password, expirationDate, watchLater); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getEmail(), email) + && Objects.equals(other.getPassword(), password) + && Objects.equals(other.getExpirationDate(), expirationDate) + && Objects.equals(other.getWatchLater(), watchLater); + } +} diff --git a/src/main/java/com/example/demo/users/repository/UserRepository.java b/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..fa4b654 --- /dev/null +++ b/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.users.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.users.model.UserEntity; + +@Repository +public class UserRepository extends MapRepository { +} diff --git a/src/main/java/com/example/demo/users/service/UserService.java b/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..cc0063d --- /dev/null +++ b/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,63 @@ +package com.example.demo.users.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.repository.UserRepository; +import com.example.demo.core.error.NotFoundException; +import com.example.demo.movies.model.MovieEntity; +import com.example.demo.movies.service.MovieService; + +@Service +public class UserService { + private final UserRepository repository; + private final MovieService movieService; + + public UserService(UserRepository repository, MovieService movieService) { + this.movieService = movieService; + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public UserEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public UserEntity create(UserEntity entity) { + return repository.create(entity); + } + + public UserEntity update(Long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + existsEntity.setEmail(entity.getEmail()); + return repository.update(existsEntity); + } + + public UserEntity delete(Long id) { + final UserEntity existsEntity = get(id); + return repository.delete(existsEntity); + } + + public void deleteAll() { + repository.deleteAll(); + } + + public UserEntity addMovie(Long id, Long movieId) { + final UserEntity existsEntity = get(id); + + MovieEntity movie = movieService.get(movieId); + + if (!existsEntity.getWatchLater().contains(movie.getId())) { + existsEntity.getWatchLater().add(movie.getId()); + } + + return existsEntity; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/com/example/demo/AgeRatingServiceTests.java b/src/test/java/com/example/demo/AgeRatingServiceTests.java new file mode 100644 index 0000000..7483ec6 --- /dev/null +++ b/src/test/java/com/example/demo/AgeRatingServiceTests.java @@ -0,0 +1,65 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +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.context.SpringBootTest; + +import com.example.demo.ageRatings.model.AgeRatingEntity; +import com.example.demo.ageRatings.service.AgeRatingService; +import com.example.demo.core.error.NotFoundException; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class AgeRatingServiceTests { + @Autowired + private AgeRatingService ageRatingService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> ageRatingService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + ageRatingService.deleteAll(); + + ageRatingService.create(new AgeRatingEntity(null, "12+")); + ageRatingService.create(new AgeRatingEntity(null, "16+")); + final AgeRatingEntity last = ageRatingService.create(new AgeRatingEntity(null, "18+")); + + Assertions.assertEquals(3, ageRatingService.getAll().size()); + Assertions.assertEquals(last, ageRatingService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final String test = "TEST"; + final AgeRatingEntity entity = ageRatingService.get(3L); + final String oldName = entity.getName(); + final AgeRatingEntity newEntity = ageRatingService.update(3L, new AgeRatingEntity(2L, test)); + + Assertions.assertEquals(3, ageRatingService.getAll().size()); + Assertions.assertEquals(newEntity, ageRatingService.get(3L)); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + @Order(3) + void deleteTest() { + ageRatingService.delete(3L); + Assertions.assertEquals(2, ageRatingService.getAll().size()); + final AgeRatingEntity last = ageRatingService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final AgeRatingEntity newEntity = ageRatingService.create(new AgeRatingEntity(null, "18+")); + Assertions.assertEquals(3, ageRatingService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/src/test/java/com/example/demo/MovieServiceTests.java b/src/test/java/com/example/demo/MovieServiceTests.java new file mode 100644 index 0000000..599e3d8 --- /dev/null +++ b/src/test/java/com/example/demo/MovieServiceTests.java @@ -0,0 +1,109 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +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.context.SpringBootTest; + +import com.example.demo.ageRatings.model.AgeRatingEntity; +import com.example.demo.ageRatings.service.AgeRatingService; +import com.example.demo.core.error.NotFoundException; +import com.example.demo.movies.model.MovieEntity; +import com.example.demo.movies.service.MovieService; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class MovieServiceTests { + @Autowired + private TypeService typeService; + + @Autowired + private AgeRatingService ageRatingService; + + @Autowired + private MovieService movieService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> movieService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + movieService.deleteAll(); + + final var type1 = typeService.create(new TypeEntity(null, "Фильм")); + final var type2 = typeService.create(new TypeEntity(null, "Сериал")); + final var ageRating4 = ageRatingService.create(new AgeRatingEntity(null, "16+")); + final var ageRating5 = ageRatingService.create(new AgeRatingEntity(null, "18+")); + + movieService.create(new MovieEntity(null, "Бойцовский клуб", type1, false, + "src/assets/main-page/posters/PeakyBlinders.png", + "Сотрудник страховой компании страдает хронической бессонницей и отчаянно пытается вырваться из мучительно скучной жизни...", + 1999, "США", "Интриги. Хаос. Мыло", "Дэвид Финчер", ageRating5, + "https://www.youtube.com/embed/dfeUzm6KF4g?si=U2D-2WNsJzkcxlBX")); + movieService.create(new MovieEntity(null, "Американский психопат", type1, true, + "src/assets/main-page/posters/AmericanPsycho.jpg", + "Днем он ничем не отличается от окружающих, и в толпе вы не обратите на него внимания...", + 2000, "США, Канада", "Респектабельная внешность дьявола", "Мэри Хэррон", ageRating5, + "https://www.youtube.com/embed/PpUWjff_OcM?si=e7tSm4V6qYkz406B")); + final MovieEntity last = movieService.create(new MovieEntity(null, "Острые козырьки", type2, false, + "src/assets/main-page/posters/PeakyBlinders.png", + "Сериал рассказывает историю восхождения одной ирландской семьи...", + 2013, "Великобритания", "The streets are theirs", "Энтони Бирн, Колм МакКарти", ageRating4, + "https://www.youtube.com/embed/7cOfn_sjlXM?si=fxNoZjlUon1SZd70")); + + Assertions.assertEquals(3, movieService.getAll(0L).size()); + Assertions.assertEquals(2, movieService.getAll(1L).size()); + Assertions.assertEquals(last, movieService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final var type2 = typeService.create(new TypeEntity(null, "Сериал")); + final var ageRating4 = ageRatingService.create(new AgeRatingEntity(null, "16+")); + + final String test = "TEST"; + final MovieEntity entity = movieService.get(3L); + final String oldName = entity.getTitle(); + final MovieEntity newEntity = movieService.update(3L, new MovieEntity(null, + test, type2, false, + "src/assets/main-page/posters/PeakyBlinders.png", + "Сериал рассказывает историю восхождения одной ирландской семьи...", + 2013, "Великобритания", "The streets are theirs", "Энтони Бирн, Колм МакКарти", ageRating4, + "https://www.youtube.com/embed/7cOfn_sjlXM?si=fxNoZjlUon1SZd70")); + + Assertions.assertEquals(3, movieService.getAll(0L).size()); + Assertions.assertEquals(newEntity, movieService.get(3L)); + Assertions.assertEquals(test, newEntity.getTitle()); + Assertions.assertNotEquals(oldName, newEntity.getTitle()); + } + + @Test + @Order(3) + void deleteTest() { + final var type2 = typeService.create(new TypeEntity(null, "Сериал")); + final var ageRating4 = ageRatingService.create(new AgeRatingEntity(null, "16+")); + + movieService.delete(3L); + Assertions.assertEquals(2, movieService.getAll(0L).size()); + final MovieEntity last = movieService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final MovieEntity newEntity = movieService.create(new MovieEntity(null, + "Острые козырьки", type2, false, + "src/assets/main-page/posters/PeakyBlinders.png", + "Сериал рассказывает историю восхождения одной ирландской семьи...", + 2013, "Великобритания", "The streets are theirs", "Энтони Бирн, Колм МакКарти", ageRating4, + "https://www.youtube.com/embed/7cOfn_sjlXM?si=fxNoZjlUon1SZd70")); + Assertions.assertEquals(3, movieService.getAll(0L).size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/src/test/java/com/example/demo/TypeServiceTests.java b/src/test/java/com/example/demo/TypeServiceTests.java new file mode 100644 index 0000000..cbc6fa7 --- /dev/null +++ b/src/test/java/com/example/demo/TypeServiceTests.java @@ -0,0 +1,64 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +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.context.SpringBootTest; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class TypeServiceTests { + @Autowired + private TypeService typeService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + typeService.deleteAll(); + + typeService.create(new TypeEntity(null, "Фильм")); + final TypeEntity last = typeService.create(new TypeEntity(null, "Сериал")); + + Assertions.assertEquals(2, typeService.getAll().size()); + Assertions.assertEquals(last, typeService.get(2L)); + } + + @Test + @Order(2) + void updateTest() { + final String test = "TEST"; + final TypeEntity entity = typeService.get(2L); + final String oldName = entity.getName(); + final TypeEntity newEntity = typeService.update(2L, new TypeEntity(1L, test)); + + Assertions.assertEquals(2, typeService.getAll().size()); + Assertions.assertEquals(newEntity, typeService.get(2L)); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + @Order(3) + void deleteTest() { + typeService.delete(2L); + Assertions.assertEquals(1, typeService.getAll().size()); + final TypeEntity last = typeService.get(1L); + Assertions.assertEquals(1L, last.getId()); + + final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Сериал")); + Assertions.assertEquals(2, typeService.getAll().size()); + Assertions.assertEquals(3L, newEntity.getId()); + } +} diff --git a/src/test/java/com/example/demo/UserServiceTests.java b/src/test/java/com/example/demo/UserServiceTests.java new file mode 100644 index 0000000..3b0fe4d --- /dev/null +++ b/src/test/java/com/example/demo/UserServiceTests.java @@ -0,0 +1,102 @@ +package com.example.demo; + +import java.util.ArrayList; +import java.util.Date; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +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.context.SpringBootTest; + +import com.example.demo.ageRatings.model.AgeRatingEntity; +import com.example.demo.ageRatings.service.AgeRatingService; +import com.example.demo.core.error.NotFoundException; +import com.example.demo.movies.model.MovieEntity; +import com.example.demo.movies.service.MovieService; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class UserServiceTests { + @Autowired + private TypeService typeService; + + @Autowired + private AgeRatingService ageRatingService; + + @Autowired + private MovieService movieService; + + @Autowired + private UserService userService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + ageRatingService.deleteAll(); + typeService.deleteAll(); + movieService.deleteAll(); + userService.deleteAll(); + + userService.create(new UserEntity(null, "myemail@mail.com", "12345678", new Date(), new ArrayList<>())); + userService.create(new UserEntity(null, "secondemail@mail.com", "qwwerty", new Date(), new ArrayList<>())); + final var last = userService + .create(new UserEntity(null, "thirdemail@mail.com", "ytrewq", new Date(), new ArrayList<>())); + + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(last, userService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final var type1 = typeService.create(new TypeEntity(null, "Фильм")); + final var ageRating5 = ageRatingService.create(new AgeRatingEntity(null, "18+")); + + final var movie1 = movieService.create(new MovieEntity(null, "Бойцовский клуб", type1, false, + "src/assets/main-page/posters/PeakyBlinders.png", + "Сотрудник страховой компании страдает хронической бессонницей и отчаянно пытается вырваться из мучительно скучной жизни...", + 1999, "США", "Интриги. Хаос. Мыло", "Дэвид Финчер", ageRating5, + "https://www.youtube.com/embed/dfeUzm6KF4g?si=U2D-2WNsJzkcxlBX")); + final var movie2 = movieService.create(new MovieEntity(null, "Американский психопат", type1, true, + "src/assets/main-page/posters/AmericanPsycho.jpg", + "Днем он ничем не отличается от окружающих, и в толпе вы не обратите на него внимания...", + 2000, "США, Канада", "Респектабельная внешность дьявола", "Мэри Хэррон", ageRating5, + "https://www.youtube.com/embed/PpUWjff_OcM?si=e7tSm4V6qYkz406B")); + + userService.addMovie(1L, movie1.getId()); + final UserEntity newEntity = userService.addMovie(1L, movie2.getId()); + + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(newEntity, userService.get(1L)); + Assertions.assertEquals(2, userService.get(1L).getWatchLater().size()); + + userService.addMovie(1L, movie1.getId()); + Assertions.assertEquals(2, userService.get(1L).getWatchLater().size()); + } + + @Test + @Order(3) + void deleteTest() { + userService.delete(3L); + Assertions.assertEquals(2, userService.getAll().size()); + final UserEntity last = userService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final var newEntity = userService + .create(new UserEntity(null, "thirdemail@mail.com", "ytrewq", new Date(), new ArrayList<>())); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/Отчёт (лабораторная работа №2).docx b/Отчёт (лабораторная работа №2).docx new file mode 100644 index 0000000..6863e1d Binary files /dev/null and b/Отчёт (лабораторная работа №2).docx differ