diff --git a/.current.json b/.current.json index 641cfc5..b67a040 100644 --- a/.current.json +++ b/.current.json @@ -1 +1 @@ -{"assignment":"java-spring-boot-ru/dto-to-entity-for-update"} +{"assignment":"java-spring-boot-ru/dto-mapper"} diff --git a/java-spring-boot-ru/dto-mapper/.gitignore b/java-spring-boot-ru/dto-mapper/.gitignore new file mode 100644 index 0000000..184bfba --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/.gitignore @@ -0,0 +1,4 @@ +.gradle/ +build/ +caches/ +.idea/ diff --git a/java-spring-boot-ru/dto-mapper/Makefile b/java-spring-boot-ru/dto-mapper/Makefile new file mode 100644 index 0000000..ebb0b08 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/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/dto-mapper/README.html b/java-spring-boot-ru/dto-mapper/README.html new file mode 100644 index 0000000..012431f --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/README.html @@ -0,0 +1,51 @@ + + + + + + + + +
+

Автоматическая конвертация сущностей в DTO и обратно

+

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

+ +

В этом домашнем задании мы снова будем работать с магазином, но немного поменяем условия задачи. Теперь после создания товара его название и артикул остаются неизменными. Мы можем изменить только цену, потому что цена товара – вещь непостоянная. Обратите внимание на изменения, которые произошли в модели товара.

+

build.gradle.kts

+

Добавьте в проект зависимости, необходимые для работы библиотеки MapStruct.

+

src/main/java/exercise/model/Product.java

+

Изучите модель товара. Обратите внимание на изменения, произошедшие в классе Product. Название товара теперь содержится в поле name, цена в поле cost, а артикул в поле barcode.

+

При этом интерфейс нашего приложения должен остаться неизменным, потому что на него рассчитывают пользователи. Загляните в DTO, изучите интерфейс приложения.

+

src/main/java/exercise/mapper/ProductMapper.java

+

Создайте маппер для преобразования объектов DTO в сущность и обратно. Укажите в нем правила преобразования с учетом того, что имена полей сущности и DTO не совпадают.

+

src/main/java/exercise/controller/ProductsController.java

+

Создайте в контроллере обработчики, которые будут обрабатывать следующие запросы:

+
    +
  • GET /products – вывод списка всех товаров
    • +
  • GET /products/{id} – просмотр конкретного товара
    • +
  • POST /products – создание нового товара
    • +
  • PUT /products/{id} – редактирование товара
    • +
+

Подсказки

+
    +
  • Посмотрите в документации mapstruct, как задать несколько правил преобразования для одного метода
    • +
+
+
+ + + \ No newline at end of file diff --git a/java-spring-boot-ru/dto-mapper/README.md b/java-spring-boot-ru/dto-mapper/README.md new file mode 100644 index 0000000..c0d5308 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/README.md @@ -0,0 +1,34 @@ +## Автоматическая конвертация сущностей в DTO и обратно + +### Полезные ссылки + +* [Аннотация @Mapping](https://mapstruct.org/documentation/stable/reference/html/#basic-mappings) – позволяет указать правила преобразования свойств + +В этом домашнем задании мы снова будем работать с магазином, но немного поменяем условия задачи. Теперь после создания товара его название и артикул остаются неизменными. Мы можем изменить только цену, потому что цена товара – вещь непостоянная. Обратите внимание на изменения, которые произошли в модели товара. + +### build.gradle.kts + +Добавьте в проект зависимости, необходимые для работы библиотеки MapStruct. + +### src/main/java/exercise/model/Product.java + +Изучите модель товара. Обратите внимание на изменения, произошедшие в классе `Product`. Название товара теперь содержится в поле *name*, цена в поле *cost*, а артикул в поле *barcode*. + +При этом интерфейс нашего приложения должен остаться неизменным, потому что на него рассчитывают пользователи. Загляните в DTO, изучите интерфейс приложения. + +### src/main/java/exercise/mapper/ProductMapper.java + +Создайте маппер для преобразования объектов DTO в сущность и обратно. Укажите в нем правила преобразования с учетом того, что имена полей сущности и DTO не совпадают. + +### src/main/java/exercise/controller/ProductsController.java + +Создайте в контроллере обработчики, которые будут обрабатывать следующие запросы: + +* *GET /products* – вывод списка всех товаров +* *GET /products/{id}* – просмотр конкретного товара +* *POST /products* – создание нового товара +* *PUT /products/{id}* – редактирование товара + +### Подсказки + +* Посмотрите в документации [mapstruct](https://mapstruct.org/documentation/stable/reference/html/#basic-mappings), как задать несколько правил преобразования для одного метода diff --git a/java-spring-boot-ru/dto-mapper/build.gradle.kts b/java-spring-boot-ru/dto-mapper/build.gradle.kts new file mode 100644 index 0000000..d188304 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/build.gradle.kts @@ -0,0 +1,48 @@ +import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.api.tasks.testing.logging.TestLogEvent + +plugins { + application + id("org.springframework.boot") version "3.2.2" + id("io.spring.dependency-management") version "1.1.3" + id("com.github.ben-manes.versions") version "0.48.0" + id("io.freefair.lombok") version "8.6" +} + +group = "exercise" + +version = "1.0-SNAPSHOT" + +application { mainClass.set("exercise.Application") } + +repositories { + mavenCentral() +} + +dependencies { + // BEGIN + implementation("org.mapstruct:mapstruct:1.5.5.Final") + annotationProcessor("org.mapstruct:mapstruct-processor:1.5.5.Final") + // END + 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-devtools") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("net.datafaker:datafaker:2.0.1") + implementation("org.instancio:instancio-junit:3.3.0") + 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/dto-mapper/gradle.properties b/java-spring-boot-ru/dto-mapper/gradle.properties new file mode 100644 index 0000000..5b0558d --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/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/dto-mapper/gradle/wrapper/gradle-wrapper.jar b/java-spring-boot-ru/dto-mapper/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7f93135 Binary files /dev/null and b/java-spring-boot-ru/dto-mapper/gradle/wrapper/gradle-wrapper.jar differ diff --git a/java-spring-boot-ru/dto-mapper/gradle/wrapper/gradle-wrapper.properties b/java-spring-boot-ru/dto-mapper/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/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/dto-mapper/gradlew b/java-spring-boot-ru/dto-mapper/gradlew new file mode 100755 index 0000000..0adc8e1 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/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/dto-mapper/gradlew.bat b/java-spring-boot-ru/dto-mapper/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/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/dto-mapper/settings.gradle.kts b/java-spring-boot-ru/dto-mapper/settings.gradle.kts new file mode 100644 index 0000000..0a42d5b --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/settings.gradle.kts @@ -0,0 +1,3 @@ +rootProject.name = "error-handling" +// spring.jpa.generate-ddl = true +// spring.jpa.hibernate.ddl-auto diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/Application.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/Application.java new file mode 100644 index 0000000..ebd06d4 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/Application.java @@ -0,0 +1,21 @@ +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; + +@EnableJpaAuditing +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + + @Bean + public Faker getFaker() { + return new Faker(); + } +} diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/controller/ProductsController.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/controller/ProductsController.java new file mode 100644 index 0000000..72db321 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/controller/ProductsController.java @@ -0,0 +1,67 @@ +package exercise.controller; + +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.web.bind.annotation.PutMapping; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; +import java.util.List; + +import exercise.repository.ProductRepository; +import exercise.dto.ProductDTO; +import exercise.dto.ProductCreateDTO; +import exercise.dto.ProductUpdateDTO; +import exercise.exception.ResourceNotFoundException; +import exercise.mapper.ProductMapper; + +@RestController +@RequestMapping("/products") +public class ProductsController { + + @Autowired + private ProductRepository productRepository; + + // BEGIN + @Autowired + private ProductMapper productMapper; + + @GetMapping(path = "") + @ResponseStatus(HttpStatus.OK) + public List index() { + return productRepository.findAll().stream() + .map(pr -> productMapper.map(pr)) + .toList(); + } + + @GetMapping(path = "/{id}") + @ResponseStatus(HttpStatus.OK) + public ProductDTO show(@PathVariable Long id) { + var product = productRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException("Product with id " + id + "not Found")); + return productMapper.map(product); + } + + @PostMapping(path = "") + @ResponseStatus(HttpStatus.CREATED) + public ProductDTO create(@RequestBody ProductCreateDTO productData) { + var product = productMapper.map(productData); + productRepository.save(product); + return productMapper.map(product); + } + + @PutMapping(path = "/{id}") + @ResponseStatus(HttpStatus.OK) + public ProductDTO update(@RequestBody ProductUpdateDTO productData, @PathVariable Long id) { + var product = productRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException("Product with id " + id + "not Found")); + productMapper.update(productData, product); + productRepository.save(product); + return productMapper.map(product); + } + // END +} diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/controller/WelcomeController.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/controller/WelcomeController.java new file mode 100644 index 0000000..c96ae7d --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/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/dto-mapper/src/main/java/exercise/dto/ProductCreateDTO.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/dto/ProductCreateDTO.java new file mode 100644 index 0000000..17a3088 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/dto/ProductCreateDTO.java @@ -0,0 +1,12 @@ +package exercise.dto; + +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class ProductCreateDTO { + private String title; + private int price; + private long vendorCode; +} diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/dto/ProductDTO.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/dto/ProductDTO.java new file mode 100644 index 0000000..6d86b70 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/dto/ProductDTO.java @@ -0,0 +1,17 @@ +package exercise.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Setter +@Getter +public class ProductDTO { + private long id; + private String title; + private int price; + private long vendorCode; + private LocalDate createdAt; + private LocalDate updatedAt; +} diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/dto/ProductUpdateDTO.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/dto/ProductUpdateDTO.java new file mode 100644 index 0000000..a35c000 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/dto/ProductUpdateDTO.java @@ -0,0 +1,10 @@ +package exercise.dto; + +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class ProductUpdateDTO { + private int price; +} diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/exception/ResourceNotFoundException.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/exception/ResourceNotFoundException.java new file mode 100644 index 0000000..67dd5d9 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/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/dto-mapper/src/main/java/exercise/handler/GlobalExceptionHandler.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/handler/GlobalExceptionHandler.java new file mode 100644 index 0000000..251eb9f --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/handler/GlobalExceptionHandler.java @@ -0,0 +1,18 @@ +package exercise.handler; + +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()); + } +} diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/mapper/ProductMapper.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/mapper/ProductMapper.java new file mode 100644 index 0000000..dc226ee --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/mapper/ProductMapper.java @@ -0,0 +1,37 @@ +package exercise.mapper; + +// BEGIN +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.MappingTarget; +import org.mapstruct.InheritConfiguration; +import org.mapstruct.InheritInverseConfiguration; +import org.mapstruct.NullValuePropertyMappingStrategy; +import org.mapstruct.MappingConstants; +import org.mapstruct.ReportingPolicy; + +import exercise.dto.ProductCreateDTO; +import exercise.dto.ProductUpdateDTO; +import exercise.dto.ProductDTO; +import exercise.model.Product; + +@Mapper( + nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, + componentModel = MappingConstants.ComponentModel.SPRING, + unmappedTargetPolicy = ReportingPolicy.IGNORE +) +public abstract class ProductMapper { + @Mapping(target = "title", source = "name") + @Mapping(target = "price", source = "cost") + @Mapping(target = "vendorCode", source = "barcode") + public abstract ProductDTO map(Product model); + + @Mapping(target = "name", source = "title") + @Mapping(target = "cost", source = "price") + @Mapping(target = "barcode", source = "vendorCode") + public abstract Product map(ProductCreateDTO dto); + + @Mapping(target = "cost", source = "price") + public abstract void update(ProductUpdateDTO dto, @MappingTarget Product model); +} +// END diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/model/Product.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/model/Product.java new file mode 100644 index 0000000..5f7af8b --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/model/Product.java @@ -0,0 +1,40 @@ +package exercise.model; + +import jakarta.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.EntityListeners; +import static jakarta.persistence.GenerationType.IDENTITY; + +import lombok.Getter; +import lombok.Setter; +import java.time.LocalDate; + +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import jakarta.persistence.GeneratedValue; + +@Entity +@Table(name = "products") +@EntityListeners(AuditingEntityListener.class) +@Getter +@Setter +public class Product { + + @Id + @GeneratedValue(strategy = IDENTITY) + private long id; + + private String name; + + private int cost; + + private long barcode; + + @LastModifiedDate + private LocalDate updatedAt; + + @CreatedDate + private LocalDate createdAt; +} diff --git a/java-spring-boot-ru/dto-mapper/src/main/java/exercise/repository/ProductRepository.java b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/repository/ProductRepository.java new file mode 100644 index 0000000..a7519f5 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/main/java/exercise/repository/ProductRepository.java @@ -0,0 +1,12 @@ +package exercise.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import java.util.Optional; + +import exercise.model.Product; + +@Repository +public interface ProductRepository extends JpaRepository { + Optional findByBarcode(long vendorCode); +} diff --git a/java-spring-boot-ru/dto-mapper/src/main/resources/application.yml b/java-spring-boot-ru/dto-mapper/src/main/resources/application.yml new file mode 100644 index 0000000..8804c50 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/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/dto-mapper/src/test/java/exercise/controller/ProductControllerTest.java b/java-spring-boot-ru/dto-mapper/src/test/java/exercise/controller/ProductControllerTest.java new file mode 100644 index 0000000..617557c --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/src/test/java/exercise/controller/ProductControllerTest.java @@ -0,0 +1,172 @@ +package exercise.controller; + +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.instancio.Select; + +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 static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; + +import java.nio.charset.StandardCharsets; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import java.util.HashMap; +import com.fasterxml.jackson.databind.ObjectMapper; +import net.datafaker.Faker; +import exercise.repository.ProductRepository; +import exercise.model.Product; +import exercise.dto.ProductCreateDTO; +import exercise.dto.ProductUpdateDTO; + +@SpringBootTest +@AutoConfigureMockMvc +class ProductControllerTest { + + @Autowired + private WebApplicationContext wac; + + @Autowired + private MockMvc mockMvc; + + @Autowired + private Faker faker; + + @Autowired + private ObjectMapper om; + + @Autowired + private ProductRepository productRepository; + + private Product testProduct; + + @BeforeEach + public void setUp() { + mockMvc = MockMvcBuilders.webAppContextSetup(wac) + .defaultResponseCharacterEncoding(StandardCharsets.UTF_8) + .build(); + testProduct = Instancio.of(Product.class) + .ignore(Select.field(Product::getId)) + .supply(Select.field(Product::getName), () -> faker.book().title()) + .supply(Select.field(Product::getCost), () -> faker.number().numberBetween(1, 100)) + .supply(Select.field(Product::getBarcode), () -> faker.barcode().ean13()) + .create(); + } + + @Test + public void testWelcomePage() throws Exception { + var result = mockMvc.perform(get("/")) + .andExpect(status().isOk()) + .andReturn(); + + var body = result.getResponse().getContentAsString(); + assertThat(body).contains("Welcome to Spring!"); + } + + @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(); + } + + @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.getName()), + v -> v.node("price").isEqualTo(testProduct.getCost()), + v -> v.node("vendorCode").isEqualTo(testProduct.getBarcode()) + ); + } + + @Test + public void testCreate() throws Exception { + // В тестах тоже можно использовать автоматический маппинг + // Здесь мы делаем это вручную, чтобы не спойлерить готовое решение + var dto = new ProductCreateDTO(); + dto.setTitle(testProduct.getName()); + dto.setPrice(testProduct.getCost()); + dto.setVendorCode(testProduct.getBarcode()); + + var request = post("/products") + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(dto)); + + mockMvc.perform(request) + .andExpect(status().isCreated()); + + var product = productRepository.findByBarcode(testProduct.getBarcode()).get(); + + assertThat(product).isNotNull(); + assertThat(product.getName()).isEqualTo(testProduct.getName()); + assertThat(product.getCost()).isEqualTo(testProduct.getCost()); + } + + @Test + public void testUpdate() throws Exception { + + productRepository.save(testProduct); + + var data = new ProductUpdateDTO(); + data.setPrice(20); + + var request = put("/products/{id}", testProduct.getId()) + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(data)); + + mockMvc.perform(request) + .andExpect(status().isOk()); + + var product = productRepository.findById(testProduct.getId()).get(); + + assertThat(product.getCost()).isEqualTo(data.getPrice()); + } + + @Test + public void testUpdateWithVendor() throws Exception { + + productRepository.save(testProduct); + + var data = new HashMap(); + data.put("title", "new title"); + data.put("price", 20); + data.put("vendorCode", 123L); + + + var request = put("/products/{id}", testProduct.getId()) + .contentType(MediaType.APPLICATION_JSON) + .content(om.writeValueAsString(data)); + + mockMvc.perform(request) + .andExpect(status().isOk()); + + var product = productRepository.findById(testProduct.getId()).get(); + + assertThat(product.getName()).isEqualTo(testProduct.getName()); + assertThat(product.getCost()).isEqualTo(data.get("price")); + assertThat(product.getBarcode()).isEqualTo(testProduct.getBarcode()); + } +} diff --git a/java-spring-boot-ru/dto-mapper/system.properties b/java-spring-boot-ru/dto-mapper/system.properties new file mode 100644 index 0000000..f133b45 --- /dev/null +++ b/java-spring-boot-ru/dto-mapper/system.properties @@ -0,0 +1 @@ +# java.runtime.version=20