diff --git a/emelaynov_artem_lab_3/price_history_module/.idea/workspace.xml b/emelaynov_artem_lab_3/price_history_module/.idea/workspace.xml new file mode 100644 index 0000000..c01fad5 --- /dev/null +++ b/emelaynov_artem_lab_3/price_history_module/.idea/workspace.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + + + + + + + + + + + + + + + + + + + 1728723033711 + + + + + + \ No newline at end of file diff --git a/emelyanov_artem_lab_3/.idea/workspace.xml b/emelyanov_artem_lab_3/.idea/workspace.xml new file mode 100644 index 0000000..4d2f2a6 --- /dev/null +++ b/emelyanov_artem_lab_3/.idea/workspace.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + {} + { + "isMigrated": true +} + { + "associatedIndex": 3 +} + + + + { + "keyToString": { + "Docker.docker-compose.yml.price: Compose Deployment.executor": "Run", + "Docker.docker-compose.yml: Compose Deployment.executor": "Run", + "RunOnceActivity.ShowReadmeOnStart": "true", + "git-widget-placeholder": "emelaynov__artem__lab__3", + "kotlin-language-version-configured": "true", + "last_opened_file_path": "/home/forever/УлГТУ/Распределенные вычисления и приложения/DAS_2024_1/emelaynov_artem_lab_3", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1728722079988 + + + + + + \ No newline at end of file diff --git a/emelyanov_artem_lab_3/README.md b/emelyanov_artem_lab_3/README.md new file mode 100644 index 0000000..bce1adc --- /dev/null +++ b/emelyanov_artem_lab_3/README.md @@ -0,0 +1,30 @@ +## Задание + +1. Создать 2 микросервиса, реализующих CRUD на связанных сущностях. +2. Реализовать механизм синхронного обмена сообщениями между микросервисами. +3. Реализовать шлюз на основе прозрачного прокси-сервера nginx. + +Вариант: Продукты и история цен на них + +## Выполнение +Были написаны два сервиса на языке java, фреймворк Spring: +* Сервис price_module, хранящий данные о продуктах и реализующий CRUD операции с ними через HTTP запросы. +* Сервис price_history_module, хранящий данные об истории цен на продукты и реализующий CRUD операции с ними через HTTP запросы. + +Сервисы синхронно сообщены - сервис истории цен при создании записи с ценой, посылает сообщение продукту на связывание. + +Для сервисов прописаны файлы Dockerfile, описывающие создание контейнеров: +* Оба контейнера проявляют порты, на которых работает приложение: 8080 для продуктов и 8081 для истории цен. +* Выбирается рабочая директория /app и туда копируются файлы скриптов. +* Командой запускаются сами скрипты. + +Общий yaml-файл развёртки был настроен следующим образом: +* блок services, где перечислены разворачиваемые сервисы. +* для каждого сервиса прописан build, где объявляется его папка и докерфайл создания и зависимости. +* для сервиса nginx прописан порт для отображения вовне. + +## Результат +Демонстрация работы в видео. + +## Ссылка на видео +https://drive.google.com/file/d/1tH7FwSu_VWJ5SKJBXm3zPKbxTAKVUFxb/view?usp=sharing \ No newline at end of file diff --git a/emelyanov_artem_lab_3/docker-compose.yml b/emelyanov_artem_lab_3/docker-compose.yml new file mode 100644 index 0000000..f5a769e --- /dev/null +++ b/emelyanov_artem_lab_3/docker-compose.yml @@ -0,0 +1,37 @@ +version: '3' + +services: + nginx: + image: nginx:latest + container_name: nginx + ports: + - "80:80" + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf:ro + depends_on: + - price + - product + networks: + - app-network + + product: + build: + context: ./product_module + dockerfile: Dockerfile + ports: + - "8080:8080" + networks: + - app-network + + price: + build: + context: ./price_history_module + dockerfile: Dockerfile + ports: + - "8081:8081" + networks: + - app-network + +networks: + app-network: + driver: bridge diff --git a/emelyanov_artem_lab_3/nginx.conf b/emelyanov_artem_lab_3/nginx.conf new file mode 100644 index 0000000..b2e0032 --- /dev/null +++ b/emelyanov_artem_lab_3/nginx.conf @@ -0,0 +1,21 @@ +http { + server { + listen 80; + listen [::]:80; + server_name localhost; + + # Прокси для ProductService + location /product/ { + proxy_pass http://product:8080; + } + + # Прокси для PriceHistoryService + location /price-history/ { + proxy_pass http://price:8081; + } + } +} + +events { + worker_connections 1024; +} \ No newline at end of file diff --git a/emelyanov_artem_lab_3/price_history_module/.gitignore b/emelyanov_artem_lab_3/price_history_module/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/emelyanov_artem_lab_3/price_history_module/Dockerfile b/emelyanov_artem_lab_3/price_history_module/Dockerfile new file mode 100644 index 0000000..69b58c5 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:17-jdk-slim + +WORKDIR /app + +COPY build/libs/price_history_module-0.0.1-SNAPSHOT.jar /app/price.jar + +ENTRYPOINT ["java", "-jar", "price.jar"] \ No newline at end of file diff --git a/emelyanov_artem_lab_3/price_history_module/build.gradle b/emelyanov_artem_lab_3/price_history_module/build.gradle new file mode 100644 index 0000000..899a13c --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.4' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'ru.ulstu' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0' + implementation 'org.springframework.boot:spring-boot-starter-web' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/emelyanov_artem_lab_3/price_history_module/gradle/wrapper/gradle-wrapper.jar b/emelyanov_artem_lab_3/price_history_module/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/emelyanov_artem_lab_3/price_history_module/gradle/wrapper/gradle-wrapper.jar differ diff --git a/emelyanov_artem_lab_3/price_history_module/gradle/wrapper/gradle-wrapper.properties b/emelyanov_artem_lab_3/price_history_module/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/emelyanov_artem_lab_3/price_history_module/gradlew b/emelyanov_artem_lab_3/price_history_module/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/gradlew @@ -0,0 +1,252 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/platforms/jvm/plugins-application/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 -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/emelyanov_artem_lab_3/price_history_module/gradlew.bat b/emelyanov_artem_lab_3/price_history_module/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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/emelyanov_artem_lab_3/price_history_module/settings.gradle b/emelyanov_artem_lab_3/price_history_module/settings.gradle new file mode 100644 index 0000000..8eaa297 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'price_history_module' diff --git a/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/PriceHistoryModuleApplication.java b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/PriceHistoryModuleApplication.java new file mode 100644 index 0000000..e6c3a67 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/PriceHistoryModuleApplication.java @@ -0,0 +1,13 @@ +package ru.ulstu.price_history_module; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PriceHistoryModuleApplication { + + public static void main(String[] args) { + SpringApplication.run(PriceHistoryModuleApplication.class, args); + } + +} diff --git a/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/config/AppConfig.java b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/config/AppConfig.java new file mode 100644 index 0000000..932f5a1 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/config/AppConfig.java @@ -0,0 +1,13 @@ +package ru.ulstu.price_history_module.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +@Configuration +public class AppConfig { + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } +} diff --git a/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/controller/PriceHistoryController.java b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/controller/PriceHistoryController.java new file mode 100644 index 0000000..7db554d --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/controller/PriceHistoryController.java @@ -0,0 +1,42 @@ +package ru.ulstu.price_history_module.controller; + +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import ru.ulstu.price_history_module.service.PriceHistoryService; +import ru.ulstu.price_history_module.service.dto.CreatePriceHistoryDto; + +@AllArgsConstructor +@RequestMapping("/price-history") +@RestController +public class PriceHistoryController { + private final PriceHistoryService priceHistoryService; + + @GetMapping + public ResponseEntity findAll() { + return ResponseEntity.ok(priceHistoryService.getPriceHistory()); + } + + @GetMapping("/{id}") + public ResponseEntity findById(@PathVariable Long id) { + return ResponseEntity.ok(priceHistoryService.getProductPrice(id)); + } + + @PostMapping + public ResponseEntity createPriceHistory(@RequestBody CreatePriceHistoryDto createProductDto) { + return ResponseEntity.ok(priceHistoryService.addProductPrice(createProductDto)); + } + + @PutMapping("/{id}") + public ResponseEntity updatePriceHistory( + @PathVariable Long id, + @RequestBody CreatePriceHistoryDto createProductDto + ) { + return ResponseEntity.ok(priceHistoryService.updatePriceHistory(id, createProductDto)); + } + + @DeleteMapping("/{id}") + public void deletePriceHistory(@PathVariable Long id) { + priceHistoryService.deletePriceHistory(id); + } +} diff --git a/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/model/PriceHistory.java b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/model/PriceHistory.java new file mode 100644 index 0000000..c2c6a9a --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/model/PriceHistory.java @@ -0,0 +1,19 @@ +package ru.ulstu.price_history_module.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@Builder +public class PriceHistory { + private Long id; + private Date date; + private Double price; + private Long productId; +} diff --git a/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/service/PriceHistoryService.java b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/service/PriceHistoryService.java new file mode 100644 index 0000000..57b15f1 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/service/PriceHistoryService.java @@ -0,0 +1,80 @@ +package ru.ulstu.price_history_module.service; + +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.server.ResponseStatusException; +import ru.ulstu.price_history_module.model.PriceHistory; +import ru.ulstu.price_history_module.service.dto.CreatePriceHistoryDto; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class PriceHistoryService { + private final Map products = new HashMap<>(); + private Long countId = 1L; + private final RestTemplate restTemplate; + + public PriceHistoryService(RestTemplate restTemplate) { + this.restTemplate = restTemplate; + } + + public List getPriceHistory() { + return new ArrayList<>(products.values()); + } + + public PriceHistory getProductPrice(Long id) { + if (!products.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Product price not found"); + } + return products.get(id); + } + + public Long addProductPrice(CreatePriceHistoryDto createPriceHistoryDto) { + final PriceHistory priceHistory = PriceHistory.builder() + .id(countId) + .date(createPriceHistoryDto.getDate()) + .price(createPriceHistoryDto.getPrice()) + .productId(createPriceHistoryDto.getProductId()) + .build(); + countId++; + products.put(priceHistory.getId(), priceHistory); + + try { + + String baseUrl = "http://nginx/product/addPriceHistory"; + restTemplate.postForObject( + baseUrl + "/" + createPriceHistoryDto.getProductId(), + priceHistory, + Void.class + ); + } catch (RestClientException e) { + throw new RuntimeException("Failed to add price history to product: " + e.getMessage(), e); + } + + return priceHistory.getId(); + } + + public CreatePriceHistoryDto updatePriceHistory(Long id, CreatePriceHistoryDto createPriceHistoryDto) { + final PriceHistory priceHistory = products.get(id); + priceHistory.setDate(createPriceHistoryDto.getDate()); + priceHistory.setPrice(createPriceHistoryDto.getPrice()); + priceHistory.setProductId(createPriceHistoryDto.getProductId()); + return CreatePriceHistoryDto.builder() + .price(priceHistory.getPrice()) + .date(priceHistory.getDate()) + .productId(priceHistory.getProductId()) + .build(); + } + + public void deletePriceHistory(Long id) { + if (!products.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Product price not found"); + } + products.remove(id); + } +} diff --git a/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/service/dto/CreatePriceHistoryDto.java b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/service/dto/CreatePriceHistoryDto.java new file mode 100644 index 0000000..c63f861 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/src/main/java/ru/ulstu/price_history_module/service/dto/CreatePriceHistoryDto.java @@ -0,0 +1,18 @@ +package ru.ulstu.price_history_module.service.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@Builder +public class CreatePriceHistoryDto { + private Date date; + private Double price; + private Long productId; +} diff --git a/emelyanov_artem_lab_3/price_history_module/src/main/resources/application.properties b/emelyanov_artem_lab_3/price_history_module/src/main/resources/application.properties new file mode 100644 index 0000000..70f70b5 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.application.name=price_history_module +server.port=8081 diff --git a/emelyanov_artem_lab_3/price_history_module/src/test/java/ru/ulstu/price_history_module/PriceHistoryModuleApplicationTests.java b/emelyanov_artem_lab_3/price_history_module/src/test/java/ru/ulstu/price_history_module/PriceHistoryModuleApplicationTests.java new file mode 100644 index 0000000..a04eb58 --- /dev/null +++ b/emelyanov_artem_lab_3/price_history_module/src/test/java/ru/ulstu/price_history_module/PriceHistoryModuleApplicationTests.java @@ -0,0 +1,13 @@ +package ru.ulstu.price_history_module; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class PriceHistoryModuleApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/emelyanov_artem_lab_3/product_module/.gitignore b/emelyanov_artem_lab_3/product_module/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/emelyanov_artem_lab_3/product_module/Dockerfile b/emelyanov_artem_lab_3/product_module/Dockerfile new file mode 100644 index 0000000..d8ae178 --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:23-ea-17-jdk-bullseye +WORKDIR /app +COPY build/libs/product_module-0.0.1-SNAPSHOT.jar /app/product.jar +ENTRYPOINT ["java", "-jar", "product.jar"] \ No newline at end of file diff --git a/emelyanov_artem_lab_3/product_module/build.gradle b/emelyanov_artem_lab_3/product_module/build.gradle new file mode 100644 index 0000000..5525141 --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.4' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'ru.ulstu' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0' + implementation 'org.springframework.boot:spring-boot-starter-web' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/emelyanov_artem_lab_3/product_module/gradle/wrapper/gradle-wrapper.jar b/emelyanov_artem_lab_3/product_module/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/emelyanov_artem_lab_3/product_module/gradle/wrapper/gradle-wrapper.jar differ diff --git a/emelyanov_artem_lab_3/product_module/gradle/wrapper/gradle-wrapper.properties b/emelyanov_artem_lab_3/product_module/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/emelyanov_artem_lab_3/product_module/gradlew b/emelyanov_artem_lab_3/product_module/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/gradlew @@ -0,0 +1,252 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/platforms/jvm/plugins-application/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 -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/emelyanov_artem_lab_3/product_module/gradlew.bat b/emelyanov_artem_lab_3/product_module/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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/emelyanov_artem_lab_3/product_module/settings.gradle b/emelyanov_artem_lab_3/product_module/settings.gradle new file mode 100644 index 0000000..a058aea --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'product_module' diff --git a/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/ProductModuleApplication.java b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/ProductModuleApplication.java new file mode 100644 index 0000000..2062a83 --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/ProductModuleApplication.java @@ -0,0 +1,13 @@ +package ru.ulstu.product_module; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ProductModuleApplication { + + public static void main(String[] args) { + SpringApplication.run(ProductModuleApplication.class, args); + } + +} diff --git a/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/controller/ProductController.java b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/controller/ProductController.java new file mode 100644 index 0000000..75904cf --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/controller/ProductController.java @@ -0,0 +1,52 @@ +package ru.ulstu.product_module.controller; + + +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import ru.ulstu.product_module.model.PriceHistory; +import ru.ulstu.product_module.service.ProductService; +import ru.ulstu.product_module.service.dto.CreateProductDto; + +@AllArgsConstructor +@RequestMapping("/product") +@RestController +public class ProductController { + private final ProductService productService; + + @GetMapping + public ResponseEntity findAll() { + return ResponseEntity.ok(productService.getProduct()); + } + + @GetMapping("/{id}") + public ResponseEntity findById(@PathVariable Long id) { + return ResponseEntity.ok(productService.getProduct(id)); + } + + @PostMapping + public ResponseEntity createProduct(@RequestBody CreateProductDto createProductDto) { + return ResponseEntity.ok(productService.addProduct(createProductDto)); + } + + @PutMapping("/{id}") + public ResponseEntity updateProduct( + @PathVariable Long id, + @RequestBody CreateProductDto createProductDto + ) { + return ResponseEntity.ok(productService.updateProduct(id, createProductDto)); + } + + @DeleteMapping("/{id}") + public void deleteProduct(@PathVariable Long id) { + productService.deleteProduct(id); + } + + @PostMapping("/addPriceHistory/{id}") + public void addPriceHistory( + @PathVariable Long id, + @RequestBody PriceHistory priceHistory + ){ + productService.addPriceHistory(id, priceHistory); + } +} diff --git a/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/model/PriceHistory.java b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/model/PriceHistory.java new file mode 100644 index 0000000..693d313 --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/model/PriceHistory.java @@ -0,0 +1,15 @@ +package ru.ulstu.product_module.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PriceHistory { + private Date date; + private Double price; +} diff --git a/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/model/Product.java b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/model/Product.java new file mode 100644 index 0000000..da8900c --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/model/Product.java @@ -0,0 +1,18 @@ +package ru.ulstu.product_module.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class Product { + private Long id; + private String name; + private List priceHistory; +} diff --git a/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/service/ProductService.java b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/service/ProductService.java new file mode 100644 index 0000000..1e72a4c --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/service/ProductService.java @@ -0,0 +1,64 @@ +package ru.ulstu.product_module.service; + +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.web.server.ResponseStatusException; +import ru.ulstu.product_module.model.PriceHistory; +import ru.ulstu.product_module.model.Product; +import ru.ulstu.product_module.service.dto.CreateProductDto; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class ProductService { + private final Map products = new HashMap<>(); + private Long countId = 1L; + + public List getProduct() { + return new ArrayList<>(products.values()); + } + + public Product getProduct(Long id) { + if (!products.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Product not found"); + } + return products.get(id); + } + + public Long addProduct(CreateProductDto createProductDto) { + final Product product = Product.builder() + .id(countId) + .name(createProductDto.getName()) + .priceHistory(new ArrayList<>()) + .build(); + countId++; + products.put(product.getId(), product); + return product.getId(); + } + + public CreateProductDto updateProduct(Long id, CreateProductDto createProductDto) { + final Product product = products.get(id); + product.setName(createProductDto.getName()); + return CreateProductDto.builder() + .name(product.getName()) + .build(); + } + + public void deleteProduct(Long id) { + if (!products.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Product not found"); + } + products.remove(id); + } + + public void addPriceHistory(Long id, PriceHistory priceHistory) { + if (!products.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Product not found"); + } + final Product product = products.get(id); + product.getPriceHistory().add(priceHistory); + } +} diff --git a/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/service/dto/CreateProductDto.java b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/service/dto/CreateProductDto.java new file mode 100644 index 0000000..67fc2ae --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/src/main/java/ru/ulstu/product_module/service/dto/CreateProductDto.java @@ -0,0 +1,14 @@ +package ru.ulstu.product_module.service.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class CreateProductDto { + private String name; +} diff --git a/emelyanov_artem_lab_3/product_module/src/main/resources/application.properties b/emelyanov_artem_lab_3/product_module/src/main/resources/application.properties new file mode 100644 index 0000000..d71e87c --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.application.name=product_module +server.port=8080 diff --git a/emelyanov_artem_lab_3/product_module/src/test/java/ru/ulstu/product_module/ProductModuleApplicationTests.java b/emelyanov_artem_lab_3/product_module/src/test/java/ru/ulstu/product_module/ProductModuleApplicationTests.java new file mode 100644 index 0000000..d6ba77d --- /dev/null +++ b/emelyanov_artem_lab_3/product_module/src/test/java/ru/ulstu/product_module/ProductModuleApplicationTests.java @@ -0,0 +1,13 @@ +package ru.ulstu.product_module; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ProductModuleApplicationTests { + + @Test + void contextLoads() { + } + +}