martysheva_tamara_lab_3 is ready

martysheva_tamara_lab_3/README.md

@@ -0,0 +1,105 @@
+# Лабораторная работа №3 - REST API, Gateway и синхронный обмен между микросервисами
+**Цель**: изучение шаблона проектирования gateway, построения синхронного обмена между микросервисами и архитектурного стиля RESTful API.
+
+**Задачи**:
+* Создать 2 микросервиса, реализующих CRUD на связанных сущностях.
+* Реализовать механизм синхронного обмена сообщениями между микросервисами.
+* Реализовать шлюз на основе прозрачного прокси-сервера nginx.
+***
+## *Ход работы:*
+### Разворачивание сервисов:
+Были разработаны два приложения на ЯП Java с использованием средства автоматизации сборки проектов Gradle и с использованием библиотеки spring-boot:
+* client - содержит работу с записями по пользователям мобильного приложения для поддержки здоровья.
+* training - содержит работу с записями по тренировкам пользователей. Каждая тренировка относится к единственному пользователю, у пользователя может быть много тренировок (связь многие к одному). 
+### Обмен сообщениями
+При чтении (создании, обновлении) записи тренировки при помощи RestTemplate по id клиента мы получаем его данные. Пример с методом создания тренировки:
+
+![](images/message.jpg "")
+### 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/labIP-0.0.1-SNAPSHOT.jar"] #точка входа для контейнера
+```
+### nginx.conf
+Были созданы идентичные докер-файлы для приложений :
+```
+http {
+    server {
+        listen 80; #запросы по порту 80 для IPv4
+        listen [::]:80; #запросы по порту 80 для IPv6
+        server_name localhost; #имя сервера
+
+        location /client/ {  #настройки для запросов, поступающих по пути /client/
+            proxy_pass http://client:8089/; #прокси-перенаправление на адрес
+            proxy_set_header Host $host; #установка дополнительных HTTP-заголовков
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Prefix /client;
+        }
+
+        location /training/ { #настройки для запросов, поступающих по пути /training/ 
+            proxy_pass http://training:8090/; #прокси-перенаправление на адрес
+            proxy_set_header Host $host; #установка дополнительных HTTP-заголовков
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Prefix /training;
+        }
+    }
+}
+
+events {
+    worker_connections  1024; #максимальное количество одновременных соединений для каждого рабочего процесса
+}
+```
+### docker-compose.yml
+Был создан файл docker-compose.yml для разворачивания сервисов:
+```
+version: "3" #формат конфигурации Docker Compose версии 3
+services: #определение сервисов
+  client:
+    build:
+      context: /client #путь к контексту сборки
+      dockerfile: Dockerfile #имя докерфайла
+    ports:
+      - "8089:8089" #проброс портов
+    networks: 
+      - netwrk #сеть
+    
+  training:
+    build:
+      context: /training #путь к контексту сборки
+      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: #зависимость от сервисов
+      - client
+      - training
+
+networks:
+  netwrk:
+    driver: bridge #изолированная сеть
+```
+***
+## *Результат:*
+![](images/result-dockerhub.jpg "")
+
+![](images/result-swagger-client.jpg "")
+
+![](images/result-swagger-training.jpg "")

martysheva_tamara_lab_3/client/.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/

martysheva_tamara_lab_3/client/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/labIP-0.0.1-SNAPSHOT.jar"] 

martysheva_tamara_lab_3/client/build.gradle

@@ -0,0 +1,31 @@
+plugins {
+	id 'org.springframework.boot' version '2.6.3'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'java'
+}
+
+group = 'myapp'
+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'
+
+	implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5'
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}

martysheva_tamara_lab_3/client/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

martysheva_tamara_lab_3/client/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" "$@"

martysheva_tamara_lab_3/client/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

martysheva_tamara_lab_3/client/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'labIP'

martysheva_tamara_lab_3/client/src/main/java/myapp/ApplicationRvip.java

@@ -0,0 +1,12 @@
+package myapp;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ApplicationRvip {
+
+	public static void main(String[] args) {
+		SpringApplication.run(ApplicationRvip.class, args);
+	}
+}

martysheva_tamara_lab_3/client/src/main/java/myapp/controller/ClientController.java

@@ -0,0 +1,48 @@
+package myapp.controller;
+
+import myapp.models.ClientDto;
+import org.springframework.web.bind.annotation.*;
+import myapp.service.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/")
+public class ClientController {
+    private final ClientService clientService;
+
+    public ClientController(ClientService clientService) {
+        this.clientService = clientService;
+    }
+
+    @GetMapping("/{id}")
+    public ClientDto getClient(@PathVariable Long id) {
+        return new ClientDto(clientService.findClient(id));
+    }
+
+    @GetMapping("/")
+    public List<ClientDto> getClients() {
+        return clientService.findAllClients().stream()
+                .map(ClientDto::new)
+                .collect(Collectors.toList());
+    }
+
+    @PostMapping("/")
+    public ClientDto createClient(@RequestBody @Valid ClientDto clientDto) {
+        return new ClientDto(clientService.addClient(clientDto));
+    }
+
+    @PutMapping("/{id}")
+    public ClientDto updateClient(@RequestBody @Valid ClientDto clientDto) {
+        return new ClientDto(clientService.updateClient(clientDto));
+    }
+
+
+    @DeleteMapping("/{id}")
+    public ClientDto deleteClient(@PathVariable Long id) {
+        return new ClientDto(clientService.deleteClient(id));
+    }
+
+}

martysheva_tamara_lab_3/client/src/main/java/myapp/models/Client.java

@@ -0,0 +1,53 @@
+package myapp.models;
+
+import javax.persistence.*;
+
+@Entity
+public class Client {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private String fullName;
+    private Integer age;
+
+    public Client() {
+    }
+
+    public Client( String fullName, Integer age) {
+        this.fullName = fullName;
+        this.age = age;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    @Override
+    public String toString() {
+        return "Client{" +
+                "id=" + id +
+                ", fullName='" + fullName + '\'' +
+                ", age='" + age + '\'' +
+                '}';
+    }
+}

martysheva_tamara_lab_3/client/src/main/java/myapp/models/ClientDto.java

@@ -0,0 +1,43 @@
+package myapp.models;
+
+import myapp.models.Client;
+
+public class ClientDto {
+    private Long id;
+    private String fullName;
+    private Integer age;
+
+    public ClientDto() {
+    }
+
+
+    public ClientDto(Client client) {
+        this.id = client.getId();
+        this.fullName = String.format("%s", client.getFullName());
+        this.age = client.getAge();;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+}

martysheva_tamara_lab_3/client/src/main/java/myapp/repository/ClientRepository.java

@@ -0,0 +1,7 @@
+package myapp.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import myapp.models.Client;
+
+public interface ClientRepository extends JpaRepository<Client, Long> {
+}

martysheva_tamara_lab_3/client/src/main/java/myapp/service/ClientNotFoundException.java

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

martysheva_tamara_lab_3/client/src/main/java/myapp/service/ClientService.java

@@ -0,0 +1,49 @@
+package myapp.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import myapp.models.*;
+import myapp.repository.*;
+
+import java.util.*;
+
+@Service
+public class ClientService {
+    private final ClientRepository clientRepository;
+
+    public ClientService(ClientRepository clientRepository) {
+        this.clientRepository = clientRepository;
+    }
+
+    @Transactional
+    public Client addClient(ClientDto clientDto) {
+        final Client client = new Client(clientDto.getFullName(), clientDto.getAge());
+        return clientRepository.save(client);
+    }
+
+    @Transactional(readOnly = true)
+    public Client findClient(Long id) {
+        final Optional<Client> client = clientRepository.findById(id);
+        return client.orElseThrow(() -> new ClientNotFoundException(id));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Client> findAllClients() {
+        return clientRepository.findAll();
+    }
+
+    @Transactional
+    public Client updateClient(ClientDto clientDto) {
+        final Client currentClient = findClient(clientDto.getId());
+        currentClient.setFullName(clientDto.getFullName());
+        currentClient.setAge(clientDto.getAge());
+        return clientRepository.save(currentClient);
+    }
+
+    @Transactional
+    public Client deleteClient(Long id) {
+        final Client currentClient = findClient(id);
+        clientRepository.delete(currentClient);
+        return currentClient;
+    }
+}

martysheva_tamara_lab_3/client/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

martysheva_tamara_lab_3/docker-compose.yml

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

martysheva_tamara_lab_3/nginx.conf

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

martysheva_tamara_lab_3/training/.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/

martysheva_tamara_lab_3/training/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 8090 
+ENTRYPOINT ["java","-jar","build/libs/labIP-0.0.1-SNAPSHOT.jar"] 

martysheva_tamara_lab_3/training/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 = 'myapp'
+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()
+}

martysheva_tamara_lab_3/training/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

martysheva_tamara_lab_3/training/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" "$@"

martysheva_tamara_lab_3/training/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

martysheva_tamara_lab_3/training/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'labIP'

martysheva_tamara_lab_3/training/src/main/java/myapp/ApplicationRvip.java

@@ -0,0 +1,19 @@
+package myapp;
+
+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 ApplicationRvip {
+
+	public static void main(String[] args) {
+		SpringApplication.run(ApplicationRvip.class, args);
+	}
+
+	@Bean
+	public RestTemplate restTemplate() {
+		return new RestTemplate();
+	}
+}

martysheva_tamara_lab_3/training/src/main/java/myapp/controller/TrainingController.java

@@ -0,0 +1,48 @@
+package myapp.controller;
+
+import myapp.models.*;
+import org.springframework.web.bind.annotation.*;
+import myapp.service.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/")
+public class TrainingController {
+    private final TrainingService trainingService;
+
+    public TrainingController(TrainingService trainingService) {
+        this.trainingService = trainingService;
+    }
+
+    @GetMapping("/{id}")
+    public TrainingFullInfoDto getTraining(@PathVariable Long id) {
+        return trainingService.findTraining(id);
+    }
+
+    @GetMapping("/")
+    public List<TrainingDto> getTrainings() {
+        return trainingService.findAllTrainings().stream()
+                .map(TrainingDto::new)
+                .collect(Collectors.toList());
+    }
+
+    @PostMapping("/")
+    public TrainingFullInfoDto createTraining(@RequestBody @Valid TrainingDto TrainingDto) {
+        return trainingService.addTraining(TrainingDto);
+    }
+
+    @PutMapping("/{id}")
+    public TrainingFullInfoDto updateTraining(@RequestBody @Valid TrainingDto trainingDto) {
+        return trainingService.updateTraining(trainingDto);
+    }
+
+
+    @DeleteMapping("/{id}")
+    public TrainingDto deleteClient(@PathVariable Long id) {
+        return new TrainingDto(trainingService.deleteTraining(id));
+    }
+
+}

martysheva_tamara_lab_3/training/src/main/java/myapp/models/ClientInfoDto.java

@@ -0,0 +1,34 @@
+package myapp.models;
+
+import lombok.Data;
+
+@Data
+public class ClientInfoDto {
+    private Long id;
+    private String fullName;
+    private Long age;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public Long getAge() {
+        return age;
+    }
+
+    public void setAge(Long age) {
+        this.age = age;
+    }
+}

martysheva_tamara_lab_3/training/src/main/java/myapp/models/Training.java

@@ -0,0 +1,85 @@
+package myapp.models;
+
+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 java.sql.Date;
+import java.sql.Time;
+import java.time.LocalTime;
+
+import lombok.Data;
+
+@Data
+@Entity
+public class Training {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private Date date;
+    private String time;
+    private String description;
+    private Long clientId;
+
+    public Training() {
+    }
+
+    public Training(Date date, String time, String description, Long clientId) {
+        this.date = date;
+        this.time = time;
+        this.description = description;
+        this.clientId = clientId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Long getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(Long clientId) {
+        this.clientId = clientId;
+    }
+
+    @Override
+    public String toString() {
+        return "Training{" +
+                "id=" + id +
+                ", date=" + date +
+                ", time=" + time +
+                ", description='" + description + '\'' +
+                ", clientId=" + clientId +
+                '}';
+    }
+}

martysheva_tamara_lab_3/training/src/main/java/myapp/models/TrainingDto.java

@@ -0,0 +1,72 @@
+package myapp.models;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import javax.persistence.Embedded;
+import java.sql.Date;
+import java.sql.Time;
+import java.time.LocalTime;
+
+import lombok.Data;
+
+@Data
+public class TrainingDto {
+    private Long id;
+    private Date date;
+    private String time;
+    private String description;
+    private Long clientId;
+
+    public TrainingDto() {
+    }
+
+    public TrainingDto(Training training) {
+        this.id = training.getId();
+        this.date = training.getDate();
+        this.time = training.getTime();
+        this.description = String.format("%s", training.getDescription());
+        this.clientId = training.getClientId();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Long getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(Long clientId) {
+        this.clientId = clientId;
+    }
+}

martysheva_tamara_lab_3/training/src/main/java/myapp/models/TrainingFullInfoDto.java

@@ -0,0 +1,73 @@
+package myapp.models;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import javax.persistence.Embedded;
+import java.sql.Date;
+import java.sql.Time;
+import java.time.LocalTime;
+
+import lombok.Data;
+
+@Data
+public class TrainingFullInfoDto {
+    private Long id;
+    private Date date;
+    private String time;
+    private String description;
+    private Long clientId;
+    private ClientInfoDto clientInfo;
+
+    public TrainingFullInfoDto() {
+    }
+
+    public TrainingFullInfoDto(Training training, ClientInfoDto clientInfo) {
+        this.id = training.getId();
+        this.date = training.getDate();
+        this.time = training.getTime();
+        this.description = String.format("%s", training.getDescription());
+        this.clientId = training.getClientId();
+        this.clientInfo = clientInfo;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Long getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(Long clientId) {
+        this.clientId = clientId;
+    }
+}

martysheva_tamara_lab_3/training/src/main/java/myapp/repository/TrainingRepository.java

@@ -0,0 +1,7 @@
+package myapp.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import myapp.models.Training;
+
+public interface TrainingRepository extends JpaRepository<Training, Long> {
+}

martysheva_tamara_lab_3/training/src/main/java/myapp/service/TrainingNotFoundException.java

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

martysheva_tamara_lab_3/training/src/main/java/myapp/service/TrainingService.java

@@ -0,0 +1,74 @@
+package myapp.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import myapp.models.*;
+import myapp.repository.*;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.*;
+
+@Service
+public class TrainingService {
+    private final TrainingRepository trainingRepository;
+    private final RestTemplate restTemplate;
+    private final String NginxUrl = "http://nginx/client/";
+
+    @Autowired
+    public TrainingService(TrainingRepository trainingRepository, RestTemplate restTemplate) {
+        this.trainingRepository = trainingRepository;
+        this.restTemplate = restTemplate;
+    }
+
+    @Transactional
+    public TrainingFullInfoDto addTraining(TrainingDto trainingDto) {
+        final Training training = new Training(trainingDto.getDate(), trainingDto.getTime(), trainingDto.getDescription(), trainingDto.getClientId());
+        trainingRepository.save(training);
+
+        ClientInfoDto clientInfo = restTemplate.getForObject(NginxUrl + trainingDto.getClientId(), ClientInfoDto.class);
+        return new TrainingFullInfoDto(training, clientInfo);
+    }
+
+    @Transactional(readOnly = true)
+    public TrainingFullInfoDto findTraining(Long id) {
+        final Training training = trainingRepository.findById(id).orElse(null);
+        if (training == null) {
+            throw new TrainingNotFoundException(id);
+        }
+
+        ClientInfoDto clientInfo = restTemplate.getForObject(NginxUrl + training.getClientId(), ClientInfoDto.class);
+        return new TrainingFullInfoDto(training, clientInfo);
+    }
+
+    @Transactional(readOnly = true)
+    public Training findTrainingClear(Long id) {
+        final Optional<Training> training = trainingRepository.findById(id);
+        return training.orElseThrow(() -> new TrainingNotFoundException(id));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Training> findAllTrainings() {
+        return trainingRepository.findAll();
+    }
+
+    @Transactional
+    public TrainingFullInfoDto updateTraining(TrainingDto trainingDto) {
+        final Training currentTraining = findTrainingClear(trainingDto.getId());
+        currentTraining.setDate(trainingDto.getDate());
+        currentTraining.setTime(trainingDto.getTime());
+        currentTraining.setDescription(trainingDto.getDescription());
+        currentTraining.setClientId(trainingDto.getClientId());
+        trainingRepository.save(currentTraining);
+
+        ClientInfoDto clientInfo = restTemplate.getForObject(NginxUrl + trainingDto.getClientId(), ClientInfoDto.class);
+        return new TrainingFullInfoDto(currentTraining, clientInfo);
+    }
+
+    @Transactional
+    public Training deleteTraining(Long id) {
+        final Training currentTraining = findTrainingClear(id);
+        trainingRepository.delete(currentTraining);
+        return currentTraining;
+    }
+}

martysheva_tamara_lab_3/training/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