Merge pull request 'arutunyan_dmitry_lab_3 is ready' (#14) from arutunyan_dmitry_lab_3 into main
Reviewed-on: http://student.git.athene.tech/Alexey/DAS_2023_1/pulls/14
This commit is contained in:
commit
74fa559d08
250
arutunyan_dmitry_lab_3/README.md
Normal file
250
arutunyan_dmitry_lab_3/README.md
Normal file
@ -0,0 +1,250 @@
|
|||||||
|
|
||||||
|
## Лабораторная работа 3. Вариант 4.
|
||||||
|
### Задание
|
||||||
|
- Создать 2 микросервиса, реализующих CRUD на связанных сущностях.
|
||||||
|
- Реализовать механизм синхронного обмена сообщениями между микросервисами.
|
||||||
|
- Реализовать шлюз на основе прозрачного прокси-сервера `nginx`.
|
||||||
|
Описание предметной области:
|
||||||
|
|
||||||
|
Микросервисное приложение "Онлайн магазин", состоящее из 4х сервисов:
|
||||||
|
- СУБД `PostgreSQL` - используется в качестве хранилища данных приложения, содержит в себе БД с сущностями "заказ" и "товар",
|
||||||
|
- Микросервис "Товар" - микросервисное приложение, отвечающее за CRUD сущности "товар",
|
||||||
|
- Микросервис "Заказ" - микросервисное приложение, отвечающее за CRUD сущности "заказ" и её связи с сущностью "товар",
|
||||||
|
- Прокси-сервер `nginx` - используется в качестве шлюза для переадресации запросов на конкретные микросервисы.
|
||||||
|
|
||||||
|
### Как запустить
|
||||||
|
В директории с файлом характеристик `docker-compose.yaml` выполнить команду:
|
||||||
|
```
|
||||||
|
docker-compose -f docker-compose.yaml up
|
||||||
|
```
|
||||||
|
Это запустит `docker-compose`, который развернёт в общем контейнере 4 контейнера с сервисами для работы микросервисного приложения.
|
||||||
|
|
||||||
|
### Описание работы
|
||||||
|
#### Разработка сервиса БД
|
||||||
|
Согласно описанию предметной области, БД приложения будет состоять из 2х сущностей, связанных как "Один ко многим":
|
||||||
|
```
|
||||||
|
order (single) -> product (many)
|
||||||
|
```
|
||||||
|
В качестве СУБД будет использована PostgreSQL. Для создания таблиц базы данных, создания связей между ними их заполнения тестовыми данными создадим файл sql-запросов `database.sql`:
|
||||||
|
```sql
|
||||||
|
-- Создание таблицы заказов
|
||||||
|
CREATE TABLE t_order (
|
||||||
|
id INTEGER PRIMARY KEY UNIQUE NOT NULL,
|
||||||
|
status VARCHAR(255) NOT NULL
|
||||||
|
);
|
||||||
|
-- Создание таблицы товаров
|
||||||
|
CREATE TABLE t_product (
|
||||||
|
id INTEGER PRIMARY KEY UNIQUE NOT NULL,
|
||||||
|
name VARCHAR(255) NOT NULL,
|
||||||
|
price INTEGER NOT NULL,
|
||||||
|
order_id INTEGER,
|
||||||
|
FOREIGN KEY (order_id) REFERENCES t_order(id)
|
||||||
|
);
|
||||||
|
-- Добавление пустых заказов
|
||||||
|
INSERT INTO t_order (id, status)
|
||||||
|
VALUES (0, 'Принят'),
|
||||||
|
(1, 'В обработке');
|
||||||
|
|
||||||
|
-- Добавление товаров
|
||||||
|
INSERT INTO t_product (id, name, price)
|
||||||
|
VALUES (0, 'Гантели', 5000),
|
||||||
|
(1, 'Эспандер', 500),
|
||||||
|
(2, 'Тренажёр', 25990);
|
||||||
|
```
|
||||||
|
Для разворачивания сервиса БД в контейнере, пропишем необходимые конфигурации в файле `docker-compose.yaml`:
|
||||||
|
```yaml
|
||||||
|
db-market-api:
|
||||||
|
image: postgres:latest
|
||||||
|
ports:
|
||||||
|
- 5432:5432
|
||||||
|
environment:
|
||||||
|
POSTGRES_PASSWORD: admin
|
||||||
|
POSTGRES_USER: admin
|
||||||
|
POSTGRES_DB: market-api
|
||||||
|
volumes:
|
||||||
|
- ./database.sql:/docker-entrypoint-initdb.d/database.sql
|
||||||
|
restart: always
|
||||||
|
```
|
||||||
|
Где `image` указывает, что мы берём последний образ `postgres`, `ports` указывает запускать сервис на порту 5432, `environment` определяет название БД - `market-api`, а `volumes` указывает, что при запуске контейнера и вызове функции `initdb`, необходимо использовать созданный ранее файл `database.sql`.
|
||||||
|
|
||||||
|
#### Разработка микросервиса "Товар"
|
||||||
|
Микросервис "Товар" представляет собой `SpringBoot` приложение на языке `Java`. Приложение было разработано в соответствии со стандартом реализации CRUD с использованием `JPA`.
|
||||||
|
|
||||||
|
На выходе у микросервиса лежит `rest` интерфейс `swagger`, через который можно отправить CRUD запросы приложению.
|
||||||
|
|
||||||
|
Чтобы настроить связь приложения и БД, создадим конфигурационный файл `application.yaml`:
|
||||||
|
```yaml
|
||||||
|
server:
|
||||||
|
port: "8080"
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
url: jdbc:postgresql://db-market-api:5432/market-api
|
||||||
|
username: admin
|
||||||
|
password: admin
|
||||||
|
```
|
||||||
|
Где `port` указывает, что микросервис будет развёрнут на порту 8080, а `datasource/url` указывает адрес к сервису с БД `market-api`.
|
||||||
|
|
||||||
|
Чтобы создать образ микросервиса для `docker` контейнера, создадим `Dockerfile`:
|
||||||
|
```dockerfile
|
||||||
|
FROM openjdk:17-jdk
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY ./product-service/build/libs/product-service-0.0.1-SNAPSHOT.jar /app/product-service-0.0.1-SNAPSHOT.jar
|
||||||
|
EXPOSE 8080
|
||||||
|
|
||||||
|
CMD ["java", "-jar", "product-service-0.0.1-SNAPSHOT.jar"]
|
||||||
|
```
|
||||||
|
В которм указывается версия `jdk` для запуска микросервиса, копируется исполняемый файл приложения, указывается порт и обозначается команда при старте контейнера: `java -jar product-service-0.0.1-SNAPSHOT.jar`
|
||||||
|
|
||||||
|
Чтобы развернуть микросервис в контейнере, пропишем его конфигурации в файле `docker-compose.yaml`:
|
||||||
|
```yaml
|
||||||
|
product-service:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: ./product-service/Dockerfile
|
||||||
|
ports:
|
||||||
|
- 8080:8080
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- db-market-api
|
||||||
|
```
|
||||||
|
Где `build` указывает на метод сборки образа в котором: `context` указывает на корневую директорию, а `dockerfile` указывает на путь к `Dockerfile`, `ports` устанавливает порт для обращения к микросервису 8080, `depends_on` указывает, что микросервис зависим от БД и разворачивается только после запуска `postgres`.
|
||||||
|
|
||||||
|
#### Разработка микросервиса "Заказ"
|
||||||
|
Микросервис "Заказ" представляет собой `SpringBoot` приложение на языке `Java`. Приложение было разработано в соответствии со стандартом реализации CRUD с использованием `JPA`. В отличие от микросервиса "Товар", данный микросервис отвечает также за связь сущностей товара и заказа, поэтому в соответсвующих методах он отправляет запрос к сервису товаров.
|
||||||
|
|
||||||
|
Метод добавления товара в заказ:
|
||||||
|
```java
|
||||||
|
RestTemplate restTemplate = new RestTemplate();
|
||||||
|
HttpEntity<String> entity = new HttpEntity<>(new HttpHeaders());
|
||||||
|
ResponseEntity<String> response = restTemplate.exchange(
|
||||||
|
"http://product-service:8080/product/" + product_id, HttpMethod.GET, entity, String.class);
|
||||||
|
|
||||||
|
if (response.getStatusCode().is2xxSuccessful()) {
|
||||||
|
String responseBody = response.getBody();
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
ProductDto productDto;
|
||||||
|
try {
|
||||||
|
productDto = objectMapper.readValue(responseBody, ProductDto.class);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new Exception("Не удалось десериализовать тело запроса в объект product");
|
||||||
|
}
|
||||||
|
productDto.setOrder_id(order_id);
|
||||||
|
restTemplate.exchange("http://product-service:8080/product/", HttpMethod.PUT, new HttpEntity<>(productDto), String.class);
|
||||||
|
} else {
|
||||||
|
throw new Exception("Ошибка получения объекта product");
|
||||||
|
}
|
||||||
|
```
|
||||||
|
Таким же способом запросов к микросервису товаров работают методы чтения всех заказов и чтения одного заказа. Этим и достигается микросервисная архитектура приложения.
|
||||||
|
|
||||||
|
На выходе у микросервиса лежит `rest` интерфейс `swagger`, через который можно отправить CRUD запросы приложению.
|
||||||
|
|
||||||
|
Чтобы настроить связь приложения и БД, создадим конфигурационный файл `application.yaml`:
|
||||||
|
```yaml
|
||||||
|
server:
|
||||||
|
port: "8081"
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
url: jdbc:postgresql://db-market-api:5432/market-api
|
||||||
|
username: admin
|
||||||
|
password: admin
|
||||||
|
```
|
||||||
|
Где `port` указывает, что микросервис будет развёрнут на порту 8081, а `datasource/url` указывает адрес к сервису с БД `market-api`.
|
||||||
|
|
||||||
|
Чтобы создать образ микросервиса для `docker` контейнера, создадим `Dockerfile`:
|
||||||
|
```dockerfile
|
||||||
|
FROM openjdk:17-jdk
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY ./order-service/build/libs/order-service-0.0.1-SNAPSHOT.jar /app/order-service-0.0.1-SNAPSHOT.jar
|
||||||
|
EXPOSE 8081
|
||||||
|
|
||||||
|
CMD ["java", "-jar", "order-service-0.0.1-SNAPSHOT.jar"]
|
||||||
|
```
|
||||||
|
В которм указывается версия `jdk` для запуска микросервиса, копируется исполняемый файл приложения, указывается порт и обозначается команда при старте контейнера: `order-service-0.0.1-SNAPSHOT.jar`
|
||||||
|
|
||||||
|
Чтобы развернуть микросервис в контейнере, пропишем его конфигурации в файле `docker-compose.yaml`:
|
||||||
|
```yaml
|
||||||
|
order-service:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: ./order-service/Dockerfile
|
||||||
|
ports:
|
||||||
|
- 8081:8081
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- db-market-api
|
||||||
|
```
|
||||||
|
Где `build` указывает на метод сборки образа в котором: `context` указывает на корневую директорию, а `dockerfile` указывает на путь к `Dockerfile`, `ports` устанавливает порт для обращения к микросервису 8081, `depends_on` указывает, что микросервис зависим от БД и разворачивается только после запуска `postgres`.
|
||||||
|
|
||||||
|
#### Настройка прокси-сервера Nginx
|
||||||
|
Согласно заданию, в данной архитектуре `nginx` выполняет работу шлюза и переадресовывает запросы на микросервисы в зависимости от их заголовков. Чтобы это осуществить, пропишем файл конфигураций `nginx`:
|
||||||
|
```ini
|
||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
upstream product-service {
|
||||||
|
server product-service:8080;
|
||||||
|
}
|
||||||
|
upstream order-service {
|
||||||
|
server order-service:8081;
|
||||||
|
}
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name localhost;
|
||||||
|
location /product-service/ {
|
||||||
|
proxy_pass http://product-service/;
|
||||||
|
}
|
||||||
|
location /order-service/ {
|
||||||
|
proxy_pass http://order-service/;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
Где `events` создаёт событие запуска `nginx`, `upstream product-service` создаёт поток запросов по адресу микросервиса товаров `product-service:8080`, `upstream order-service` создаёт поток запросов по адресу микросервиса заказов `order-service:8080`, `server` разворачивает сервер-шлюз, в котором:
|
||||||
|
- `listen` - указывает порт для прослушивания запрсов - 80
|
||||||
|
- `server_name` - указывает host сервера, по которому будут проходить запросы - `localhost`
|
||||||
|
- `location /product-service/` - указывает префикс запросов к микросервису товаров
|
||||||
|
- `proxy_pass http://product-service/` - адресует запросы с данным префиксом к микросервису товаров
|
||||||
|
- `location /order-service/` - указывает префикс запросов к микросервису заказов
|
||||||
|
- `proxy_pass http://order-service/` - адресует запросы с данным префиксом к микросервису заказов
|
||||||
|
|
||||||
|
Чтобы развернуть прокси-сервер `nginx` в контейнере, пропишем его конфигурации в файле `docker-compose.yaml`:
|
||||||
|
```yaml
|
||||||
|
nginx:
|
||||||
|
image: nginx:latest
|
||||||
|
ports:
|
||||||
|
- 80:80
|
||||||
|
volumes:
|
||||||
|
- ./nginx.conf:/etc/nginx/nginx.conf
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- product-service
|
||||||
|
- order-service
|
||||||
|
```
|
||||||
|
Где `image` указывает, что мы берём последний образ `nginx`, `ports` указывает запускать сервер на порту 80, `volumes` указывает, что при запуске контейнера, локальный файл конфигураций `nginx.conf` следует поместить вместо стандартного файла конфигураций `nginx`, а depends_on указывает, что данный прокси-сервер зависим от обеих микросервисов и разворачивается только после их запуска.
|
||||||
|
|
||||||
|
> **Note**
|
||||||
|
>
|
||||||
|
> Для обеспечения работы прокси-сервера `nginx` в качестве шлюза, необходимо чтобы все управляемые им сервисы находились в одной сети типа "мост". Если это не так, то в файле `docker-compose.yaml` необходимо создать виртуальную сеть между контейнерами
|
||||||
|
```yaml
|
||||||
|
networks:
|
||||||
|
mynetwork:
|
||||||
|
driver: bridge
|
||||||
|
```
|
||||||
|
> и назначить её каждому из контейнеров.
|
||||||
|
|
||||||
|
#### Разворачивание микросервисного приложения
|
||||||
|
log-журнал контейнеров:
|
||||||
|
![](pic2.png "")
|
||||||
|
|
||||||
|
Пример запроса к микросервисному приложению:
|
||||||
|
![](pic1.png "")
|
||||||
|
|
||||||
|
Примеры остальных запросов показаны в видео.
|
||||||
|
|
||||||
|
### Видео
|
||||||
|
https://youtu.be/VxaZRfyu3pI
|
23
arutunyan_dmitry_lab_3/database.sql
Normal file
23
arutunyan_dmitry_lab_3/database.sql
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
-- Создание таблицы заказов
|
||||||
|
CREATE TABLE t_order (
|
||||||
|
id INTEGER PRIMARY KEY UNIQUE NOT NULL,
|
||||||
|
status VARCHAR(255) NOT NULL
|
||||||
|
);
|
||||||
|
-- Создание таблицы товаров
|
||||||
|
CREATE TABLE t_product (
|
||||||
|
id INTEGER PRIMARY KEY UNIQUE NOT NULL,
|
||||||
|
name VARCHAR(255) NOT NULL,
|
||||||
|
price INTEGER NOT NULL,
|
||||||
|
order_id INTEGER,
|
||||||
|
FOREIGN KEY (order_id) REFERENCES t_order(id)
|
||||||
|
);
|
||||||
|
-- Добавление пустых заказов
|
||||||
|
INSERT INTO t_order (id, status)
|
||||||
|
VALUES (0, 'Принят'),
|
||||||
|
(1, 'В обработке');
|
||||||
|
|
||||||
|
-- Добавление товаров
|
||||||
|
INSERT INTO t_product (id, name, price)
|
||||||
|
VALUES (0, 'Гантели', 5000),
|
||||||
|
(1, 'Эспандер', 500),
|
||||||
|
(2, 'Тренажёр', 25990);
|
58
arutunyan_dmitry_lab_3/docker-compose.yaml
Normal file
58
arutunyan_dmitry_lab_3/docker-compose.yaml
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
|
networks:
|
||||||
|
mynetwork:
|
||||||
|
driver: bridge
|
||||||
|
|
||||||
|
|
||||||
|
services:
|
||||||
|
db-market-api:
|
||||||
|
image: postgres:latest
|
||||||
|
ports:
|
||||||
|
- 5432:5432
|
||||||
|
environment:
|
||||||
|
POSTGRES_PASSWORD: admin
|
||||||
|
POSTGRES_USER: admin
|
||||||
|
POSTGRES_DB: market-api
|
||||||
|
volumes:
|
||||||
|
- ./database.sql:/docker-entrypoint-initdb.d/database.sql
|
||||||
|
restart: always
|
||||||
|
networks:
|
||||||
|
- mynetwork
|
||||||
|
|
||||||
|
product-service:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: ./product-service/Dockerfile
|
||||||
|
ports:
|
||||||
|
- 8080:8080
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- db-market-api
|
||||||
|
networks:
|
||||||
|
- mynetwork
|
||||||
|
|
||||||
|
order-service:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: ./order-service/Dockerfile
|
||||||
|
ports:
|
||||||
|
- 8081:8081
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- db-market-api
|
||||||
|
networks:
|
||||||
|
- mynetwork
|
||||||
|
|
||||||
|
nginx:
|
||||||
|
image: nginx:latest
|
||||||
|
ports:
|
||||||
|
- 80:80
|
||||||
|
volumes:
|
||||||
|
- ./nginx.conf:/etc/nginx/nginx.conf
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- product-service
|
||||||
|
- order-service
|
||||||
|
networks:
|
||||||
|
- mynetwork
|
28
arutunyan_dmitry_lab_3/nginx.conf
Normal file
28
arutunyan_dmitry_lab_3/nginx.conf
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
|
||||||
|
upstream product-service {
|
||||||
|
server product-service:8080;
|
||||||
|
}
|
||||||
|
upstream order-service {
|
||||||
|
server order-service:8081;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name localhost;
|
||||||
|
|
||||||
|
location /product-service/ {
|
||||||
|
proxy_pass http://product-service/;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /order-service/ {
|
||||||
|
proxy_pass http://order-service/;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
37
arutunyan_dmitry_lab_3/order-service/.gitignore
vendored
Normal file
37
arutunyan_dmitry_lab_3/order-service/.gitignore
vendored
Normal file
@ -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/
|
7
arutunyan_dmitry_lab_3/order-service/Dockerfile
Normal file
7
arutunyan_dmitry_lab_3/order-service/Dockerfile
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
FROM openjdk:17-jdk
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY ./order-service/build/libs/order-service-0.0.1-SNAPSHOT.jar /app/order-service-0.0.1-SNAPSHOT.jar
|
||||||
|
EXPOSE 8081
|
||||||
|
|
||||||
|
CMD ["java", "-jar", "order-service-0.0.1-SNAPSHOT.jar"]
|
38
arutunyan_dmitry_lab_3/order-service/build.gradle
Normal file
38
arutunyan_dmitry_lab_3/order-service/build.gradle
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java'
|
||||||
|
id 'org.springframework.boot' version '3.1.5'
|
||||||
|
id 'io.spring.dependency-management' version '1.1.3'
|
||||||
|
}
|
||||||
|
|
||||||
|
group = 'com.ulstu'
|
||||||
|
version = '0.0.1-SNAPSHOT'
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = '17'
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
compileOnly {
|
||||||
|
extendsFrom annotationProcessor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-devtools'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
||||||
|
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.3'
|
||||||
|
compileOnly 'org.projectlombok:lombok'
|
||||||
|
runtimeOnly 'org.postgresql:postgresql'
|
||||||
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('test') {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
BIN
arutunyan_dmitry_lab_3/order-service/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
arutunyan_dmitry_lab_3/order-service/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
arutunyan_dmitry_lab_3/order-service/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
arutunyan_dmitry_lab_3/order-service/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
249
arutunyan_dmitry_lab_3/order-service/gradlew
vendored
Normal file
249
arutunyan_dmitry_lab_3/order-service/gradlew
vendored
Normal file
@ -0,0 +1,249 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright © 2015-2021 the original authors.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
#
|
||||||
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
app_path=$0
|
||||||
|
|
||||||
|
# Need this for daisy-chained symlinks.
|
||||||
|
while
|
||||||
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
|
[ -h "$app_path" ]
|
||||||
|
do
|
||||||
|
ls=$( ls -ld "$app_path" )
|
||||||
|
link=${ls#*' -> '}
|
||||||
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD=maximum
|
||||||
|
|
||||||
|
warn () {
|
||||||
|
echo "$*"
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
die () {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
nonstop=false
|
||||||
|
case "$( uname )" in #(
|
||||||
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
|
Darwin* ) darwin=true ;; #(
|
||||||
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
|
NONSTOP* ) nonstop=true ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
|
else
|
||||||
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD=java
|
||||||
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
|
case $MAX_FD in #(
|
||||||
|
max*)
|
||||||
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC3045
|
||||||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
|
warn "Could not query maximum file descriptor limit"
|
||||||
|
esac
|
||||||
|
case $MAX_FD in #(
|
||||||
|
'' | soft) :;; #(
|
||||||
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC3045
|
||||||
|
ulimit -n "$MAX_FD" ||
|
||||||
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
|
# * args from the command line
|
||||||
|
# * the main class name
|
||||||
|
# * -classpath
|
||||||
|
# * -D...appname settings
|
||||||
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Collect all arguments for the java command;
|
||||||
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
# double quotes to make sure that they get re-expanded; and
|
||||||
|
# * put everything else in single quotes, so that it's not re-expanded.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
92
arutunyan_dmitry_lab_3/order-service/gradlew.bat
vendored
Normal file
92
arutunyan_dmitry_lab_3/order-service/gradlew.bat
vendored
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
@rem
|
||||||
|
@rem Copyright 2015 the original author or authors.
|
||||||
|
@rem
|
||||||
|
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
@rem you may not use this file except in compliance with the License.
|
||||||
|
@rem You may obtain a copy of the License at
|
||||||
|
@rem
|
||||||
|
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
@rem
|
||||||
|
@rem Unless required by applicable law or agreed to in writing, software
|
||||||
|
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
@rem See the License for the specific language governing permissions and
|
||||||
|
@rem limitations under the License.
|
||||||
|
@rem
|
||||||
|
|
||||||
|
@if "%DEBUG%"=="" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
1
arutunyan_dmitry_lab_3/order-service/settings.gradle
Normal file
1
arutunyan_dmitry_lab_3/order-service/settings.gradle
Normal file
@ -0,0 +1 @@
|
|||||||
|
rootProject.name = 'order-service'
|
@ -0,0 +1,13 @@
|
|||||||
|
package ru.services.order;
|
||||||
|
|
||||||
|
import org.springframework.boot.SpringApplication;
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
public class OrderApplication {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
SpringApplication.run(OrderApplication.class, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,48 @@
|
|||||||
|
package ru.services.order.controller;
|
||||||
|
|
||||||
|
import ru.services.order.dto.OrderDto;
|
||||||
|
import ru.services.order.model.Order;
|
||||||
|
import ru.services.order.service.OrderService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/order")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class OrderController {
|
||||||
|
private final OrderService orderService;
|
||||||
|
|
||||||
|
@GetMapping("/")
|
||||||
|
public List<OrderDto> getOrders() throws Exception {
|
||||||
|
return orderService.findAllOrders();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public OrderDto getOrder(@PathVariable int id) throws Exception {
|
||||||
|
return orderService.findOrder(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/")
|
||||||
|
public Order createPOrder(@RequestBody OrderDto orderDto)
|
||||||
|
{
|
||||||
|
return orderService.addOrder(orderDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/")
|
||||||
|
public Order updateOrder(@RequestBody OrderDto orderDto)
|
||||||
|
{
|
||||||
|
return orderService.updateOrder(orderDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public void deleteOrder(@PathVariable int id) {
|
||||||
|
orderService.deleteOrder(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PatchMapping("/{product_id}/{order_id}")
|
||||||
|
public void addProductToOrder(@PathVariable int product_id, @PathVariable int order_id) throws Exception {
|
||||||
|
orderService.addProductToOrder(product_id, order_id);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,12 @@
|
|||||||
|
package ru.services.order.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class OrderDto {
|
||||||
|
private int id;
|
||||||
|
private String status;
|
||||||
|
private List<ProductDto> products;
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
package ru.services.order.dto;
|
||||||
|
|
||||||
|
import jakarta.annotation.Nullable;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ProductDto {
|
||||||
|
private int id;
|
||||||
|
private String name;
|
||||||
|
private int price;
|
||||||
|
@Nullable
|
||||||
|
private Integer order_id;
|
||||||
|
}
|
@ -0,0 +1,18 @@
|
|||||||
|
package ru.services.order.model;
|
||||||
|
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.Id;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "t_order")
|
||||||
|
@Data
|
||||||
|
@Accessors(chain = true)
|
||||||
|
public class Order {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
private Integer id;
|
||||||
|
private String status;
|
||||||
|
}
|
@ -0,0 +1,8 @@
|
|||||||
|
package ru.services.order.repository;
|
||||||
|
|
||||||
|
import ru.services.order.model.Order;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
public interface OrderRepository extends JpaRepository<Order, Integer> {
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,122 @@
|
|||||||
|
package ru.services.order.service;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import org.springframework.http.HttpEntity;
|
||||||
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.HttpMethod;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
import ru.services.order.dto.OrderDto;
|
||||||
|
import ru.services.order.dto.ProductDto;
|
||||||
|
import ru.services.order.model.Order;
|
||||||
|
import ru.services.order.repository.OrderRepository;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class OrderService {
|
||||||
|
|
||||||
|
private final OrderRepository orderRepository;
|
||||||
|
private static int counter = 2;
|
||||||
|
|
||||||
|
public List<OrderDto> findAllOrders() throws Exception {
|
||||||
|
RestTemplate restTemplate = new RestTemplate();
|
||||||
|
HttpEntity<String> entity = new HttpEntity<>(new HttpHeaders());
|
||||||
|
List<OrderDto> orderDtos = new ArrayList<>();
|
||||||
|
for (Order order : orderRepository.findAll()) {
|
||||||
|
OrderDto orderDto = new OrderDto();
|
||||||
|
orderDto.setId(order.getId());
|
||||||
|
orderDto.setStatus(order.getStatus());
|
||||||
|
|
||||||
|
ResponseEntity<String> response = restTemplate.exchange(
|
||||||
|
"http://product-service:8080/product/ord/" + orderDto.getId(), HttpMethod.GET, entity, String.class);
|
||||||
|
|
||||||
|
if (response.getStatusCode().is2xxSuccessful()) {
|
||||||
|
String responseBody = response.getBody();
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
List<ProductDto> productDtos;
|
||||||
|
try {
|
||||||
|
productDtos = objectMapper.readValue(responseBody, ArrayList.class);
|
||||||
|
orderDto.setProducts(productDtos);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new Exception("Не удалось десериализовать тело запроса в объект product");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new Exception("Ошибка получения объекта product");
|
||||||
|
}
|
||||||
|
orderDtos.add(orderDto);
|
||||||
|
}
|
||||||
|
return orderDtos;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OrderDto findOrder(int id) throws Exception {
|
||||||
|
OrderDto orderDto = new OrderDto();
|
||||||
|
Order order = orderRepository.findById(id).orElseThrow();
|
||||||
|
orderDto.setId(order.getId());
|
||||||
|
orderDto.setStatus(order.getStatus());
|
||||||
|
|
||||||
|
RestTemplate restTemplate = new RestTemplate();
|
||||||
|
HttpEntity<String> entity = new HttpEntity<>(new HttpHeaders());
|
||||||
|
ResponseEntity<String> response = restTemplate.exchange(
|
||||||
|
"http://product-service:8080/product/ord/" + orderDto.getId(), HttpMethod.GET, entity, String.class);
|
||||||
|
|
||||||
|
if (response.getStatusCode().is2xxSuccessful()) {
|
||||||
|
String responseBody = response.getBody();
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
List<ProductDto> productDtos;
|
||||||
|
try {
|
||||||
|
productDtos = objectMapper.readValue(responseBody, ArrayList.class);
|
||||||
|
orderDto.setProducts(productDtos);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new Exception("Не удалось десериализовать тело запроса в объект product");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new Exception("Ошибка получения объекта product");
|
||||||
|
}
|
||||||
|
return orderDto;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Order addOrder(OrderDto orderDto) {
|
||||||
|
Order order = new Order();
|
||||||
|
order.setId(counter++);
|
||||||
|
order.setStatus(orderDto.getStatus());
|
||||||
|
return orderRepository.save(order);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Order updateOrder(OrderDto orderDto) {
|
||||||
|
Order order = orderRepository.findById(orderDto.getId()).orElseThrow();
|
||||||
|
order.setStatus(orderDto.getStatus());
|
||||||
|
return orderRepository.save(order);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addProductToOrder(int product_id, int order_id) throws Exception {
|
||||||
|
RestTemplate restTemplate = new RestTemplate();
|
||||||
|
HttpEntity<String> entity = new HttpEntity<>(new HttpHeaders());
|
||||||
|
ResponseEntity<String> response = restTemplate.exchange(
|
||||||
|
"http://product-service:8080/product/" + product_id, HttpMethod.GET, entity, String.class);
|
||||||
|
|
||||||
|
if (response.getStatusCode().is2xxSuccessful()) {
|
||||||
|
String responseBody = response.getBody();
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
ProductDto productDto;
|
||||||
|
try {
|
||||||
|
productDto = objectMapper.readValue(responseBody, ProductDto.class);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new Exception("Не удалось десериализовать тело запроса в объект product");
|
||||||
|
}
|
||||||
|
productDto.setOrder_id(order_id);
|
||||||
|
restTemplate.exchange("http://product-service:8080/product/", HttpMethod.PUT, new HttpEntity<>(productDto), String.class);
|
||||||
|
} else {
|
||||||
|
throw new Exception("Ошибка получения объекта product");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteOrder(int id) {
|
||||||
|
orderRepository.delete(orderRepository.findById(id).orElseThrow());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,7 @@
|
|||||||
|
server:
|
||||||
|
port: "8081"
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
url: jdbc:postgresql://db-market-api:5432/market-api
|
||||||
|
username: admin
|
||||||
|
password: admin
|
@ -0,0 +1,8 @@
|
|||||||
|
package ru.services.order;
|
||||||
|
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
class ProductApplicationTests {
|
||||||
|
|
||||||
|
}
|
BIN
arutunyan_dmitry_lab_3/pic1.png
Normal file
BIN
arutunyan_dmitry_lab_3/pic1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 226 KiB |
BIN
arutunyan_dmitry_lab_3/pic2.png
Normal file
BIN
arutunyan_dmitry_lab_3/pic2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 408 KiB |
37
arutunyan_dmitry_lab_3/product-service/.gitignore
vendored
Normal file
37
arutunyan_dmitry_lab_3/product-service/.gitignore
vendored
Normal file
@ -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/
|
7
arutunyan_dmitry_lab_3/product-service/Dockerfile
Normal file
7
arutunyan_dmitry_lab_3/product-service/Dockerfile
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
FROM openjdk:17-jdk
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY ./product-service/build/libs/product-service-0.0.1-SNAPSHOT.jar /app/product-service-0.0.1-SNAPSHOT.jar
|
||||||
|
EXPOSE 8080
|
||||||
|
|
||||||
|
CMD ["java", "-jar", "product-service-0.0.1-SNAPSHOT.jar"]
|
38
arutunyan_dmitry_lab_3/product-service/build.gradle
Normal file
38
arutunyan_dmitry_lab_3/product-service/build.gradle
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java'
|
||||||
|
id 'org.springframework.boot' version '3.1.5'
|
||||||
|
id 'io.spring.dependency-management' version '1.1.3'
|
||||||
|
}
|
||||||
|
|
||||||
|
group = 'com.ulstu'
|
||||||
|
version = '0.0.1-SNAPSHOT'
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = '17'
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
compileOnly {
|
||||||
|
extendsFrom annotationProcessor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-devtools'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
||||||
|
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.3'
|
||||||
|
compileOnly 'org.projectlombok:lombok'
|
||||||
|
runtimeOnly 'org.postgresql:postgresql'
|
||||||
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('test') {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
BIN
arutunyan_dmitry_lab_3/product-service/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
arutunyan_dmitry_lab_3/product-service/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
arutunyan_dmitry_lab_3/product-service/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
arutunyan_dmitry_lab_3/product-service/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
249
arutunyan_dmitry_lab_3/product-service/gradlew
vendored
Normal file
249
arutunyan_dmitry_lab_3/product-service/gradlew
vendored
Normal file
@ -0,0 +1,249 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright © 2015-2021 the original authors.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
#
|
||||||
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
app_path=$0
|
||||||
|
|
||||||
|
# Need this for daisy-chained symlinks.
|
||||||
|
while
|
||||||
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
|
[ -h "$app_path" ]
|
||||||
|
do
|
||||||
|
ls=$( ls -ld "$app_path" )
|
||||||
|
link=${ls#*' -> '}
|
||||||
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD=maximum
|
||||||
|
|
||||||
|
warn () {
|
||||||
|
echo "$*"
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
die () {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
nonstop=false
|
||||||
|
case "$( uname )" in #(
|
||||||
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
|
Darwin* ) darwin=true ;; #(
|
||||||
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
|
NONSTOP* ) nonstop=true ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
|
else
|
||||||
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD=java
|
||||||
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
|
case $MAX_FD in #(
|
||||||
|
max*)
|
||||||
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC3045
|
||||||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
|
warn "Could not query maximum file descriptor limit"
|
||||||
|
esac
|
||||||
|
case $MAX_FD in #(
|
||||||
|
'' | soft) :;; #(
|
||||||
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC3045
|
||||||
|
ulimit -n "$MAX_FD" ||
|
||||||
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
|
# * args from the command line
|
||||||
|
# * the main class name
|
||||||
|
# * -classpath
|
||||||
|
# * -D...appname settings
|
||||||
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Collect all arguments for the java command;
|
||||||
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
# double quotes to make sure that they get re-expanded; and
|
||||||
|
# * put everything else in single quotes, so that it's not re-expanded.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
92
arutunyan_dmitry_lab_3/product-service/gradlew.bat
vendored
Normal file
92
arutunyan_dmitry_lab_3/product-service/gradlew.bat
vendored
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
@rem
|
||||||
|
@rem Copyright 2015 the original author or authors.
|
||||||
|
@rem
|
||||||
|
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
@rem you may not use this file except in compliance with the License.
|
||||||
|
@rem You may obtain a copy of the License at
|
||||||
|
@rem
|
||||||
|
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
@rem
|
||||||
|
@rem Unless required by applicable law or agreed to in writing, software
|
||||||
|
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
@rem See the License for the specific language governing permissions and
|
||||||
|
@rem limitations under the License.
|
||||||
|
@rem
|
||||||
|
|
||||||
|
@if "%DEBUG%"=="" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
1
arutunyan_dmitry_lab_3/product-service/settings.gradle
Normal file
1
arutunyan_dmitry_lab_3/product-service/settings.gradle
Normal file
@ -0,0 +1 @@
|
|||||||
|
rootProject.name = 'product-service'
|
@ -0,0 +1,13 @@
|
|||||||
|
package ru.services.product;
|
||||||
|
|
||||||
|
import org.springframework.boot.SpringApplication;
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
public class ProductApplication {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
SpringApplication.run(ProductApplication.class, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,48 @@
|
|||||||
|
package ru.services.product.controller;
|
||||||
|
|
||||||
|
import ru.services.product.dto.ProductDto;
|
||||||
|
import ru.services.product.model.Product;
|
||||||
|
import ru.services.product.service.ProductService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/product")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ProductController {
|
||||||
|
private final ProductService productService;
|
||||||
|
|
||||||
|
@GetMapping("/")
|
||||||
|
public List<Product> getProducts() {
|
||||||
|
return productService.findAllProducts();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public Product getProduct(@PathVariable int id) {
|
||||||
|
return productService.findProduct(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/ord/{id}")
|
||||||
|
public List<Product> getOrderProducts(@PathVariable int id) {
|
||||||
|
return productService.findOrderProducts(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/")
|
||||||
|
public Product createProduct(@RequestBody ProductDto productDto)
|
||||||
|
{
|
||||||
|
return productService.addProduct(productDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/")
|
||||||
|
public Product updateProduct(@RequestBody ProductDto productDto)
|
||||||
|
{
|
||||||
|
return productService.updateProduct(productDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public void deleteProduct(@PathVariable int id) {
|
||||||
|
productService.deleteProduct(id);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
package ru.services.product.dto;
|
||||||
|
|
||||||
|
import jakarta.annotation.Nullable;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ProductDto {
|
||||||
|
private int id;
|
||||||
|
private String name;
|
||||||
|
private int price;
|
||||||
|
@Nullable
|
||||||
|
private Integer order_id;
|
||||||
|
}
|
@ -0,0 +1,21 @@
|
|||||||
|
package ru.services.product.model;
|
||||||
|
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.Id;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "t_product")
|
||||||
|
@Data
|
||||||
|
@Accessors(chain = true)
|
||||||
|
public class Product {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
private Integer id;
|
||||||
|
private String name;
|
||||||
|
private Integer price;
|
||||||
|
private Integer order_id;
|
||||||
|
}
|
@ -0,0 +1,8 @@
|
|||||||
|
package ru.services.product.repository;
|
||||||
|
|
||||||
|
import ru.services.product.model.Product;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
public interface ProductRepository extends JpaRepository<Product, Integer> {
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,54 @@
|
|||||||
|
package ru.services.product.service;
|
||||||
|
|
||||||
|
import ru.services.product.dto.ProductDto;
|
||||||
|
import ru.services.product.model.Product;
|
||||||
|
import ru.services.product.repository.ProductRepository;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ProductService {
|
||||||
|
|
||||||
|
private final ProductRepository productRepository;
|
||||||
|
private static int counter = 3;
|
||||||
|
|
||||||
|
public List<Product> findAllProducts() {
|
||||||
|
return productRepository.findAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Product findProduct(int id) {
|
||||||
|
return productRepository.findById(id).orElseThrow();
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Product> findOrderProducts(int order_id) {
|
||||||
|
return productRepository.findAll().stream()
|
||||||
|
.filter(product -> product.getOrder_id() != null)
|
||||||
|
.filter(product -> product.getOrder_id() == order_id)
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Product addProduct(ProductDto productDto) {
|
||||||
|
Product product = new Product();
|
||||||
|
product.setId(counter++);
|
||||||
|
product.setName(productDto.getName());
|
||||||
|
product.setPrice(productDto.getPrice());
|
||||||
|
return productRepository.save(product);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Product updateProduct(ProductDto productDto) {
|
||||||
|
Product product = productRepository.findById(productDto.getId()).orElseThrow();
|
||||||
|
product.setName(productDto.getName());
|
||||||
|
product.setPrice(productDto.getPrice());
|
||||||
|
if (productDto.getOrder_id() != null) {
|
||||||
|
product.setOrder_id(productDto.getOrder_id());
|
||||||
|
}
|
||||||
|
return productRepository.save(product);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteProduct(int id) {
|
||||||
|
productRepository.delete(productRepository.findById(id).orElseThrow());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,7 @@
|
|||||||
|
server:
|
||||||
|
port: "8080"
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
url: jdbc:postgresql://db-market-api:5432/market-api
|
||||||
|
username: admin
|
||||||
|
password: admin
|
@ -0,0 +1,9 @@
|
|||||||
|
package ru.services.product;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
class ProductApplicationTests {
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user