forked from Alexey/DAS_2024_1
Compare commits
5 Commits
kuzarin_ma
...
borschevsk
| Author | SHA1 | Date | |
|---|---|---|---|
| ef68b506b8 | |||
| 520337f92d | |||
|
|
0c3e973307 | ||
| c474c13c4a | |||
|
|
c8dbd5fb37 |
38
borschevskaya_anna_lab_2/.gitignore
vendored
Normal file
38
borschevskaya_anna_lab_2/.gitignore
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
target/
|
||||
!.mvn/wrapper/maven-wrapper.jar
|
||||
!**/src/main/**/target/
|
||||
!**/src/test/**/target/
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea/modules.xml
|
||||
.idea/jarRepositories.xml
|
||||
.idea/compiler.xml
|
||||
.idea/libraries/
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
### Eclipse ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
.factorypath
|
||||
.project
|
||||
.settings
|
||||
.springBeans
|
||||
.sts4-cache
|
||||
|
||||
### NetBeans ###
|
||||
/nbproject/private/
|
||||
/nbbuild/
|
||||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
build/
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
### Mac OS ###
|
||||
.DS_Store
|
||||
43
borschevskaya_anna_lab_2/README.md
Normal file
43
borschevskaya_anna_lab_2/README.md
Normal file
@@ -0,0 +1,43 @@
|
||||
# Отчет. Лабораторная работа 2
|
||||
|
||||
В рамках лабораторной работы №2 были написаны два сервиса, работающих с текстовыми файлами.
|
||||
Для первого сервиса был выбран вариант задания №5:
|
||||
```
|
||||
Ищет в каталоге /var/data файл с самым коротким названием и перекладывает его в /var/result/data.txt.
|
||||
```
|
||||
А для второго - №2:
|
||||
```
|
||||
Ищет наименьшее число из файла /var/data/data.txt и сохраняет его третью степень в /var/result/result.txt.
|
||||
```
|
||||
## Описание
|
||||
Сначала сервис first перемещает данные из файла с самым коротким названием, находящегося в указанной примонтированной директории, в выходную папку.
|
||||
Доступ к выходной папке имеет второй сервис, который выводит наименьшее число из помещенного первым сервисом файла
|
||||
в третьей степени в выходной файл.
|
||||
Выходной файл расположен в примонтированной директории и доступен на машине, где запускаются сервисы.
|
||||
|
||||
В Dockerfile используется многоэтапная сборка с использованием нескольких базовых образов на каждом этапе.
|
||||
Описание значения каждой строки есть в Dockerfile в сервисе first.
|
||||
|
||||
В файле docker-compose.yml приведено описание новых строк, связанных с подключением примонтированных томов.
|
||||
Стоит отметить, что для "общения" сервисов используется общий том common, который монтируется в контейнер по пути /var/result. Это позволяет сохранять результаты
|
||||
работы первого сервиса для использования вторым сервисом.
|
||||
## Как запустить
|
||||
Для того, чтобы запустить сервисы, необходимо выполнить следующие действия:
|
||||
1. Установить и запустить Docker Engine или Docker Desktop
|
||||
2. Через консоль перейти в папку, в которой расположен файл docker-compose.yml
|
||||
3. Выполнить команду:
|
||||
```
|
||||
docker compose up --build
|
||||
```
|
||||
В случае успешного запуска всех контейнеров в консоли будет выведено следующее сообщение:
|
||||
```
|
||||
✔ Network borschevskaya_anna_lab_2_default Created 0.1s
|
||||
✔ Container borschevskaya_anna_lab_2-first-1 Created 0.1s
|
||||
✔ Container borschevskaya_anna_lab_2-second-1 Created 0.1s
|
||||
Attaching to borschevskaya_anna_lab_2-first-1, borschevskaya_anna_lab_2-second-1
|
||||
```
|
||||
Далее, в консоль каждого сервиса будут выведены сообщения о том, как прошла обработка файлов.
|
||||
В случае отсутствия заданных значений переменных окружения INPUT_PATH и OUTPUT_PATH и
|
||||
в иных исключительных ситуация будет выведена информация об этом.
|
||||
## Видео-отчет
|
||||
Работоспособность лабораторной работы можно оценить в следующем [видео](https://disk.yandex.ru/i/LFxdyRUFQDwXEQ).
|
||||
22
borschevskaya_anna_lab_2/docker-compose.yml
Normal file
22
borschevskaya_anna_lab_2/docker-compose.yml
Normal file
@@ -0,0 +1,22 @@
|
||||
services:
|
||||
first:
|
||||
build: ./first # директория, в которой нужно искать Dockerfile для сборки первого сервиса
|
||||
environment:
|
||||
INPUT_PATH: /var/data/ # директория с входными данными для обработки файлов
|
||||
OUTPUT_PATH: /var/result/ # директория с выходными данными обработки
|
||||
volumes:
|
||||
- ./volumes/input:/var/data # монтируется локальная папка с входными данными в папку внутри контейнера
|
||||
- common:/var/result # монтируется общий для двух сервисов том, в который first сложит результаты обработки по варианту
|
||||
second:
|
||||
build: ./second # директория, в которой нужно искать Dockerfile для сборки второго сервиса
|
||||
depends_on: # сервис second зависит от сервиса first и будет запущен после него
|
||||
- first
|
||||
environment:
|
||||
INPUT_PATH: /var/result/
|
||||
OUTPUT_PATH: /var/data/
|
||||
volumes:
|
||||
- ./volumes/output:/var/data
|
||||
- common:/var/result # монтируется общий для двух сервисов том, из которого second получит результаты обработки first сервиса и выполнит свою логику
|
||||
|
||||
volumes:
|
||||
common:
|
||||
25
borschevskaya_anna_lab_2/first/Dockerfile
Normal file
25
borschevskaya_anna_lab_2/first/Dockerfile
Normal file
@@ -0,0 +1,25 @@
|
||||
# Используем образ Maven для сборки
|
||||
FROM maven:3.8-eclipse-temurin-21-alpine AS build
|
||||
|
||||
# Устанавливаем рабочую директорию
|
||||
WORKDIR /app
|
||||
|
||||
# Копируем только pom.xml и загружаем зависимости
|
||||
# Так зависимости закэшируются в Docker при изменении кода закэшированные слои с зависимостями будут подгружаться быстрее
|
||||
COPY pom.xml .
|
||||
RUN mvn dependency:go-offline
|
||||
|
||||
# Копируем остальные исходные файлы
|
||||
COPY src ./src
|
||||
|
||||
# Собираем весь проект
|
||||
RUN mvn clean package -DskipTests
|
||||
|
||||
# Используем официальный образ JDK для запуска собранного jar-файла
|
||||
FROM eclipse-temurin:21-jdk-alpine
|
||||
|
||||
# Копируем jar-файл из предыдущего этапа
|
||||
COPY --from=build /app/target/*.jar /app.jar
|
||||
|
||||
# Указываем команду для запуска приложения
|
||||
CMD ["java", "-jar", "app.jar"]
|
||||
37
borschevskaya_anna_lab_2/first/pom.xml
Normal file
37
borschevskaya_anna_lab_2/first/pom.xml
Normal file
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>ru.first</groupId>
|
||||
<artifactId>first</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<!-- Build an executable JAR -->
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<addClasspath>true</addClasspath>
|
||||
<classpathPrefix>lib/</classpathPrefix>
|
||||
<mainClass>ru.first.Main</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@@ -0,0 +1,50 @@
|
||||
package ru.first;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
|
||||
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
|
||||
import static java.util.Objects.isNull;
|
||||
|
||||
public class Main {
|
||||
|
||||
public static final String INPUT_PATH = System.getenv("INPUT_PATH");
|
||||
public static final String OUTPUT_PATH = System.getenv("OUTPUT_PATH");
|
||||
public static final String RESULT_FILE_NAME = "data.txt";
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
if (isNull(INPUT_PATH) || INPUT_PATH.isEmpty() || isNull(OUTPUT_PATH) || OUTPUT_PATH.isEmpty()) {
|
||||
System.out.printf("Отсутствуют переменные окружения INPUT_PATH = '%s' или OUTPUT_PATH = '%s'%n",
|
||||
INPUT_PATH, OUTPUT_PATH);
|
||||
return;
|
||||
}
|
||||
var inputPathDir = Path.of(INPUT_PATH);
|
||||
if (!Files.exists(inputPathDir)) {
|
||||
Files.createDirectory(inputPathDir);
|
||||
}
|
||||
var inputDirectory = new File(INPUT_PATH);
|
||||
var allDirFiles = inputDirectory.listFiles();
|
||||
if (isNull(allDirFiles) || allDirFiles.length == 0) {
|
||||
System.out.println("Директория пуста");
|
||||
return;
|
||||
}
|
||||
var dirFiles = Arrays.stream(allDirFiles).filter(File::isFile).toList();
|
||||
if (dirFiles.isEmpty()) {
|
||||
System.out.println("В указанной директории нет подходящих для обработки файлов");
|
||||
return;
|
||||
}
|
||||
|
||||
var shortestName = dirFiles.stream().min(Comparator.comparing(file -> file.getName().length())).get();
|
||||
|
||||
var outputPathDir = Path.of(OUTPUT_PATH);
|
||||
if (!Files.exists(outputPathDir)) {
|
||||
Files.createDirectory(outputPathDir);
|
||||
}
|
||||
var resultFilePath = Path.of(OUTPUT_PATH + File.separator + RESULT_FILE_NAME);
|
||||
Files.move(Path.of(INPUT_PATH + File.separator + shortestName.getName()), resultFilePath, REPLACE_EXISTING);
|
||||
}
|
||||
}
|
||||
16
borschevskaya_anna_lab_2/second/Dockerfile
Normal file
16
borschevskaya_anna_lab_2/second/Dockerfile
Normal file
@@ -0,0 +1,16 @@
|
||||
FROM maven:3.8-eclipse-temurin-21-alpine AS build
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY pom.xml .
|
||||
RUN mvn dependency:go-offline
|
||||
|
||||
COPY src ./src
|
||||
|
||||
RUN mvn clean package -DskipTests
|
||||
|
||||
FROM eclipse-temurin:21-jdk-alpine
|
||||
|
||||
COPY --from=build /app/target/*.jar /app.jar
|
||||
|
||||
CMD ["java", "-jar", "app.jar"]
|
||||
36
borschevskaya_anna_lab_2/second/pom.xml
Normal file
36
borschevskaya_anna_lab_2/second/pom.xml
Normal file
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>ru.second</groupId>
|
||||
<artifactId>second</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<addClasspath>true</addClasspath>
|
||||
<classpathPrefix>lib/</classpathPrefix>
|
||||
<mainClass>ru.second.Main</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@@ -0,0 +1,51 @@
|
||||
package ru.second;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.nio.file.Files;
|
||||
|
||||
import static java.util.Objects.isNull;
|
||||
|
||||
public class Main {
|
||||
|
||||
public static final String INPUT_PATH = System.getenv("INPUT_PATH");
|
||||
public static final String INPUT_FILE_NAME = "data.txt";
|
||||
|
||||
public static final String OUTPUT_PATH = System.getenv("OUTPUT_PATH");
|
||||
public static final String RESULT_FILE_NAME = "result.txt";
|
||||
|
||||
public static void main(String[] args) {
|
||||
if (isNull(INPUT_PATH) || INPUT_PATH.isEmpty() || isNull(OUTPUT_PATH) || OUTPUT_PATH.isEmpty()) {
|
||||
System.out.printf("Отсутствуют переменные окружения INPUT_PATH = '%s' или OUTPUT_PATH = '%s'%n",
|
||||
INPUT_PATH, OUTPUT_PATH);
|
||||
return;
|
||||
}
|
||||
|
||||
var inputFile = new File(INPUT_PATH + File.separator + INPUT_FILE_NAME);
|
||||
if (!inputFile.exists()) {
|
||||
System.out.println("Входной файл не существует");
|
||||
return;
|
||||
}
|
||||
|
||||
try (var stream = Files.lines(inputFile.toPath());
|
||||
var writer = new FileWriter(OUTPUT_PATH + File.separator + RESULT_FILE_NAME);
|
||||
) {
|
||||
var min = stream.map(Main::parseInt).reduce(Integer::min);
|
||||
if (min.isEmpty()) {
|
||||
System.out.println("Не найдено минимальное значение среди строк файла");
|
||||
return;
|
||||
}
|
||||
var minValue = Math.pow(min.get(), 3);
|
||||
System.out.printf("Get min value = '%d'%n", min.get());
|
||||
writer.append(Double.toString(minValue));
|
||||
System.out.printf("To file %s was written value %f%n", RESULT_FILE_NAME, minValue);
|
||||
} catch (Exception ex) {
|
||||
System.out.println(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private static Integer parseInt(String line) {
|
||||
line = line.replace("\\n", "");
|
||||
return Integer.parseInt(line);
|
||||
}
|
||||
}
|
||||
58
borschevskaya_anna_lab_3/README.md
Normal file
58
borschevskaya_anna_lab_3/README.md
Normal file
@@ -0,0 +1,58 @@
|
||||
# Отчет. Лабораторная работа 3
|
||||
|
||||
## Описание
|
||||
В рамках лабораторной работы № 3 были реализованы два сервиса (Java + Spring), осуществляющие CRUD-операции над сущностями.
|
||||
|
||||
Модель данных следующая:
|
||||
|
||||
Сущность "Компания" (сервис company)
|
||||
- идентификатор компании
|
||||
- название
|
||||
- адрес
|
||||
|
||||
Сущность "Вакансия" (сервис vacancy)
|
||||
- идентификатор вакансии
|
||||
- название
|
||||
- описание
|
||||
- нижняя граница зарплаты
|
||||
- верхняя граница зарплаты
|
||||
- идентификатор компании
|
||||
|
||||
Компания с вакансией связана как "один ко многим".
|
||||
|
||||
Каждый из сервисов имеет API с пятью эндпоинтами. При этом в сервисе vacancy при запросе вакансии по id происходит
|
||||
дополнительный запрос в сервис company для получения информации по компании, связанной с вакансией.
|
||||
Происходит это взаимодействие с помощью библиотеки OpenFeign, которая "под капотом" использует HttpClient.
|
||||
|
||||
В качестве хранилища данных использовалась СУБД Postgres. У каждого сервиса своя база данных в поднятой СУБД.
|
||||
Для создания схемы БД была использована библиотека Flyway, которая применила написанные миграции при старте приложения.
|
||||
|
||||
Запросы к сервисам проксирует шлюз на основе Nginx. Для этого перед запуском nginx был описан конфигурационный файл nginx.conf,
|
||||
в котором описан прослушиваемый порт и название сервера (в блоке server), маршруты до микросервисов и параметры проксирования (в блоке location).
|
||||
|
||||
Таким образом, с помощью Docker Compose были подняты сервисы:
|
||||
- company
|
||||
- vacancy
|
||||
- postgres
|
||||
- nginx
|
||||
## Как запустить
|
||||
Для того, чтобы запустить сервисы, необходимо выполнить следующие действия:
|
||||
1. Установить и запустить Docker Engine или Docker Desktop
|
||||
2. Через консоль перейти в папку, в которой расположен файл docker-compose.yml
|
||||
3. Выполнить команду:
|
||||
```
|
||||
docker compose up --build
|
||||
```
|
||||
В случае успешного запуска всех контейнеров в консоли будет выведено следующее сообщение:
|
||||
```
|
||||
[+] Running 5/5
|
||||
✔ Network borschevskaya_anna_lab_3_default Created 0.0s
|
||||
✔ Container postgres Started 0.6s
|
||||
✔ Container vacancy Started 1.1s
|
||||
✔ Container company Started 0.9s
|
||||
✔ Container borschevskaya_anna_lab_3-nginx-1 Started
|
||||
```
|
||||
Далее можно осуществлять запросы к сервисам по адресу http://localhost/{location}, где часть пути location меняется в зависимости от сервиса и запроса.
|
||||
## Видео-отчет
|
||||
Работоспособность лабораторной работы можно оценить в следующем [видео](https://disk.yandex.ru/i/KPNBfnlcgl1auw).
|
||||
Демонстрация взаимодействия с системой производится с применением сервиса Postman.
|
||||
38
borschevskaya_anna_lab_3/company-service/.gitignore
vendored
Normal file
38
borschevskaya_anna_lab_3/company-service/.gitignore
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
target/
|
||||
!.mvn/wrapper/maven-wrapper.jar
|
||||
!**/src/main/**/target/
|
||||
!**/src/test/**/target/
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea/modules.xml
|
||||
.idea/jarRepositories.xml
|
||||
.idea/compiler.xml
|
||||
.idea/libraries/
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
### Eclipse ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
.factorypath
|
||||
.project
|
||||
.settings
|
||||
.springBeans
|
||||
.sts4-cache
|
||||
|
||||
### NetBeans ###
|
||||
/nbproject/private/
|
||||
/nbbuild/
|
||||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
build/
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
### Mac OS ###
|
||||
.DS_Store
|
||||
21
borschevskaya_anna_lab_3/company-service/Dockerfile
Normal file
21
borschevskaya_anna_lab_3/company-service/Dockerfile
Normal file
@@ -0,0 +1,21 @@
|
||||
# Используем образ Maven для сборки
|
||||
FROM maven:3.8-eclipse-temurin-21-alpine AS build
|
||||
|
||||
# Устанавливаем рабочую директорию
|
||||
WORKDIR /app
|
||||
|
||||
# Копируем остальные исходные файлы
|
||||
COPY pom.xml .
|
||||
COPY src src
|
||||
|
||||
# Собираем весь проект
|
||||
RUN mvn clean package -DskipTests
|
||||
|
||||
# Используем официальный образ JDK для запуска собранного jar-файла
|
||||
FROM eclipse-temurin:21-jdk-alpine
|
||||
|
||||
# Копируем jar-файл из предыдущего этапа
|
||||
COPY --from=build /app/target/*.jar /app.jar
|
||||
|
||||
# Указываем команду для запуска приложения
|
||||
CMD ["java", "-jar", "app.jar"]
|
||||
66
borschevskaya_anna_lab_3/company-service/pom.xml
Normal file
66
borschevskaya_anna_lab_3/company-service/pom.xml
Normal file
@@ -0,0 +1,66 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>ru.somecompany</groupId>
|
||||
<artifactId>company-service</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>3.2.3</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.30</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.swagger.core.v3</groupId>
|
||||
<artifactId>swagger-annotations</artifactId>
|
||||
<version>2.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
|
||||
<version>2.3.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -0,0 +1,12 @@
|
||||
package ru.somecompany;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
@SpringBootApplication
|
||||
public class CompanyApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(CompanyApplication.class, args);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package ru.somecompany.controller;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import ru.somecompany.domain.CompanyEntity;
|
||||
import ru.somecompany.domain.CreateCompanyRequest;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
|
||||
@Validated
|
||||
@Tag(name = "company", description = "API для управления компаниями")
|
||||
public interface CompanyController {
|
||||
|
||||
@Operation(summary = "Получение всех компаний")
|
||||
@GetMapping(value = "/api/v1/company")
|
||||
List<CompanyEntity> getCompanies();
|
||||
|
||||
@Operation(summary = "Создание компании")
|
||||
@PostMapping(value = "/api/v1/company")
|
||||
CompanyEntity createCompany(@RequestBody @NotNull CreateCompanyRequest companyRequest);
|
||||
|
||||
@Operation(summary = "Получение информации о компании по id")
|
||||
@GetMapping(value = "/api/v1/company/{companyId}")
|
||||
CompanyEntity getCompany(@PathVariable UUID companyId);
|
||||
|
||||
@Operation(summary = "Редактирование компании")
|
||||
@PutMapping(value = "/api/v1/company/{companyId}")
|
||||
CompanyEntity updateCompany(@PathVariable UUID companyId,
|
||||
@RequestBody @NotNull CreateCompanyRequest companyRequest);
|
||||
|
||||
@Operation(summary = "Удалении компании по id")
|
||||
@DeleteMapping(value = "/api/v1/company/{companyId}")
|
||||
void deleteCompany(@PathVariable UUID companyId);
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package ru.somecompany.controller;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import ru.somecompany.domain.CompanyEntity;
|
||||
import ru.somecompany.domain.CreateCompanyRequest;
|
||||
import ru.somecompany.service.CompanyService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
public class CompanyControllerImpl implements CompanyController {
|
||||
|
||||
private final CompanyService companyService;
|
||||
|
||||
@Override
|
||||
public List<CompanyEntity> getCompanies() {
|
||||
return companyService.getCompanies();
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompanyEntity createCompany(CreateCompanyRequest companyRequest) {
|
||||
return companyService.createCompany(companyRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompanyEntity getCompany(UUID companyId) {
|
||||
return companyService.getCompany(companyId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompanyEntity updateCompany(UUID companyId, CreateCompanyRequest companyRequest) {
|
||||
return companyService.updateCompany(companyId, companyRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteCompany(UUID companyId) {
|
||||
companyService.deleteCompany(companyId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package ru.somecompany.domain;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@Builder
|
||||
@Table(name = "company")
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CompanyEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue
|
||||
private UUID id;
|
||||
|
||||
@Column(name = "name", unique = true, nullable = false)
|
||||
private String name;
|
||||
|
||||
@Column(name = "address", unique = true, nullable = false)
|
||||
private String address;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package ru.somecompany.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class CreateCompanyRequest {
|
||||
|
||||
private String name;
|
||||
|
||||
private String address;
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static org.springframework.http.HttpStatus.NOT_FOUND;
|
||||
|
||||
@Slf4j
|
||||
public abstract class AbstractWebExceptionHandler {
|
||||
|
||||
public static ResponseEntity<ResponseError> buildResponse(ErrorCode errorCode, HttpStatus status, String msg,
|
||||
boolean details, Throwable ex) {
|
||||
return buildResponse(errorCode.name(), status, msg, details, ex, LocalDateTime.now());
|
||||
}
|
||||
|
||||
public static ResponseEntity<ResponseError> buildResponse(String errorCode, HttpStatus status, String msg,
|
||||
boolean details, Throwable ex, LocalDateTime timestamp) {
|
||||
if (details) {
|
||||
log.error(msg, ex); // with stack-trace
|
||||
} else {
|
||||
var message = StringUtils.equals(msg, ex.getMessage()) ? msg : msg + ": " + ex.getMessage();
|
||||
if (status == NOT_FOUND) {
|
||||
log.warn(message);
|
||||
} else {
|
||||
log.error(message);
|
||||
}
|
||||
}
|
||||
|
||||
return ResponseEntity.status(status.value())
|
||||
.body(ResponseError.builder()
|
||||
.code(errorCode)
|
||||
.message(msg)
|
||||
.timestamp(timestamp)
|
||||
.status(status.value())
|
||||
.build());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
public enum BasicError implements ErrorCode {
|
||||
NOT_FOUND
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import lombok.Getter;
|
||||
import org.springframework.http.HttpStatus;
|
||||
|
||||
@Getter
|
||||
public class CompanyAppRuntimeException extends RuntimeException {
|
||||
private final ErrorCode errorCode;
|
||||
private final HttpStatus status;
|
||||
private final boolean details;
|
||||
|
||||
public CompanyAppRuntimeException(ErrorCode errorCode, HttpStatus status, String message) {
|
||||
this(errorCode, status, message, null);
|
||||
}
|
||||
|
||||
public CompanyAppRuntimeException(ErrorCode errorCode, HttpStatus status, String message, Throwable error) {
|
||||
this(errorCode, status, message, true, error);
|
||||
}
|
||||
|
||||
public CompanyAppRuntimeException(ErrorCode errorCode, HttpStatus status, String message, boolean details, Throwable error) {
|
||||
super(message, error);
|
||||
this.errorCode = errorCode;
|
||||
this.status = status;
|
||||
this.details = details;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
public interface ErrorCode extends Serializable {
|
||||
|
||||
String name();
|
||||
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import org.springframework.http.HttpStatus;
|
||||
|
||||
import static ru.somecompany.exception.BasicError.NOT_FOUND;
|
||||
|
||||
public class ResourceNotFoundException extends CompanyAppRuntimeException {
|
||||
|
||||
public ResourceNotFoundException(ErrorCode errorCode, String message) {
|
||||
this(errorCode, message, null);
|
||||
}
|
||||
|
||||
public ResourceNotFoundException(ErrorCode errorCode, String message, Throwable error) {
|
||||
super(errorCode, HttpStatus.NOT_FOUND, message, error);
|
||||
}
|
||||
|
||||
public static ResourceNotFoundException notFound(String message, Object... args) {
|
||||
return new ResourceNotFoundException(NOT_FOUND, String.format(message, args), null);
|
||||
}
|
||||
|
||||
public static ResourceNotFoundException notFound() {
|
||||
return new ResourceNotFoundException(NOT_FOUND, "Запрашиваемые данные не найдены", null);
|
||||
}
|
||||
|
||||
public static ResourceNotFoundException notFound(Throwable error) {
|
||||
return new ResourceNotFoundException(NOT_FOUND, error.getMessage(), error);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ResponseError {
|
||||
@JsonProperty(required = true)
|
||||
private LocalDateTime timestamp;
|
||||
@JsonProperty(required = true)
|
||||
private Integer status;
|
||||
@JsonProperty(required = true)
|
||||
private String message;
|
||||
@JsonProperty(required = true)
|
||||
private String code;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||
|
||||
@Slf4j
|
||||
@Getter
|
||||
@RestControllerAdvice
|
||||
@RequiredArgsConstructor
|
||||
public class WebExceptionHandler extends AbstractWebExceptionHandler {
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
@ExceptionHandler(CompanyAppRuntimeException.class)
|
||||
public ResponseEntity<ResponseError> handleException(CompanyAppRuntimeException ex) {
|
||||
return buildResponse(ex.getErrorCode(), ex.getStatus(), ex.getMessage(), ex.isDetails(), ex);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package ru.somecompany.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.somecompany.domain.CompanyEntity;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public interface CompanyRepository extends JpaRepository<CompanyEntity, UUID> {
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package ru.somecompany.service;
|
||||
|
||||
import ru.somecompany.domain.CompanyEntity;
|
||||
import ru.somecompany.domain.CreateCompanyRequest;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface CompanyService {
|
||||
|
||||
List<CompanyEntity> getCompanies();
|
||||
|
||||
CompanyEntity createCompany(CreateCompanyRequest companyRequest);
|
||||
|
||||
CompanyEntity updateCompany(UUID companyId, CreateCompanyRequest companyRequest);
|
||||
|
||||
void deleteCompany(UUID companyId);
|
||||
|
||||
CompanyEntity getCompany(UUID companyId);
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package ru.somecompany.service;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.somecompany.domain.CompanyEntity;
|
||||
import ru.somecompany.domain.CreateCompanyRequest;
|
||||
import ru.somecompany.repository.CompanyRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import static ru.somecompany.exception.ResourceNotFoundException.notFound;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class CompanyServiceImpl implements CompanyService {
|
||||
|
||||
private final CompanyRepository companyRepository;
|
||||
|
||||
@Override
|
||||
public List<CompanyEntity> getCompanies() {
|
||||
return companyRepository.findAll();
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompanyEntity createCompany(CreateCompanyRequest companyRequest) {
|
||||
var entity = CompanyEntity.builder()
|
||||
.name(companyRequest.getName())
|
||||
.address(companyRequest.getAddress())
|
||||
.build();
|
||||
return companyRepository.save(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompanyEntity updateCompany(UUID companyId, CreateCompanyRequest companyRequest) {
|
||||
var company = getById(companyId);
|
||||
company.setName(companyRequest.getName());
|
||||
company.setAddress(companyRequest.getAddress());
|
||||
return companyRepository.save(company);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteCompany(UUID companyId) {
|
||||
var company = getById(companyId);
|
||||
companyRepository.delete(company);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompanyEntity getCompany(UUID companyId) {
|
||||
return getById(companyId);
|
||||
}
|
||||
|
||||
private CompanyEntity getById(UUID companyId) {
|
||||
return companyRepository.findById(companyId)
|
||||
.orElseThrow(() -> notFound("Компания не найдена"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
server:
|
||||
port: ${SERVER_PORT:8080}
|
||||
spring:
|
||||
application:
|
||||
name: company-app
|
||||
jpa:
|
||||
database: POSTGRESQL
|
||||
open-in-view: false
|
||||
show-sql: false
|
||||
hibernate:
|
||||
ddl-auto: none
|
||||
properties:
|
||||
hibernate:
|
||||
dialect: org.hibernate.dialect.PostgreSQLDialect
|
||||
datasource:
|
||||
url: ${DB_URL:jdbc:postgresql://postgres:5433/company}
|
||||
username: ${DB_USERNAME:postgres}
|
||||
password: ${DB_PASSWORD:postgres}
|
||||
driverClassName: org.postgresql.Driver
|
||||
type: com.zaxxer.hikari.HikariDataSource
|
||||
hikari:
|
||||
maximum-pool-size: 15
|
||||
minimum-idle: 4
|
||||
idle-timeout: 180000
|
||||
max-lifetime: 599000
|
||||
flyway:
|
||||
enabled: true
|
||||
locations: db/migration/
|
||||
@@ -0,0 +1,6 @@
|
||||
CREATE TABLE company (
|
||||
id UUID
|
||||
CONSTRAINT company_pk PRIMARY KEY,
|
||||
name VARCHAR(255) UNIQUE NOT NULL,
|
||||
address VARCHAR(255) NOT NULL
|
||||
);
|
||||
43
borschevskaya_anna_lab_3/docker-compose.yml
Normal file
43
borschevskaya_anna_lab_3/docker-compose.yml
Normal file
@@ -0,0 +1,43 @@
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:latest
|
||||
container_name: postgres
|
||||
environment:
|
||||
POSTGRES_USERNAME: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
PGDATA: "/var/lib/postgresql/data/pgdata"
|
||||
ports:
|
||||
- "5432:5432"
|
||||
volumes:
|
||||
- ./postgres_data:/var/lib/postgresql/data/
|
||||
- ./init-database.sh:/docker-entrypoint-initdb.d/init-database.sh
|
||||
company:
|
||||
build: ./company-service
|
||||
container_name: company
|
||||
depends_on:
|
||||
- postgres
|
||||
environment:
|
||||
SERVER_PORT: 8080
|
||||
DB_URL: jdbc:postgresql://postgres:5432/company
|
||||
DB_USERNAME: postgres
|
||||
DB_PASSWORD: postgres
|
||||
vacancy:
|
||||
build: ./vacancy-service
|
||||
container_name: vacancy
|
||||
depends_on:
|
||||
- postgres
|
||||
environment:
|
||||
SERVER_PORT: 8080
|
||||
DB_URL: jdbc:postgresql://postgres:5432/vacancy
|
||||
DB_USERNAME: postgres
|
||||
DB_PASSWORD: postgres
|
||||
COMPANY_URL: http://nginx/
|
||||
nginx:
|
||||
image: nginx
|
||||
depends_on:
|
||||
- vacancy
|
||||
- company
|
||||
volumes:
|
||||
- ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
|
||||
ports:
|
||||
- 80:80
|
||||
8
borschevskaya_anna_lab_3/init-database.sh
Normal file
8
borschevskaya_anna_lab_3/init-database.sh
Normal file
@@ -0,0 +1,8 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
# Создаем БД
|
||||
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
|
||||
CREATE DATABASE company;
|
||||
CREATE DATABASE vacancy;
|
||||
EOSQL
|
||||
@@ -1,22 +1,21 @@
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name localhost;
|
||||
|
||||
location /first/ {
|
||||
proxy_pass http://first:8080/;
|
||||
location /api/v1/company {
|
||||
proxy_pass http://company:8080;
|
||||
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 /test;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
}
|
||||
|
||||
location /second/ {
|
||||
proxy_pass http://second:8080/;
|
||||
location /api/v1/vacancy {
|
||||
proxy_pass http://vacancy:8080;
|
||||
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 /admin;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
}
|
||||
}
|
||||
}
|
||||
38
borschevskaya_anna_lab_3/vacancy-service/.gitignore
vendored
Normal file
38
borschevskaya_anna_lab_3/vacancy-service/.gitignore
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
target/
|
||||
!.mvn/wrapper/maven-wrapper.jar
|
||||
!**/src/main/**/target/
|
||||
!**/src/test/**/target/
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea/modules.xml
|
||||
.idea/jarRepositories.xml
|
||||
.idea/compiler.xml
|
||||
.idea/libraries/
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
### Eclipse ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
.factorypath
|
||||
.project
|
||||
.settings
|
||||
.springBeans
|
||||
.sts4-cache
|
||||
|
||||
### NetBeans ###
|
||||
/nbproject/private/
|
||||
/nbbuild/
|
||||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
build/
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
### Mac OS ###
|
||||
.DS_Store
|
||||
21
borschevskaya_anna_lab_3/vacancy-service/Dockerfile
Normal file
21
borschevskaya_anna_lab_3/vacancy-service/Dockerfile
Normal file
@@ -0,0 +1,21 @@
|
||||
# Используем образ Maven для сборки
|
||||
FROM maven:3.8-eclipse-temurin-21-alpine AS build
|
||||
|
||||
# Устанавливаем рабочую директорию
|
||||
WORKDIR /app
|
||||
|
||||
# Копируем остальные исходные файлы
|
||||
COPY pom.xml .
|
||||
COPY src src
|
||||
|
||||
# Собираем весь проект
|
||||
RUN mvn clean package -DskipTests
|
||||
|
||||
# Используем официальный образ JDK для запуска собранного jar-файла
|
||||
FROM eclipse-temurin:21-jdk-alpine
|
||||
|
||||
# Копируем jar-файл из предыдущего этапа
|
||||
COPY --from=build /app/target/*.jar /app.jar
|
||||
|
||||
# Указываем команду для запуска приложения
|
||||
CMD ["java", "-jar", "app.jar"]
|
||||
128
borschevskaya_anna_lab_3/vacancy-service/pom.xml
Normal file
128
borschevskaya_anna_lab_3/vacancy-service/pom.xml
Normal file
@@ -0,0 +1,128 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>ru.somecompany</groupId>
|
||||
<artifactId>vacancy-service</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>3.2.3</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<mapstruct.version>1.5.5.Final</mapstruct.version>
|
||||
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
|
||||
<spring-cloud.version>2023.0.3</spring-cloud.version>
|
||||
</properties>
|
||||
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.30</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
<artifactId>mapstruct</artifactId>
|
||||
<version>${mapstruct.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok-mapstruct-binding</artifactId>
|
||||
<version>${lombok-mapstruct-binding.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.swagger.core.v3</groupId>
|
||||
<artifactId>swagger-annotations</artifactId>
|
||||
<version>2.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
|
||||
<version>2.3.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-dependencies</artifactId>
|
||||
<version>${spring-cloud.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
<artifactId>mapstruct-processor</artifactId>
|
||||
<version>${mapstruct.version}</version>
|
||||
</path>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.30</version>
|
||||
</path>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok-mapstruct-binding</artifactId>
|
||||
<version>${lombok-mapstruct-binding.version}</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
<compilerArgs>
|
||||
<arg>-Amapstruct.defaultComponentModel=spring</arg>
|
||||
</compilerArgs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@@ -0,0 +1,14 @@
|
||||
package ru.somecompany;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
|
||||
@SpringBootApplication
|
||||
@EnableFeignClients
|
||||
public class VacancyApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(VacancyApplication.class, args);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package ru.somecompany.controller;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import ru.somecompany.domain.CreateVacancyRequest;
|
||||
import ru.somecompany.domain.VacancyEntity;
|
||||
import ru.somecompany.domain.VacancyResponse;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Validated
|
||||
@Tag(name = "vacancy", description = "API для управления вакансиями")
|
||||
public interface VacancyController {
|
||||
|
||||
@Operation(summary = "Получение всех вакансий")
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(responseCode = "200", description = "Данные успешно переданы"),
|
||||
})
|
||||
@GetMapping(value = "/api/v1/vacancy")
|
||||
List<VacancyEntity> getVacancies();
|
||||
|
||||
@Operation(summary = "Создание вакансии")
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(responseCode = "200", description = "Вакансия успешно создана"),
|
||||
})
|
||||
@PostMapping(value = "/api/v1/vacancy")
|
||||
VacancyEntity createVacancy(@RequestBody @NotNull CreateVacancyRequest request);
|
||||
|
||||
@Operation(summary = "Получение информации о вакансии по id")
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(responseCode = "200", description = "Данные успешно переданы"),
|
||||
@ApiResponse(responseCode = "404", description = "Вакансия не найдена")
|
||||
})
|
||||
@GetMapping(value = "/api/v1/vacancy/{vacancyId}")
|
||||
VacancyResponse getVacancy(@PathVariable UUID vacancyId);
|
||||
|
||||
@Operation(summary = "Редактирование вакансии")
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(responseCode = "200", description = "Данные вакансии успешно изменены"),
|
||||
@ApiResponse(responseCode = "404", description = "Вакансия не найдена")
|
||||
})
|
||||
@PutMapping(value = "/api/v1/vacancy/{vacancyId}")
|
||||
VacancyEntity updateVacancy(@PathVariable UUID vacancyId,
|
||||
@RequestBody @NotNull CreateVacancyRequest request);
|
||||
|
||||
@Operation(summary = "Удалении вакансии по id")
|
||||
@ApiResponses(value = {
|
||||
@ApiResponse(responseCode = "200", description = "Вакансия успешно удалена"),
|
||||
@ApiResponse(responseCode = "404", description = "Вакансия не найдена")
|
||||
})
|
||||
@DeleteMapping(value = "/api/v1/vacancy/{vacancyId}")
|
||||
void deleteVacancy(@PathVariable UUID vacancyId);
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package ru.somecompany.controller;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import ru.somecompany.domain.CreateVacancyRequest;
|
||||
import ru.somecompany.domain.VacancyEntity;
|
||||
import ru.somecompany.domain.VacancyResponse;
|
||||
import ru.somecompany.service.VacancyService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
public class VacancyControllerImpl implements VacancyController {
|
||||
|
||||
private final VacancyService vacancyService;
|
||||
|
||||
@Override
|
||||
public List<VacancyEntity> getVacancies() {
|
||||
return vacancyService.getVacancies();
|
||||
}
|
||||
|
||||
@Override
|
||||
public VacancyEntity createVacancy(CreateVacancyRequest request) {
|
||||
return vacancyService.createVacancy(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public VacancyResponse getVacancy(UUID vacancyId) {
|
||||
return vacancyService.getVacancy(vacancyId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public VacancyEntity updateVacancy(UUID vacancyId, CreateVacancyRequest request) {
|
||||
return vacancyService.updateVacancy(vacancyId, request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteVacancy(UUID vacancyId) {
|
||||
vacancyService.deleteVacancy(vacancyId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package ru.somecompany.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class CompanyResponse {
|
||||
|
||||
private UUID id;
|
||||
|
||||
private String name;
|
||||
|
||||
private String address;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package ru.somecompany.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class CreateVacancyRequest {
|
||||
|
||||
private String name;
|
||||
|
||||
private String description;
|
||||
|
||||
private Integer salaryLow;
|
||||
|
||||
private Integer salaryHigh;
|
||||
|
||||
private UUID companyId;
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package ru.somecompany.domain;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@Builder
|
||||
@Table(name = "vacancy")
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class VacancyEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue
|
||||
private UUID id;
|
||||
|
||||
@Column(name = "name", nullable = false)
|
||||
private String name;
|
||||
|
||||
@Column(name = "description", nullable = true, length = 1000)
|
||||
private String description;
|
||||
|
||||
@Column(name = "salary_low", nullable = false)
|
||||
private Integer salaryLow;
|
||||
|
||||
@Column(name = "salary_high", nullable = false)
|
||||
private Integer salaryHigh;
|
||||
|
||||
@Column(name = "company_id", nullable = false)
|
||||
private UUID companyId;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package ru.somecompany.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@Schema(description = "Данные по вакансии")
|
||||
public class VacancyResponse {
|
||||
|
||||
private UUID id;
|
||||
|
||||
private String name;
|
||||
|
||||
private String description;
|
||||
|
||||
private Integer salaryLow;
|
||||
|
||||
private Integer salaryHigh;
|
||||
|
||||
private CompanyResponse company;
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static org.springframework.http.HttpStatus.NOT_FOUND;
|
||||
|
||||
@Slf4j
|
||||
public abstract class AbstractWebExceptionHandler {
|
||||
|
||||
public static ResponseEntity<ResponseError> buildResponse(ErrorCode errorCode, HttpStatus status, String msg,
|
||||
boolean details, Throwable ex) {
|
||||
return buildResponse(errorCode.name(), status, msg, details, ex, LocalDateTime.now());
|
||||
}
|
||||
|
||||
public static ResponseEntity<ResponseError> buildResponse(String errorCode, HttpStatus status, String msg,
|
||||
boolean details, Throwable ex, LocalDateTime timestamp) {
|
||||
if (details) {
|
||||
log.error(msg, ex); // with stack-trace
|
||||
} else {
|
||||
var message = StringUtils.equals(msg, ex.getMessage()) ? msg : msg + ": " + ex.getMessage();
|
||||
if (status == NOT_FOUND) {
|
||||
log.warn(message);
|
||||
} else {
|
||||
log.error(message);
|
||||
}
|
||||
}
|
||||
|
||||
return ResponseEntity.status(status.value())
|
||||
.body(ResponseError.builder()
|
||||
.code(errorCode)
|
||||
.message(msg)
|
||||
.timestamp(timestamp)
|
||||
.status(status.value())
|
||||
.build());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
public enum BasicError implements ErrorCode {
|
||||
NOT_FOUND
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import lombok.Getter;
|
||||
import org.springframework.http.HttpStatus;
|
||||
|
||||
@Getter
|
||||
public class CompanyAppRuntimeException extends RuntimeException {
|
||||
private final ErrorCode errorCode;
|
||||
private final HttpStatus status;
|
||||
private final boolean details;
|
||||
|
||||
public CompanyAppRuntimeException(ErrorCode errorCode, HttpStatus status, String message) {
|
||||
this(errorCode, status, message, null);
|
||||
}
|
||||
|
||||
public CompanyAppRuntimeException(ErrorCode errorCode, HttpStatus status, String message, Throwable error) {
|
||||
this(errorCode, status, message, true, error);
|
||||
}
|
||||
|
||||
public CompanyAppRuntimeException(ErrorCode errorCode, HttpStatus status, String message, boolean details, Throwable error) {
|
||||
super(message, error);
|
||||
this.errorCode = errorCode;
|
||||
this.status = status;
|
||||
this.details = details;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
public interface ErrorCode extends Serializable {
|
||||
|
||||
String name();
|
||||
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import org.springframework.http.HttpStatus;
|
||||
|
||||
import static ru.somecompany.exception.BasicError.NOT_FOUND;
|
||||
|
||||
public class ResourceNotFoundException extends CompanyAppRuntimeException {
|
||||
|
||||
public ResourceNotFoundException(ErrorCode errorCode, String message) {
|
||||
this(errorCode, message, null);
|
||||
}
|
||||
|
||||
public ResourceNotFoundException(ErrorCode errorCode, String message, Throwable error) {
|
||||
super(errorCode, HttpStatus.NOT_FOUND, message, error);
|
||||
}
|
||||
|
||||
public static ResourceNotFoundException notFound(String message, Object... args) {
|
||||
return new ResourceNotFoundException(NOT_FOUND, String.format(message, args), null);
|
||||
}
|
||||
|
||||
public static ResourceNotFoundException notFound() {
|
||||
return new ResourceNotFoundException(NOT_FOUND, "Запрашиваемые данные не найдены", null);
|
||||
}
|
||||
|
||||
public static ResourceNotFoundException notFound(Throwable error) {
|
||||
return new ResourceNotFoundException(NOT_FOUND, error.getMessage(), error);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ResponseError {
|
||||
@JsonProperty(required = true)
|
||||
private LocalDateTime timestamp;
|
||||
@JsonProperty(required = true)
|
||||
private Integer status;
|
||||
@JsonProperty(required = true)
|
||||
private String message;
|
||||
@JsonProperty(required = true)
|
||||
private String code;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package ru.somecompany.exception;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||
|
||||
@Slf4j
|
||||
@Getter
|
||||
@RestControllerAdvice
|
||||
@RequiredArgsConstructor
|
||||
public class WebExceptionHandler extends AbstractWebExceptionHandler {
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
@ExceptionHandler(CompanyAppRuntimeException.class)
|
||||
public ResponseEntity<ResponseError> handleException(CompanyAppRuntimeException ex) {
|
||||
return buildResponse(ex.getErrorCode(), ex.getStatus(), ex.getMessage(), ex.isDetails(), ex);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package ru.somecompany.external;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import ru.somecompany.domain.CompanyResponse;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@FeignClient(name = "company", url = "${app.feign.company-url}")
|
||||
public interface CompanyClient {
|
||||
|
||||
@GetMapping(value = "/api/v1/company/{companyId}")
|
||||
CompanyResponse getCompany(@PathVariable UUID companyId);
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package ru.somecompany.mapper;
|
||||
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
import org.mapstruct.MappingTarget;
|
||||
import ru.somecompany.domain.CompanyResponse;
|
||||
import ru.somecompany.domain.CreateVacancyRequest;
|
||||
import ru.somecompany.domain.VacancyEntity;
|
||||
import ru.somecompany.domain.VacancyResponse;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Mapper(imports = UUID.class)
|
||||
public interface VacancyMapper {
|
||||
|
||||
@Mapping(target = "company", source = "company")
|
||||
@Mapping(target = "name", source = "entity.name")
|
||||
@Mapping(target = "id", source = "entity.id")
|
||||
VacancyResponse map(VacancyEntity entity, CompanyResponse company);
|
||||
|
||||
VacancyEntity map(CreateVacancyRequest request);
|
||||
|
||||
VacancyEntity map(@MappingTarget VacancyEntity entity, CreateVacancyRequest request);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.somecompany.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import ru.somecompany.domain.VacancyEntity;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Repository
|
||||
public interface VacancyRepository extends JpaRepository<VacancyEntity, UUID> {
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package ru.somecompany.service;
|
||||
|
||||
import ru.somecompany.domain.CreateVacancyRequest;
|
||||
import ru.somecompany.domain.VacancyEntity;
|
||||
import ru.somecompany.domain.VacancyResponse;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface VacancyService {
|
||||
|
||||
List<VacancyEntity> getVacancies();
|
||||
|
||||
VacancyEntity createVacancy(CreateVacancyRequest request);
|
||||
|
||||
VacancyEntity updateVacancy(UUID vacancyId, CreateVacancyRequest request);
|
||||
|
||||
void deleteVacancy(UUID vacancyId);
|
||||
|
||||
VacancyResponse getVacancy(UUID vacancyId);
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package ru.somecompany.service;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.somecompany.domain.CreateVacancyRequest;
|
||||
import ru.somecompany.domain.VacancyEntity;
|
||||
import ru.somecompany.domain.VacancyResponse;
|
||||
import ru.somecompany.mapper.VacancyMapper;
|
||||
import ru.somecompany.repository.VacancyRepository;
|
||||
import ru.somecompany.service.adapter.CompanyAdapter;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import static ru.somecompany.exception.ResourceNotFoundException.notFound;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class VacancyServiceImpl implements VacancyService {
|
||||
|
||||
private final VacancyRepository vacancyRepository;
|
||||
private final CompanyAdapter companyAdapter;
|
||||
private final VacancyMapper mapper;
|
||||
|
||||
@Override
|
||||
public List<VacancyEntity> getVacancies() {
|
||||
return vacancyRepository.findAll();
|
||||
}
|
||||
|
||||
@Override
|
||||
public VacancyEntity createVacancy(CreateVacancyRequest request) {
|
||||
var entity = mapper.map(request);
|
||||
return vacancyRepository.save(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public VacancyEntity updateVacancy(UUID vacancyId, CreateVacancyRequest request) {
|
||||
var entity = getById(vacancyId);
|
||||
entity = mapper.map(entity, request);
|
||||
|
||||
return vacancyRepository.save(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteVacancy(UUID vacancyId) {
|
||||
var entity = getById(vacancyId);
|
||||
vacancyRepository.delete(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public VacancyResponse getVacancy(UUID vacancyId) {
|
||||
var entity = getById(vacancyId);
|
||||
var company = companyAdapter.getCompanyById(entity.getCompanyId());
|
||||
|
||||
return mapper.map(entity, company);
|
||||
}
|
||||
|
||||
private VacancyEntity getById(UUID vacancyId) {
|
||||
var entity = vacancyRepository.findById(vacancyId);
|
||||
if (entity.isEmpty()) {
|
||||
log.warn("The vacancy with id '{}' was not found", vacancyId);
|
||||
throw notFound("Вакансия не найдена");
|
||||
}
|
||||
return entity.get();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package ru.somecompany.service.adapter;
|
||||
|
||||
import ru.somecompany.domain.CompanyResponse;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public interface CompanyAdapter {
|
||||
|
||||
CompanyResponse getCompanyById(UUID companyId);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package ru.somecompany.service.adapter;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.somecompany.domain.CompanyResponse;
|
||||
import ru.somecompany.external.CompanyClient;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class CompanyAdapterImpl implements CompanyAdapter {
|
||||
|
||||
private final CompanyClient companyClient;
|
||||
|
||||
@Override
|
||||
public CompanyResponse getCompanyById(UUID companyId) {
|
||||
return companyClient.getCompany(companyId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
server:
|
||||
port: ${SERVER_PORT:8080}
|
||||
spring:
|
||||
application:
|
||||
name: vacancy-app
|
||||
jpa:
|
||||
database: POSTGRESQL
|
||||
open-in-view: false
|
||||
show-sql: false
|
||||
hibernate:
|
||||
ddl-auto: none
|
||||
properties:
|
||||
hibernate:
|
||||
dialect: org.hibernate.dialect.PostgreSQLDialect
|
||||
datasource:
|
||||
url: ${DB_URL:jdbc:postgresql://localhost:5433/vacancy}
|
||||
username: ${DB_USERNAME:postgres}
|
||||
password: ${DB_PASSWORD:postgres}
|
||||
driverClassName: org.postgresql.Driver
|
||||
type: com.zaxxer.hikari.HikariDataSource
|
||||
hikari:
|
||||
maximum-pool-size: 15
|
||||
minimum-idle: 4
|
||||
idle-timeout: 180000
|
||||
max-lifetime: 599000
|
||||
flyway:
|
||||
enabled: true
|
||||
locations: db/migration/
|
||||
|
||||
app:
|
||||
feign:
|
||||
company-url: ${COMPANY_URL:http://localhost:8081}
|
||||
@@ -0,0 +1,9 @@
|
||||
CREATE TABLE vacancy (
|
||||
id UUID
|
||||
CONSTRAINT company_pk PRIMARY KEY,
|
||||
name VARCHAR(255) NOT NULL,
|
||||
description VARCHAR(1000),
|
||||
salary_low int8 NOT NULL,
|
||||
salary_high int8 NOT NULL,
|
||||
company_id UUID NOT NULL
|
||||
);
|
||||
@@ -1,30 +0,0 @@
|
||||
**/.classpath
|
||||
**/.dockerignore
|
||||
**/.env
|
||||
**/.git
|
||||
**/.gitignore
|
||||
**/.project
|
||||
**/.settings
|
||||
**/.toolstarget
|
||||
**/.vs
|
||||
**/.vscode
|
||||
**/*.*proj.user
|
||||
**/*.dbmdl
|
||||
**/*.jfm
|
||||
**/azds.yaml
|
||||
**/bin
|
||||
**/charts
|
||||
**/docker-compose*
|
||||
**/Dockerfile*
|
||||
**/node_modules
|
||||
**/npm-debug.log
|
||||
**/obj
|
||||
**/secrets.dev.yaml
|
||||
**/values.dev.yaml
|
||||
LICENSE
|
||||
README.md
|
||||
!**/.gitignore
|
||||
!.git/HEAD
|
||||
!.git/config
|
||||
!.git/packed-refs
|
||||
!.git/refs/heads/**
|
||||
63
kuzarin_maxim_lab_3/.gitattributes
vendored
63
kuzarin_maxim_lab_3/.gitattributes
vendored
@@ -1,63 +0,0 @@
|
||||
###############################################################################
|
||||
# Set default behavior to automatically normalize line endings.
|
||||
###############################################################################
|
||||
* text=auto
|
||||
|
||||
###############################################################################
|
||||
# Set default behavior for command prompt diff.
|
||||
#
|
||||
# This is need for earlier builds of msysgit that does not have it on by
|
||||
# default for csharp files.
|
||||
# Note: This is only used by command line
|
||||
###############################################################################
|
||||
#*.cs diff=csharp
|
||||
|
||||
###############################################################################
|
||||
# Set the merge driver for project and solution files
|
||||
#
|
||||
# Merging from the command prompt will add diff markers to the files if there
|
||||
# are conflicts (Merging from VS is not affected by the settings below, in VS
|
||||
# the diff markers are never inserted). Diff markers may cause the following
|
||||
# file extensions to fail to load in VS. An alternative would be to treat
|
||||
# these files as binary and thus will always conflict and require user
|
||||
# intervention with every merge. To do so, just uncomment the entries below
|
||||
###############################################################################
|
||||
#*.sln merge=binary
|
||||
#*.csproj merge=binary
|
||||
#*.vbproj merge=binary
|
||||
#*.vcxproj merge=binary
|
||||
#*.vcproj merge=binary
|
||||
#*.dbproj merge=binary
|
||||
#*.fsproj merge=binary
|
||||
#*.lsproj merge=binary
|
||||
#*.wixproj merge=binary
|
||||
#*.modelproj merge=binary
|
||||
#*.sqlproj merge=binary
|
||||
#*.wwaproj merge=binary
|
||||
|
||||
###############################################################################
|
||||
# behavior for image files
|
||||
#
|
||||
# image files are treated as binary by default.
|
||||
###############################################################################
|
||||
#*.jpg binary
|
||||
#*.png binary
|
||||
#*.gif binary
|
||||
|
||||
###############################################################################
|
||||
# diff behavior for common document formats
|
||||
#
|
||||
# Convert binary document formats to text before diffing them. This feature
|
||||
# is only available from the command line. Turn it on by uncommenting the
|
||||
# entries below.
|
||||
###############################################################################
|
||||
#*.doc diff=astextplain
|
||||
#*.DOC diff=astextplain
|
||||
#*.docx diff=astextplain
|
||||
#*.DOCX diff=astextplain
|
||||
#*.dot diff=astextplain
|
||||
#*.DOT diff=astextplain
|
||||
#*.pdf diff=astextplain
|
||||
#*.PDF diff=astextplain
|
||||
#*.rtf diff=astextplain
|
||||
#*.RTF diff=astextplain
|
||||
363
kuzarin_maxim_lab_3/.gitignore
vendored
363
kuzarin_maxim_lab_3/.gitignore
vendored
@@ -1,363 +0,0 @@
|
||||
## Ignore Visual Studio temporary files, build results, and
|
||||
## files generated by popular Visual Studio add-ons.
|
||||
##
|
||||
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
|
||||
|
||||
# User-specific files
|
||||
*.rsuser
|
||||
*.suo
|
||||
*.user
|
||||
*.userosscache
|
||||
*.sln.docstates
|
||||
|
||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||
*.userprefs
|
||||
|
||||
# Mono auto generated files
|
||||
mono_crash.*
|
||||
|
||||
# Build results
|
||||
[Dd]ebug/
|
||||
[Dd]ebugPublic/
|
||||
[Rr]elease/
|
||||
[Rr]eleases/
|
||||
x64/
|
||||
x86/
|
||||
[Ww][Ii][Nn]32/
|
||||
[Aa][Rr][Mm]/
|
||||
[Aa][Rr][Mm]64/
|
||||
bld/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
[Oo]ut/
|
||||
[Ll]og/
|
||||
[Ll]ogs/
|
||||
|
||||
# Visual Studio 2015/2017 cache/options directory
|
||||
.vs/
|
||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||
#wwwroot/
|
||||
|
||||
# Visual Studio 2017 auto generated files
|
||||
Generated\ Files/
|
||||
|
||||
# MSTest test Results
|
||||
[Tt]est[Rr]esult*/
|
||||
[Bb]uild[Ll]og.*
|
||||
|
||||
# NUnit
|
||||
*.VisualState.xml
|
||||
TestResult.xml
|
||||
nunit-*.xml
|
||||
|
||||
# Build Results of an ATL Project
|
||||
[Dd]ebugPS/
|
||||
[Rr]eleasePS/
|
||||
dlldata.c
|
||||
|
||||
# Benchmark Results
|
||||
BenchmarkDotNet.Artifacts/
|
||||
|
||||
# .NET Core
|
||||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
|
||||
# ASP.NET Scaffolding
|
||||
ScaffoldingReadMe.txt
|
||||
|
||||
# StyleCop
|
||||
StyleCopReport.xml
|
||||
|
||||
# Files built by Visual Studio
|
||||
*_i.c
|
||||
*_p.c
|
||||
*_h.h
|
||||
*.ilk
|
||||
*.meta
|
||||
*.obj
|
||||
*.iobj
|
||||
*.pch
|
||||
*.pdb
|
||||
*.ipdb
|
||||
*.pgc
|
||||
*.pgd
|
||||
*.rsp
|
||||
*.sbr
|
||||
*.tlb
|
||||
*.tli
|
||||
*.tlh
|
||||
*.tmp
|
||||
*.tmp_proj
|
||||
*_wpftmp.csproj
|
||||
*.log
|
||||
*.vspscc
|
||||
*.vssscc
|
||||
.builds
|
||||
*.pidb
|
||||
*.svclog
|
||||
*.scc
|
||||
|
||||
# Chutzpah Test files
|
||||
_Chutzpah*
|
||||
|
||||
# Visual C++ cache files
|
||||
ipch/
|
||||
*.aps
|
||||
*.ncb
|
||||
*.opendb
|
||||
*.opensdf
|
||||
*.sdf
|
||||
*.cachefile
|
||||
*.VC.db
|
||||
*.VC.VC.opendb
|
||||
|
||||
# Visual Studio profiler
|
||||
*.psess
|
||||
*.vsp
|
||||
*.vspx
|
||||
*.sap
|
||||
|
||||
# Visual Studio Trace Files
|
||||
*.e2e
|
||||
|
||||
# TFS 2012 Local Workspace
|
||||
$tf/
|
||||
|
||||
# Guidance Automation Toolkit
|
||||
*.gpState
|
||||
|
||||
# ReSharper is a .NET coding add-in
|
||||
_ReSharper*/
|
||||
*.[Rr]e[Ss]harper
|
||||
*.DotSettings.user
|
||||
|
||||
# TeamCity is a build add-in
|
||||
_TeamCity*
|
||||
|
||||
# DotCover is a Code Coverage Tool
|
||||
*.dotCover
|
||||
|
||||
# AxoCover is a Code Coverage Tool
|
||||
.axoCover/*
|
||||
!.axoCover/settings.json
|
||||
|
||||
# Coverlet is a free, cross platform Code Coverage Tool
|
||||
coverage*.json
|
||||
coverage*.xml
|
||||
coverage*.info
|
||||
|
||||
# Visual Studio code coverage results
|
||||
*.coverage
|
||||
*.coveragexml
|
||||
|
||||
# NCrunch
|
||||
_NCrunch_*
|
||||
.*crunch*.local.xml
|
||||
nCrunchTemp_*
|
||||
|
||||
# MightyMoose
|
||||
*.mm.*
|
||||
AutoTest.Net/
|
||||
|
||||
# Web workbench (sass)
|
||||
.sass-cache/
|
||||
|
||||
# Installshield output folder
|
||||
[Ee]xpress/
|
||||
|
||||
# DocProject is a documentation generator add-in
|
||||
DocProject/buildhelp/
|
||||
DocProject/Help/*.HxT
|
||||
DocProject/Help/*.HxC
|
||||
DocProject/Help/*.hhc
|
||||
DocProject/Help/*.hhk
|
||||
DocProject/Help/*.hhp
|
||||
DocProject/Help/Html2
|
||||
DocProject/Help/html
|
||||
|
||||
# Click-Once directory
|
||||
publish/
|
||||
|
||||
# Publish Web Output
|
||||
*.[Pp]ublish.xml
|
||||
*.azurePubxml
|
||||
# Note: Comment the next line if you want to checkin your web deploy settings,
|
||||
# but database connection strings (with potential passwords) will be unencrypted
|
||||
*.pubxml
|
||||
*.publishproj
|
||||
|
||||
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
||||
# checkin your Azure Web App publish settings, but sensitive information contained
|
||||
# in these scripts will be unencrypted
|
||||
PublishScripts/
|
||||
|
||||
# NuGet Packages
|
||||
*.nupkg
|
||||
# NuGet Symbol Packages
|
||||
*.snupkg
|
||||
# The packages folder can be ignored because of Package Restore
|
||||
**/[Pp]ackages/*
|
||||
# except build/, which is used as an MSBuild target.
|
||||
!**/[Pp]ackages/build/
|
||||
# Uncomment if necessary however generally it will be regenerated when needed
|
||||
#!**/[Pp]ackages/repositories.config
|
||||
# NuGet v3's project.json files produces more ignorable files
|
||||
*.nuget.props
|
||||
*.nuget.targets
|
||||
|
||||
# Microsoft Azure Build Output
|
||||
csx/
|
||||
*.build.csdef
|
||||
|
||||
# Microsoft Azure Emulator
|
||||
ecf/
|
||||
rcf/
|
||||
|
||||
# Windows Store app package directories and files
|
||||
AppPackages/
|
||||
BundleArtifacts/
|
||||
Package.StoreAssociation.xml
|
||||
_pkginfo.txt
|
||||
*.appx
|
||||
*.appxbundle
|
||||
*.appxupload
|
||||
|
||||
# Visual Studio cache files
|
||||
# files ending in .cache can be ignored
|
||||
*.[Cc]ache
|
||||
# but keep track of directories ending in .cache
|
||||
!?*.[Cc]ache/
|
||||
|
||||
# Others
|
||||
ClientBin/
|
||||
~$*
|
||||
*~
|
||||
*.dbmdl
|
||||
*.dbproj.schemaview
|
||||
*.jfm
|
||||
*.pfx
|
||||
*.publishsettings
|
||||
orleans.codegen.cs
|
||||
|
||||
# Including strong name files can present a security risk
|
||||
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
|
||||
#*.snk
|
||||
|
||||
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
||||
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
||||
#bower_components/
|
||||
|
||||
# RIA/Silverlight projects
|
||||
Generated_Code/
|
||||
|
||||
# Backup & report files from converting an old project file
|
||||
# to a newer Visual Studio version. Backup files are not needed,
|
||||
# because we have git ;-)
|
||||
_UpgradeReport_Files/
|
||||
Backup*/
|
||||
UpgradeLog*.XML
|
||||
UpgradeLog*.htm
|
||||
ServiceFabricBackup/
|
||||
*.rptproj.bak
|
||||
|
||||
# SQL Server files
|
||||
*.mdf
|
||||
*.ldf
|
||||
*.ndf
|
||||
|
||||
# Business Intelligence projects
|
||||
*.rdl.data
|
||||
*.bim.layout
|
||||
*.bim_*.settings
|
||||
*.rptproj.rsuser
|
||||
*- [Bb]ackup.rdl
|
||||
*- [Bb]ackup ([0-9]).rdl
|
||||
*- [Bb]ackup ([0-9][0-9]).rdl
|
||||
|
||||
# Microsoft Fakes
|
||||
FakesAssemblies/
|
||||
|
||||
# GhostDoc plugin setting file
|
||||
*.GhostDoc.xml
|
||||
|
||||
# Node.js Tools for Visual Studio
|
||||
.ntvs_analysis.dat
|
||||
node_modules/
|
||||
|
||||
# Visual Studio 6 build log
|
||||
*.plg
|
||||
|
||||
# Visual Studio 6 workspace options file
|
||||
*.opt
|
||||
|
||||
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
|
||||
*.vbw
|
||||
|
||||
# Visual Studio LightSwitch build output
|
||||
**/*.HTMLClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/ModelManifest.xml
|
||||
**/*.Server/GeneratedArtifacts
|
||||
**/*.Server/ModelManifest.xml
|
||||
_Pvt_Extensions
|
||||
|
||||
# Paket dependency manager
|
||||
.paket/paket.exe
|
||||
paket-files/
|
||||
|
||||
# FAKE - F# Make
|
||||
.fake/
|
||||
|
||||
# CodeRush personal settings
|
||||
.cr/personal
|
||||
|
||||
# Python Tools for Visual Studio (PTVS)
|
||||
__pycache__/
|
||||
*.pyc
|
||||
|
||||
# Cake - Uncomment if you are using it
|
||||
# tools/**
|
||||
# !tools/packages.config
|
||||
|
||||
# Tabs Studio
|
||||
*.tss
|
||||
|
||||
# Telerik's JustMock configuration file
|
||||
*.jmconfig
|
||||
|
||||
# BizTalk build output
|
||||
*.btp.cs
|
||||
*.btm.cs
|
||||
*.odx.cs
|
||||
*.xsd.cs
|
||||
|
||||
# OpenCover UI analysis results
|
||||
OpenCover/
|
||||
|
||||
# Azure Stream Analytics local run output
|
||||
ASALocalRun/
|
||||
|
||||
# MSBuild Binary and Structured Log
|
||||
*.binlog
|
||||
|
||||
# NVidia Nsight GPU debugger configuration file
|
||||
*.nvuser
|
||||
|
||||
# MFractors (Xamarin productivity tool) working folder
|
||||
.mfractor/
|
||||
|
||||
# Local History for Visual Studio
|
||||
.localhistory/
|
||||
|
||||
# BeatPulse healthcheck temp database
|
||||
healthchecksdb
|
||||
|
||||
# Backup folder for Package Reference Convert tool in Visual Studio 2017
|
||||
MigrationBackup/
|
||||
|
||||
# Ionide (cross platform F# VS Code tools) working folder
|
||||
.ionide/
|
||||
|
||||
# Fody - auto-generated XML schema
|
||||
FodyWeavers.xsd
|
||||
@@ -1,31 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.10.34916.146
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSaC", "DSaC\DSaC.csproj", "{C1051C12-D7D0-4C77-AFBC-4F5FFD8EE367}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DSaC_second", "DSaC_second\DSaC_second.csproj", "{64F78585-2BBC-4656-BC50-41FBB8917719}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{C1051C12-D7D0-4C77-AFBC-4F5FFD8EE367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C1051C12-D7D0-4C77-AFBC-4F5FFD8EE367}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C1051C12-D7D0-4C77-AFBC-4F5FFD8EE367}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C1051C12-D7D0-4C77-AFBC-4F5FFD8EE367}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{64F78585-2BBC-4656-BC50-41FBB8917719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{64F78585-2BBC-4656-BC50-41FBB8917719}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{64F78585-2BBC-4656-BC50-41FBB8917719}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{64F78585-2BBC-4656-BC50-41FBB8917719}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {30D05708-634E-4FDE-9BCA-5A1B7A5EFF59}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,88 +0,0 @@
|
||||
using DSaC.Models.DTOs;
|
||||
using DSaC.Models.Internal.Queries;
|
||||
using DSaC.Models.Internal.Сommands;
|
||||
using MediatR;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
|
||||
namespace DSaC.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class CounterpartiesController : ControllerBase
|
||||
{
|
||||
private readonly IMediator mediator;
|
||||
|
||||
public CounterpartiesController(IMediator mediator)
|
||||
{
|
||||
this.mediator = mediator;
|
||||
}
|
||||
|
||||
[HttpGet("")]
|
||||
public async Task<IActionResult> GetCounterparties(
|
||||
[FromQuery] int page = 0,
|
||||
[FromQuery] int pageSize = 10,
|
||||
[FromQuery] List<Guid>? ids = null
|
||||
)
|
||||
{
|
||||
var request = new GetCounterpartiesQuery
|
||||
{
|
||||
Page = page,
|
||||
PageSize = pageSize,
|
||||
Ids = ids
|
||||
};
|
||||
|
||||
var response = await mediator.Send(request);
|
||||
|
||||
return !response.IsError ? Ok(response.Value) : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
|
||||
[HttpGet("{uuid:guid}")]
|
||||
public async Task<IActionResult> GetFullCounterparty([FromRoute] Guid uuid)
|
||||
{
|
||||
var request = new GetCounterpartyQuery
|
||||
{
|
||||
Id = uuid
|
||||
};
|
||||
|
||||
var response = await mediator.Send(request);
|
||||
|
||||
return !response.IsError ? Ok(response.Value) : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
|
||||
[HttpPost("")]
|
||||
public async Task<IActionResult> CreateCounterparty([FromBody] CounterpartyBaseDto dto)
|
||||
{
|
||||
var response = await mediator.Send(new CreateCounterpartyCommand()
|
||||
{
|
||||
Model = dto
|
||||
});
|
||||
|
||||
return !response.IsError ? Ok(response.Value) : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
|
||||
[HttpPut("{uuid:guid}")]
|
||||
public async Task<IActionResult> UpdateRecord([FromRoute] Guid uuid, [FromBody] CounterpartyViewDto dto)
|
||||
{
|
||||
var response = await mediator.Send(new UpdateCounterpartyCommand()
|
||||
{
|
||||
Id=uuid,
|
||||
Model = dto
|
||||
});
|
||||
|
||||
return !response.IsError ? Ok(response.Value) : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
|
||||
[HttpDelete("{uuid:guid}")]
|
||||
public async Task<IActionResult> DeleteRecord([FromRoute] Guid uuid)
|
||||
{
|
||||
var response = await mediator.Send(new DeleteCounterpartyCommand()
|
||||
{
|
||||
Id = uuid,
|
||||
});
|
||||
|
||||
return !response.IsError ? Ok() : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<UserSecretsId>55894bef-8317-4e30-a5f0-4dcd5c3f861e</UserSecretsId>
|
||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MediatR" Version="12.4.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
|
||||
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.12" />
|
||||
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
|
||||
<PackageReference Include="PIHelperSh.Configuration" Version="1.0.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,14 +0,0 @@
|
||||
using DSaC.Database.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace DSaC.Database
|
||||
{
|
||||
public class DsacContext: DbContext
|
||||
{
|
||||
public DsacContext(DbContextOptions options) : base(options)
|
||||
{
|
||||
}
|
||||
|
||||
public DbSet<Counterparty> Counterparties { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DSaC.Models.DTOs;
|
||||
using DSaC.Models.Internal.Сommands;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DSaC.Database.Models
|
||||
{
|
||||
[Table("counterparty")]
|
||||
[AutoMap(typeof(CounterpartyBaseDto))]
|
||||
[AutoMap(typeof(CounterpartyViewDto))]
|
||||
public class Counterparty
|
||||
{
|
||||
[Key]
|
||||
[Column("id")]
|
||||
public Guid Id { get; set; }
|
||||
|
||||
[Required]
|
||||
[MaxLength(255)]
|
||||
[Column("name")]
|
||||
public string Name { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
|
||||
WORKDIR /app
|
||||
EXPOSE 8080
|
||||
EXPOSE 8081
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
||||
ARG BUILD_CONFIGURATION=Release
|
||||
WORKDIR /src
|
||||
COPY ["DSaC.csproj", "DSaC/"]
|
||||
RUN dotnet restore "DSaC/DSaC.csproj"
|
||||
WORKDIR "/src/DSaC"
|
||||
COPY . .
|
||||
RUN dotnet build "DSaC.csproj" -c $BUILD_CONFIGURATION -o /app/build
|
||||
|
||||
FROM build AS publish
|
||||
ARG BUILD_CONFIGURATION=Release
|
||||
RUN dotnet publish "DSaC.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
|
||||
|
||||
FROM base AS final
|
||||
WORKDIR /app
|
||||
COPY --from=publish /app/publish .
|
||||
ENTRYPOINT ["dotnet", "DSaC.dll"]
|
||||
@@ -1,51 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DSaC.Database;
|
||||
using DSaC.Database.Models;
|
||||
using DSaC.Logic.Handlers.Queries;
|
||||
using DSaC.Models.DTOs;
|
||||
using DSaC.Models.Internal;
|
||||
using DSaC.Models.Internal.Сommands;
|
||||
using MediatR;
|
||||
|
||||
namespace DSaC.Logic.Handlers.Commands
|
||||
{
|
||||
public class CreateCounterpartyCommandHandler : IRequestHandler<CreateCounterpartyCommand, ResponseModel<CounterpartyViewDto>>
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly DsacContext _context;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public CreateCounterpartyCommandHandler(ILogger<CreateCounterpartyCommandHandler> logger, DsacContext context, IMapper mapper)
|
||||
{
|
||||
_logger = logger;
|
||||
_context = context;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public async Task<ResponseModel<CounterpartyViewDto>> Handle(CreateCounterpartyCommand request, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var model = _mapper.Map<Counterparty>(request.Model);
|
||||
|
||||
var res = await _context.AddAsync(model);
|
||||
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return new()
|
||||
{
|
||||
Value = _mapper.Map<CounterpartyViewDto>(res.Entity)
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error on creating counterparty");
|
||||
return new()
|
||||
{
|
||||
StatusCode = System.Net.HttpStatusCode.NotFound,
|
||||
ErrorText = "Cannot create counterparty"
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DSaC.Database;
|
||||
using DSaC.Database.Models;
|
||||
using DSaC.Models.DTOs;
|
||||
using DSaC.Models.Internal;
|
||||
using DSaC.Models.Internal.Сommands;
|
||||
using MediatR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace DSaC.Logic.Handlers.Commands
|
||||
{
|
||||
public class DeleteCounterpartyCommandHandler: IRequestHandler<DeleteCounterpartyCommand, ResponseModel>
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly DsacContext _context;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public DeleteCounterpartyCommandHandler(ILogger<DeleteCounterpartyCommandHandler> logger, DsacContext context, IMapper mapper)
|
||||
{
|
||||
_logger = logger;
|
||||
_context = context;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public async Task<ResponseModel> Handle(DeleteCounterpartyCommand request, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var res = await _context.Counterparties.Where(x=>x.Id == request.Id).ExecuteDeleteAsync();
|
||||
|
||||
if (res == 1)return new();
|
||||
|
||||
return new()
|
||||
{
|
||||
ErrorText = "Cannot find object to delete",
|
||||
StatusCode = System.Net.HttpStatusCode.NotFound
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error on deleteing counterparty");
|
||||
return new()
|
||||
{
|
||||
StatusCode = System.Net.HttpStatusCode.NotFound,
|
||||
ErrorText = "Cannot delete counterparty"
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DSaC.Database;
|
||||
using DSaC.Database.Models;
|
||||
using DSaC.Models.DTOs;
|
||||
using DSaC.Models.Internal;
|
||||
using DSaC.Models.Internal.Сommands;
|
||||
using MediatR;
|
||||
|
||||
namespace DSaC.Logic.Handlers.Commands
|
||||
{
|
||||
public class UpdateCounterpartyCommandHandler: IRequestHandler<UpdateCounterpartyCommand, ResponseModel<CounterpartyViewDto>>
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly DsacContext _context;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public UpdateCounterpartyCommandHandler(ILogger<UpdateCounterpartyCommandHandler> logger, DsacContext context, IMapper mapper)
|
||||
{
|
||||
_logger = logger;
|
||||
_context = context;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public async Task<ResponseModel<CounterpartyViewDto>> Handle(UpdateCounterpartyCommand request, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var model = _mapper.Map<Counterparty>(request.Model);
|
||||
|
||||
var res = _context.Update(model);
|
||||
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return new()
|
||||
{
|
||||
Value = _mapper.Map<CounterpartyViewDto>(res.Entity)
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error on updating counterparty");
|
||||
return new()
|
||||
{
|
||||
StatusCode = System.Net.HttpStatusCode.NotFound,
|
||||
ErrorText = "Cannot update counterparty"
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DSaC.Database;
|
||||
using DSaC.Models.DTOs;
|
||||
using DSaC.Models.Internal;
|
||||
using DSaC.Models.Internal.Queries;
|
||||
using MediatR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace DSaC.Logic.Handlers.Queries
|
||||
{
|
||||
public class GetCounterpartiesQueryHandler : IRequestHandler<GetCounterpartiesQuery, ResponseModel<List<CounterpartyViewDto>>>
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly DsacContext _context;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public GetCounterpartiesQueryHandler(ILogger<GetCounterpartiesQueryHandler> logger, DsacContext context, IMapper mapper)
|
||||
{
|
||||
_logger = logger;
|
||||
_context = context;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public async Task<ResponseModel<List<CounterpartyViewDto>>> Handle(GetCounterpartiesQuery request, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var res = await _context.Counterparties
|
||||
.Where(x=>request.Ids == null || request.Ids.Contains(x.Id))
|
||||
.Skip(request.Page * request.PageSize).Take(request.PageSize)
|
||||
.ToListAsync();
|
||||
|
||||
return new()
|
||||
{
|
||||
Value = res.Select(_mapper.Map<CounterpartyViewDto>).ToList(),
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error on getting records");
|
||||
|
||||
return new()
|
||||
{
|
||||
StatusCode = System.Net.HttpStatusCode.BadRequest,
|
||||
ErrorText = "Cannot get Counterparties by this request",
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DSaC.Database;
|
||||
using DSaC.Models.DTOs;
|
||||
using DSaC.Models.Internal;
|
||||
using DSaC.Models.Internal.Queries;
|
||||
using MediatR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace DSaC.Logic.Handlers.Queries
|
||||
{
|
||||
public class GetCounterpartyQueryHandler: IRequestHandler<GetCounterpartyQuery, ResponseModel<CounterpartyViewDto>>
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly DsacContext _context;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public GetCounterpartyQueryHandler(ILogger<GetCounterpartyQueryHandler> logger, DsacContext context, IMapper mapper)
|
||||
{
|
||||
_logger = logger;
|
||||
_context = context;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public async Task<ResponseModel<CounterpartyViewDto>> Handle(GetCounterpartyQuery request, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var res = await _context.Counterparties.FirstOrDefaultAsync(x=>x.Id == request.Id);
|
||||
|
||||
if (res == null)
|
||||
return new()
|
||||
{
|
||||
StatusCode = System.Net.HttpStatusCode.NotFound,
|
||||
ErrorText = "Counterparty with this ID does not exsist",
|
||||
};
|
||||
|
||||
return new()
|
||||
{
|
||||
Value = _mapper.Map<CounterpartyViewDto>(res),
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error on getting record");
|
||||
|
||||
return new()
|
||||
{
|
||||
StatusCode = System.Net.HttpStatusCode.NotFound,
|
||||
ErrorText = "Cannot get Counterparty by id",
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using DSaC.Database;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
[DbContext(typeof(DsacContext))]
|
||||
[Migration("20240907133944_InitMigraton")]
|
||||
partial class InitMigraton
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "8.0.8")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DSaC.Database.Models.Counterparty", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("id");
|
||||
|
||||
b.Property<string>("ContractNumber")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)")
|
||||
.HasColumnName("contract_number");
|
||||
|
||||
b.Property<string>("ManagerName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)")
|
||||
.HasColumnName("manager_name");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)")
|
||||
.HasColumnName("name");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("counterparty");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class InitMigraton : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "counterparty",
|
||||
columns: table => new
|
||||
{
|
||||
id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
name = table.Column<string>(type: "character varying(255)", maxLength: 255, nullable: false),
|
||||
contract_number = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
|
||||
manager_name = table.Column<string>(type: "character varying(255)", maxLength: 255, nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_counterparty", x => x.id);
|
||||
});
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "counterparty");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using DSaC.Database;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
[DbContext(typeof(DsacContext))]
|
||||
[Migration("20240907140843_ChangingContractInfo")]
|
||||
partial class ChangingContractInfo
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "8.0.8")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DSaC.Database.Models.Counterparty", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("id");
|
||||
|
||||
b.Property<string>("ContractNumber")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)")
|
||||
.HasColumnName("contract_number");
|
||||
|
||||
b.Property<bool>("IsContractClosed")
|
||||
.HasColumnType("boolean")
|
||||
.HasColumnName("is_contract_closed");
|
||||
|
||||
b.Property<string>("ManagerName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)")
|
||||
.HasColumnName("manager_name");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)")
|
||||
.HasColumnName("name");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("counterparty");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class ChangingContractInfo : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "is_contract_closed",
|
||||
table: "counterparty",
|
||||
type: "boolean",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "is_contract_closed",
|
||||
table: "counterparty");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using DSaC.Database;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
[DbContext(typeof(DsacContext))]
|
||||
[Migration("20240907141343_SmallHotfix")]
|
||||
partial class SmallHotfix
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "8.0.8")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DSaC.Database.Models.Counterparty", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("id");
|
||||
|
||||
b.Property<string>("ContractNumber")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)")
|
||||
.HasColumnName("contract_number");
|
||||
|
||||
b.Property<bool>("IsContractClosed")
|
||||
.HasColumnType("boolean")
|
||||
.HasColumnName("is_contract_closed");
|
||||
|
||||
b.Property<string>("ManagerName")
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)")
|
||||
.HasColumnName("manager_name");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)")
|
||||
.HasColumnName("name");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("counterparty");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class SmallHotfix : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "manager_name",
|
||||
table: "counterparty",
|
||||
type: "character varying(255)",
|
||||
maxLength: 255,
|
||||
nullable: true,
|
||||
oldClrType: typeof(string),
|
||||
oldType: "character varying(255)",
|
||||
oldMaxLength: 255);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "manager_name",
|
||||
table: "counterparty",
|
||||
type: "character varying(255)",
|
||||
maxLength: 255,
|
||||
nullable: false,
|
||||
defaultValue: "",
|
||||
oldClrType: typeof(string),
|
||||
oldType: "character varying(255)",
|
||||
oldMaxLength: 255,
|
||||
oldNullable: true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using DSaC.Database;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
[DbContext(typeof(DsacContext))]
|
||||
[Migration("20240914065929_after-reconstruction")]
|
||||
partial class afterreconstruction
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "8.0.8")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DSaC.Database.Models.Counterparty", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("id");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)")
|
||||
.HasColumnName("name");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("counterparty");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class afterreconstruction : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "contract_number",
|
||||
table: "counterparty");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "is_contract_closed",
|
||||
table: "counterparty");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "manager_name",
|
||||
table: "counterparty");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "contract_number",
|
||||
table: "counterparty",
|
||||
type: "character varying(50)",
|
||||
maxLength: 50,
|
||||
nullable: false,
|
||||
defaultValue: "");
|
||||
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "is_contract_closed",
|
||||
table: "counterparty",
|
||||
type: "boolean",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "manager_name",
|
||||
table: "counterparty",
|
||||
type: "character varying(255)",
|
||||
maxLength: 255,
|
||||
nullable: true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using DSaC.Database;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DSaC.Migrations
|
||||
{
|
||||
[DbContext(typeof(DsacContext))]
|
||||
partial class DsacContextModelSnapshot : ModelSnapshot
|
||||
{
|
||||
protected override void BuildModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "8.0.8")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DSaC.Database.Models.Counterparty", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("id");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)")
|
||||
.HasColumnName("name");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("counterparty");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DSaC.Models.DTOs
|
||||
{
|
||||
public class ContractViewDto
|
||||
{
|
||||
[Required(ErrorMessage = "Contract number must be present")]
|
||||
public string ContractNumber { get; set; } = null!;
|
||||
|
||||
[Required(ErrorMessage = "Manager name must be present")]
|
||||
public string ManagerName { get; set; } = null!;
|
||||
|
||||
public DateTime CreatinTime { get; set; }
|
||||
|
||||
public bool IsClosed { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
|
||||
using AutoMapper;
|
||||
using DSaC.Database.Models;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DSaC.Models.DTOs
|
||||
{
|
||||
public class CounterpartyBaseDto
|
||||
{
|
||||
[Required(ErrorMessage = "Cpty name must be present")]
|
||||
public string Name { get; set; } = null!;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DSaC.Database.Models;
|
||||
|
||||
namespace DSaC.Models.DTOs
|
||||
{
|
||||
[AutoMap(typeof(Counterparty))]
|
||||
public class CounterpartyViewDto: CounterpartyBaseDto
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
using DSaC.Models.DTOs;
|
||||
using MediatR;
|
||||
|
||||
namespace DSaC.Models.Internal.Queries
|
||||
{
|
||||
public class GetCounterpartiesQuery: IRequest<ResponseModel<List<CounterpartyViewDto>>>
|
||||
{
|
||||
public List<Guid>? Ids { get; set; }
|
||||
|
||||
public int Page { get; set; }
|
||||
|
||||
public int PageSize { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
using DSaC.Models.DTOs;
|
||||
using MediatR;
|
||||
|
||||
namespace DSaC.Models.Internal.Queries
|
||||
{
|
||||
public class GetCounterpartyQuery: IRequest<ResponseModel<CounterpartyViewDto>>
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
using System.Net;
|
||||
|
||||
namespace DSaC.Models.Internal
|
||||
{
|
||||
public class ResponseModel
|
||||
{
|
||||
public string? ErrorText;
|
||||
|
||||
public bool IsError => !string.IsNullOrEmpty(ErrorText);
|
||||
|
||||
private int? _errorCode = 200;
|
||||
|
||||
public int? ErrorCode
|
||||
{
|
||||
get => _errorCode;
|
||||
set => _errorCode = value;
|
||||
}
|
||||
|
||||
public HttpStatusCode? StatusCode
|
||||
{
|
||||
get => (HttpStatusCode?)_errorCode;
|
||||
set => _errorCode = (int?)value;
|
||||
}
|
||||
}
|
||||
|
||||
public class ResponseModel<T> : ResponseModel
|
||||
{
|
||||
public T? Value { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
using DSaC.Models.DTOs;
|
||||
using MediatR;
|
||||
|
||||
namespace DSaC.Models.Internal.Сommands
|
||||
{
|
||||
public class CreateCounterpartyCommand : IRequest<ResponseModel<CounterpartyViewDto>>
|
||||
{
|
||||
public CounterpartyBaseDto Model { get; set; } = null!;
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
using MediatR;
|
||||
|
||||
namespace DSaC.Models.Internal.Сommands
|
||||
{
|
||||
public class DeleteCounterpartyCommand: IRequest<ResponseModel>
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
using DSaC.Models.DTOs;
|
||||
using MediatR;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DSaC.Models.Internal.Сommands
|
||||
{
|
||||
public class UpdateCounterpartyCommand: IRequest<ResponseModel<CounterpartyViewDto>>
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
|
||||
[Required(ErrorMessage = "UpdateMessageMust be present")]
|
||||
public CounterpartyViewDto Model { get; set; } = null!;
|
||||
}
|
||||
}
|
||||
@@ -1,128 +0,0 @@
|
||||
using DSaC.Database;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using NLog.Config;
|
||||
using NLog.Extensions.Logging;
|
||||
using NLog.Targets;
|
||||
using PIHelperSh.Configuration;
|
||||
using PIHelperSh.Configuration.Attributes;
|
||||
using System.Reflection;
|
||||
using LogLevel = NLog.LogLevel;
|
||||
|
||||
[TrackedType]
|
||||
public class Program
|
||||
{
|
||||
private static WebApplication? app;
|
||||
|
||||
[Constant(BlockName = "Database")]
|
||||
private static string ConnectionString;
|
||||
|
||||
[Constant(BlockName = "GatewaySettings")]
|
||||
private static string AppPrefix;
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
ConfigureLogger(builder);
|
||||
|
||||
ConfigureServices(builder);
|
||||
|
||||
ConfigureDatabase(builder);
|
||||
|
||||
app = builder.Build();
|
||||
|
||||
var t = MigrateDatabase();
|
||||
|
||||
app.UseSwagger(c =>
|
||||
{
|
||||
if (!string.IsNullOrEmpty(AppPrefix))
|
||||
{
|
||||
//c.RouteTemplate = AppPrefix + "/swagger/{documentName}/swagger.json";
|
||||
|
||||
c.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
|
||||
{
|
||||
swaggerDoc.Servers = new List<OpenApiServer> { new OpenApiServer { Url = $"{httpReq.Scheme}://{httpReq.Host.Value}/{AppPrefix}" } };
|
||||
});
|
||||
}
|
||||
});
|
||||
app.UseSwaggerUI(c =>
|
||||
{
|
||||
//if (!string.IsNullOrEmpty(AppPrefix))
|
||||
//{
|
||||
// c.SwaggerEndpoint($"/{AppPrefix}/swagger/v1/swagger.json", $"APP API");
|
||||
// c.RoutePrefix = $"{AppPrefix}/swagger";
|
||||
//}
|
||||
});
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
||||
t.Wait();
|
||||
|
||||
app.Run();
|
||||
}
|
||||
|
||||
private static void ConfigureLogger(WebApplicationBuilder builder)
|
||||
{
|
||||
var nLogConfig = new LoggingConfiguration();
|
||||
var logConsole = new ConsoleTarget();
|
||||
var blackhole = new NullTarget();
|
||||
|
||||
var logFile = new FileTarget()
|
||||
{
|
||||
FileName = "${basedir}/logs/${shortdate}_logs.log"
|
||||
};
|
||||
|
||||
nLogConfig.AddRule(LogLevel.Trace, LogLevel.Trace, blackhole, "Microsoft.AspNetCore.*", true);
|
||||
nLogConfig.AddRule(LogLevel.Info, LogLevel.Warn, logFile, "Microsoft.EntityFrameworkCore.*", true);
|
||||
nLogConfig.AddRule(LogLevel.Info, LogLevel.Warn, logFile, "Microsoft.AspNetCore.*", true);
|
||||
nLogConfig.AddRule(LogLevel.Info, LogLevel.Warn, logFile, "System.Net.Http.HttpClient.Refit.*", true);
|
||||
nLogConfig.AddRule(LogLevel.Info, LogLevel.Error, logConsole);
|
||||
nLogConfig.AddRule(LogLevel.Debug, LogLevel.Error, logFile);
|
||||
|
||||
builder.Logging.ClearProviders();
|
||||
builder.Services.AddLogging(m => m.AddNLog(nLogConfig));
|
||||
}
|
||||
|
||||
private static void ConfigureServices(WebApplicationBuilder builder)
|
||||
{
|
||||
builder.Services.AddConfigurations(builder.Configuration);
|
||||
builder.Configuration.AddConstants();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
|
||||
|
||||
builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<Program>());
|
||||
|
||||
builder.Services.AddControllers().AddNewtonsoftJson();
|
||||
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
c.SwaggerDoc("v1", new OpenApiInfo
|
||||
{
|
||||
Title = "Distributed computing and applications",
|
||||
Version = "v1",
|
||||
Description = ""
|
||||
});
|
||||
|
||||
//c.EnableAnnotations();
|
||||
});
|
||||
}
|
||||
|
||||
private static void ConfigureDatabase(WebApplicationBuilder builder)
|
||||
{
|
||||
builder.Services.AddDbContext<DsacContext>(options =>
|
||||
{
|
||||
options.UseNpgsql(ConnectionString);
|
||||
});
|
||||
}
|
||||
|
||||
private static async Task MigrateDatabase()
|
||||
{
|
||||
var context = app?.Services.CreateScope().ServiceProvider.GetService<DsacContext>();
|
||||
if(context != null)
|
||||
await context.Database.MigrateAsync();
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
{
|
||||
"profiles": {
|
||||
"http": {
|
||||
"commandName": "Project",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
},
|
||||
"dotnetRunMessages": true,
|
||||
"applicationUrl": "http://localhost:5062"
|
||||
},
|
||||
"https": {
|
||||
"commandName": "Project",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
},
|
||||
"dotnetRunMessages": true,
|
||||
"applicationUrl": "https://localhost:7219;http://localhost:5062"
|
||||
},
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"Container (Dockerfile)": {
|
||||
"commandName": "Docker",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_HTTPS_PORTS": "8081",
|
||||
"ASPNETCORE_HTTP_PORTS": "8080"
|
||||
},
|
||||
"publishAllPorts": true,
|
||||
"useSSL": true
|
||||
}
|
||||
},
|
||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:9154",
|
||||
"sslPort": 44381
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"Database": {
|
||||
"ConnectionString": "Host=db.dev-moio.online;Port=31153;Database=dsac_maxim;Username=postgres;Password=postgres_password"
|
||||
},
|
||||
"GatewaySettings": {
|
||||
"AppPrefix": ""
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
using DSaC_second.Models.DTOs;
|
||||
using DSaC_second.Models.Internal.Queries;
|
||||
using DSaC_second.Models.Internal.Сommands;
|
||||
using MediatR;
|
||||
using Microsoft.AspNetCore.Components.Forms;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace DSaC_second.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class ContractController : ControllerBase
|
||||
{
|
||||
private readonly IMediator _mediator;
|
||||
|
||||
public ContractController(IMediator mediator)
|
||||
{
|
||||
_mediator = mediator;
|
||||
}
|
||||
|
||||
[HttpGet("")]
|
||||
public async Task<IActionResult> GetContracts(
|
||||
[FromQuery] int page = 0,
|
||||
[FromQuery] int pageSize = 10,
|
||||
[FromQuery] List<Guid>? ids = null
|
||||
)
|
||||
{
|
||||
var request = new GetContractsQuery
|
||||
{
|
||||
Page = page,
|
||||
PageSize = pageSize,
|
||||
Ids = ids
|
||||
};
|
||||
|
||||
var response = await _mediator.Send(request);
|
||||
|
||||
return !response.IsError ? Ok(response.Value) : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
|
||||
[HttpGet("{uuid:guid}")]
|
||||
public async Task<IActionResult> GetFullContract([FromRoute] Guid uuid)
|
||||
{
|
||||
var request = new GetContractQuery
|
||||
{
|
||||
Id = uuid
|
||||
};
|
||||
|
||||
var response = await _mediator.Send(request);
|
||||
|
||||
return !response.IsError ? Ok(response.Value) : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
|
||||
[HttpPost("")]
|
||||
public async Task<IActionResult> CreateContract([FromBody] ContractBaseDto dto)
|
||||
{
|
||||
var response = await _mediator.Send(new CreateContractCommand()
|
||||
{
|
||||
Model = dto
|
||||
});
|
||||
|
||||
return !response.IsError ? Ok(response.Value) : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
|
||||
[HttpPut("{uuid:guid}")]
|
||||
public async Task<IActionResult> UpdateContract([FromRoute] Guid uuid, [FromBody] ContractViewDto dto)
|
||||
{
|
||||
var response = await _mediator.Send(new UpdateContractCommand()
|
||||
{
|
||||
Id = uuid,
|
||||
Model = dto
|
||||
});
|
||||
|
||||
return !response.IsError ? Ok(response.Value) : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
|
||||
[HttpDelete("{uuid:guid}")]
|
||||
public async Task<IActionResult> DeleteContract([FromRoute] Guid uuid)
|
||||
{
|
||||
var response = await _mediator.Send(new DeleteContractCommand()
|
||||
{
|
||||
Id = uuid,
|
||||
});
|
||||
|
||||
return !response.IsError ? Ok() : StatusCode(response.ErrorCode!.Value, response.ErrorText);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<UserSecretsId>39d29416-63e9-4884-9c5f-9d6ff461995f</UserSecretsId>
|
||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MediatR" Version="12.4.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
|
||||
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.13" />
|
||||
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
|
||||
<PackageReference Include="PIHelperSh.Configuration" Version="1.0.1" />
|
||||
<PackageReference Include="RestSharp" Version="112.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,15 +0,0 @@
|
||||
using DSaC_second.Database.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace DSaC_second.Database
|
||||
{
|
||||
public class DsacContext : DbContext
|
||||
{
|
||||
public DsacContext(DbContextOptions options) : base(options)
|
||||
{
|
||||
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
|
||||
}
|
||||
|
||||
public DbSet<Contract> Contracts { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DSaC_second.Models.DTOs;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DSaC_second.Database.Models
|
||||
{
|
||||
[Table("contract")]
|
||||
[AutoMap(typeof(ContractBaseDto))]
|
||||
[AutoMap(typeof(ContractViewDto))]
|
||||
public class Contract
|
||||
{
|
||||
[Key]
|
||||
[Column("id")]
|
||||
public Guid Id { get; set; }
|
||||
|
||||
[Column("contract_number")]
|
||||
[Required]
|
||||
public string ContractNumber { get; set; }
|
||||
|
||||
[Column("manager_name")]
|
||||
[Required]
|
||||
public string ManagerName { get; set; }
|
||||
|
||||
[Column("counterparty_id")]
|
||||
[Required]
|
||||
public Guid CounterpartyId { get; set; }
|
||||
|
||||
[Column("creation_time")]
|
||||
[Required]
|
||||
public DateTime CreatinTime { get; set; } = DateTime.Now;
|
||||
|
||||
[Column("is_closed")]
|
||||
[DefaultValue(false)]
|
||||
public bool IsClosed { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
|
||||
WORKDIR /app
|
||||
EXPOSE 8080
|
||||
EXPOSE 8081
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
||||
ARG BUILD_CONFIGURATION=Release
|
||||
WORKDIR /src
|
||||
COPY ["DSaC_second.csproj", "DSaC_second/"]
|
||||
RUN dotnet restore "DSaC_second/DSaC_second.csproj"
|
||||
WORKDIR "/src/DSaC_second"
|
||||
COPY . .
|
||||
RUN dotnet build "DSaC_second.csproj" -c $BUILD_CONFIGURATION -o /app/build
|
||||
|
||||
FROM build AS publish
|
||||
ARG BUILD_CONFIGURATION=Release
|
||||
RUN dotnet publish "DSaC_second.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
|
||||
|
||||
FROM base AS final
|
||||
WORKDIR /app
|
||||
COPY --from=publish /app/publish .
|
||||
ENTRYPOINT ["dotnet", "DSaC_second.dll"]
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user