Merge pull request 'belyaeva lab3 ready' (#113) from belyaeva_ekaterina_lab_3 into main

Reviewed-on: http://student.git.athene.tech/Alexey/DAS_2023_1/pulls/113

belyaeva_ekaterina_lab_3/README.md

@@ -0,0 +1,112 @@
+# Лабораторная работа №3
+
+## Задание
+
+Цель: изучение шаблона проектирования gateway, построения синхронного обмена между микросервисами и архитектурного стиля RESTful API.
+
+Задачи:
+
+- Создать 2 микросервиса, реализующих CRUD на связанных сущностях.
+- Реализовать механизм синхронного обмена сообщениями между микросервисами.
+- Реализовать шлюз на основе прозрачного прокси-сервера nginx.
+
+## Ход работы
+
+### Разворачивание сервисов:
+
+Были разработаны два приложения на Java с использованием средства автоматизации сборки проектов Gradle и с использованием библиотеки spring-boot:
+
+- disciplineService - работа с дисциплинами (crud)
+- learningPlanService - работа с планами обучения (crud). При создании плана обучения выбирается id дисциплины, и через nginx и rest template происходит получение данных о дисциплины с этим id
+
+### Обмен сообщениями
+При создании плана обучения выбирается id дисциплины, и через nginx и rest template происходит получение данных о дисциплины с этим id
+
+![img.png](img.png)
+
+### 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: #определение сервисов
+  discipline:
+    build:
+      context: /disciplineService #путь к контексту сборки
+      dockerfile: Dockerfile #имя докерфайла
+    ports:
+      - "8089:8089" #проброс портов
+    networks:
+      - netwrk #сеть
+
+  learning_plan:
+    build:
+      context: /learningPlanService #путь к контексту сборки
+      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: #зависимость от сервисов
+      - discipline
+      - learning_plan
+
+networks:
+  netwrk:
+    driver: bridge #изолированная сеть
+```
+### nginx.conf
+Настройка nginx:
+```
+http {
+    server {
+        listen 80;
+        listen [::]:80;
+        server_name localhost;
+
+        location /disciplineService/ {
+            proxy_pass http://discipline: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 /disciplineService;
+        }
+
+        location /learningPlanService/ {
+            proxy_pass http://learning_plan: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 /learningPlanService;
+        }
+    }
+}
+
+events {
+    worker_connections  1024;
+}
+```
+
+
+## Результат
+
+Работоспособность и взаимодействие сервисов показаны в видео: [lab3.mp4](lab3.mp4)

belyaeva_ekaterina_lab_3/disciplineService/.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

belyaeva_ekaterina_lab_3/disciplineService/.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

belyaeva_ekaterina_lab_3/disciplineService/.idea/.name

@@ -0,0 +1 @@
+lab3

belyaeva_ekaterina_lab_3/disciplineService/.idea/gradle.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

belyaeva_ekaterina_lab_3/disciplineService/.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

belyaeva_ekaterina_lab_3/disciplineService/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"]

belyaeva_ekaterina_lab_3/disciplineService/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 = 'disciplineApp'
+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()
+}

belyaeva_ekaterina_lab_3/disciplineService/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

belyaeva_ekaterina_lab_3/disciplineService/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" "$@"

belyaeva_ekaterina_lab_3/disciplineService/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

belyaeva_ekaterina_lab_3/disciplineService/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = "lab3"
+

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/Application.java

@@ -0,0 +1,12 @@
+package disciplineApp;
+
+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);
+    }
+}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/controller/DisciplineController.java

@@ -0,0 +1,48 @@
+package disciplineApp.controller;
+
+import disciplineApp.model.DisciplineDto;
+import org.springframework.web.bind.annotation.*;
+import disciplineApp.service.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/")
+public class DisciplineController {
+    private final DisciplineService disciplineService;
+
+    public DisciplineController(DisciplineService disciplineService) {
+        this.disciplineService = disciplineService;
+    }
+
+    @GetMapping("/{id}")
+    public DisciplineDto getDiscipline(@PathVariable Long id) {
+        return new DisciplineDto(disciplineService.findDiscipline(id));
+    }
+
+    @GetMapping("/")
+    public List<DisciplineDto> getDisciplines() {
+        return disciplineService.findAllDisciplines().stream()
+                .map(DisciplineDto::new)
+                .collect(Collectors.toList());
+    }
+
+    @PostMapping("/")
+    public DisciplineDto createDiscipline(@RequestBody @Valid DisciplineDto disciplineDto) {
+        return new DisciplineDto(disciplineService.addDiscipline(disciplineDto));
+    }
+
+    @PutMapping("/{id}")
+    public DisciplineDto updateDiscipline(@RequestBody @Valid DisciplineDto disciplineDto) {
+        return new DisciplineDto(disciplineService.updateDiscipline(disciplineDto));
+    }
+
+
+    @DeleteMapping("/{id}")
+    public DisciplineDto deleteDiscipline(@PathVariable Long id) {
+        return new DisciplineDto(disciplineService.deleteDiscipline(id));
+    }
+
+}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/model/Discipline.java

@@ -0,0 +1,53 @@
+package disciplineApp.model;
+
+import javax.persistence.*;
+
+@Entity
+public class Discipline {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private String name;
+    private String description;
+
+    public Discipline() {
+    }
+
+    public Discipline(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 "Discipline {" +
+                "id =" + id +
+                ", name ='" + name + '\'' +
+                ", desc ='" + description + '\'' +
+                '}';
+    }
+}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/model/DisciplineDto.java

@@ -0,0 +1,40 @@
+package disciplineApp.model;
+
+public class DisciplineDto {
+    private Long id;
+    private String name;
+    private String description;
+
+    public DisciplineDto() {
+    }
+
+    public DisciplineDto(Discipline discipline) {
+        this.id = discipline.getId();
+        this.name = String.format("%s", discipline.getName());
+        this.description = discipline.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;
+    }
+}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/repository/DisciplineRepository.java

@@ -0,0 +1,7 @@
+package disciplineApp.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import disciplineApp.model.Discipline;
+
+public interface DisciplineRepository extends JpaRepository<Discipline, Long> {
+}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/service/DisciplineNotFoundException.java

@@ -0,0 +1,7 @@
+package disciplineApp.service;
+
+public class DisciplineNotFoundException extends RuntimeException{
+    public DisciplineNotFoundException(Long id) {
+        super(String.format("Discipline with id [%s] is not found", id));
+    }
+}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/service/DisciplineService.java

@@ -0,0 +1,49 @@
+package disciplineApp.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import disciplineApp.model.*;
+import disciplineApp.repository.*;
+
+import java.util.*;
+
+@Service
+public class DisciplineService {
+    private final DisciplineRepository disciplineRepository;
+
+    public DisciplineService(DisciplineRepository disciplineRepository) {
+        this.disciplineRepository = disciplineRepository;
+    }
+
+    @Transactional
+    public Discipline addDiscipline(DisciplineDto disciplineDto) {
+        final Discipline discipline = new Discipline(disciplineDto.getName(), disciplineDto.getDescription());
+        return disciplineRepository.save(discipline);
+    }
+
+    @Transactional(readOnly = true)
+    public Discipline findDiscipline(Long id) {
+        final Optional<Discipline> discipline = disciplineRepository.findById(id);
+        return discipline.orElseThrow(() -> new DisciplineNotFoundException(id));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Discipline> findAllDisciplines() {
+        return disciplineRepository.findAll();
+    }
+
+    @Transactional
+    public Discipline updateDiscipline(DisciplineDto disciplineDto) {
+        final Discipline currentDiscipline = findDiscipline(disciplineDto.getId());
+        currentDiscipline.setName(disciplineDto.getName());
+        currentDiscipline.setDescription(disciplineDto.getDescription());
+        return disciplineRepository.save(currentDiscipline);
+    }
+
+    @Transactional
+    public Discipline deleteDiscipline(Long id) {
+        final Discipline currentDiscipline = findDiscipline(id);
+        disciplineRepository.delete(currentDiscipline);
+        return currentDiscipline;
+    }
+}

belyaeva_ekaterina_lab_3/disciplineService/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

belyaeva_ekaterina_lab_3/docker-compose.yml

@@ -0,0 +1,35 @@
+version: "3" #формат конфигурации Docker Compose версии 3
+services: #определение сервисов
+  discipline:
+    build:
+      context: /disciplineService #путь к контексту сборки
+      dockerfile: Dockerfile #имя докерфайла
+    ports:
+      - "8089:8089" #проброс портов
+    networks:
+      - netwrk #сеть
+
+  learning_plan:
+    build:
+      context: /learningPlanService #путь к контексту сборки
+      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: #зависимость от сервисов
+      - discipline
+      - learning_plan
+
+networks:
+  netwrk:
+    driver: bridge #изолированная сеть

belyaeva_ekaterina_lab_3/learningPlanService/.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

belyaeva_ekaterina_lab_3/learningPlanService/.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

belyaeva_ekaterina_lab_3/learningPlanService/.idea/.name

@@ -0,0 +1 @@
+lab3

belyaeva_ekaterina_lab_3/learningPlanService/.idea/gradle.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

belyaeva_ekaterina_lab_3/learningPlanService/.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

belyaeva_ekaterina_lab_3/learningPlanService/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"]

belyaeva_ekaterina_lab_3/learningPlanService/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 = 'disciplineApp'
+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()
+}

belyaeva_ekaterina_lab_3/learningPlanService/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

belyaeva_ekaterina_lab_3/learningPlanService/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" "$@"

belyaeva_ekaterina_lab_3/learningPlanService/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

belyaeva_ekaterina_lab_3/learningPlanService/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = "lab3"
+

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/Application.java

@@ -0,0 +1,19 @@
+package learningPlanApp;
+
+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();
+    }
+}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/controller/LearningPlanController.java

@@ -0,0 +1,48 @@
+package learningPlanApp.controller;
+
+import learningPlanApp.model.*;
+import org.springframework.web.bind.annotation.*;
+import learningPlanApp.service.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/")
+public class LearningPlanController {
+    private final LearningPlanService learningPlanService;
+
+    public LearningPlanController(LearningPlanService learningPlanService) {
+        this.learningPlanService = learningPlanService;
+    }
+
+    @GetMapping("/{id}")
+    public LearningPlanFullInfoDto getLearningPlan(@PathVariable Long id) {
+        return learningPlanService.findLearningPlan(id);
+    }
+
+    @GetMapping("/")
+    public List<LearningPlanDto> getLearningPlans() {
+        return learningPlanService.findAllLearningPlans().stream()
+                .map(LearningPlanDto::new)
+                .collect(Collectors.toList());
+    }
+
+    @PostMapping("/")
+    public LearningPlanFullInfoDto createLearningPlan(@RequestBody @Valid LearningPlanDto learningPlanDto) {
+        return learningPlanService.addLearningPlan(learningPlanDto);
+    }
+
+    @PutMapping("/{id}")
+    public LearningPlanFullInfoDto updateLearningPlan(@RequestBody @Valid LearningPlanDto learningPlanDto) {
+        return learningPlanService.updateLearningPlan(learningPlanDto);
+    }
+
+
+    @DeleteMapping("/{id}")
+    public LearningPlanDto deleteClient(@PathVariable Long id) {
+        return new LearningPlanDto(learningPlanService.deleteLearningPlan(id));
+    }
+
+}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/model/DisciplineInfoDto.java

@@ -0,0 +1,34 @@
+package learningPlanApp.model;
+
+import lombok.Data;
+
+@Data
+public class DisciplineInfoDto {
+    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;
+    }
+}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/model/LearningPlan.java

@@ -0,0 +1,71 @@
+package learningPlanApp.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 LearningPlan {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private String name;
+    private String description;
+    private Long disciplineId;
+
+    public LearningPlan() {
+    }
+
+    public LearningPlan(String name, String description, Long disciplineId) {
+        this.name = name;
+        this.description = description;
+        this.disciplineId = disciplineId;
+    }
+
+    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 getDisciplineId() {
+        return disciplineId;
+    }
+
+    public void setDisciplineId(Long disciplineId) {
+        this.disciplineId = disciplineId;
+    }
+
+    @Override
+    public String toString() {
+        return "Discipline {" +
+                "id =" + id +
+                ", time =" + name +
+                ", description='" + description + '\'' +
+                ", disciplineId=" + disciplineId +
+                '}';
+    }
+}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/model/LearningPlanDto.java

@@ -0,0 +1,52 @@
+package learningPlanApp.model;
+import lombok.Data;
+
+@Data
+public class LearningPlanDto {
+    private Long id;
+    private String name;
+    private String description;
+    private Long disciplineId;
+
+    public LearningPlanDto() {
+    }
+
+    public LearningPlanDto(LearningPlan learningPlan) {
+        this.id = learningPlan.getId();
+        this.name = learningPlan.getName();
+        this.description = String.format("%s", learningPlan.getDescription());
+        this.disciplineId = learningPlan.getDisciplineId();
+    }
+
+    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 getDisciplineId() {
+        return disciplineId;
+    }
+
+    public void setDisciplineId(Long disciplineId) {
+        this.disciplineId = disciplineId;
+    }
+}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/model/LearningPlanFullInfoDto.java

@@ -0,0 +1,62 @@
+package learningPlanApp.model;
+import lombok.Data;
+
+@Data
+public class LearningPlanFullInfoDto {
+    private Long id;
+    private String name;
+    private String description;
+    private Long disciplineId;
+    private DisciplineInfoDto disciplineInfo;
+
+    public LearningPlanFullInfoDto() {
+    }
+
+    public LearningPlanFullInfoDto(LearningPlan learningPlan, DisciplineInfoDto disciplineInfo) {
+        this.id = learningPlan.getId();
+        this.name = learningPlan.getName();
+        this.description = learningPlan.getDescription();
+        this.disciplineId = learningPlan.getDisciplineId();
+        this.disciplineInfo = disciplineInfo;
+    }
+
+    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 getDisciplineId() {
+        return disciplineId;
+    }
+
+    public void setDisciplineId(Long disciplineId) {
+        this.disciplineId = disciplineId;
+    }
+
+    /*public DisciplineInfoDto getDisciplineInfo() {
+        return disciplineInfo;
+    }
+
+    public void setDisciplineInfo(DisciplineInfoDto disciplineInfo) {
+        this.disciplineInfo = disciplineInfo;
+    }*/
+}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/repository/LearningPlanRepository.java

@@ -0,0 +1,7 @@
+package learningPlanApp.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import learningPlanApp.model.LearningPlan;
+
+public interface LearningPlanRepository extends JpaRepository<LearningPlan, Long> {
+}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/service/LearningPlanNotFoundException.java

@@ -0,0 +1,7 @@
+package learningPlanApp.service;
+
+public class LearningPlanNotFoundException extends RuntimeException{
+    public LearningPlanNotFoundException(Long id) {
+        super(String.format("Learning Plan with id [%s] is not found", id));
+    }
+}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/service/LearningPlanService.java

@@ -0,0 +1,73 @@
+package learningPlanApp.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import learningPlanApp.model.*;
+import learningPlanApp.repository.*;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.*;
+
+@Service
+public class LearningPlanService {
+    private final LearningPlanRepository learningPlanRepository;
+    private final RestTemplate restTemplate;
+    private final String NginxUrl = "http://nginx/disciplineService/";
+
+    @Autowired
+    public LearningPlanService(LearningPlanRepository learningPlanRepository, RestTemplate restTemplate) {
+        this.learningPlanRepository = learningPlanRepository;
+        this.restTemplate = restTemplate;
+    }
+
+    @Transactional
+    public LearningPlanFullInfoDto addLearningPlan(LearningPlanDto learningPlanDto) {
+        final LearningPlan learningPlan = new LearningPlan(learningPlanDto.getName(), learningPlanDto.getDescription(), learningPlanDto.getDisciplineId());
+        learningPlanRepository.save(learningPlan);
+
+        DisciplineInfoDto disciplineInfo = restTemplate.getForObject(NginxUrl + learningPlanDto.getDisciplineId(), DisciplineInfoDto.class);
+        return new LearningPlanFullInfoDto(learningPlan, disciplineInfo);
+    }
+
+    @Transactional(readOnly = true)
+    public LearningPlanFullInfoDto findLearningPlan(Long id) {
+        final LearningPlan learningPlan = learningPlanRepository.findById(id).orElse(null);
+        if (learningPlan == null) {
+            throw new LearningPlanNotFoundException(id);
+        }
+
+        DisciplineInfoDto disciplineInfo = restTemplate.getForObject(NginxUrl + learningPlan.getDisciplineId(), DisciplineInfoDto.class);
+        return new LearningPlanFullInfoDto(learningPlan, disciplineInfo);
+    }
+
+    @Transactional(readOnly = true)
+    public LearningPlan findLearningPlanClear(Long id) {
+        final Optional<LearningPlan> learningPlan = learningPlanRepository.findById(id);
+        return learningPlan.orElseThrow(() -> new LearningPlanNotFoundException(id));
+    }
+
+    @Transactional(readOnly = true)
+    public List<LearningPlan> findAllLearningPlans() {
+        return learningPlanRepository.findAll();
+    }
+
+    @Transactional
+    public LearningPlanFullInfoDto updateLearningPlan(LearningPlanDto learningPlanDto) {
+        final LearningPlan currentLearningPlan = findLearningPlanClear(learningPlanDto.getId());
+        currentLearningPlan.setName(learningPlanDto.getName());
+        currentLearningPlan.setDescription(learningPlanDto.getDescription());
+        currentLearningPlan.setDisciplineId(learningPlanDto.getDisciplineId());
+        learningPlanRepository.save(currentLearningPlan);
+
+        DisciplineInfoDto disciplineInfo = restTemplate.getForObject(NginxUrl + learningPlanDto.getDisciplineId(), DisciplineInfoDto.class);
+        return new LearningPlanFullInfoDto(currentLearningPlan, disciplineInfo);
+    }
+
+    @Transactional
+    public LearningPlan deleteLearningPlan(Long id) {
+        final LearningPlan currentLearningPlan = findLearningPlanClear(id);
+        learningPlanRepository.delete(currentLearningPlan);
+        return currentLearningPlan;
+    }
+}

belyaeva_ekaterina_lab_3/learningPlanService/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

belyaeva_ekaterina_lab_3/nginx.conf

@@ -0,0 +1,27 @@
+http {
+    server {
+        listen 80;
+        listen [::]:80;
+        server_name localhost;
+
+        location /disciplineService/ {
+            proxy_pass http://discipline: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 /disciplineService;
+        }
+
+        location /learningPlanService/ {
+            proxy_pass http://learning_plan: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 /learningPlanService;
+        }
+    }
+}
+
+events {
+    worker_connections  1024;
+}