diff --git a/.current.json b/.current.json index 15faff5..854d860 100644 --- a/.current.json +++ b/.current.json @@ -1 +1 @@ -{"assignment":"java-spring-boot-ru/crud"} +{"assignment":"java-spring-boot-ru/search"} diff --git a/java-spring-boot-ru/search/.gitignore b/java-spring-boot-ru/search/.gitignore new file mode 100644 index 0000000..184bfba --- /dev/null +++ b/java-spring-boot-ru/search/.gitignore @@ -0,0 +1,4 @@ +.gradle/ +build/ +caches/ +.idea/ diff --git a/java-spring-boot-ru/search/Makefile b/java-spring-boot-ru/search/Makefile new file mode 100644 index 0000000..ebb0b08 --- /dev/null +++ b/java-spring-boot-ru/search/Makefile @@ -0,0 +1,28 @@ +setup: + ./gradlew wrapper --gradle-version 8.3 + ./gradlew build + +app: + ./gradlew bootRun --args='--spring.profiles.active=dev' + +clean: + ./gradlew clean + +build: + ./gradlew clean build + +dev: app + +reload-classes: + ./gradlew -t classes + +install: + ./gradlew installDist + +test: + ./gradlew test + +check-java-deps: + ./gradlew dependencyUpdates -Drevision=release + +.PHONY: build diff --git a/java-spring-boot-ru/search/README.html b/java-spring-boot-ru/search/README.html new file mode 100644 index 0000000..8a320e1 --- /dev/null +++ b/java-spring-boot-ru/search/README.html @@ -0,0 +1,52 @@ + + + + + + + + +
+

Поиск

+

В этом упражнении продолжим работать с системой управления товарами. Товаров в интернет-магазине обычно очень много, а потому покупатели наверняка захотят отфильтровать товары по определенным критериям. Так они смогут просматривать только те товары, которые удовлетворяют их запросам, а оставшиеся — игнорировать.

+

В этом упражнении вам предстоит реализовать фильтрацию по названию, категории, цене и рейтингу товара.

+

Полезные ссылки

+ +

src/main/java/exercise/dto/ProductParamsDTO.java

+

Изучите DTO с параметрами фильтрации. Посмотрите, какие имена параметров будут передаваться в строке запроса при фильтрации.

+

src/main/java/exercise/specification/ProductSpecification.java

+

Создайте спецификацию для фильтрации товара. Реализуйте возможность фильтрации товара по следующим условиям:

+
    +
  • Товар находится в определенной категории
    • +
  • Цена товара выше указанной
    • +
  • Цена товара ниже указанной
    • +
  • Рейтинг товара выше указанного
    • +
  • Название товара содержит указанную подстроку без учета регистра
    • +
+

Все эти параметры необязательны.

+

При создании спецификации опирайтесь на названия полей сущности и параметров в ProductParamsDTO

+

src/main/java/exercise/controller/ProductController.java

+

Реализуйте метод, который будет обрабатывать GET-запросы на адрес /products и возвращать список товаров. Обеспечьте возможность фильтрации товаров по перечисленным критериям. Сделайте постраничную отдачу результата по 10 товаров на странице. По умолчанию должна открываться первая страница.

+

Подсказки

+
    +
  • Посмотрите урок по фильтрации строк из курса по основам SQL. Он поможет подобрать методы из класса CriteriaBuilder для построения запроса
    • +
+
+
+ + + \ No newline at end of file diff --git a/java-spring-boot-ru/search/README.md b/java-spring-boot-ru/search/README.md new file mode 100644 index 0000000..0399b67 --- /dev/null +++ b/java-spring-boot-ru/search/README.md @@ -0,0 +1,35 @@ +## Поиск + +В этом упражнении продолжим работать с системой управления товарами. Товаров в интернет-магазине обычно очень много, а потому покупатели наверняка захотят отфильтровать товары по определенным критериям. Так они смогут просматривать только те товары, которые удовлетворяют их запросам, а оставшиеся — игнорировать. + +В этом упражнении вам предстоит реализовать фильтрацию по названию, категории, цене и рейтингу товара. + +### Полезные ссылки + +* [Методы класса CriteriaBuilder](https://docs.oracle.com/javaee/7/api/javax/persistence/criteria/CriteriaBuilder.html) – они используются для построения выборок + +### src/main/java/exercise/dto/ProductParamsDTO.java + +Изучите DTO с параметрами фильтрации. Посмотрите, какие имена параметров будут передаваться в строке запроса при фильтрации. + +### src/main/java/exercise/specification/ProductSpecification.java + +Создайте спецификацию для фильтрации товара. Реализуйте возможность фильтрации товара по следующим условиям: + +* Товар находится в определенной категории +* Цена товара выше указанной +* Цена товара ниже указанной +* Рейтинг товара выше указанного +* Название товара содержит указанную подстроку без учета регистра + +Все эти параметры необязательны. + +При создании спецификации опирайтесь на названия полей сущности и параметров в `ProductParamsDTO` + +### src/main/java/exercise/controller/ProductController.java + +Реализуйте метод, который будет обрабатывать GET-запросы на адрес */products* и возвращать список товаров. Обеспечьте возможность фильтрации товаров по перечисленным критериям. Сделайте постраничную отдачу результата по 10 товаров на странице. По умолчанию должна открываться первая страница. + +### Подсказки + +* Посмотрите [урок](https://ru.hexlet.io/courses/sql-basics/lessons/where-like/theory_unit) по фильтрации строк из курса по основам SQL. Он поможет подобрать методы из класса *CriteriaBuilder* для построения запроса diff --git a/java-spring-boot-ru/search/build.gradle.kts b/java-spring-boot-ru/search/build.gradle.kts new file mode 100644 index 0000000..314ba46 --- /dev/null +++ b/java-spring-boot-ru/search/build.gradle.kts @@ -0,0 +1,47 @@ +import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.api.tasks.testing.logging.TestLogEvent + +plugins { + application + id("org.springframework.boot") version "3.1.4" + id("io.spring.dependency-management") version "1.1.3" + id("com.github.ben-manes.versions") version "0.49.0" + id("io.freefair.lombok") version "8.6" +} + +group = "exercise" + +version = "1.0-SNAPSHOT" + +application { mainClass.set("exercise.Application") } + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.mapstruct:mapstruct:1.5.5.Final") + annotationProcessor("org.mapstruct:mapstruct-processor:1.5.5.Final") + runtimeOnly("com.h2database:h2") + implementation("org.springframework.boot:spring-boot-starter") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-validation") + implementation("org.springframework.boot:spring-boot-devtools") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("net.datafaker:datafaker:2.0.2") + implementation("org.instancio:instancio-junit:3.3.1") + implementation("org.openapitools:jackson-databind-nullable:0.2.6") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation(platform("org.junit:junit-bom:5.10.0")) + testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") + testImplementation("net.javacrumbs.json-unit:json-unit-assertj:3.2.2") +} + +tasks.test { + useJUnitPlatform() + testLogging { + exceptionFormat = TestExceptionFormat.FULL + events = mutableSetOf(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED) + showStandardStreams = true + } +} diff --git a/java-spring-boot-ru/search/gradle.properties b/java-spring-boot-ru/search/gradle.properties new file mode 100644 index 0000000..5b0558d --- /dev/null +++ b/java-spring-boot-ru/search/gradle.properties @@ -0,0 +1,5 @@ +# org.gradle.vfs.watch=true +# org.gradle.vfs.verbose=true +# org.gradle.parallel=true +# org.gradle.configureondemand=true +# rootProject.name = 'javaspringblog' diff --git a/java-spring-boot-ru/search/gradle/wrapper/gradle-wrapper.jar b/java-spring-boot-ru/search/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7f93135 Binary files /dev/null and b/java-spring-boot-ru/search/gradle/wrapper/gradle-wrapper.jar differ diff --git a/java-spring-boot-ru/search/gradle/wrapper/gradle-wrapper.properties b/java-spring-boot-ru/search/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/java-spring-boot-ru/search/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/java-spring-boot-ru/search/gradlew b/java-spring-boot-ru/search/gradlew new file mode 100755 index 0000000..0adc8e1 --- /dev/null +++ b/java-spring-boot-ru/search/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=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=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, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/java-spring-boot-ru/search/gradlew.bat b/java-spring-boot-ru/search/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/java-spring-boot-ru/search/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/java-spring-boot-ru/search/settings.gradle.kts b/java-spring-boot-ru/search/settings.gradle.kts new file mode 100644 index 0000000..3196f69 --- /dev/null +++ b/java-spring-boot-ru/search/settings.gradle.kts @@ -0,0 +1,3 @@ +rootProject.name = "one-to-many" +// spring.jpa.generate-ddl = true +// spring.jpa.hibernate.ddl-auto diff --git a/java-spring-boot-ru/search/src/main/java/exercise/Application.java b/java-spring-boot-ru/search/src/main/java/exercise/Application.java new file mode 100644 index 0000000..d09e3d4 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/Application.java @@ -0,0 +1,26 @@ +package exercise; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.context.annotation.Bean; +import net.datafaker.Faker; + +import java.util.Random; +import java.util.Locale; + +@EnableJpaAuditing +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + + @Bean + public Faker getFaker() { + var seed = 123; + var rand = new Random(seed); + return new Faker(new Locale("en", "US"), rand); + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/component/DataInitializer.java b/java-spring-boot-ru/search/src/main/java/exercise/component/DataInitializer.java new file mode 100644 index 0000000..6b7e68a --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/component/DataInitializer.java @@ -0,0 +1,60 @@ +package exercise.component; + +import java.util.List; +import java.util.stream.IntStream; + +import org.instancio.Instancio; +import org.instancio.Select; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +import exercise.model.Category; +import exercise.model.Product; +import exercise.repository.CategoryRepository; +import exercise.repository.ProductRepository; +import lombok.AllArgsConstructor; +import net.datafaker.Faker; + +@Component +@AllArgsConstructor +public class DataInitializer implements ApplicationRunner { + + @Autowired + private final ProductRepository productRepository; + + @Autowired + private final CategoryRepository categoryRepository; + + @Autowired + private final Faker faker; + + @Override + public void run(ApplicationArguments args) throws Exception { + IntStream.range(1, 5).forEach(i -> { + var category = Instancio.of(Category.class) + .ignore(Select.field(Category::getId)) + .ignore(Select.field(Category::getProducts)) + .supply(Select.field(Category::getName), () -> faker.commerce().department()) + .create(); + + categoryRepository.save(category); + }); + + List categories = categoryRepository.findAll(); + + IntStream.range(1, 30).forEach(i -> { + var randomIndex = faker.number().numberBetween(0, categories.size()); + var product = Instancio.of(Product.class) + .ignore(Select.field(Product::getId)) + .supply(Select.field(Product::getTitle), () -> faker.commerce().productName()) + .supply(Select.field(Product::getPrice), () -> faker.number().numberBetween(1, 100)) + .supply(Select.field(Product::getRating), () -> faker.number().randomDouble(2, 1, 5)) + .supply(Select.field(Product::getCategory), () -> categories.get(randomIndex)) + .create(); + + productRepository.save(product); + }); + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/config/JacksonConfig.java b/java-spring-boot-ru/search/src/main/java/exercise/config/JacksonConfig.java new file mode 100644 index 0000000..79b4c23 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/config/JacksonConfig.java @@ -0,0 +1,19 @@ +package exercise.config; + +import org.openapitools.jackson.nullable.JsonNullableModule; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@Configuration +public class JacksonConfig { + @Bean + Jackson2ObjectMapperBuilder objectMapperBuilder() { + var builder = new Jackson2ObjectMapperBuilder(); + builder.serializationInclusion(JsonInclude.Include.NON_NULL) + .modulesToInstall(new JsonNullableModule()); + return builder; + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/controller/CategoriesController.java b/java-spring-boot-ru/search/src/main/java/exercise/controller/CategoriesController.java new file mode 100644 index 0000000..5a5325e --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/controller/CategoriesController.java @@ -0,0 +1,56 @@ +package exercise.controller; + +import exercise.dto.CategoryDTO; +import exercise.mapper.CategoryMapper; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; +import java.util.List; + +import exercise.repository.CategoryRepository; +import exercise.dto.CategoryCreateDTO; +import exercise.exception.ResourceNotFoundException; + +@RestController +@RequestMapping("/categories") +public class CategoriesController { + + @Autowired + private CategoryRepository categoryRepository; + + @Autowired + private CategoryMapper categoryMapper; + + @GetMapping(path = "") + public List index() { + var categories = categoryRepository.findAll(); + return categories.stream() + .map(categoryMapper::map) + .toList(); + } + + @GetMapping(path = "/{id}") + public CategoryDTO show(@PathVariable long id) { + + var category = categoryRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException("Category with id " + id + " not found")); + var categoryDTO = categoryMapper.map(category); + return categoryDTO; + } + + @PostMapping(path = "") + @ResponseStatus(HttpStatus.CREATED) + public CategoryDTO create(@Valid @RequestBody CategoryCreateDTO categoryData) { + var category = categoryMapper.map(categoryData); + categoryRepository.save(category); + var categoryDto = categoryMapper.map(category); + return categoryDto; + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/controller/ProductsController.java b/java-spring-boot-ru/search/src/main/java/exercise/controller/ProductsController.java new file mode 100644 index 0000000..04d4564 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/controller/ProductsController.java @@ -0,0 +1,88 @@ +package exercise.controller; + +import java.util.List; + +import exercise.dto.ProductCreateDTO; +import exercise.dto.ProductDTO; +import exercise.dto.ProductParamsDTO; +import exercise.dto.ProductUpdateDTO; +import exercise.mapper.ProductMapper; +import exercise.specification.ProductSpecification; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.http.HttpStatus; +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.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +import exercise.exception.ResourceNotFoundException; +import exercise.repository.ProductRepository; +import jakarta.validation.Valid; + +@RestController +@RequestMapping("/products") +public class ProductsController { + @Autowired + private ProductRepository productRepository; + + @Autowired + private ProductMapper productMapper; + + // BEGIN + @Autowired + private ProductSpecification specBuilder; + + + @GetMapping(path = "") + @ResponseStatus(HttpStatus.OK) + List index(ProductParamsDTO params, @RequestParam(defaultValue = "1") int page) { + var spec = specBuilder.build(params); + + var products = productRepository.findAll(spec, PageRequest.of(page - 1, 10)); + return products.map(productMapper::map).toList(); + } + // END + + @PostMapping("") + @ResponseStatus(HttpStatus.CREATED) + ProductDTO create(@Valid @RequestBody ProductCreateDTO productData) { + var product = productMapper.map(productData); + productRepository.save(product); + var productDto = productMapper.map(product); + return productDto; + } + + @GetMapping("/{id}") + @ResponseStatus(HttpStatus.OK) + ProductDTO show(@PathVariable Long id) { + var product = productRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException("Product not Found: " + id)); + var productDto = productMapper.map(product); + return productDto; + } + + @PutMapping("/{id}") + @ResponseStatus(HttpStatus.OK) + ProductDTO update(@RequestBody @Valid ProductUpdateDTO productData, @PathVariable Long id) { + var product = productRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException("Product not Found: " + id)); + + productMapper.update(productData, product); + productRepository.save(product); + var productDto = productMapper.map(product); + return productDto; + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + void destroy(@PathVariable Long id) { + productRepository.deleteById(id); + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/controller/WelcomeController.java b/java-spring-boot-ru/search/src/main/java/exercise/controller/WelcomeController.java new file mode 100644 index 0000000..c96ae7d --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/controller/WelcomeController.java @@ -0,0 +1,13 @@ +package exercise.controller; + +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; + +@RestController +public class WelcomeController { + + @GetMapping(path = "") + public String welcome() { + return "Welcome to Spring!"; + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/dto/CategoryCreateDTO.java b/java-spring-boot-ru/search/src/main/java/exercise/dto/CategoryCreateDTO.java new file mode 100644 index 0000000..b3bfeb8 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/dto/CategoryCreateDTO.java @@ -0,0 +1,14 @@ +package exercise.dto; + +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class CategoryCreateDTO { + + @NotBlank + private String name; + +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/dto/CategoryDTO.java b/java-spring-boot-ru/search/src/main/java/exercise/dto/CategoryDTO.java new file mode 100644 index 0000000..8b381a7 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/dto/CategoryDTO.java @@ -0,0 +1,13 @@ +package exercise.dto; + +import lombok.Getter; +import lombok.Setter; +import java.time.LocalDate; + +@Setter +@Getter +public class CategoryDTO { + private long id; + private String name; + private LocalDate createdAt; +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductCreateDTO.java b/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductCreateDTO.java new file mode 100644 index 0000000..42971f4 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductCreateDTO.java @@ -0,0 +1,19 @@ +package exercise.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class ProductCreateDTO { + @NotNull + private Long categoryId; + + @NotBlank + private String title; + + @NotNull + private int price; +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductDTO.java b/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductDTO.java new file mode 100644 index 0000000..a9d6c8a --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductDTO.java @@ -0,0 +1,19 @@ +package exercise.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +public class ProductDTO { + private Long id; + private Long categoryId; + private String categoryName; + private String title; + private int price; + private double rating; + private LocalDate createdAt; + private LocalDate updatedAt; +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductParamsDTO.java b/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductParamsDTO.java new file mode 100644 index 0000000..400e773 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductParamsDTO.java @@ -0,0 +1,14 @@ +package exercise.dto; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ProductParamsDTO { + private String titleCont; + private Long categoryId; + private Integer priceLt; + private Integer priceGt; + private Double ratingGt; +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductUpdateDTO.java b/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductUpdateDTO.java new file mode 100644 index 0000000..04f57d1 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/dto/ProductUpdateDTO.java @@ -0,0 +1,20 @@ +package exercise.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import org.openapitools.jackson.nullable.JsonNullable; + +@Setter +@Getter +public class ProductUpdateDTO { + @NotNull + private JsonNullable categoryId; + + @NotBlank + private JsonNullable title; + + @NotNull + private JsonNullable price; +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/exception/ResourceNotFoundException.java b/java-spring-boot-ru/search/src/main/java/exercise/exception/ResourceNotFoundException.java new file mode 100644 index 0000000..67dd5d9 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/exception/ResourceNotFoundException.java @@ -0,0 +1,7 @@ +package exercise.exception; + +public class ResourceNotFoundException extends RuntimeException { + public ResourceNotFoundException(String message) { + super(message); + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/handler/GlobalExceptionHandler.java b/java-spring-boot-ru/search/src/main/java/exercise/handler/GlobalExceptionHandler.java new file mode 100644 index 0000000..1676275 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/handler/GlobalExceptionHandler.java @@ -0,0 +1,24 @@ +package exercise.handler; + +import jakarta.validation.ConstraintViolationException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +import exercise.exception.ResourceNotFoundException; + +@ControllerAdvice +public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { + + @ExceptionHandler(ResourceNotFoundException.class) + public ResponseEntity handleResourceNotFoundException(ResourceNotFoundException ex) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage()); + } + + @ExceptionHandler(ConstraintViolationException.class) + public ResponseEntity handleConstraintViolationException(ConstraintViolationException ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage()); + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/mapper/CategoryMapper.java b/java-spring-boot-ru/search/src/main/java/exercise/mapper/CategoryMapper.java new file mode 100644 index 0000000..c8fb6f3 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/mapper/CategoryMapper.java @@ -0,0 +1,22 @@ +package exercise.mapper; + +import exercise.dto.CategoryCreateDTO; +import exercise.dto.CategoryDTO; +import exercise.model.Category; +import org.mapstruct.Mapper; +import org.mapstruct.MappingConstants; +import org.mapstruct.NullValuePropertyMappingStrategy; +import org.mapstruct.ReportingPolicy; + +@Mapper( + nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, + componentModel = MappingConstants.ComponentModel.SPRING, + unmappedTargetPolicy = ReportingPolicy.IGNORE +) +public abstract class CategoryMapper { + + public abstract Category map(CategoryCreateDTO dto); + + public abstract CategoryDTO map(Category model); +} + diff --git a/java-spring-boot-ru/search/src/main/java/exercise/mapper/JsonNullableMapper.java b/java-spring-boot-ru/search/src/main/java/exercise/mapper/JsonNullableMapper.java new file mode 100644 index 0000000..3b81a7e --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/mapper/JsonNullableMapper.java @@ -0,0 +1,25 @@ +package exercise.mapper; + +import org.mapstruct.Condition; +import org.mapstruct.Mapper; +import org.mapstruct.MappingConstants; +import org.openapitools.jackson.nullable.JsonNullable; + +@Mapper( + componentModel = MappingConstants.ComponentModel.SPRING +) +public abstract class JsonNullableMapper { + + public JsonNullable wrap(T entity) { + return JsonNullable.of(entity); + } + + public T unwrap(JsonNullable jsonNullable) { + return jsonNullable == null ? null : jsonNullable.orElse(null); + } + + @Condition + public boolean isPresent(JsonNullable nullable) { + return nullable != null && nullable.isPresent(); + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/mapper/ProductMapper.java b/java-spring-boot-ru/search/src/main/java/exercise/mapper/ProductMapper.java new file mode 100644 index 0000000..f660d54 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/mapper/ProductMapper.java @@ -0,0 +1,30 @@ +package exercise.mapper; + +import exercise.dto.ProductCreateDTO; +import exercise.dto.ProductDTO; +import exercise.dto.ProductUpdateDTO; +import exercise.model.Product; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.MappingConstants; +import org.mapstruct.MappingTarget; +import org.mapstruct.NullValuePropertyMappingStrategy; +import org.mapstruct.ReportingPolicy; + +@Mapper( + uses = {JsonNullableMapper.class, ReferenceMapper.class}, + nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, + componentModel = MappingConstants.ComponentModel.SPRING, + unmappedTargetPolicy = ReportingPolicy.IGNORE +) +public abstract class ProductMapper { + + @Mapping(target = "category", source = "categoryId") + public abstract Product map(ProductCreateDTO dto); + @Mapping(source = "category.id", target = "categoryId") + @Mapping(source = "category.name", target = "categoryName") + public abstract ProductDTO map(Product model); + + @Mapping(target = "category", source = "categoryId") + public abstract void update(ProductUpdateDTO dto, @MappingTarget Product model); +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/mapper/ReferenceMapper.java b/java-spring-boot-ru/search/src/main/java/exercise/mapper/ReferenceMapper.java new file mode 100644 index 0000000..f2a633b --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/mapper/ReferenceMapper.java @@ -0,0 +1,21 @@ +package exercise.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.MappingConstants; +import org.mapstruct.TargetType; +import org.springframework.beans.factory.annotation.Autowired; + +import exercise.model.BaseEntity; +import jakarta.persistence.EntityManager; + +@Mapper( + componentModel = MappingConstants.ComponentModel.SPRING +) +public abstract class ReferenceMapper { + @Autowired + private EntityManager entityManager; + + public T toEntity(Long id, @TargetType Class entityClass) { + return id != null ? entityManager.find(entityClass, id) : null; + } +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/model/BaseEntity.java b/java-spring-boot-ru/search/src/main/java/exercise/model/BaseEntity.java new file mode 100644 index 0000000..fd14a0e --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/model/BaseEntity.java @@ -0,0 +1,4 @@ +package exercise.model; + +public interface BaseEntity { +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/model/Category.java b/java-spring-boot-ru/search/src/main/java/exercise/model/Category.java new file mode 100644 index 0000000..affcb56 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/model/Category.java @@ -0,0 +1,44 @@ +package exercise.model; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import static jakarta.persistence.GenerationType.IDENTITY; +import jakarta.validation.constraints.NotBlank; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.time.LocalDate; +import java.util.List; + + +@Entity +@Table(name = "categories") +@EntityListeners(AuditingEntityListener.class) +@Getter +@Setter +public class Category implements BaseEntity { + + @Id + @GeneratedValue(strategy = IDENTITY) + private long id; + + @NotBlank + @Column(unique = true) + private String name; + + @CreatedDate + private LocalDate createdAt; + + @OneToMany(mappedBy = "category", cascade = CascadeType.ALL) + private List products = new ArrayList<>(); +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/model/Product.java b/java-spring-boot-ru/search/src/main/java/exercise/model/Product.java new file mode 100644 index 0000000..02cbf95 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/model/Product.java @@ -0,0 +1,47 @@ +package exercise.model; + +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import static jakarta.persistence.GenerationType.IDENTITY; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDate; + +@Entity +@Table(name = "assignees") +@EntityListeners(AuditingEntityListener.class) +@Getter +@Setter +public class Product implements BaseEntity { + @Id + @GeneratedValue(strategy = IDENTITY) + private long id; + + @NotBlank + private String title; + + @NotNull + private int price; + + @CreatedDate + private LocalDate createdAt; + + @LastModifiedDate + private LocalDate updatedAt; + + @NotNull + @ManyToOne + private Category category; + + private Double rating; +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/repository/CategoryRepository.java b/java-spring-boot-ru/search/src/main/java/exercise/repository/CategoryRepository.java new file mode 100644 index 0000000..2d8e7ad --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/repository/CategoryRepository.java @@ -0,0 +1,11 @@ +package exercise.repository; + +import exercise.model.Category; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import java.util.Optional; + +@Repository +public interface CategoryRepository extends JpaRepository { + Optional findByName(String name); +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/repository/ProductRepository.java b/java-spring-boot-ru/search/src/main/java/exercise/repository/ProductRepository.java new file mode 100644 index 0000000..17891de --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/repository/ProductRepository.java @@ -0,0 +1,13 @@ +package exercise.repository; + +import exercise.model.Product; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; +import java.util.Optional; + + +@Repository +public interface ProductRepository extends JpaRepository, JpaSpecificationExecutor { + Optional findByTitle(String title); +} diff --git a/java-spring-boot-ru/search/src/main/java/exercise/specification/ProductSpecification.java b/java-spring-boot-ru/search/src/main/java/exercise/specification/ProductSpecification.java new file mode 100644 index 0000000..349a45d --- /dev/null +++ b/java-spring-boot-ru/search/src/main/java/exercise/specification/ProductSpecification.java @@ -0,0 +1,46 @@ +package exercise.specification; + +import org.springframework.data.jpa.domain.Specification; +import org.springframework.stereotype.Component; + +import exercise.dto.ProductParamsDTO; +import exercise.model.Product; + +// BEGIN +@Component +public class ProductSpecification { + + public Specification build(ProductParamsDTO params) { + return withCategoryId(params.getCategoryId()) + .and(withPriceGt(params.getPriceGt())) + .and(withPriceLt(params.getPriceLt())) + .and(withRatingGt(params.getRatingGt())) + .and(withTitleCont(params.getTitleCont())); + } + + private Specification withCategoryId(Long categoryId) { + return (root, query, cb) -> categoryId == null ? + cb.conjunction() : cb.equal(root.get("category").get("id"), categoryId); + } + + private Specification withPriceGt(Integer priceGt) { + return (root, query, cb) -> priceGt == null ? + cb.conjunction() : cb.greaterThan(root.get("price"), priceGt); + } + + private Specification withPriceLt(Integer priceLt) { + return (root, query, cb) -> priceLt == null ? + cb.conjunction() : cb.lessThan(root.get("price"), priceLt); + } + + private Specification withRatingGt(Double ratingGt) { + return (root, query, cb) -> ratingGt == null ? + cb.conjunction() : cb.greaterThan(root.get("rating"), ratingGt); + } + + private Specification withTitleCont(String titleCont) { + return (root, query, cb) -> titleCont == null ? + cb.conjunction() : cb.like(cb.lower(root.get("title")), "%" + titleCont + "%"); + } +} +// END diff --git a/java-spring-boot-ru/search/src/main/resources/application.yml b/java-spring-boot-ru/search/src/main/resources/application.yml new file mode 100644 index 0000000..8804c50 --- /dev/null +++ b/java-spring-boot-ru/search/src/main/resources/application.yml @@ -0,0 +1,10 @@ +--- + +spring: + jpa: + show-sql: true + hibernate: + ddl-auto: update + output: + ansi: + enabled: always diff --git a/java-spring-boot-ru/search/src/test/java/exercise/controller/CategoriesControllerTest.java b/java-spring-boot-ru/search/src/test/java/exercise/controller/CategoriesControllerTest.java new file mode 100644 index 0000000..a0326ac --- /dev/null +++ b/java-spring-boot-ru/search/src/test/java/exercise/controller/CategoriesControllerTest.java @@ -0,0 +1,118 @@ +package exercise.controller; + +import exercise.mapper.CategoryMapper; +import exercise.model.Category; +import exercise.util.ModelGenerator; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.BeforeEach; + +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; +import static org.assertj.core.api.Assertions.assertThat; + +import org.instancio.Instancio; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.test.web.servlet.MockMvc; + +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + +import java.nio.charset.StandardCharsets; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import com.fasterxml.jackson.databind.ObjectMapper; +import exercise.repository.CategoryRepository; + +@SpringBootTest +@AutoConfigureMockMvc +class CategoriesControllerTest { + @Autowired + private WebApplicationContext wac; + + @Autowired + private MockMvc mockMvc; + + @Autowired + private ObjectMapper om; + + @Autowired + private CategoryRepository categoryRepository; + + @Autowired + private CategoryMapper mapper; + + @Autowired + private ModelGenerator modelGenerator; + + private Category testCategory; + + @BeforeEach + public void setUp() { + mockMvc = MockMvcBuilders.webAppContextSetup(wac) + .defaultResponseCharacterEncoding(StandardCharsets.UTF_8) + .build(); + testCategory = Instancio.of(modelGenerator.getCategoryModel()).create(); + } + + @Test + public void testIndex() throws Exception { + categoryRepository.save(testCategory); + var result = mockMvc.perform(get("/categories")) + .andExpect(status().isOk()) + .andReturn(); + + var body = result.getResponse().getContentAsString(); + assertThatJson(body).isArray(); + } + + @Test + public void testShow() throws Exception { + + categoryRepository.save(testCategory); + + var request = get("/categories/{id}", testCategory.getId()); + var result = mockMvc.perform(request) + .andExpect(status().isOk()) + .andReturn(); + var body = result.getResponse().getContentAsString(); + + assertThatJson(body).and( + v -> v.node("name").isEqualTo(testCategory.getName()) + ); + } + + @Test + public void testCreate() throws Exception { + var dto = mapper.map(testCategory); + + var request = post("/categories") + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(dto)); + + mockMvc.perform(request) + .andExpect(status().isCreated()); + + var category = categoryRepository.findByName(testCategory.getName()).get(); + + assertThat(category).isNotNull(); + assertThat(category.getName()).isEqualTo(testCategory.getName()); + } + + @Test + public void testCreateWithNotValidName() throws Exception { + var dto = mapper.map(testCategory); + dto.setName(""); + + var request = post("/categories") + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(dto)); + + mockMvc.perform(request) + .andExpect(status().isBadRequest()); + } +} diff --git a/java-spring-boot-ru/search/src/test/java/exercise/controller/ProductsControllerTest.java b/java-spring-boot-ru/search/src/test/java/exercise/controller/ProductsControllerTest.java new file mode 100644 index 0000000..86f6c15 --- /dev/null +++ b/java-spring-boot-ru/search/src/test/java/exercise/controller/ProductsControllerTest.java @@ -0,0 +1,269 @@ + +package exercise.controller; + +import exercise.mapper.ProductMapper; +import exercise.model.Product; +import exercise.model.Category; +import exercise.repository.ProductRepository; +import exercise.util.ModelGenerator; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.BeforeEach; + +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; +import static org.assertj.core.api.Assertions.assertThat; + +import org.instancio.Instancio; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.test.web.servlet.MockMvc; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + +import java.nio.charset.StandardCharsets; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import com.fasterxml.jackson.databind.ObjectMapper; +import exercise.repository.CategoryRepository; + +import java.math.BigDecimal; +import java.util.HashMap; + +@SpringBootTest +@AutoConfigureMockMvc +class ProductsControllerTest { + @Autowired + private WebApplicationContext wac; + + @Autowired + private MockMvc mockMvc; + + + @Autowired + private ObjectMapper om; + + @Autowired + private ProductRepository productRepository; + + @Autowired + private CategoryRepository categoryRepository; + + @Autowired + private ProductMapper mapper; + + @Autowired + private ModelGenerator modelGenerator; + + private Product testProduct; + + private Category anotherCategory; + + @BeforeEach + public void setUp() { + mockMvc = MockMvcBuilders.webAppContextSetup(wac) + .defaultResponseCharacterEncoding(StandardCharsets.UTF_8) + .build(); + var category = Instancio.of(modelGenerator.getCategoryModel()).create(); + anotherCategory = Instancio.of(modelGenerator.getCategoryModel()).create(); + categoryRepository.save(category); + categoryRepository.save(anotherCategory); + testProduct = Instancio.of(modelGenerator.getProductModel()).create(); + testProduct.setCategory(category); + } + + @Test + public void testIndex() throws Exception { + productRepository.save(testProduct); + var result = mockMvc.perform(get("/products")) + .andExpect(status().isOk()) + .andReturn(); + + var body = result.getResponse().getContentAsString(); + assertThatJson(body).isArray().hasSize(10); + } + + @Test + public void testIndexWithTitleContains() throws Exception { + var result = mockMvc.perform(get("/products?titleCont=lamp")) + .andExpect(status().isOk()) + .andReturn(); + + var body = result.getResponse().getContentAsString(); + assertThatJson(body).isArray().allSatisfy(element -> + assertThatJson(element) + .and(v -> v.node("title").asString().containsIgnoringCase("lamp")) + ); + } + + @Test + public void testIndexWithPrice() throws Exception { + var result = mockMvc.perform(get("/products?priceGt=20&priceLt=50")) + .andExpect(status().isOk()) + .andReturn(); + + var body = result.getResponse().getContentAsString(); + assertThatJson(body).isArray().allSatisfy(element -> + assertThatJson(element) + .and(v -> v.node("price").asNumber() + .isGreaterThan(BigDecimal.valueOf(20)).isLessThan(BigDecimal.valueOf(50))) + ); + } + + @Test + public void testIndexWithRating() throws Exception { + var result = mockMvc.perform(get("/products?ratingGt=4")) + .andExpect(status().isOk()) + .andReturn(); + + var body = result.getResponse().getContentAsString(); + assertThatJson(body).isArray().allSatisfy(element -> + assertThatJson(element) + .and(v -> v.node("rating").asNumber() + .isGreaterThan(BigDecimal.valueOf(4))) + ); + } + + @Test + public void testIndexWithCategory() throws Exception { + var result = mockMvc.perform(get("/products?categoryId=1")) + .andExpect(status().isOk()) + .andReturn(); + + var body = result.getResponse().getContentAsString(); + assertThatJson(body).isArray().allSatisfy(element -> + assertThatJson(element) + .and(v -> v.node("categoryId").isEqualTo(1)) + ); + } + + @Test + public void testIndexComplexCondition() throws Exception { + var request = get("/products?priceGt=10&priceLt=80&CategoryId=1&ratingGt=3&titleCont=b"); + var result = mockMvc.perform(request) + .andExpect(status().isOk()) + .andReturn(); + + var body = result.getResponse().getContentAsString(); + assertThatJson(body).isArray().allSatisfy(element -> + assertThatJson(element) + .and(v -> v.node("price").asNumber() + .isGreaterThan(BigDecimal.valueOf(10)).isLessThan(BigDecimal.valueOf(80))) + .and(v -> v.node("categoryId").isEqualTo(1)) + .and(v -> v.node("price").asNumber().isGreaterThan(BigDecimal.valueOf(3))) + .and(v -> v.node("title").asString().containsIgnoringCase("b")) + ); + } + + @Test + public void testShow() throws Exception { + + productRepository.save(testProduct); + + var request = get("/products/{id}", testProduct.getId()); + var result = mockMvc.perform(request) + .andExpect(status().isOk()) + .andReturn(); + var body = result.getResponse().getContentAsString(); + + assertThatJson(body).and( + v -> v.node("title").isEqualTo(testProduct.getTitle()), + v -> v.node("price").isEqualTo(testProduct.getPrice()), + v -> v.node("categoryId").isEqualTo(testProduct.getCategory().getId()), + v -> v.node("categoryName").isEqualTo(testProduct.getCategory().getName()) + ); + } + + @Test + public void testCreate() throws Exception { + var dto = mapper.map(testProduct); + + var request = post("/products") + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(dto)); + + mockMvc.perform(request) + .andExpect(status().isCreated()); + + var product = productRepository.findByTitle(testProduct.getTitle()).get(); + + assertThat(product).isNotNull(); + assertThat(product.getTitle()).isEqualTo(testProduct.getTitle()); + assertThat(product.getPrice()).isEqualTo(testProduct.getPrice()); + assertThat(product.getCategory().getId()).isEqualTo(testProduct.getCategory().getId()); + } + + @Test + public void testCreateWithWrongCategory() throws Exception { + var dto = mapper.map(testProduct); + dto.setCategoryId(12345L); + + var request = post("/products") + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(dto)); + + mockMvc.perform(request) + .andExpect(status().isBadRequest()); + } + + @Test + public void testUpdate() throws Exception { + productRepository.save(testProduct); + + var dto = mapper.map(testProduct); + + dto.setTitle("new title"); + dto.setPrice(123); + dto.setCategoryId(anotherCategory.getId()); + + var request = put("/products/{id}", testProduct.getId()) + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(dto)); + + mockMvc.perform(request) + .andExpect(status().isOk()); + + var task = productRepository.findById(testProduct.getId()).get(); + + assertThat(task.getTitle()).isEqualTo(dto.getTitle()); + assertThat(task.getPrice()).isEqualTo(dto.getPrice()); + assertThat(task.getCategory().getId()).isEqualTo(dto.getCategoryId()); + } + + @Test + public void testPartialUpdate() throws Exception { + productRepository.save(testProduct); + + var dto = new HashMap(); + dto.put("categoryId", anotherCategory.getId()); + + var request = put("/products/{id}", testProduct.getId()) + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(dto)); + + mockMvc.perform(request) + .andExpect(status().isOk()); + + var task = productRepository.findById(testProduct.getId()).get(); + + assertThat(task.getTitle()).isEqualTo(testProduct.getTitle()); + assertThat(task.getPrice()).isEqualTo(testProduct.getPrice()); + assertThat(task.getCategory().getId()).isEqualTo(dto.get("categoryId")); + } + + @Test + public void testDestroy() throws Exception { + productRepository.save(testProduct); + var request = delete("/products/{id}", testProduct.getId()); + mockMvc.perform(request) + .andExpect(status().isNoContent()); + + assertThat(productRepository.existsById(testProduct.getId())).isEqualTo(false); + } +} diff --git a/java-spring-boot-ru/search/src/test/java/exercise/util/ModelGenerator.java b/java-spring-boot-ru/search/src/test/java/exercise/util/ModelGenerator.java new file mode 100644 index 0000000..710e131 --- /dev/null +++ b/java-spring-boot-ru/search/src/test/java/exercise/util/ModelGenerator.java @@ -0,0 +1,38 @@ +package exercise.util; + +import exercise.model.Category; +import exercise.model.Product; +import jakarta.annotation.PostConstruct; +import lombok.Getter; +import net.datafaker.Faker; +import org.instancio.Instancio; +import org.instancio.Model; +import org.instancio.Select; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Getter +@Component +public class ModelGenerator { + private Model productModel; + private Model categoryModel; + + @Autowired + private Faker faker; + + @PostConstruct + private void init() { + categoryModel = Instancio.of(Category.class) + .ignore(Select.field(Category::getId)) + .ignore(Select.field(Category::getProducts)) + .supply(Select.field(Category::getName), () -> faker.name().fullName()) + .toModel(); + + + productModel = Instancio.of(Product.class) + .ignore(Select.field(Product::getId)) + .supply(Select.field(Product::getTitle), () -> faker.brand().car()) + .supply(Select.field(Product::getPrice), () -> faker.number().positive()) + .toModel(); + } +} diff --git a/java-spring-boot-ru/search/system.properties b/java-spring-boot-ru/search/system.properties new file mode 100644 index 0000000..f133b45 --- /dev/null +++ b/java-spring-boot-ru/search/system.properties @@ -0,0 +1 @@ +# java.runtime.version=20