diff --git a/kutygin_andrey_lab_2/.idea/workspace.xml b/kutygin_andrey_lab_2/.idea/workspace.xml new file mode 100644 index 0000000..f0c7d04 --- /dev/null +++ b/kutygin_andrey_lab_2/.idea/workspace.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1704634533824 + + + + \ No newline at end of file diff --git a/kutygin_andrey_lab_3/.idea/.gitignore b/kutygin_andrey_lab_3/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/kutygin_andrey_lab_3/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/kutygin_andrey_lab_3/.idea/jpa-buddy.xml b/kutygin_andrey_lab_3/.idea/jpa-buddy.xml new file mode 100644 index 0000000..966d5f5 --- /dev/null +++ b/kutygin_andrey_lab_3/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/kutygin_andrey_lab_3/.idea/lab3.iml b/kutygin_andrey_lab_3/.idea/lab3.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/kutygin_andrey_lab_3/.idea/lab3.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/kutygin_andrey_lab_3/.idea/misc.xml b/kutygin_andrey_lab_3/.idea/misc.xml new file mode 100644 index 0000000..dea8866 --- /dev/null +++ b/kutygin_andrey_lab_3/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/kutygin_andrey_lab_3/.idea/modules.xml b/kutygin_andrey_lab_3/.idea/modules.xml new file mode 100644 index 0000000..deb08da --- /dev/null +++ b/kutygin_andrey_lab_3/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/kutygin_andrey_lab_3/README.md b/kutygin_andrey_lab_3/README.md new file mode 100644 index 0000000..6a3dfeb --- /dev/null +++ b/kutygin_andrey_lab_3/README.md @@ -0,0 +1,110 @@ + +## Задание + +Цель: изучение шаблона проектирования gateway, построения синхронного обмена между микросервисами и архитектурного стиля RESTful API. + +Задачи: + +- Создать 2 микросервиса, реализующих CRUD на связанных сущностях. +- Реализовать механизм синхронного обмена сообщениями между микросервисами. +- Реализовать шлюз на основе прозрачного прокси-сервера nginx. + +## Ход работы + +### Разворачивание сервисов: + +Были разработаны два приложения на Java с использованием средства автоматизации сборки проектов Gradle и с использованием библиотеки spring-boot: + +- categoryService - работа с дисциплинами (crud) +- productService - работа с продуктами (crud). При создании продукта выбирается id категории, и через nginx и rest template происходит получение данных о категории с этим id + +### Обмен сообщениями +При создании плана обучения выбирается id категории, и через nginx и rest template происходит получение данных о категории с этим id + + +### Dockerfile +Идентичные докерфайлы для приложений: +``` +FROM openjdk:17 +RUN mkdir -p /usr/src/app/ +WORKDIR /usr/src/app/ +COPY . /usr/src/app/ +RUN ./gradlew clean build +EXPOSE 8089 +ENTRYPOINT ["java","-jar","build/libs/lab3-0.0.1-SNAPSHOT.jar"] +``` +### docker-compose.yml +Файл, соединяющий сервисы (содержащий настройку Docker): +``` +version: "3" #формат конфигурации Docker Compose версии 3 +services: #определение сервисов + category: + build: + context: /categoryService #путь к контексту сборки + dockerfile: Dockerfile #имя докерфайла + ports: + - "8089:8089" #проброс портов + networks: + - netwrk #сеть + + product: + build: + context: /productService #путь к контексту сборки + dockerfile: Dockerfile #имя докерфайла + ports: + - "8090:8090" #проброс портов + networks: + - netwrk #сеть + + nginx: + image: nginx:latest #образ для контейнера + ports: + - "8091:80" #проброс портов + networks: + - netwrk #сеть + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf #монтирует локальный файл конфигурации + depends_on: #зависимость от сервисов + - category + - product + +networks: + netwrk: + driver: bridge #изолированная сеть +``` +### nginx.conf +Настройка nginx: +``` +http { + server { + listen 80; + listen [::]:80; + server_name localhost; + + location /categoryService/ { + proxy_pass http://category:8089/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Prefix /categoryService; + } + + location /productService/ { + proxy_pass http://product:8090/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Prefix /productService; + } + } +} + +events { + worker_connections 1024; +} +``` + + +## Результат + +Видео: https://disk.yandex.ru/d/8Lcvb0H9LPNSKw \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/.gitignore b/kutygin_andrey_lab_3/categoryService/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/Dockerfile b/kutygin_andrey_lab_3/categoryService/Dockerfile new file mode 100644 index 0000000..8c70839 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:17 +RUN mkdir -p /usr/src/app/ +WORKDIR /usr/src/app/ +COPY . /usr/src/app/ +RUN ./gradlew clean build +EXPOSE 8089 +ENTRYPOINT ["java","-jar","build/libs/lab3-0.0.1-SNAPSHOT.jar"] \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/build.gradle b/kutygin_andrey_lab_3/categoryService/build.gradle new file mode 100644 index 0000000..740a05c --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/build.gradle @@ -0,0 +1,34 @@ +plugins { + id 'org.springframework.boot' version '2.6.3' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'categoryApp' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '17' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'com.h2database:h2:2.1.210' + + implementation 'org.hibernate.validator:hibernate-validator' + + implementation 'org.springdoc:springdoc-openapi-ui:1.6.5' + + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5' +} + +tasks.named('test') { + useJUnitPlatform() +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/data.mv.db b/kutygin_andrey_lab_3/categoryService/data.mv.db new file mode 100644 index 0000000..c43b69d Binary files /dev/null and b/kutygin_andrey_lab_3/categoryService/data.mv.db differ diff --git a/kutygin_andrey_lab_3/categoryService/gradle/wrapper/gradle-wrapper.jar b/kutygin_andrey_lab_3/categoryService/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/kutygin_andrey_lab_3/categoryService/gradle/wrapper/gradle-wrapper.jar differ diff --git a/kutygin_andrey_lab_3/categoryService/gradle/wrapper/gradle-wrapper.properties b/kutygin_andrey_lab_3/categoryService/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9d1e214 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Jan 10 18:16:23 GMT+04:00 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/kutygin_andrey_lab_3/categoryService/gradlew b/kutygin_andrey_lab_3/categoryService/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/kutygin_andrey_lab_3/categoryService/gradlew.bat b/kutygin_andrey_lab_3/categoryService/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "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%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/kutygin_andrey_lab_3/categoryService/settings.gradle b/kutygin_andrey_lab_3/categoryService/settings.gradle new file mode 100644 index 0000000..85b9cdd --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = "lab3" + diff --git a/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/Application.java b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/Application.java new file mode 100644 index 0000000..fdc4eb9 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/Application.java @@ -0,0 +1,12 @@ +package categoryApp; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/controller/CategoryController.java b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/controller/CategoryController.java new file mode 100644 index 0000000..a569ffa --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/controller/CategoryController.java @@ -0,0 +1,48 @@ +package categoryApp.controller; + +import categoryApp.model.CategoryDto; +import org.springframework.web.bind.annotation.*; +import categoryApp.service.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/") +public class CategoryController { + private final CategoryService categoryService; + + public CategoryController(CategoryService categoryService) { + this.categoryService = categoryService; + } + + @GetMapping("/{id}") + public CategoryDto getCategory(@PathVariable Long id) { + return new CategoryDto(categoryService.findCategory(id)); + } + + @GetMapping("/") + public List getCategorys() { + return categoryService.findAllCategorys().stream() + .map(CategoryDto::new) + .collect(Collectors.toList()); + } + + @PostMapping("/") + public CategoryDto createCategory(@RequestBody @Valid CategoryDto categoryDto) { + return new CategoryDto(categoryService.addCategory(categoryDto)); + } + + @PutMapping("/{id}") + public CategoryDto updateCategory(@RequestBody @Valid CategoryDto categoryDto) { + return new CategoryDto(categoryService.updateCategory(categoryDto)); + } + + + @DeleteMapping("/{id}") + public CategoryDto deleteCategory(@PathVariable Long id) { + return new CategoryDto(categoryService.deleteCategory(id)); + } + +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/model/Category.java b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/model/Category.java new file mode 100644 index 0000000..37ce416 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/model/Category.java @@ -0,0 +1,53 @@ +package categoryApp.model; + +import javax.persistence.*; + +@Entity +public class Category { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + private String name; + private String description; + + public Category() { + } + + public Category(String name, String description) { + this.name = name; + this.description = description; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public String toString() { + return "Category {" + + "id =" + id + + ", name ='" + name + '\'' + + ", desc ='" + description + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/model/CategoryDto.java b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/model/CategoryDto.java new file mode 100644 index 0000000..9eb8f5b --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/model/CategoryDto.java @@ -0,0 +1,40 @@ +package categoryApp.model; + +public class CategoryDto { + private Long id; + private String name; + private String description; + + public CategoryDto() { + } + + public CategoryDto(Category category) { + this.id = category.getId(); + this.name = String.format("%s", category.getName()); + this.description = category.getDescription(); + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/repository/CategoryRepository.java b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/repository/CategoryRepository.java new file mode 100644 index 0000000..5e49708 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/repository/CategoryRepository.java @@ -0,0 +1,7 @@ +package categoryApp.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import categoryApp.model.Category; + +public interface CategoryRepository extends JpaRepository { +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/service/CategoryNotFoundException.java b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/service/CategoryNotFoundException.java new file mode 100644 index 0000000..1fb3641 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/service/CategoryNotFoundException.java @@ -0,0 +1,7 @@ +package categoryApp.service; + +public class CategoryNotFoundException extends RuntimeException{ + public CategoryNotFoundException(Long id) { + super(String.format("Category with id [%s] is not found", id)); + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/service/CategoryService.java b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/service/CategoryService.java new file mode 100644 index 0000000..4001e55 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/src/main/java/categoryApp/service/CategoryService.java @@ -0,0 +1,49 @@ +package categoryApp.service; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import categoryApp.model.*; +import categoryApp.repository.*; + +import java.util.*; + +@Service +public class CategoryService { + private final CategoryRepository categoryRepository; + + public CategoryService(CategoryRepository categoryRepository) { + this.categoryRepository = categoryRepository; + } + + @Transactional + public Category addCategory(CategoryDto categoryDto) { + final Category category = new Category(categoryDto.getName(), categoryDto.getDescription()); + return categoryRepository.save(category); + } + + @Transactional(readOnly = true) + public Category findCategory(Long id) { + final Optional category = categoryRepository.findById(id); + return category.orElseThrow(() -> new CategoryNotFoundException(id)); + } + + @Transactional(readOnly = true) + public List findAllCategorys() { + return categoryRepository.findAll(); + } + + @Transactional + public Category updateCategory(CategoryDto categoryDto) { + final Category currentCategory = findCategory(categoryDto.getId()); + currentCategory.setName(categoryDto.getName()); + currentCategory.setDescription(categoryDto.getDescription()); + return categoryRepository.save(currentCategory); + } + + @Transactional + public Category deleteCategory(Long id) { + final Category currentCategory = findCategory(id); + categoryRepository.delete(currentCategory); + return currentCategory; + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/categoryService/src/main/resources/application.properties b/kutygin_andrey_lab_3/categoryService/src/main/resources/application.properties new file mode 100644 index 0000000..ac95291 --- /dev/null +++ b/kutygin_andrey_lab_3/categoryService/src/main/resources/application.properties @@ -0,0 +1,11 @@ +spring.main.banner-mode=off +spring.datasource.url=jdbc:h2:file:./data +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.hibernate.ddl-auto=update +spring.h2.console.enabled=true +spring.h2.console.settings.trace=false +spring.h2.console.settings.web-allow-others=false +server.port=8089 \ No newline at end of file diff --git a/kutygin_andrey_lab_3/docker-compose.yml b/kutygin_andrey_lab_3/docker-compose.yml new file mode 100644 index 0000000..74526e0 --- /dev/null +++ b/kutygin_andrey_lab_3/docker-compose.yml @@ -0,0 +1,35 @@ +version: "3" #формат конфигурации Docker Compose версии 3 +services: #определение сервисов + category: + build: + context: /categoryService #путь к контексту сборки + dockerfile: Dockerfile #имя докерфайла + ports: + - "8089:8089" #проброс портов + networks: + - netwrk #сеть + + product: + build: + context: /productService #путь к контексту сборки + dockerfile: Dockerfile #имя докерфайла + ports: + - "8090:8090" #проброс портов + networks: + - netwrk #сеть + + nginx: + image: nginx:latest #образ для контейнера + ports: + - "8091:80" #проброс портов + networks: + - netwrk #сеть + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf #монтирует локальный файл конфигурации + depends_on: #зависимость от сервисов + - category + - product + +networks: + netwrk: + driver: bridge #изолированная сеть \ No newline at end of file diff --git a/kutygin_andrey_lab_3/img.png b/kutygin_andrey_lab_3/img.png new file mode 100644 index 0000000..94f2f81 Binary files /dev/null and b/kutygin_andrey_lab_3/img.png differ diff --git a/kutygin_andrey_lab_3/lab3.mp4 b/kutygin_andrey_lab_3/lab3.mp4 new file mode 100644 index 0000000..e482241 Binary files /dev/null and b/kutygin_andrey_lab_3/lab3.mp4 differ diff --git a/kutygin_andrey_lab_3/nginx.conf b/kutygin_andrey_lab_3/nginx.conf new file mode 100644 index 0000000..6632cb6 --- /dev/null +++ b/kutygin_andrey_lab_3/nginx.conf @@ -0,0 +1,27 @@ +http { + server { + listen 80; + listen [::]:80; + server_name localhost; + + location /categoryService/ { + proxy_pass http://category:8089/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Prefix /categoryService; + } + + location /productService/ { + proxy_pass http://product:8090/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Prefix /productService; + } + } +} + +events { + worker_connections 1024; +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/.gitignore b/kutygin_andrey_lab_3/productService/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/Dockerfile b/kutygin_andrey_lab_3/productService/Dockerfile new file mode 100644 index 0000000..8c70839 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:17 +RUN mkdir -p /usr/src/app/ +WORKDIR /usr/src/app/ +COPY . /usr/src/app/ +RUN ./gradlew clean build +EXPOSE 8089 +ENTRYPOINT ["java","-jar","build/libs/lab3-0.0.1-SNAPSHOT.jar"] \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/build.gradle b/kutygin_andrey_lab_3/productService/build.gradle new file mode 100644 index 0000000..740a05c --- /dev/null +++ b/kutygin_andrey_lab_3/productService/build.gradle @@ -0,0 +1,34 @@ +plugins { + id 'org.springframework.boot' version '2.6.3' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'categoryApp' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '17' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'com.h2database:h2:2.1.210' + + implementation 'org.hibernate.validator:hibernate-validator' + + implementation 'org.springdoc:springdoc-openapi-ui:1.6.5' + + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5' +} + +tasks.named('test') { + useJUnitPlatform() +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/gradle/wrapper/gradle-wrapper.jar b/kutygin_andrey_lab_3/productService/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/kutygin_andrey_lab_3/productService/gradle/wrapper/gradle-wrapper.jar differ diff --git a/kutygin_andrey_lab_3/productService/gradle/wrapper/gradle-wrapper.properties b/kutygin_andrey_lab_3/productService/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c57ea44 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Jan 10 18:23:35 GMT+04:00 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/kutygin_andrey_lab_3/productService/gradlew b/kutygin_andrey_lab_3/productService/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/kutygin_andrey_lab_3/productService/gradlew.bat b/kutygin_andrey_lab_3/productService/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "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%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/kutygin_andrey_lab_3/productService/settings.gradle b/kutygin_andrey_lab_3/productService/settings.gradle new file mode 100644 index 0000000..85b9cdd --- /dev/null +++ b/kutygin_andrey_lab_3/productService/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = "lab3" + diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/Application.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/Application.java new file mode 100644 index 0000000..6a23d21 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/Application.java @@ -0,0 +1,19 @@ +package productApp; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.web.client.RestTemplate; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/controller/ProductController.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/controller/ProductController.java new file mode 100644 index 0000000..f99462d --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/controller/ProductController.java @@ -0,0 +1,48 @@ +package productApp.controller; + +import productApp.model.*; +import org.springframework.web.bind.annotation.*; +import productApp.service.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/") +public class ProductController { + private final ProductService productService; + + public ProductController(ProductService productService) { + this.productService = productService; + } + + @GetMapping("/{id}") + public ProductFullInfoDto getProduct(@PathVariable Long id) { + return productService.findProduct(id); + } + + @GetMapping("/") + public List getProducts() { + return productService.findAllProducts().stream() + .map(ProductDto::new) + .collect(Collectors.toList()); + } + + @PostMapping("/") + public ProductFullInfoDto createProduct(@RequestBody @Valid ProductDto productDto) { + return productService.addProduct(productDto); + } + + @PutMapping("/{id}") + public ProductFullInfoDto updateProduct(@RequestBody @Valid ProductDto productDto) { + return productService.updateProduct(productDto); + } + + + @DeleteMapping("/{id}") + public ProductDto deleteClient(@PathVariable Long id) { + return new ProductDto(productService.deleteProduct(id)); + } + +} diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/CategoryInfoDto.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/CategoryInfoDto.java new file mode 100644 index 0000000..a555ba4 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/CategoryInfoDto.java @@ -0,0 +1,34 @@ +package productApp.model; + +import lombok.Data; + +@Data +public class CategoryInfoDto { + private Long id; + private String name; + private String description; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/Product.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/Product.java new file mode 100644 index 0000000..36549f4 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/Product.java @@ -0,0 +1,71 @@ +package productApp.model; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.v3.oas.annotations.media.Schema; + +import javax.persistence.*; + +import lombok.Data; + +@Data +@Entity +public class Product { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + private String name; + private String description; + private Long categoryId; + + public Product() { + } + + public Product(String name, String description, Long categoryId) { + this.name = name; + this.description = description; + this.categoryId = categoryId; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Long getCategoryId() { + return categoryId; + } + + public void setCategoryId(Long categoryId) { + this.categoryId = categoryId; + } + + @Override + public String toString() { + return "Category {" + + "id =" + id + + ", time =" + name + + ", description='" + description + '\'' + + ", categoryId=" + categoryId + + '}'; + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/ProductDto.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/ProductDto.java new file mode 100644 index 0000000..011b4cc --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/ProductDto.java @@ -0,0 +1,52 @@ +package productApp.model; +import lombok.Data; + +@Data +public class ProductDto { + private Long id; + private String name; + private String description; + private Long categoryId; + + public ProductDto() { + } + + public ProductDto(Product product) { + this.id = product.getId(); + this.name = product.getName(); + this.description = String.format("%s", product.getDescription()); + this.categoryId = product.getCategoryId(); + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Long getCategoryId() { + return categoryId; + } + + public void setCategoryId(Long categoryId) { + this.categoryId = categoryId; + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/ProductFullInfoDto.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/ProductFullInfoDto.java new file mode 100644 index 0000000..fad28d3 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/model/ProductFullInfoDto.java @@ -0,0 +1,62 @@ +package productApp.model; +import lombok.Data; + +@Data +public class ProductFullInfoDto { + private Long id; + private String name; + private String description; + private Long categoryId; + private CategoryInfoDto categoryInfo; + + public ProductFullInfoDto() { + } + + public ProductFullInfoDto(Product product, CategoryInfoDto categoryInfo) { + this.id = product.getId(); + this.name = product.getName(); + this.description = product.getDescription(); + this.categoryId = product.getCategoryId(); + this.categoryInfo = categoryInfo; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Long getCategoryId() { + return categoryId; + } + + public void setCategoryId(Long categoryId) { + this.categoryId = categoryId; + } + + /*public CategoryInfoDto getCategoryInfo() { + return categoryInfo; + } + + public void setCategoryInfo(CategoryInfoDto categoryInfo) { + this.categoryInfo = categoryInfo; + }*/ +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/repository/ProductRepository.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/repository/ProductRepository.java new file mode 100644 index 0000000..b612bc1 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/repository/ProductRepository.java @@ -0,0 +1,7 @@ +package productApp.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import productApp.model.Product; + +public interface ProductRepository extends JpaRepository { +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/service/ProductNotFoundException.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/service/ProductNotFoundException.java new file mode 100644 index 0000000..22b97af --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/service/ProductNotFoundException.java @@ -0,0 +1,7 @@ +package productApp.service; + +public class ProductNotFoundException extends RuntimeException{ + public ProductNotFoundException(Long id) { + super(String.format("Learning Plan with id [%s] is not found", id)); + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/src/main/java/productApp/service/ProductService.java b/kutygin_andrey_lab_3/productService/src/main/java/productApp/service/ProductService.java new file mode 100644 index 0000000..83422e0 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/java/productApp/service/ProductService.java @@ -0,0 +1,73 @@ +package productApp.service; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import productApp.model.*; +import productApp.repository.*; +import org.springframework.web.client.RestTemplate; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.*; + +@Service +public class ProductService { + private final ProductRepository productRepository; + private final RestTemplate restTemplate; + private final String NginxUrl = "http://nginx/categoryService/"; + + @Autowired + public ProductService(ProductRepository productRepository, RestTemplate restTemplate) { + this.productRepository = productRepository; + this.restTemplate = restTemplate; + } + + @Transactional + public ProductFullInfoDto addProduct(ProductDto productDto) { + final Product product = new Product(productDto.getName(), productDto.getDescription(), productDto.getCategoryId()); + productRepository.save(product); + + CategoryInfoDto categoryInfo = restTemplate.getForObject(NginxUrl + productDto.getCategoryId(), CategoryInfoDto.class); + return new ProductFullInfoDto(product, categoryInfo); + } + + @Transactional(readOnly = true) + public ProductFullInfoDto findProduct(Long id) { + final Product product = productRepository.findById(id).orElse(null); + if (product == null) { + throw new ProductNotFoundException(id); + } + + CategoryInfoDto categoryInfo = restTemplate.getForObject(NginxUrl + product.getCategoryId(), CategoryInfoDto.class); + return new ProductFullInfoDto(product, categoryInfo); + } + + @Transactional(readOnly = true) + public Product findProductClear(Long id) { + final Optional product = productRepository.findById(id); + return product.orElseThrow(() -> new ProductNotFoundException(id)); + } + + @Transactional(readOnly = true) + public List findAllProducts() { + return productRepository.findAll(); + } + + @Transactional + public ProductFullInfoDto updateProduct(ProductDto productDto) { + final Product currentProduct = findProductClear(productDto.getId()); + currentProduct.setName(productDto.getName()); + currentProduct.setDescription(productDto.getDescription()); + currentProduct.setCategoryId(productDto.getCategoryId()); + productRepository.save(currentProduct); + + CategoryInfoDto categoryInfo = restTemplate.getForObject(NginxUrl + productDto.getCategoryId(), CategoryInfoDto.class); + return new ProductFullInfoDto(currentProduct, categoryInfo); + } + + @Transactional + public Product deleteProduct(Long id) { + final Product currentProduct = findProductClear(id); + productRepository.delete(currentProduct); + return currentProduct; + } +} \ No newline at end of file diff --git a/kutygin_andrey_lab_3/productService/src/main/resources/application.properties b/kutygin_andrey_lab_3/productService/src/main/resources/application.properties new file mode 100644 index 0000000..9a56fe7 --- /dev/null +++ b/kutygin_andrey_lab_3/productService/src/main/resources/application.properties @@ -0,0 +1,11 @@ +spring.main.banner-mode=off +spring.datasource.url=jdbc:h2:file:./data +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.hibernate.ddl-auto=update +spring.h2.console.enabled=true +spring.h2.console.settings.trace=false +spring.h2.console.settings.web-allow-others=false +server.port=8090 \ No newline at end of file