Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 vladp
|
f4e5ea2976 |
@@ -1,19 +1,10 @@
|
|||||||
# Postgres
|
|
||||||
POSTGRES_DB=no_copy_
|
POSTGRES_DB=no_copy_
|
||||||
POSTGRES_USER=ncp_db
|
POSTGRES_USER=postgres
|
||||||
POSTGRES_PASSWORD=ncpDbApp
|
POSTGRES_PASSWORD=postgres
|
||||||
POSTGRES_PORT=5432
|
POSTGRES_PORT=5432
|
||||||
POSTGRES_HOST=postgres
|
POSTGRES_HOST=postgres
|
||||||
|
|
||||||
# Redis
|
|
||||||
REDIS_HOST=redis
|
REDIS_HOST=redis
|
||||||
REDIS_PORT=6379
|
REDIS_PORT=6379
|
||||||
|
|
||||||
# Backend server
|
|
||||||
SERVER_PORT=8080
|
SERVER_PORT=8080
|
||||||
|
|
||||||
# Postfix
|
|
||||||
MAIL_HOST_PROD=postfix-production
|
|
||||||
MAIL_PORT_PROD=25
|
|
||||||
MAIL_USERNAME_PROD=noreply@nocopy.com
|
|
||||||
SMTP_PASSWORD_PROD=nocopy!nocopy!
|
|
||||||
@@ -14,9 +14,6 @@ COPY --from=build /app/build/libs/*.jar app.jar
|
|||||||
|
|
||||||
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
||||||
|
|
||||||
ENV BUILD_TIME_BACK="unknown"\
|
|
||||||
BUILD_TIME_FRONT="unknown"
|
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
CMD ["java", "-jar", "app.jar"]
|
CMD ["java", "-jar", "app.jar"]
|
||||||
@@ -1,163 +0,0 @@
|
|||||||
Создаем сеть:
|
|
||||||
docker network create app-network
|
|
||||||
|
|
||||||
Войти в БД:
|
|
||||||
docker exec -it postgres psql -U ncp_db -d no_copy_
|
|
||||||
|
|
||||||
Выполнить команду:
|
|
||||||
\du
|
|
||||||
|
|
||||||
Должен быть один пользователь:
|
|
||||||
List of roles
|
|
||||||
Role name | Attributes
|
|
||||||
-----------+------------------------------------------------------------
|
|
||||||
ncp_db | Superuser, Create role, Create DB, Replication, Bypass RLS
|
|
||||||
|
|
||||||
суперпользователь БД:
|
|
||||||
postgres/postgres
|
|
||||||
пользователь бд для бэка
|
|
||||||
ncp_db / ncpDbApp
|
|
||||||
|
|
||||||
Подключение к БД для приложения,если volume не существует :
|
|
||||||
|
|
||||||
Создаться автоматически.
|
|
||||||
|
|
||||||
Если уже существует volume :
|
|
||||||
|
|
||||||
docker exec -it postgres psql -U postgres -d postgres
|
|
||||||
|
|
||||||
CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
|
|
||||||
|
|
||||||
GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
|
|
||||||
|
|
||||||
\du
|
|
||||||
|
|
||||||
\q
|
|
||||||
|
|
||||||
-------
|
|
||||||
|
|
||||||
psql -U postgres -d no_copy_
|
|
||||||
|
|
||||||
-- база
|
|
||||||
|
|
||||||
GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
|
|
||||||
|
|
||||||
-- схема
|
|
||||||
|
|
||||||
GRANT USAGE ON SCHEMA public TO ncp_db;
|
|
||||||
|
|
||||||
-- существующие таблицы
|
|
||||||
|
|
||||||
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
|
|
||||||
|
|
||||||
-- существующие sequence (очень важно для id)
|
|
||||||
|
|
||||||
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
|
|
||||||
|
|
||||||
-- будущие таблицы
|
|
||||||
|
|
||||||
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
|
||||||
GRANT ALL ON TABLES TO ncp_db;
|
|
||||||
|
|
||||||
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
|
||||||
GRANT ALL ON SEQUENCES TO ncp_db;
|
|
||||||
|
|
||||||
|
|
||||||
Зайти в контейнер:
|
|
||||||
docker exec -it {name} bash
|
|
||||||
|
|
||||||
------
|
|
||||||
|
|
||||||
Создать для сущности FileEntity sequence для икремента индетификатора
|
|
||||||
|
|
||||||
CREATE SEQUENCE IF NOT EXISTS file_support_id_seq START 1;
|
|
||||||
|
|
||||||
ALTER TABLE file_entities
|
|
||||||
ALTER COLUMN support_id
|
|
||||||
SET DEFAULT nextval('file_support_id_seq');
|
|
||||||
|
|
||||||
----------
|
|
||||||
Раздать всем лимиты,у кого их нет
|
|
||||||
|
|
||||||
INSERT INTO protect_check (user_id, check_limit, count_checked, last_check_at, version)
|
|
||||||
SELECT
|
|
||||||
id as user_id,
|
|
||||||
10 as check_limit,
|
|
||||||
0 as count_checked,
|
|
||||||
NULL as last_check_at,
|
|
||||||
0 as version
|
|
||||||
FROM users
|
|
||||||
WHERE id NOT IN (SELECT user_id FROM protect_check);
|
|
||||||
|
|
||||||
--------
|
|
||||||
Обновлять констрейнты для file_entities
|
|
||||||
|
|
||||||
ALTER TABLE file_entities DROP CONSTRAINT file_entities_status_check;
|
|
||||||
|
|
||||||
ALTER TABLE file_entities
|
|
||||||
ADD CONSTRAINT file_entities_status_check
|
|
||||||
CHECK (status IN (
|
|
||||||
'ACTIVE',
|
|
||||||
'DELETED',
|
|
||||||
'PROCESSING',
|
|
||||||
'VIOLATION',
|
|
||||||
'CHECKED',
|
|
||||||
'ERROR',
|
|
||||||
'TEMP'
|
|
||||||
));
|
|
||||||
|
|
||||||
-------
|
|
||||||
Записи для лимитов поиска
|
|
||||||
|
|
||||||
INSERT INTO protect_check (user_id, limit_check, count_checked, last_check_at, version)
|
|
||||||
SELECT
|
|
||||||
u.id,
|
|
||||||
100, -- limit_check = 100
|
|
||||||
0, -- count_checked = 0
|
|
||||||
NULL, -- last_check_at = NULL
|
|
||||||
0 -- version = 0
|
|
||||||
FROM users u
|
|
||||||
WHERE NOT EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM protect_check pc
|
|
||||||
WHERE pc.user_id = u.id
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
------
|
|
||||||
Скрипты рефералки
|
|
||||||
|
|
||||||
INSERT INTO referrals (user_id, referral_link, inviter_id, level_id, total_income, is_active, created_at, hold_balance)
|
|
||||||
SELECT
|
|
||||||
u.id as user_id,
|
|
||||||
CONCAT('ref-', u.id, '-', LOWER(SUBSTRING(MD5(RANDOM()::text) FROM 1 FOR 8))) as referral_link,
|
|
||||||
NULL as inviter_id,
|
|
||||||
'bronze' as level_id,
|
|
||||||
0 as total_income,
|
|
||||||
false as is_active,
|
|
||||||
NOW() as created_at,
|
|
||||||
0 as hold_balance
|
|
||||||
FROM users u
|
|
||||||
LEFT JOIN referrals r ON u.id = r.user_id
|
|
||||||
WHERE
|
|
||||||
u.company_id IS NULL
|
|
||||||
AND r.user_id IS NULL
|
|
||||||
ORDER BY u.id;
|
|
||||||
|
|
||||||
-------
|
|
||||||
|
|
||||||
INSERT INTO referral_levels (id, name, min_invitees, reward_percentage) VALUES
|
|
||||||
('bronze', 'BRONZE', 0, 15),
|
|
||||||
('silver', 'SILVER', 6, 18),
|
|
||||||
('gold', 'GOLD', 16, 22),
|
|
||||||
('platinum', 'PLATINUM', 50, 25);
|
|
||||||
|
|
||||||
------
|
|
||||||
|
|
||||||
Настройка Яндекс Клауд
|
|
||||||
|
|
||||||
1. YCAJEpWAtaVkVGX0sH6_EupEg - индетификатор ключа
|
|
||||||
2. YCMmVykfXrZ_nfU13Vo4yoCVGa70DnTlBgF1pUzO - секретный ключ
|
|
||||||
|
|
||||||
private static final String KEY_ID = "YCAJEmHZcWxzf4oGWvETG3mms";
|
|
||||||
private static final String SECRET_KEY = "YCPAPZ32XC-LWb8xE0b_xTcBD8NZUCHpSOfu8LUG";
|
|
||||||
@@ -21,9 +21,6 @@ configurations {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
flatDir {
|
|
||||||
dirs 'libs'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -33,16 +30,6 @@ dependencies {
|
|||||||
implementation 'org.springframework.security:spring-security-crypto:6.5.3'
|
implementation 'org.springframework.security:spring-security-crypto:6.5.3'
|
||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
implementation 'commons-validator:commons-validator:1.7'
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
|
|
||||||
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.17.2'
|
|
||||||
implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
|
|
||||||
implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
|
|
||||||
|
|
||||||
implementation 'org.flywaydb:flyway-core:9.22.0'
|
|
||||||
|
|
||||||
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
|
||||||
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
|
||||||
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
|
|
||||||
|
|
||||||
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
||||||
annotationProcessor 'org.projectlombok:lombok'
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
@@ -58,19 +45,6 @@ dependencies {
|
|||||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
|
|
||||||
implementation name: 'testlib-fat-0.3.0-all'
|
|
||||||
|
|
||||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
|
|
||||||
|
|
||||||
implementation project(':referral')
|
|
||||||
|
|
||||||
//cloud
|
|
||||||
implementation("software.amazon.awssdk:aws-sdk-java:2.29.33")
|
|
||||||
implementation("software.amazon.awssdk:apache-client:2.29.33")
|
|
||||||
|
|
||||||
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")
|
|
||||||
implementation("org.springframework.boot:spring-boot-starter-web")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('test') {
|
tasks.named('test') {
|
||||||
|
|||||||
+13
-59
@@ -17,31 +17,8 @@ services:
|
|||||||
command: tail -f /dev/null
|
command: tail -f /dev/null
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# postfix:
|
|
||||||
# image: boky/postfix:latest
|
|
||||||
# container_name: postfix-production
|
|
||||||
# hostname: ${DOMAIN:-no-copy.ru}
|
|
||||||
# environment:
|
|
||||||
# - DOMAIN=${DOMAIN:-no-copy.ru}
|
|
||||||
# - ALLOWED_SENDER_DOMAINS=*
|
|
||||||
# - RELAYHOST=
|
|
||||||
# - DISABLE_SMTP_AUTH=
|
|
||||||
# - SMTP_USERNAME=${MAIL_USERNAME:-noreply@no-copy.ru}
|
|
||||||
# - SMTP_PASSWORD=${SMTP_PASSWORD:-nocopy!nocopy!}
|
|
||||||
# - RELAY_NETWORKS=172.16.0.0/12
|
|
||||||
# - POSTFIX_mynetworks=127.0.0.0/8 172.17.0.0/16 172.16.0.0/12
|
|
||||||
# - POSTFIX_smtpd_relay_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
|
|
||||||
# - POSTFIX_smtpd_recipient_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
|
|
||||||
# - DISABLE_SIGNING=true
|
|
||||||
# ports:
|
|
||||||
# - "25:25"
|
|
||||||
# - "587:587"
|
|
||||||
# networks:
|
|
||||||
# - app-network
|
|
||||||
# restart: unless-stopped
|
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:17.7
|
image: postgres:17
|
||||||
restart: always
|
restart: always
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -53,17 +30,14 @@ services:
|
|||||||
memory: 1G
|
memory: 1G
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
# POSTGRES_USER: postgres
|
POSTGRES_USER: postgres
|
||||||
# POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: postgres
|
||||||
POSTGRES_USER: ${POSTGRES_USER}
|
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
|
||||||
POSTGRES_SHARED_BUFFERS: 512MB
|
POSTGRES_SHARED_BUFFERS: 512MB
|
||||||
POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
|
POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
|
||||||
ports:
|
ports:
|
||||||
- "54320:5432"
|
- "54320:5432"
|
||||||
volumes:
|
volumes:
|
||||||
- pgdata:/var/lib/postgresql/data
|
- pgdata:/var/lib/postgresql/data
|
||||||
- ./init-scripts:/docker-entrypoint-initdb.d:ro
|
|
||||||
container_name: postgres
|
container_name: postgres
|
||||||
networks:
|
networks:
|
||||||
app-network:
|
app-network:
|
||||||
@@ -77,36 +51,20 @@ services:
|
|||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '1.5'
|
cpus: '1.5'
|
||||||
memory: 3G
|
memory: 1G
|
||||||
reservations:
|
reservations:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
memory: 2G
|
memory: 512M
|
||||||
environment:
|
environment:
|
||||||
JAVA_TOOL_OPTIONS: "-Xmx2g -Xms1g -XX:MaxMetaspaceSize=512m -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -XX:+UseContainerSupport -XX:InitialRAMPercentage=50 -XX:MaxRAMPercentage=75"
|
|
||||||
FILE_STORAGE_PATH: /data/uploads
|
FILE_STORAGE_PATH: /data/uploads
|
||||||
MAX_FILE_SIZE: 10737418240
|
MAX_FILE_SIZE: 10737418240
|
||||||
# FILE_CHUNK_SIZE: 1048576
|
FILE_CHUNK_SIZE: 1048576
|
||||||
FILE_CHUNK_SIZE: 1000000
|
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
|
POSTGRES_USER: postgres
|
||||||
POSTGRES_USER: ${POSTGRES_USER}
|
POSTGRES_PASSWORD: postgres
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
POSTGRES_HOST: db
|
POSTGRES_HOST: db
|
||||||
STORAGE_SERVICE_URL: http://storage:8081
|
STORAGE_SERVICE_URL: http://storage:8081
|
||||||
SPRING_PROFILES_ACTIVE: prod
|
|
||||||
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
|
||||||
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
|
||||||
YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
|
||||||
# POSTGRES_USER: postgres
|
|
||||||
# POSTGRES_PASSWORD: postgres
|
|
||||||
# MAIL_HOST: postfix
|
|
||||||
# MAIL_PORT: 25
|
|
||||||
# MAIL_USERNAME: noreply@no-copy.ru
|
|
||||||
# SMTP_PASSWORD: nocopy!nocopy!
|
|
||||||
# SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: "false"
|
|
||||||
# SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: "false"
|
|
||||||
# SPRING_MAIL_PROPERTIES_MAIL_DEBUG: "true"
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
ports:
|
ports:
|
||||||
@@ -119,10 +77,6 @@ services:
|
|||||||
- api
|
- api
|
||||||
volumes:
|
volumes:
|
||||||
- uploads_data:/data/uploads:rw
|
- uploads_data:/data/uploads:rw
|
||||||
healthcheck:
|
|
||||||
test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
|
|
||||||
interval: 10s
|
|
||||||
retries: 5
|
|
||||||
|
|
||||||
grafana:
|
grafana:
|
||||||
image: grafana/grafana:10.3.1
|
image: grafana/grafana:10.3.1
|
||||||
@@ -166,7 +120,7 @@ services:
|
|||||||
prometheus:
|
prometheus:
|
||||||
image: prom/prometheus:latest
|
image: prom/prometheus:latest
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
deploy:
|
deploy: # ← ДОБАВЛЕНО
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
@@ -181,7 +135,7 @@ services:
|
|||||||
command:
|
command:
|
||||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||||
- '--storage.tsdb.path=/prometheus'
|
- '--storage.tsdb.path=/prometheus'
|
||||||
- '--storage.tsdb.retention.time=15d'
|
- '--storage.tsdb.retention.time=15d' # Удерживать 15 дней
|
||||||
- '--web.enable-lifecycle'
|
- '--web.enable-lifecycle'
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
||||||
@@ -194,7 +148,7 @@ services:
|
|||||||
loki:
|
loki:
|
||||||
image: grafana/loki:2.9.2
|
image: grafana/loki:2.9.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
deploy:
|
deploy: # ← ДОБАВЛЕНО
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '1.0'
|
cpus: '1.0'
|
||||||
@@ -219,7 +173,7 @@ services:
|
|||||||
tempo:
|
tempo:
|
||||||
image: grafana/tempo:2.4.1
|
image: grafana/tempo:2.4.1
|
||||||
container_name: tempo
|
container_name: tempo
|
||||||
deploy:
|
deploy: # ← ДОБАВЛЕНО
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
@@ -275,7 +229,7 @@ volumes:
|
|||||||
loki_rules:
|
loki_rules:
|
||||||
uploads_data:
|
uploads_data:
|
||||||
prometheus_data:
|
prometheus_data:
|
||||||
# postfix-data:
|
|
||||||
networks:
|
networks:
|
||||||
app-network:
|
app-network:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
plugins {
|
|
||||||
kotlin("jvm") version "2.1.10"
|
|
||||||
}
|
|
||||||
|
|
||||||
group = "ru.soune"
|
|
||||||
version = "1.0.0"
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
|
|
||||||
implementation("io.insert-koin:koin-core:4.1.1")
|
|
||||||
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.test {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
kotlin {
|
|
||||||
jvmToolchain(21)
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
fun main() {
|
|
||||||
println("Hello World!")
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
package ru.soune.actions
|
|
||||||
|
|
||||||
abstract class NoCopyAction
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package ru.soune.actions.free
|
|
||||||
|
|
||||||
import ru.soune.actions.NoCopyAction
|
|
||||||
|
|
||||||
sealed class NoCopyFreeAction : NoCopyAction()
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package ru.soune.actions.paid
|
|
||||||
|
|
||||||
import ru.soune.actions.NoCopyAction
|
|
||||||
|
|
||||||
sealed class NoCopyPaidAction : NoCopyAction() {
|
|
||||||
|
|
||||||
abstract val cost: Double
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
## Команды для помещения в сеть
|
|
||||||
|
|
||||||
Сеть для работы бэка и фронта : Наименование == app-network-{port}
|
|
||||||
|
|
||||||
|
|
||||||
### Проверить состояние:
|
|
||||||
|
|
||||||
|
|
||||||
docker inspect {container-name} --format='{{range $net, $_ := .NetworkSettings.Networks}}{{$net}} {{end}}'
|
|
||||||
|
|
||||||
|
|
||||||
### Создать сеть ,если нет
|
|
||||||
|
|
||||||
docker network create {name-network} 2>/dev/null || echo "Сеть уже существует"
|
|
||||||
|
|
||||||
### Переместить контейнер:
|
|
||||||
|
|
||||||
# Отключить от старой сети
|
|
||||||
docker network disconnect {network-name-old} {container-name}
|
|
||||||
|
|
||||||
# Подключить к новой сети
|
|
||||||
docker network connect {network-name-new} {container-name}
|
|
||||||
|
|
||||||
# Добавить алиас (опционально)
|
|
||||||
docker network connect --alias {alias} {network-name-new} {container-name}
|
|
||||||
|
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent any
|
|
||||||
|
|
||||||
parameters {
|
|
||||||
string(
|
|
||||||
name: 'BRANCH',
|
|
||||||
defaultValue: 'main',
|
|
||||||
description: 'Ветка для деплоя админ-панели'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'PORT',
|
|
||||||
defaultValue: '2996',
|
|
||||||
description: 'Порт для запуска экземпляра'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
stage('Git pull') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
checkout([
|
|
||||||
$class: 'GitSCM',
|
|
||||||
branches: [[name: params.BRANCH]],
|
|
||||||
userRemoteConfigs: [[
|
|
||||||
url: 'https://code.3err0.ru/frontdev/no-copy-admin-panel-frontend.git',
|
|
||||||
credentialsId: 'nx-jen'
|
|
||||||
]]
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Stop old') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
docker stop no-copy-admin-panel-${params.PORT} 2>/dev/null || true
|
|
||||||
docker rm no-copy-admin-panel-${params.PORT} 2>/dev/null || true
|
|
||||||
mkdir -p /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
|
|
||||||
rm -rf /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/*
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Copy to server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Build on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
cd /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
|
|
||||||
docker build -t no-copy-admin-panel:${params.BRANCH}-${params.PORT} .
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Start on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
docker run -d \\
|
|
||||||
--name no-copy-admin-panel-${params.PORT} \\
|
|
||||||
--restart unless-stopped \\
|
|
||||||
--network app-network \\
|
|
||||||
-p ${params.PORT}:2996 \\
|
|
||||||
no-copy-admin-panel:${params.BRANCH}-${params.PORT}
|
|
||||||
sleep 5
|
|
||||||
docker ps --filter name=no-copy-admin-panel-${params.PORT}
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Check status') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-admin-panel-${params.PORT}'; then
|
|
||||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
|
|
||||||
echo 'Admin panel available on http://92.242.61.23:${params.PORT}'
|
|
||||||
else
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
success {
|
|
||||||
echo "Admin panel ${params.BRANCH} deployed"
|
|
||||||
}
|
|
||||||
failure {
|
|
||||||
echo "Deployment failed"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent any
|
|
||||||
|
|
||||||
parameters {
|
|
||||||
string(
|
|
||||||
name: 'BRANCH',
|
|
||||||
defaultValue: 'dev',
|
|
||||||
description: 'Ветка для деплоя'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'PORT',
|
|
||||||
defaultValue: '3000',
|
|
||||||
description: 'Порт для запуска экземпляра'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'SERVER',
|
|
||||||
defaultValue: '92.242.61.23',
|
|
||||||
description: 'Сервер для деплоя'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
stage('Git pull') {
|
|
||||||
steps {
|
|
||||||
cleanWs()
|
|
||||||
script {
|
|
||||||
checkout([
|
|
||||||
$class: 'GitSCM',
|
|
||||||
branches: [[name: params.BRANCH]],
|
|
||||||
userRemoteConfigs: [[
|
|
||||||
url: 'https://code.3err0.ru/backdev/no-copy.git',
|
|
||||||
credentialsId: 'nx-jen'
|
|
||||||
]]
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Deploy with docker-compose') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
def buildTime = sh(script: "date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
),
|
|
||||||
string(credentialsId: 'DB_USER', variable: 'DB_USER'),
|
|
||||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
# Тестируем подключение сначала
|
|
||||||
echo "Testing SSH connection..."
|
|
||||||
if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
|
|
||||||
echo "SSH connection OK"
|
|
||||||
else
|
|
||||||
echo "SSH connection failed"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Основная команда
|
|
||||||
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
|
||||||
cd /opt/deployments/${params.BRANCH}-${params.PORT}
|
|
||||||
|
|
||||||
echo '1. Создаем изолированную сеть для порта ${params.PORT}...'
|
|
||||||
docker network create app-network-${params.PORT} 2>/dev/null || echo 'Сеть уже существует'
|
|
||||||
|
|
||||||
echo '2. Останавливаем старые контейнеры порта ${params.PORT}...'
|
|
||||||
docker stop app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
|
||||||
docker rm app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
|
||||||
docker stop postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
|
|
||||||
docker rm postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
|
|
||||||
docker stop file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
|
||||||
docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
|
||||||
|
|
||||||
echo '3. Запускаем БД...'
|
|
||||||
docker run -d \\
|
|
||||||
--name postgres-${params.PORT} \\
|
|
||||||
--network app-network-${params.PORT} \\
|
|
||||||
--network-alias no_copy_${params.PORT} \\
|
|
||||||
--network-alias database-${params.PORT} \\
|
|
||||||
--network-alias db-${params.PORT} \\
|
|
||||||
-p ${params.PORT}0:5432 \\
|
|
||||||
-e POSTGRES_DB=no_copy_${params.PORT} \\
|
|
||||||
-e POSTGRES_USER=${DB_USER} \\
|
|
||||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
|
||||||
-v pgdata_${params.PORT}:/var/lib/postgresql/data \\
|
|
||||||
-e BUILD_TIME_BACK='${buildTime}' \\
|
|
||||||
postgres:17.7
|
|
||||||
|
|
||||||
echo '4. Запускаем storage...'
|
|
||||||
docker run -d \\
|
|
||||||
--name file-storage-${params.PORT} \\
|
|
||||||
--network app-network-${params.PORT} \\
|
|
||||||
-v uploads_data_${params.PORT}:/storage:rw \\
|
|
||||||
alpine:latest tail -f /dev/null
|
|
||||||
|
|
||||||
echo '5. Ждем БД...'
|
|
||||||
sleep 15
|
|
||||||
|
|
||||||
echo '6. Собираем приложение...'
|
|
||||||
docker build --no-cache -t app-backend-${params.PORT}:latest .
|
|
||||||
|
|
||||||
echo '7. Запускаем приложение...'
|
|
||||||
docker run -d \\
|
|
||||||
--name app-backend-${params.PORT} \\
|
|
||||||
--network app-network-${params.PORT} \\
|
|
||||||
-p ${params.PORT}:8080 \\
|
|
||||||
-v uploads_data_${params.PORT}:/data/uploads:rw \\
|
|
||||||
-e POSTGRES_DB=no_copy_${params.PORT} \\
|
|
||||||
-e POSTGRES_USER=${DB_USER} \\
|
|
||||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
|
||||||
-e POSTGRES_PORT=5432 \\
|
|
||||||
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
|
||||||
-e FILE_STORAGE_PATH=/data/uploads \\
|
|
||||||
app-backend-${params.PORT}:latest
|
|
||||||
|
|
||||||
echo '8. Проверка...'
|
|
||||||
sleep 10
|
|
||||||
|
|
||||||
if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
|
|
||||||
echo 'Приложение работает на порту ${params.PORT}'
|
|
||||||
else
|
|
||||||
echo 'Проверка health не удалась'
|
|
||||||
docker logs app-backend-${params.PORT} --tail=20
|
|
||||||
fi
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
success {
|
|
||||||
echo "Deployment successful"
|
|
||||||
echo "Application URL: http://${params.SERVER}:${params.PORT}"
|
|
||||||
}
|
|
||||||
failure {
|
|
||||||
echo "Deployment failed for branch ${params.BRANCH} on port ${params.PORT}"
|
|
||||||
}
|
|
||||||
always {
|
|
||||||
echo "Deployment process finished"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,11 +7,6 @@ pipeline {
|
|||||||
defaultValue: 'main',
|
defaultValue: 'main',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
string(
|
|
||||||
name: 'PORT',
|
|
||||||
defaultValue: '2998',
|
|
||||||
description: 'Порт для запуска экземпляра'
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
@@ -42,15 +37,15 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
docker stop no-copy-frontend-${params.PORT} 2>/dev/null || true
|
docker stop no-copy-frontend 2>/dev/null || true
|
||||||
docker rm no-copy-frontend-${params.PORT} 2>/dev/null || true
|
docker rm no-copy-frontend 2>/dev/null || true
|
||||||
|
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
docker-compose -f docker-compose.yaml -p frontend-${params.PORT} down 2>/dev/null || true
|
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} down 2>/dev/null || true
|
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
@@ -71,11 +66,11 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
rm -rf /opt/deployments/frontend/${params.BRANCH}-${params.PORT}/*
|
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
||||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
"
|
"
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}-${params.PORT}/
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,8 +80,6 @@ pipeline {
|
|||||||
stage('Build on server') {
|
stage('Build on server') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def BUILD_TIME_FRONT = sh(script: "date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
|
||||||
|
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(
|
usernamePassword(
|
||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
@@ -96,18 +89,16 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
# 1. СОЗДАЕМ JSON ФАЙЛ (ЭТО РАБОТАЕТ 100%)
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
mkdir -p public
|
docker-compose -f docker-compose.yaml build
|
||||||
echo '{\\"buildTime\\": \\"${BUILD_TIME_FRONT}\\"}' > public/build-info.json
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml build
|
||||||
# 2. Меняем имя контейнера и порт
|
else
|
||||||
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
echo 'Exception: docker-compose file not found'
|
||||||
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
exit 1
|
||||||
|
fi
|
||||||
# 3. Собираем образ
|
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
|
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@@ -127,23 +118,21 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
echo '=== Запускаем контейнер ==='
|
# Проверяем и подключаем к сети app-network если нужно
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} up -d
|
docker network inspect app-network 2>/dev/null || echo 'Warning: app-network not found'
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml up -d
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml up -d
|
||||||
|
fi
|
||||||
|
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
||||||
echo '=== Проверяем запуск ==='
|
echo 'Status container:'
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
docker ps --filter name=no-copy-frontend
|
||||||
echo '✓ Контейнер запущен: no-copy-frontend-${params.PORT}'
|
|
||||||
echo '✓ Порт: ${params.PORT}:2999'
|
|
||||||
else
|
|
||||||
echo '✗ Контейнер не запустился'
|
|
||||||
echo 'Логи:'
|
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} logs
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@@ -163,21 +152,15 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
# Ищем контейнер с правильным именем (с портом)
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
echo 'Container started'
|
||||||
echo 'Container started: no-copy-frontend-${params.PORT}'
|
|
||||||
|
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
||||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} || echo '000')
|
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||||
echo 'HTTP code: \$HTTP_CODE'
|
echo 'HTTP code: \$HTTP_CODE'
|
||||||
|
|
||||||
echo 'Frontend available on http://92.242.61.23:${params.PORT}'
|
echo 'Frontend available on http://92.242.61.23:2998'
|
||||||
|
|
||||||
# Показываем все фронтенды
|
|
||||||
echo ''
|
|
||||||
echo 'All frontend containers:'
|
|
||||||
docker ps --filter name=no-copy-frontend --format 'table {{.Names}}\\t{{.Ports}}\\t{{.Status}}'
|
|
||||||
else
|
else
|
||||||
echo 'Exception: container did not start'
|
echo 'Exception: container did not start'
|
||||||
docker ps -a | grep frontend
|
docker ps -a | grep frontend
|
||||||
@@ -194,8 +177,7 @@ pipeline {
|
|||||||
post {
|
post {
|
||||||
success {
|
success {
|
||||||
echo "Front branch ${params.BRANCH} deployment completed"
|
echo "Front branch ${params.BRANCH} deployment completed"
|
||||||
echo "Frontend available on http://92.242.61.23:${params.PORT}"
|
echo "Frontend available on http://92.242.61.23:2998"
|
||||||
echo "Container: no-copy-frontend-${params.PORT}"
|
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Deployment failed"
|
echo "Deployment failed"
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ pipeline {
|
|||||||
defaultValue: 'dev',
|
defaultValue: 'dev',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
|
|
||||||
string(
|
string(
|
||||||
name: 'SERVER',
|
name: 'SERVER',
|
||||||
defaultValue: '92.242.61.23',
|
defaultValue: '92.242.61.23',
|
||||||
@@ -17,7 +18,6 @@ pipeline {
|
|||||||
stages {
|
stages {
|
||||||
stage('Git pull') {
|
stage('Git pull') {
|
||||||
steps {
|
steps {
|
||||||
cleanWs()
|
|
||||||
script {
|
script {
|
||||||
checkout([
|
checkout([
|
||||||
$class: 'GitSCM',
|
$class: 'GitSCM',
|
||||||
@@ -34,86 +34,173 @@ pipeline {
|
|||||||
stage('Deploy with docker-compose') {
|
stage('Deploy with docker-compose') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def buildTime = sh(script: "date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(
|
usernamePassword(
|
||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
usernameVariable: 'SSH_USER',
|
usernameVariable: 'SSH_USER',
|
||||||
passwordVariable: 'SSH_PASS'
|
passwordVariable: 'SSH_PASS'
|
||||||
),
|
)
|
||||||
string(credentialsId: 'DB_USER', variable: 'DB_USER'),
|
|
||||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
echo "Deploying branch: ${params.BRANCH}"
|
echo "Deploying branch: ${params.BRANCH}"
|
||||||
|
|
||||||
echo "Copying files to server..."
|
echo "Copying files to server..."
|
||||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||||
|
sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||||
sshpass -p '$SSH_PASS' rsync -av --delete \\
|
|
||||||
--exclude=.git \\
|
|
||||||
--exclude=.gradle \\
|
|
||||||
--exclude=build \\
|
|
||||||
--exclude=**/build \\
|
|
||||||
--exclude=.idea \\
|
|
||||||
--exclude=out \\
|
|
||||||
. $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||||
cd /opt/deployments/${params.BRANCH}
|
cd /opt/deployments/${params.BRANCH}
|
||||||
|
|
||||||
echo '1. Остановка старого приложения...'
|
echo '========================================'
|
||||||
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
echo 'Step 1: Checking current state...'
|
||||||
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
echo '========================================'
|
||||||
|
|
||||||
echo '2. Удаление старых образов...'
|
docker ps --filter 'name=postgres|app-backend|storage|grafana|prometheus|loki|tempo|alloy' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||||
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
|
||||||
|
|
||||||
echo '3. Создание сети если нужно...'
|
echo '========================================'
|
||||||
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
echo 'Step 2: Setup environment for compatibility...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
echo '4. Запуск инфраструктуры...'
|
docker network create app-network 2>/dev/null || echo 'Network app-network already exists'
|
||||||
docker-compose up -d db storage
|
|
||||||
|
|
||||||
echo '5. Ожидание PostgreSQL...'
|
echo 'COMPOSE_COMPATIBILITY=true' > .env
|
||||||
sleep 10
|
|
||||||
|
|
||||||
echo '6. Сборка нового образа приложения...'
|
echo '========================================'
|
||||||
docker build --no-cache -t app-backend:latest .
|
echo 'Step 3: Force cleanup old application...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
echo '7. Запуск приложения...'
|
docker-compose --compatibility down 2>/dev/null || echo 'No previous compose stack'
|
||||||
docker run -d \\
|
|
||||||
--name app-backend \\
|
|
||||||
--network app-network \\
|
|
||||||
--network-alias app \\
|
|
||||||
-p 80:8080 \\
|
|
||||||
-v uploads_data:/data/uploads:rw \\
|
|
||||||
-e POSTGRES_DB=no_copy_ \\
|
|
||||||
-e POSTGRES_USER=$DB_USER \\
|
|
||||||
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
|
||||||
-e POSTGRES_PORT=5432 \\
|
|
||||||
-e POSTGRES_HOST=db \\
|
|
||||||
-e BUILD_TIME_BACK='${buildTime}' \\
|
|
||||||
--restart unless-stopped \\
|
|
||||||
app-backend:latest
|
|
||||||
|
|
||||||
echo '8. Запуск мониторинга...'
|
docker images --filter 'reference=*app-backend*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'No images to remove'
|
||||||
docker-compose up -d grafana prometheus loki tempo alloy
|
|
||||||
|
|
||||||
echo '9. Проверка...'
|
echo '========================================'
|
||||||
sleep 5
|
echo 'Step 4: Verify files and fix compose...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
echo 'Статус контейнеров:'
|
if [ ! -f docker-compose.yaml ]; then
|
||||||
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
echo 'ERROR: docker-compose.yaml not found!'
|
||||||
|
ls -la
|
||||||
echo '10. Проверка health...'
|
exit 1
|
||||||
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
|
||||||
echo 'Приложение работает'
|
|
||||||
echo 'URL: http://${params.SERVER}:80'
|
|
||||||
else
|
|
||||||
echo 'Проверка health не удалась'
|
|
||||||
docker logs app-backend --tail=20
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo 'Checking docker-compose.yaml syntax...'
|
||||||
|
docker-compose --compatibility config 2>&1 | head -20 || echo 'Config check output'
|
||||||
|
|
||||||
|
echo '========================================'
|
||||||
|
echo 'Step 5: Start infrastructure services...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
|
echo 'Starting PostgreSQL with resource limits...'
|
||||||
|
docker-compose --compatibility up -d db
|
||||||
|
|
||||||
|
echo 'Starting storage service...'
|
||||||
|
docker-compose --compatibility up -d storage
|
||||||
|
|
||||||
|
echo 'Waiting for PostgreSQL to be ready...'
|
||||||
|
for i in {1..30}; do
|
||||||
|
if docker-compose --compatibility exec db pg_isready -U postgres 2>/dev/null; then
|
||||||
|
echo 'PostgreSQL is ready'
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
echo 'Waiting... attempt ' \$i
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
|
||||||
|
echo '========================================'
|
||||||
|
echo 'Step 6: Build application image...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
|
if [ ! -f Dockerfile ]; then
|
||||||
|
echo 'ERROR: Dockerfile not found!'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo 'Building Docker image...'
|
||||||
|
docker build --no-cache -t app-backend:latest . 2>&1 | tail -30
|
||||||
|
|
||||||
|
echo 'Image created successfully'
|
||||||
|
docker images app-backend:latest --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.Size}}\\t{{.CreatedAt}}'
|
||||||
|
|
||||||
|
echo '========================================'
|
||||||
|
echo 'Step 7: Start application with resource limits...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
|
docker volume create uploads_data 2>/dev/null || echo 'Volume uploads_data already exists'
|
||||||
|
|
||||||
|
echo 'Starting main application...'
|
||||||
|
docker-compose --compatibility up -d app
|
||||||
|
|
||||||
|
echo 'Waiting for application to start...'
|
||||||
|
sleep 15
|
||||||
|
|
||||||
|
echo '========================================'
|
||||||
|
echo 'Step 8: Start monitoring stack...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
|
docker-compose --compatibility up -d grafana prometheus loki tempo alloy
|
||||||
|
|
||||||
|
echo '========================================'
|
||||||
|
echo 'Step 9: Verify deployment...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
|
echo 'All containers status:'
|
||||||
|
docker-compose --compatibility ps
|
||||||
|
|
||||||
|
echo ''
|
||||||
|
echo 'Resource limits check:'
|
||||||
|
echo 'App backend limits:'
|
||||||
|
docker inspect app-backend --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
|
||||||
|
|
||||||
|
echo ''
|
||||||
|
echo 'PostgreSQL limits:'
|
||||||
|
docker inspect postgres --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
|
||||||
|
|
||||||
|
echo ''
|
||||||
|
echo 'Container resource usage:'
|
||||||
|
docker stats --no-stream --format 'table {{.Name}}\\t{{.CPUPerc}}\\t{{.MemUsage}}\\t{{.MemPerc}}' postgres app-backend storage 2>/dev/null || echo 'Stats not available'
|
||||||
|
|
||||||
|
echo '========================================'
|
||||||
|
echo 'Step 10: Health checks...'
|
||||||
|
echo '========================================'
|
||||||
|
|
||||||
|
echo 'Application health check...'
|
||||||
|
for i in {1..10}; do
|
||||||
|
if curl -s -f http://localhost:80/health 2>/dev/null; then
|
||||||
|
echo '✓ Application health check PASSED'
|
||||||
|
break
|
||||||
|
elif [ \$i -eq 10 ]; then
|
||||||
|
echo '✗ Application health check FAILED'
|
||||||
|
echo 'Last logs:'
|
||||||
|
docker-compose --compatibility logs --tail=20 app
|
||||||
|
else
|
||||||
|
echo 'Waiting for application... attempt ' \$i
|
||||||
|
sleep 5
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo 'Checking monitoring services...'
|
||||||
|
if curl -s -f http://localhost:3000/api/health 2>/dev/null; then
|
||||||
|
echo '✓ Grafana is healthy'
|
||||||
|
else
|
||||||
|
echo '⚠ Grafana may be starting'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if curl -s -f http://localhost:9090/-/healthy 2>/dev/null; then
|
||||||
|
echo '✓ Prometheus is healthy'
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo '========================================'
|
||||||
|
echo 'Deployment Summary:'
|
||||||
|
echo '========================================'
|
||||||
|
echo 'Application URL: http://${params.SERVER}:80'
|
||||||
|
echo 'Grafana: http://${params.SERVER}:3000 (admin/admin)'
|
||||||
|
echo 'Prometheus: http://${params.SERVER}:9090'
|
||||||
|
echo 'Loki: http://${params.SERVER}:3100'
|
||||||
|
echo ''
|
||||||
|
echo 'To view logs: docker-compose logs -f app'
|
||||||
|
echo 'To view all containers: docker-compose ps'
|
||||||
|
echo 'To stop: docker-compose down'
|
||||||
|
echo '========================================'
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@@ -126,6 +213,8 @@ pipeline {
|
|||||||
success {
|
success {
|
||||||
echo "Deployment successful"
|
echo "Deployment successful"
|
||||||
echo "Application URL: http://${params.SERVER}:80"
|
echo "Application URL: http://${params.SERVER}:80"
|
||||||
|
echo "Grafana: http://${params.SERVER}:3000"
|
||||||
|
echo "Prometheus: http://${params.SERVER}:9090"
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Deployment failed for branch ${params.BRANCH}"
|
echo "Deployment failed for branch ${params.BRANCH}"
|
||||||
|
|||||||
@@ -0,0 +1,183 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
parameters {
|
||||||
|
string(
|
||||||
|
name: 'BRANCH',
|
||||||
|
defaultValue: 'main',
|
||||||
|
description: 'Ветка для деплоя'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Git pull') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
checkout([
|
||||||
|
$class: 'GitSCM',
|
||||||
|
branches: [[name: params.BRANCH]],
|
||||||
|
userRemoteConfigs: [[
|
||||||
|
url: 'https://code.3err0.ru/frontdev/no-copy-frontend.git',
|
||||||
|
credentialsId: 'nx-jen'
|
||||||
|
]]
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Stop old') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
docker stop no-copy-frontend 2>/dev/null || true
|
||||||
|
docker rm no-copy-frontend 2>/dev/null || true
|
||||||
|
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Copy to server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
||||||
|
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
"
|
||||||
|
|
||||||
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml build
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml build
|
||||||
|
else
|
||||||
|
echo 'Exception:don't found docker-compose'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Start on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml up -d
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml up -d
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 10
|
||||||
|
|
||||||
|
echo 'Status container:'
|
||||||
|
docker ps --filter name=no-copy-frontend
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Check status') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||||
|
echo 'Container start'
|
||||||
|
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||||
|
echo 'HTTP код: ' \$HTTP_CODE
|
||||||
|
|
||||||
|
echo 'Frong start on http://92.242.61.23:2998'
|
||||||
|
else
|
||||||
|
echo 'Exception: container don't start'
|
||||||
|
docker ps -a | grep frontend
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
echo "Front branch ${params.BRANCH} completed"
|
||||||
|
echo "Use on http://92.242.61.23:2998"
|
||||||
|
}
|
||||||
|
failure {
|
||||||
|
echo "Failed"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent any
|
|
||||||
|
|
||||||
parameters {
|
|
||||||
string(
|
|
||||||
name: 'BRANCH',
|
|
||||||
defaultValue: 'main',
|
|
||||||
description: 'Ветка для деплоя легальной панели'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'PORT',
|
|
||||||
defaultValue: '2997',
|
|
||||||
description: 'Порт для запуска экземпляра'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
stage('Git pull') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
checkout([
|
|
||||||
$class: 'GitSCM',
|
|
||||||
branches: [[name: params.BRANCH]],
|
|
||||||
userRemoteConfigs: [[
|
|
||||||
url: 'https://code.3err0.ru/frontdev/no-copy-legal-panel-frontend.git',
|
|
||||||
credentialsId: 'nx-jen'
|
|
||||||
]]
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Stop old') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
docker stop no-copy-legal-panel-${params.PORT} 2>/dev/null || true
|
|
||||||
docker rm no-copy-legal-panel-${params.PORT} 2>/dev/null || true
|
|
||||||
mkdir -p /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
|
|
||||||
rm -rf /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/*
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Copy to server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Build on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
cd /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
|
|
||||||
docker build -t no-copy-legal-panel:${params.BRANCH}-${params.PORT} .
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Start on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
docker run -d \\
|
|
||||||
--name no-copy-legal-panel-${params.PORT} \\
|
|
||||||
--restart unless-stopped \\
|
|
||||||
--network app-network \\
|
|
||||||
-p ${params.PORT}:2997 \\
|
|
||||||
no-copy-legal-panel:${params.BRANCH}-${params.PORT}
|
|
||||||
sleep 5
|
|
||||||
docker ps --filter name=no-copy-legal-panel-${params.PORT}
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Check status') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-legal-panel-${params.PORT}'; then
|
|
||||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
|
|
||||||
echo 'Legal panel available on http://92.242.61.23:${params.PORT}'
|
|
||||||
else
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
success {
|
|
||||||
echo "Legal panel ${params.BRANCH} deployed on port ${params.PORT}"
|
|
||||||
}
|
|
||||||
failure {
|
|
||||||
echo "Deployment failed"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'ncp_db') THEN
|
|
||||||
CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
|
|
||||||
END IF;
|
|
||||||
END
|
|
||||||
$$;
|
|
||||||
|
|
||||||
GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
|
|
||||||
GRANT USAGE ON SCHEMA public TO ncp_db;
|
|
||||||
|
|
||||||
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
|
|
||||||
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
|
|
||||||
|
|
||||||
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
|
||||||
GRANT ALL ON TABLES TO ncp_db;
|
|
||||||
|
|
||||||
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
|
||||||
GRANT ALL ON SEQUENCES TO ncp_db;
|
|
||||||
Binary file not shown.
@@ -1,26 +0,0 @@
|
|||||||
plugins {
|
|
||||||
kotlin("jvm") version "2.1.10"
|
|
||||||
}
|
|
||||||
|
|
||||||
group = "ru.soune"
|
|
||||||
version = "1.0.0"
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
|
|
||||||
|
|
||||||
implementation("io.insert-koin:koin-core:4.1.1")
|
|
||||||
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.test {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
kotlin {
|
|
||||||
jvmToolchain(21)
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
fun main() {
|
|
||||||
println("Hello World!")
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
interface Referral {
|
|
||||||
|
|
||||||
val userId: Long
|
|
||||||
val referralLink: String
|
|
||||||
val inviter: Long?
|
|
||||||
val currentLevel: String
|
|
||||||
val totalIncome: Int
|
|
||||||
val availableIncome: Int
|
|
||||||
val holdBalance: Int
|
|
||||||
val active: Boolean
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
data class ReferralInvitee(
|
|
||||||
val email: String,
|
|
||||||
val isActive: Boolean,
|
|
||||||
val regDate: String,
|
|
||||||
)
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
interface ReferralLevel {
|
|
||||||
val id: String
|
|
||||||
val name: String
|
|
||||||
val share: Int
|
|
||||||
val minInvitee: Int
|
|
||||||
val maxInvitee: Int
|
|
||||||
val next: String?
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
interface ReferralLevelProvider {
|
|
||||||
|
|
||||||
fun getAvailableReferralLevels(): List<ReferralLevel>
|
|
||||||
|
|
||||||
fun getInitialReferralLevelId(): String
|
|
||||||
|
|
||||||
fun getReferralLevelById(levelId: String): ReferralLevel
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
interface ReferralRepo {
|
|
||||||
|
|
||||||
fun getUserReferralLink(userId: Long): String
|
|
||||||
|
|
||||||
fun getUserIdByLink(link: String): Long?
|
|
||||||
|
|
||||||
fun getInviterIdForUser(userId: Long): Long?
|
|
||||||
|
|
||||||
fun getReferralLevelForUser(userId: Long): String
|
|
||||||
|
|
||||||
fun getReferralByUserId(userId: Long): Referral
|
|
||||||
|
|
||||||
fun getReferralInvitees(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee>
|
|
||||||
|
|
||||||
// создаем новую запись в БД
|
|
||||||
fun createReferralEntity(entity: Referral)
|
|
||||||
|
|
||||||
// прибавить к totalIncome и availableIncome значение transferAmount
|
|
||||||
fun increaseIncome(userId: Long, transferAmount: Int)
|
|
||||||
|
|
||||||
// установить active в true
|
|
||||||
fun activateUser(userId: Long): Boolean
|
|
||||||
|
|
||||||
// посчитать записи, у которых inviter == userId и active == true
|
|
||||||
fun getActiveInviteeForUser(userId: Long): Int
|
|
||||||
|
|
||||||
// посчитать записи, у которых inviter == userId
|
|
||||||
fun getTotalInviteeForUser(userId: Long): Int
|
|
||||||
|
|
||||||
fun upgradeReferralLevelForUser(userId: Long, newLevelId: String)
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
class ReferralService(
|
|
||||||
private val referralLevelProvider: ReferralLevelProvider,
|
|
||||||
private val referralRepo: ReferralRepo,
|
|
||||||
) {
|
|
||||||
|
|
||||||
fun onRegister(userId: Long, inviterReferralLink: String?) {
|
|
||||||
val initialReferralLevel = referralLevelProvider.getInitialReferralLevelId()
|
|
||||||
val referralLink = referralRepo.getUserReferralLink(userId)
|
|
||||||
val inviter = inviterReferralLink?.let(referralRepo::getUserIdByLink)
|
|
||||||
|
|
||||||
val referral = object : Referral {
|
|
||||||
override val userId = userId
|
|
||||||
override val referralLink = referralLink
|
|
||||||
override val inviter = inviter
|
|
||||||
override val currentLevel = initialReferralLevel
|
|
||||||
override val totalIncome = 0
|
|
||||||
override val availableIncome = 0
|
|
||||||
override val holdBalance: Int = 0
|
|
||||||
override val active: Boolean = false
|
|
||||||
}
|
|
||||||
|
|
||||||
referralRepo.createReferralEntity(referral)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun onUserAccountRefill(userId: Long, transferAmount: Int) {
|
|
||||||
val wasActivated = referralRepo.activateUser(userId)
|
|
||||||
val inviterId = referralRepo.getInviterIdForUser(userId) ?: return
|
|
||||||
val currentInviterLevel = referralRepo.getReferralLevelForUser(inviterId)
|
|
||||||
.let { referralLevelProvider.getReferralLevelById(it) }
|
|
||||||
val reward = transferAmount * currentInviterLevel.share / 100
|
|
||||||
|
|
||||||
referralRepo.increaseIncome(inviterId, reward)
|
|
||||||
|
|
||||||
if (!wasActivated) return
|
|
||||||
|
|
||||||
val currentCount = referralRepo.getActiveInviteeForUser(inviterId)
|
|
||||||
val nextLevel = currentInviterLevel.next
|
|
||||||
|
|
||||||
if (currentCount + 1 > currentInviterLevel.maxInvitee && nextLevel != null) {
|
|
||||||
referralRepo.upgradeReferralLevelForUser(inviterId, nextLevel)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getReferralLevels(): List<ReferralLevel> =
|
|
||||||
referralLevelProvider.getAvailableReferralLevels()
|
|
||||||
|
|
||||||
|
|
||||||
fun getReferralLevelForUser(userId: Long): ReferralLevel =
|
|
||||||
referralRepo.getReferralLevelForUser(userId)
|
|
||||||
.let { referralLevelProvider.getReferralLevelById(it) }
|
|
||||||
|
|
||||||
fun getReferralStatForUser(userId: Long): ReferralStat {
|
|
||||||
var referral = referralRepo.getReferralByUserId(userId)
|
|
||||||
return ReferralStat(
|
|
||||||
totalInvitee = referralRepo.getTotalInviteeForUser(userId),
|
|
||||||
activeInvitee = referralRepo.getActiveInviteeForUser(userId),
|
|
||||||
totalIncome = referral.totalIncome,
|
|
||||||
availableIncome = referral.availableIncome,
|
|
||||||
holdBalance = referral.holdBalance,
|
|
||||||
referralLink = referral.referralLink
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getInviteeForUser(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee> =
|
|
||||||
referralRepo.getReferralInvitees(userId, pageSize, pageNumber)
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
data class ReferralStat(
|
|
||||||
val totalInvitee: Int,
|
|
||||||
val activeInvitee: Int,
|
|
||||||
val totalIncome: Int,
|
|
||||||
val availableIncome: Int,
|
|
||||||
val holdBalance: Int,
|
|
||||||
val referralLink: String,
|
|
||||||
)
|
|
||||||
@@ -1,7 +1 @@
|
|||||||
plugins {
|
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
|
|
||||||
}
|
|
||||||
rootProject.name = 'no-copy'
|
rootProject.name = 'no-copy'
|
||||||
include 'referral'
|
|
||||||
include 'finance'
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,51 +1,17 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import com.vrt.AudioFilePathProvider;
|
|
||||||
import com.vrt.fileprotection.FileProtector;
|
|
||||||
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
|
||||||
import com.vrt.fileprotection.documents.DocumentLocalSearch;
|
|
||||||
import com.vrt.fileprotection.image.ImageLocalSearch;
|
|
||||||
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableAutoConfiguration
|
@EnableAutoConfiguration
|
||||||
@AllArgsConstructor
|
|
||||||
public class ApplicationConfig {
|
public class ApplicationConfig {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
PasswordEncoder passwordEncoder() {
|
PasswordEncoder passwordEncoder() {
|
||||||
return new BCryptPasswordEncoder();
|
return new BCryptPasswordEncoder();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
|
||||||
public com.vrt.
|
|
||||||
NoCopyFileService noCopyFileService(
|
|
||||||
FileProtector.FileProvider fileProvider,
|
|
||||||
FileProtector.ProcessingListener processingListener,
|
|
||||||
ImageUniqueCheck imageUniqueCheck,
|
|
||||||
ImageLocalSearch imageLocalSearch,
|
|
||||||
AudioLocalSearch audioLocalSearch,
|
|
||||||
AudioFilePathProvider audioFilePathProvider,
|
|
||||||
DocumentLocalSearch documentLocalSearch) {
|
|
||||||
|
|
||||||
return new com.vrt.NoCopyFileService(
|
|
||||||
Collections.emptyList(),
|
|
||||||
fileProvider,
|
|
||||||
processingListener,
|
|
||||||
imageUniqueCheck,
|
|
||||||
imageLocalSearch,
|
|
||||||
audioLocalSearch,
|
|
||||||
audioFilePathProvider,
|
|
||||||
documentLocalSearch
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
@@ -16,15 +16,7 @@ public class HandlerConfig {
|
|||||||
LoginRequestHandler login,
|
LoginRequestHandler login,
|
||||||
FileUploadHandler upload,
|
FileUploadHandler upload,
|
||||||
FileEntityHandler file,
|
FileEntityHandler file,
|
||||||
LogoutRequestHandler logoutHandler,
|
LogoutRequestHandler logoutHandler
|
||||||
ImageFoundRequestHandler imageFoundRequestHandler,
|
|
||||||
VerifyRegisterUserHandler verifyRegisterUser,
|
|
||||||
AuthRequestHandler authRequestHandler,
|
|
||||||
CompanyHandler companyHandler,
|
|
||||||
TariffHandler tariffHandler,
|
|
||||||
TariffInfoHandler tariffInfoHandler,
|
|
||||||
ReferralHandler referralHandler,
|
|
||||||
DaDataHandler daDataHandler
|
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
map.put(20001, login);
|
map.put(20001, login);
|
||||||
@@ -32,14 +24,6 @@ public class HandlerConfig {
|
|||||||
map.put(20004, upload);
|
map.put(20004, upload);
|
||||||
map.put(20005, file);
|
map.put(20005, file);
|
||||||
map.put(20006, logoutHandler);
|
map.put(20006, logoutHandler);
|
||||||
map.put(20007, imageFoundRequestHandler);
|
|
||||||
map.put(20008, authRequestHandler);
|
|
||||||
map.put(20009, verifyRegisterUser);
|
|
||||||
map.put(30000, companyHandler);
|
|
||||||
map.put(30001, tariffHandler);
|
|
||||||
map.put(30002, tariffInfoHandler);
|
|
||||||
map.put(30003, referralHandler);
|
|
||||||
map.put(30004, daDataHandler);
|
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
|||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -21,13 +20,7 @@ public class JacksonConfig {
|
|||||||
@Bean
|
@Bean
|
||||||
@Primary
|
@Primary
|
||||||
public ObjectMapper objectMapper() {
|
public ObjectMapper objectMapper() {
|
||||||
ObjectMapper mapper = Jackson2ObjectMapperBuilder.json()
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
.defaultViewInclusion(true)
|
|
||||||
.autoDetectFields(true)
|
|
||||||
.failOnUnknownProperties(false)
|
|
||||||
.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
|
||||||
.featuresToEnable(SerializationFeature.INDENT_OUTPUT)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
JavaTimeModule javaTimeModule = new JavaTimeModule();
|
JavaTimeModule javaTimeModule = new JavaTimeModule();
|
||||||
|
|
||||||
@@ -42,8 +35,6 @@ public class JacksonConfig {
|
|||||||
|
|
||||||
mapper.registerModule(javaTimeModule);
|
mapper.registerModule(javaTimeModule);
|
||||||
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
||||||
mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
|
||||||
mapper.enable(SerializationFeature.INDENT_OUTPUT);
|
|
||||||
|
|
||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
|
||||||
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import ru.soune.ReferralLevelProvider;
|
|
||||||
import ru.soune.ReferralRepo;
|
|
||||||
import ru.soune.ReferralService;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class ReferralConfig {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public ReferralService referralService(ReferralLevelProvider referralLevelProvider, ReferralRepo referralRepo) {
|
|
||||||
return new ReferralService(referralLevelProvider, referralRepo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
|
||||||
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.http.client.SimpleClientHttpRequestFactory;
|
|
||||||
import org.springframework.web.client.RestTemplate;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class RestTemplateConfig {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public RestTemplate restTemplate() {
|
|
||||||
RestTemplate restTemplate = new RestTemplate();
|
|
||||||
|
|
||||||
SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
|
|
||||||
requestFactory.setConnectTimeout(30000);
|
|
||||||
requestFactory.setReadTimeout(60000);
|
|
||||||
restTemplate.setRequestFactory(requestFactory);
|
|
||||||
|
|
||||||
return restTemplate;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package ru.soune.nocopy.configuration.file;
|
|
||||||
|
|
||||||
import jakarta.annotation.PostConstruct;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@ConfigurationProperties(prefix = "file.storage")
|
|
||||||
@Data
|
|
||||||
public class FileStorageConfig {
|
|
||||||
private String basePath;
|
|
||||||
private long maxFileSize;
|
|
||||||
private int chunkSize;
|
|
||||||
private int authTokenLifeHours;
|
|
||||||
|
|
||||||
@PostConstruct
|
|
||||||
public void init() throws IOException {
|
|
||||||
Files.createDirectories(Paths.get(basePath));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
package ru.soune.nocopy.configuration.file;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
|
||||||
import org.springframework.context.event.EventListener;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import ru.soune.nocopy.service.file.FileProcessingOrchestrator;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class NoCopyInitializer {
|
|
||||||
|
|
||||||
private final FileProcessingOrchestrator orchestrator;
|
|
||||||
|
|
||||||
@EventListener(ApplicationReadyEvent.class)
|
|
||||||
public void initializeOnStartup() {
|
|
||||||
orchestrator.initializeProcessingQueue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +1,9 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import com.vrt.NoCopyFileService;
|
|
||||||
import com.vrt.fileprotection.FileProtector;
|
|
||||||
import com.vrt.fileprotection.NoCopyCheckResult;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.core.io.FileSystemResource;
|
import org.springframework.core.io.Resource;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.core.io.UrlResource;
|
||||||
import org.springframework.data.domain.Pageable;
|
|
||||||
import org.springframework.data.web.PageableDefault;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
@@ -19,26 +14,20 @@ import org.springframework.web.multipart.MultipartFile;
|
|||||||
import ru.soune.nocopy.dto.BaseRequest;
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
import ru.soune.nocopy.dto.BaseResponse;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.file.*;
|
import ru.soune.nocopy.dto.RegAnswer;
|
||||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
||||||
|
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||||
|
import ru.soune.nocopy.dto.file.UploadProgress;
|
||||||
|
import ru.soune.nocopy.entity.auth.AuthToken;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.entity.user.AuthToken;
|
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
import ru.soune.nocopy.handler.*;
|
import ru.soune.nocopy.handler.*;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
|
||||||
import ru.soune.nocopy.service.FileSimilarityService;
|
|
||||||
import ru.soune.nocopy.service.file.ProtectionsLimitService;
|
|
||||||
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
|
|
||||||
import ru.soune.nocopy.service.register.AuthService;
|
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
import ru.soune.nocopy.util.FileUtil;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
@@ -46,7 +35,6 @@ import java.nio.file.Paths;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -60,22 +48,8 @@ public class ApiController {
|
|||||||
|
|
||||||
private final FileEntityService fileEntityService;
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
private final AuthService authService;
|
|
||||||
|
|
||||||
private final FileSimilarityService fileSimilarityService;
|
|
||||||
|
|
||||||
private final FileEntityRepository fileEntityRepository;
|
|
||||||
|
|
||||||
private final NoCopyFileService noCopyFileService;
|
|
||||||
|
|
||||||
private final FileUtil fileUtil;
|
|
||||||
|
|
||||||
private final ProtectionsLimitService protectionsLimitService;
|
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
private final CloudStorageService cloudStorageService;
|
|
||||||
|
|
||||||
@PostMapping("/v{version}/data")
|
@PostMapping("/v{version}/data")
|
||||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
@PathVariable("version") int version) {
|
@PathVariable("version") int version) {
|
||||||
@@ -97,12 +71,6 @@ public class ApiController {
|
|||||||
return ResponseEntity.ok().body(response);
|
return ResponseEntity.ok().body(response);
|
||||||
} catch (ValidationException e) {
|
} catch (ValidationException e) {
|
||||||
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
||||||
} catch (UserNotFoundException e) {
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.USER_NOT_FOUND.getCode(),
|
|
||||||
MessageCode.USER_NOT_FOUND.getDescription(), new HashMap<>()));
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
|
||||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
|
|
||||||
} catch (NotValidFieldException e) {
|
} catch (NotValidFieldException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -122,80 +90,55 @@ public class ApiController {
|
|||||||
@PathVariable("version") int version,
|
@PathVariable("version") int version,
|
||||||
@RequestParam(value = "upload_id", required = false) String uploadId,
|
@RequestParam(value = "upload_id", required = false) String uploadId,
|
||||||
@RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
|
@RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
|
||||||
@RequestParam(value = "chunk", required = false) MultipartFile chunk,
|
@RequestParam(value = "chunk", required = false) MultipartFile chunk) {
|
||||||
@RequestParam(value = "findSimilar", required = false, defaultValue = "0") Integer findSimilar) {
|
|
||||||
try {
|
try {
|
||||||
if (chunk == null || chunk.isEmpty()) {
|
if (chunk == null || chunk.isEmpty()) {
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Chunk file null or empty", ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (uploadId == null || uploadId.isBlank()) {
|
if (uploadId == null || uploadId.isBlank()) {
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Upload ID is required");
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Upload ID is required", ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chunkNumber == null || chunkNumber < 0) {
|
if (chunkNumber == null || chunkNumber < 0) {
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Valid chunk number is required", ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build()));
|
||||||
}
|
}
|
||||||
|
|
||||||
UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber,
|
fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
||||||
chunk, findSimilar);
|
|
||||||
|
|
||||||
return buildSuccessResponse(uploadId, chunkNumber, chunk,
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
|
.uploadId(uploadId)
|
||||||
} catch (DuplicateImageException e) {
|
.chunkNumber(chunkNumber)
|
||||||
Map<String, Object> duplicateData = new HashMap<>();
|
.chunkSize(chunk.getSize())
|
||||||
duplicateData.put("duplicateFileId", e.duplicateFileId());
|
.message("Chunk uploaded successfully")
|
||||||
duplicateData.put("userId", e.userId());
|
.build();
|
||||||
duplicateData.put("message", e.getMessage());
|
|
||||||
|
|
||||||
if (uploadId != null) {
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
duplicateData.put("uploadId", uploadId);
|
"Chunk uploaded successfully", responseBody));
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
|
||||||
20004,
|
|
||||||
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
|
||||||
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
|
||||||
duplicateData
|
|
||||||
));
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error uploading chunk", e);
|
log.error("Error uploading chunk", e);
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/{fileId}/similar")
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
public ResponseEntity<BaseResponse> findSimilarFiles(
|
.uploadId(uploadId)
|
||||||
@PathVariable("version") int version,
|
.chunkNumber(chunkNumber)
|
||||||
@PathVariable String fileId,
|
|
||||||
@RequestParam(value = "auth_token",required = false) String authToken,
|
|
||||||
@RequestParam(required = false) List<String> similarityLevels,
|
|
||||||
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
|
||||||
SimilarityFilter filter = SimilarityFilter.builder()
|
|
||||||
.similarityLevels(similarityLevels)
|
|
||||||
.build();
|
.build();
|
||||||
Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable, authToken);
|
|
||||||
|
|
||||||
String messageDesc;
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
MessageCode success;
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to upload chunk: " + e.getMessage(), responseBody));
|
||||||
if (similarFiles.isEmpty()) {
|
|
||||||
messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
|
|
||||||
success = MessageCode.SUCCESS;
|
|
||||||
} else {
|
|
||||||
messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
|
|
||||||
success = MessageCode.SUCCESS;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, Object> responseData = new HashMap<>();
|
|
||||||
responseData.put("content", similarFiles.getContent());
|
|
||||||
responseData.put("page", similarFiles.getNumber());
|
|
||||||
responseData.put("size", similarFiles.getSize());
|
|
||||||
responseData.put("totalElements", similarFiles.getTotalElements());
|
|
||||||
responseData.put("totalPages", similarFiles.getTotalPages());
|
|
||||||
responseData.put("hasNext", similarFiles.hasNext());
|
|
||||||
responseData.put("hasPrevious", similarFiles.hasPrevious());
|
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
|
||||||
.body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/progress/{uploadId}")
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
@@ -221,6 +164,7 @@ public class ApiController {
|
|||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
|
20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error getting progress for upload: {}", uploadId, e);
|
log.error("Error getting progress for upload: {}", uploadId, e);
|
||||||
|
|
||||||
@@ -294,6 +238,7 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/download/{fileId}")
|
@GetMapping("/v{version}/files/download/{fileId}")
|
||||||
public ResponseEntity<?> downloadFile(
|
public ResponseEntity<?> downloadFile(
|
||||||
@PathVariable(required = false) String fileId,
|
@PathVariable(required = false) String fileId,
|
||||||
@@ -312,7 +257,7 @@ public class ApiController {
|
|||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
Long userId = getUserIdFromToken(tokenHeader);
|
||||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||||
|
|
||||||
if (!entityResponse.getUserId().equals(userId)) {
|
if (!entityResponse.getUserId().equals(userId)) {
|
||||||
@@ -345,14 +290,12 @@ public class ApiController {
|
|||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
Path filePath = Paths.get(entityResponse.getProtectedFilePath());
|
Path filePath = Paths.get(entityResponse.getFilePath());
|
||||||
File file = cloudStorageService.readFileFromStorageByPath(
|
Resource resource = new UrlResource(filePath.toUri());
|
||||||
entityResponse.getProtectedFilePath());
|
|
||||||
long fileSize = Files.size(filePath);
|
|
||||||
|
|
||||||
if (!file.exists()) {
|
if (!resource.exists()) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("file", file.exists());
|
errorData.put("resource", resource.exists());
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
@@ -363,11 +306,11 @@ public class ApiController {
|
|||||||
String contentType = determineContentType(filePath);
|
String contentType = determineContentType(filePath);
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
return ResponseEntity.ok()
|
||||||
.contentLength(fileSize)
|
|
||||||
.contentType(MediaType.parseMediaType(contentType))
|
.contentType(MediaType.parseMediaType(contentType))
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||||
"attachment; filename=\"" + entityResponse.getFileName() + "\"")
|
"attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
|
||||||
.body(file);
|
.header(HttpHeaders.CONTENT_LENGTH, String.valueOf(entityResponse.getFileSize()))
|
||||||
|
.body(resource);
|
||||||
} catch (FileEntityNotFoundException e) {
|
} catch (FileEntityNotFoundException e) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("fileId", fileId);
|
errorData.put("fileId", fileId);
|
||||||
@@ -389,88 +332,6 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/protect/{fileId}")
|
|
||||||
public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
|
|
||||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
|
||||||
|
|
||||||
if (!optionalFileEntity.isPresent()) {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
FileEntity fileEntity = optionalFileEntity.get();
|
|
||||||
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
|
|
||||||
|
|
||||||
noCopyFileService.addFile(fileInfo);
|
|
||||||
|
|
||||||
fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
|
|
||||||
fileEntityRepository.save(fileEntity);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/check/{fileId}/{type}")
|
|
||||||
public ResponseEntity<?> check(@PathVariable(required = false) String fileId,
|
|
||||||
@PathVariable(required = false) String type) {
|
|
||||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
|
||||||
|
|
||||||
if (!optionalFileEntity.isPresent()) {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
|
|
||||||
FileEntity fileEntity = optionalFileEntity.get();
|
|
||||||
|
|
||||||
Path path = Paths.get(fileEntity.getProtectedFilePath());
|
|
||||||
|
|
||||||
File file = path.toFile();
|
|
||||||
|
|
||||||
NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
|
|
||||||
FileProtector.Type.valueOf(type.toUpperCase()));
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(noCopyCheckResult);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/check/file_stats")
|
|
||||||
public ResponseEntity<?> checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
|
||||||
|
|
||||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
|
||||||
|
|
||||||
Map<String, Object> fileTypeStats = protectionsLimitService.getFileTypeStats(authToken.getUser().getId());
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(fileTypeStats);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
|
|
||||||
String fileId) {
|
|
||||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
|
||||||
.uploadId(uploadId)
|
|
||||||
.chunkNumber(chunkNumber)
|
|
||||||
.chunkSize(chunk.getSize())
|
|
||||||
.fileId(fileId)
|
|
||||||
.message("Chunk uploaded successfully")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
|
||||||
20000,
|
|
||||||
MessageCode.SUCCESS.getCode(),
|
|
||||||
"Chunk uploaded successfully",
|
|
||||||
responseBody));
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
|
|
||||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
|
||||||
.uploadId(uploadId)
|
|
||||||
.chunkNumber(chunkNumber)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
|
||||||
20004,
|
|
||||||
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
|
||||||
errorMessage,
|
|
||||||
responseBody));
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
||||||
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||||
.stream()
|
.stream()
|
||||||
@@ -506,4 +367,23 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
return contentType;
|
return contentType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean isPreviewSupported(String mimeType) {
|
||||||
|
if (mimeType == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return mimeType.startsWith("image") ||
|
||||||
|
mimeType.startsWith("text") ||
|
||||||
|
mimeType.equals("pdf") ||
|
||||||
|
mimeType.startsWith("video") ||
|
||||||
|
mimeType.startsWith("audio");
|
||||||
|
}
|
||||||
|
|
||||||
|
private Long getUserIdFromToken(String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
AuthToken authToken = authTokenRepository.findByToken(token)
|
||||||
|
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
||||||
|
return authToken.getUser().getId();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.core.io.Resource;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
|
||||||
import org.springframework.http.MediaType;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.dto.file.CheckStatus;
|
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
|
||||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
|
||||||
import ru.soune.nocopy.entity.user.ProtectedFileCheck;
|
|
||||||
import ru.soune.nocopy.entity.user.User;
|
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
|
||||||
import ru.soune.nocopy.service.file.CheckCounterService;
|
|
||||||
import ru.soune.nocopy.service.file.FileStorageService;
|
|
||||||
import org.springframework.http.ContentDisposition;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/files")
|
|
||||||
@Slf4j
|
|
||||||
public class FileController {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private FileStorageService fileStorageService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private FileEntityRepository fileRepository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private CheckCounterService checkCounterService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private UserRepository userRepository;
|
|
||||||
|
|
||||||
@GetMapping("/public/{fileId}")
|
|
||||||
public ResponseEntity<Resource> getPublicFile(
|
|
||||||
@PathVariable String fileId) throws IOException {
|
|
||||||
|
|
||||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
|
||||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
|
||||||
|
|
||||||
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getFilePath());
|
|
||||||
|
|
||||||
ContentDisposition contentDisposition = ContentDisposition.inline()
|
|
||||||
.filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
|
||||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
|
|
||||||
.body(resource);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/protected/{fileId}")
|
|
||||||
public ResponseEntity<Resource> getProtectedFile(
|
|
||||||
@PathVariable String fileId) throws IOException {
|
|
||||||
|
|
||||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
|
||||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
|
||||||
|
|
||||||
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getProtectedFilePath());
|
|
||||||
|
|
||||||
if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
|
|
||||||
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
|
|
||||||
throw new RuntimeException("File is not protected");
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
|
||||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
|
||||||
"inline; filename=\"" + fileEntity.getOriginalFileName() + "\"")
|
|
||||||
.body(resource);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("check-file/status/{userId}")
|
|
||||||
public ResponseEntity<CheckStatus> getStatus(@PathVariable Long userId) {
|
|
||||||
CheckStatus status = checkCounterService.getCurrentStatus(userId);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(status);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("check-file/update-limit/{userId}/{limit}")
|
|
||||||
public ResponseEntity<ProtectedFileCheck> getStatus(@PathVariable Long userId, @PathVariable Integer limit) {
|
|
||||||
User user = userRepository.findById(userId).orElseThrow();
|
|
||||||
ProtectedFileCheck protectedFileCheck = checkCounterService.updateLimit(user, limit);
|
|
||||||
|
|
||||||
return ResponseEntity
|
|
||||||
.ok()
|
|
||||||
.body(protectedFileCheck);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +1,8 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("check/api")
|
@RequestMapping("check/api")
|
||||||
public class HealtCheckController {
|
public class HealtCheckController {
|
||||||
@@ -15,38 +11,4 @@ public class HealtCheckController {
|
|||||||
public HttpStatus healtCheck() {
|
public HttpStatus healtCheck() {
|
||||||
return HttpStatus.OK;
|
return HttpStatus.OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Value("${BUILD_TIME_BACK:unknown}")
|
|
||||||
private String buildTimeBack;
|
|
||||||
|
|
||||||
@GetMapping("/build")
|
|
||||||
public BuildInfo getBuildInfo() {
|
|
||||||
return new BuildInfo(buildTimeBack);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/api/debug/memory")
|
|
||||||
public Map<String, String> getMemoryInfo() {
|
|
||||||
Runtime runtime = Runtime.getRuntime();
|
|
||||||
long mb = 1024 * 1024;
|
|
||||||
|
|
||||||
Map<String, String> info = new HashMap<>();
|
|
||||||
info.put("maxMemory (MB)", String.valueOf(runtime.maxMemory() / mb));
|
|
||||||
info.put("totalMemory (MB)", String.valueOf(runtime.totalMemory() / mb));
|
|
||||||
info.put("freeMemory (MB)", String.valueOf(runtime.freeMemory() / mb));
|
|
||||||
info.put("usedMemory (MB)", String.valueOf((runtime.totalMemory() - runtime.freeMemory()) / mb));
|
|
||||||
info.put("availableProcessors", String.valueOf(runtime.availableProcessors()));
|
|
||||||
|
|
||||||
info.put("JAVA_TOOL_OPTIONS", System.getenv("JAVA_TOOL_OPTIONS"));
|
|
||||||
info.put("JAVA_OPTS", System.getenv("JAVA_OPTS"));
|
|
||||||
|
|
||||||
return info;
|
|
||||||
}
|
|
||||||
|
|
||||||
static class BuildInfo {
|
|
||||||
public String buildTimeBack;
|
|
||||||
|
|
||||||
public BuildInfo(String buildTimeBack) {
|
|
||||||
this.buildTimeBack = buildTimeBack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("v1/api/content")
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class UserContentController {
|
||||||
|
}
|
||||||
@@ -2,34 +2,20 @@ package ru.soune.nocopy.controller;
|
|||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import ru.soune.nocopy.dto.BaseResponse;
|
import ru.soune.nocopy.dto.ChangePasswordRequest;
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.UserDTO;
|
||||||
import ru.soune.nocopy.dto.register.ChangePasswordRequest;
|
import ru.soune.nocopy.dto.UserRequest;
|
||||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
import ru.soune.nocopy.entity.auth.AuthToken;
|
||||||
import ru.soune.nocopy.dto.register.RegRequest;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
|
||||||
import ru.soune.nocopy.dto.user.UserDTO;
|
|
||||||
import ru.soune.nocopy.dto.user.UserRequest;
|
|
||||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
|
||||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
|
||||||
import ru.soune.nocopy.entity.user.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.user.User;
|
|
||||||
import ru.soune.nocopy.exception.InvalidUserEmail;
|
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
|
||||||
import ru.soune.nocopy.mapper.UserMapper;
|
import ru.soune.nocopy.mapper.UserMapper;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.file.FileStatsService;
|
import ru.soune.nocopy.service.UserService;
|
||||||
import ru.soune.nocopy.service.register.AuthService;
|
|
||||||
import ru.soune.nocopy.service.tariff.TariffService;
|
|
||||||
import ru.soune.nocopy.service.user.UserService;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@@ -45,21 +31,12 @@ public class UserController {
|
|||||||
|
|
||||||
private final UserMapper userMapper;
|
private final UserMapper userMapper;
|
||||||
|
|
||||||
private final PasswordEncoder passwordEncoder;
|
|
||||||
|
|
||||||
private final AuthService authService;
|
|
||||||
|
|
||||||
private final TariffService tariffService;
|
|
||||||
|
|
||||||
private final FileStatsService fileStatsService;
|
|
||||||
|
|
||||||
@GetMapping("/all")
|
@GetMapping("/all")
|
||||||
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
||||||
List<UserDTO> allUsers = userRepository.findAll().stream()
|
List<UserDTO> allUsers = userRepository.findAll().stream()
|
||||||
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
|
.map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.getIsActive(),
|
||||||
u.getPhone(), u.getGenderType(),
|
u.getPhone(), u.getGenderType(),
|
||||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
|
||||||
null, null))
|
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
return ResponseEntity.ok(allUsers);
|
return ResponseEntity.ok(allUsers);
|
||||||
@@ -72,69 +49,26 @@ public class UserController {
|
|||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
if (tokenOptional.isPresent()) {
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
User user = userRepository.findByEmail(email);
|
|
||||||
|
|
||||||
if (user != null) {
|
if (authToken != null) {
|
||||||
UserDTO userDTO = userMapper.toDTO(user);
|
Optional<User> user = userRepository.findByEmail(email);
|
||||||
|
//TODO add mapper
|
||||||
|
if (user.isPresent()) {
|
||||||
|
UserDTO userDTO = userMapper.toDTO(user.get());
|
||||||
userDTO.setEmail(email);
|
userDTO.setEmail(email);
|
||||||
userDTO.setFullName(user.getFullName());
|
userDTO.setFullName(user.get().getFullName());
|
||||||
|
userDTO.setCompany(user.get().getCompany());
|
||||||
if (user.getCompany() != null) {
|
userDTO.setPhone(user.get().getPhone());
|
||||||
userDTO.setCompany(user.getCompany().getCompanyName());
|
userDTO.setGenderType(user.get().getGenderType());
|
||||||
}
|
userDTO.setBirthday(user.get().getBirthday());
|
||||||
|
userDTO.setCreatedAt(user.get().getCreatedAt());
|
||||||
if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
|
userDTO.setSubscriptionType(user.get().getSubscriptionType());
|
||||||
userDTO.setTariffs(tariffService.getTariffByAccountType(user));
|
userDTO.setActive(user.get().getIsActive());
|
||||||
|
|
||||||
Long fileOnDisk = user.canManageCompanySettings() ?
|
|
||||||
fileStatsService.calculateCompanyFileSize(user.getId()):
|
|
||||||
fileStatsService.calculateUserFileSize(user.getId());
|
|
||||||
|
|
||||||
Integer filesCount = user.canManageCompanySettings() ?
|
|
||||||
fileStatsService.filesCompanyCount(user.getId()):
|
|
||||||
fileStatsService.filesUserCount(user.getId());
|
|
||||||
|
|
||||||
TariffInfo personalTariffInfo;
|
|
||||||
|
|
||||||
if (user.getCompany() == null) {
|
|
||||||
personalTariffInfo = user.getPersonalTariffInfo();
|
|
||||||
} else {
|
|
||||||
personalTariffInfo = user.getCompany().getTariffInfo();
|
|
||||||
}
|
|
||||||
|
|
||||||
Tariff tariff = personalTariffInfo.getTariff();
|
|
||||||
|
|
||||||
TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
|
|
||||||
.id(personalTariffInfo.getId())
|
|
||||||
.tariffName(tariff.getName())
|
|
||||||
.status(personalTariffInfo.getStatus().name())
|
|
||||||
.tariffId(tariff.getId())
|
|
||||||
.currentFileCounts(filesCount)
|
|
||||||
.maxFileCounts(tariff.getMaxFilesCount())
|
|
||||||
.currentFileOnDisk(fileOnDisk)
|
|
||||||
.maxFileOnDisk(tariff.getDiskSize())
|
|
||||||
.startTariff(personalTariffInfo.getStartTariff())
|
|
||||||
.endTariff(personalTariffInfo.getEndTariff())
|
|
||||||
.tokens(personalTariffInfo.getTokens() + personalTariffInfo.getBoughtTokens())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
userDTO.setTariffInfo(infoDTO);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
userDTO.setPhone(user.getPhone());
|
|
||||||
userDTO.setGenderType(user.getGenderType());
|
|
||||||
userDTO.setBirthday(user.getBirthday());
|
|
||||||
userDTO.setCreatedAt(user.getCreatedAt());
|
|
||||||
userDTO.setSubscriptionType(user.getSubscriptionType());
|
|
||||||
userDTO.setActive(user.isActive());
|
|
||||||
userDTO.setPermission(user.getUserPermissions());
|
|
||||||
|
|
||||||
return ResponseEntity.ok(userDTO);
|
return ResponseEntity.ok(userDTO);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ResponseEntity.notFound().build();
|
return ResponseEntity.notFound().build();
|
||||||
@@ -174,46 +108,4 @@ public class UserController {
|
|||||||
|
|
||||||
return ResponseEntity.ok(userService.updateUser(userRequest, user));
|
return ResponseEntity.ok(userService.updateUser(userRequest, user));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/create-user")
|
|
||||||
public ResponseEntity<User> addUser(@RequestBody RegRequest registerRequest) {
|
|
||||||
|
|
||||||
if (userRepository.existsByEmail(registerRequest.getEmail()) ||
|
|
||||||
userRepository.existsByPhone(registerRequest.getPhone())) {
|
|
||||||
RegAnswer regAnswer = new RegAnswer();
|
|
||||||
regAnswer.setFieldErrors(Arrays.asList(Map.of("email", registerRequest.getEmail())));
|
|
||||||
regAnswer.setFieldErrors(Arrays.asList(Map.of("phone", registerRequest.getPhone())));
|
|
||||||
|
|
||||||
throw new NotValidFieldException("User already exists with email:" + registerRequest.getEmail() + " or phone: " +
|
|
||||||
registerRequest.getPhone(), new BaseResponse(2,
|
|
||||||
MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getCode(),
|
|
||||||
MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer));
|
|
||||||
}
|
|
||||||
|
|
||||||
User user = new User();
|
|
||||||
user.setFullName(registerRequest.getFullName());
|
|
||||||
user.setEmail(registerRequest.getEmail());
|
|
||||||
user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
|
|
||||||
user.setActive(true);
|
|
||||||
user.setEmailVerified(true);
|
|
||||||
|
|
||||||
if (registerRequest.getPhone() != null) {
|
|
||||||
user.setPhone(registerRequest.getPhone());
|
|
||||||
}
|
|
||||||
|
|
||||||
User savedUser = userRepository.save(user);
|
|
||||||
|
|
||||||
AuthToken authToken = authService.generateAuthToken(savedUser);
|
|
||||||
|
|
||||||
authTokenRepository.save(authToken);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(savedUser);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/delete-user/{userId}")
|
|
||||||
public ResponseEntity<?> addUser(@PathVariable Long userId) {
|
|
||||||
userRepository.deleteById(userId);
|
|
||||||
return ResponseEntity.ok().body(Map.of("userId", userId, "deleted", "true"));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.LoginAnswer;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.entity.User;
|
||||||
|
import ru.soune.nocopy.entity.auth.AuthToken;
|
||||||
|
import ru.soune.nocopy.service.AuthService;
|
||||||
|
import ru.soune.nocopy.service.VkOAuthService;
|
||||||
|
import ru.soune.nocopy.service.auth.ExternalAuthUserService;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Slf4j
|
||||||
|
public class VkAuthController {
|
||||||
|
|
||||||
|
private final VkOAuthService vkOAuthService;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final ExternalAuthUserService externalAuthUserService;
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/vk/authorization/{code}/{state}/{codeVerifier}/{deviceId}")
|
||||||
|
public BaseResponse vkAuth(@PathVariable("code") String code,
|
||||||
|
@PathVariable("state") String state,
|
||||||
|
@PathVariable("codeVerifier") String codeVerifier,
|
||||||
|
@PathVariable("deviceId") String deviceId) {
|
||||||
|
try {
|
||||||
|
Map<String, Object> authMap = vkOAuthService.authTokenMap(code, state, codeVerifier, deviceId);
|
||||||
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
|
|
||||||
|
String bodyJson = (String) authMap.get("body");
|
||||||
|
Map<String, Object> body = mapper.readValue(bodyJson, Map.class);
|
||||||
|
|
||||||
|
String accessToken = (String) body.get("access_token");
|
||||||
|
long vkUserId = ((Number) body.get("user_id")).longValue();
|
||||||
|
Integer expiresIn = (Integer) body.get("expires_in");
|
||||||
|
String refreshToken = (String) body.get("refresh_token");
|
||||||
|
|
||||||
|
Map<String, Object> vkUserInfo = vkOAuthService.userVkInfo(accessToken);
|
||||||
|
log.info("vkUserInfo {}", vkUserInfo);
|
||||||
|
|
||||||
|
String userInfoBodyJson = (String) vkUserInfo.get("body");
|
||||||
|
Map<String, Object> userInfoBody = mapper.readValue(userInfoBodyJson, Map.class);
|
||||||
|
Map<String, Object> user = (Map<String, Object>) userInfoBody.get("user");
|
||||||
|
|
||||||
|
String firstName = (String) user.get("first_name");
|
||||||
|
String lastName = (String) user.get("last_name");
|
||||||
|
String fullName = firstName + " " + lastName;
|
||||||
|
|
||||||
|
User userEntity = externalAuthUserService.findOrCreateUserFromVK(Long.toString(vkUserId), fullName,
|
||||||
|
null, accessToken, refreshToken, expiresIn);
|
||||||
|
|
||||||
|
AuthToken ourToken = authService.createTokenForUser(userEntity);
|
||||||
|
|
||||||
|
LoginAnswer loginAnswer = new LoginAnswer();
|
||||||
|
loginAnswer.setToken(ourToken.getToken());
|
||||||
|
loginAnswer.setFieldErrors(new ArrayList<>());
|
||||||
|
|
||||||
|
return new BaseResponse(20009, MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("VK auth error: ", e);
|
||||||
|
|
||||||
|
LoginAnswer loginAnswer = new LoginAnswer();
|
||||||
|
loginAnswer.setToken(null);
|
||||||
|
|
||||||
|
List<Map<String, String>> errors = new ArrayList<>();
|
||||||
|
Map<String, String> error = new HashMap<>();
|
||||||
|
error.put("field", "vk_auth");
|
||||||
|
error.put("message", e.getMessage());
|
||||||
|
errors.add(error);
|
||||||
|
|
||||||
|
loginAnswer.setFieldErrors(errors);
|
||||||
|
|
||||||
|
return new BaseResponse(20009, MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,11 +1,9 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
|
||||||
public class BaseRequest {
|
public class BaseRequest {
|
||||||
@JsonProperty("version")
|
@JsonProperty("version")
|
||||||
Integer version;
|
Integer version;
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
|
||||||
public class BaseResponse {
|
public class BaseResponse {
|
||||||
@JsonProperty("msg_id")
|
@JsonProperty("msg_id")
|
||||||
private Integer msgId;
|
private Integer msgId;
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-5
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -13,9 +13,5 @@ import java.util.Map;
|
|||||||
public class LoginAnswer {
|
public class LoginAnswer {
|
||||||
private String Token;
|
private String Token;
|
||||||
|
|
||||||
private boolean isActive;
|
|
||||||
|
|
||||||
private boolean isVerified;
|
|
||||||
|
|
||||||
private List<Map<String, String>> fieldErrors;
|
private List<Map<String, String>> fieldErrors;
|
||||||
}
|
}
|
||||||
+1
-3
@@ -1,6 +1,5 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
@@ -11,7 +10,6 @@ import lombok.NoArgsConstructor;
|
|||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
|
||||||
public class LoginRequest {
|
public class LoginRequest {
|
||||||
|
|
||||||
@NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)
|
@NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
@@ -4,19 +4,12 @@ public enum MessageCode {
|
|||||||
SUCCESS(0, "Operation successful"),
|
SUCCESS(0, "Operation successful"),
|
||||||
REG_EMAIL_EXISTS(1, "Email already registered"),
|
REG_EMAIL_EXISTS(1, "Email already registered"),
|
||||||
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||||
REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"),
|
|
||||||
INVALID_FIELD(2, "Invalid field"),
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
INVALID_TOKEN(2, "Invalid token"),
|
INVALID_TOKEN(2, "Invalid token"),
|
||||||
TOKEN_IS_ALIVE(2, "Token is alive"),
|
|
||||||
INVALID_ACTION(2, "Invalid action"),
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
|
||||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
USER_NOT_VERIFIED(2, "User not verified"),
|
|
||||||
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
|
||||||
USER_NOT_FOUND(2, "User not found"),
|
|
||||||
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
||||||
IMAGE_FOUND_ERROR(2, "Image found error"),
|
|
||||||
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
||||||
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||||
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
||||||
@@ -25,24 +18,8 @@ public enum MessageCode {
|
|||||||
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
||||||
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
||||||
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
|
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
|
||||||
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
|
|
||||||
FILE_NOT_FOUND(4, "File not found"),
|
FILE_NOT_FOUND(4, "File not found"),
|
||||||
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
|
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
|
||||||
SEND_EMAIL_EXCEPTION(2, "Send email exception"),
|
|
||||||
SIMILAR_FILES_FOUND(0, "Similar files found"),
|
|
||||||
FILE_IS_PROTECTED(0, "File is protected"),
|
|
||||||
FILE_IS_NOT_PROTECTED(0, "File is not protected"),
|
|
||||||
TARIFF_IS_ADD(0, "Tariff is added"),
|
|
||||||
TARIFF_IS_DELETED(0, "Tariff is deleted"),
|
|
||||||
TARIFF_IS_UPDATED(0, "Tariff is updated"),
|
|
||||||
TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
|
|
||||||
VALIDATION_ERROR(2, "Validation error"),
|
|
||||||
RESOURCE_NOT_FOUND(4, "Resource not found"),
|
|
||||||
INTERNAL_ERROR(4, "Internal server error"),
|
|
||||||
COMPANY_NOT_FOUND(4, "Company not found"),
|
|
||||||
COMPANY_ALREADY_EXISTS(2, "Company already exists"),
|
|
||||||
USER_LIMIT_IS_OVER(2, "Over user limits"),
|
|
||||||
ERROR_TARIFF_INFO(2, "Erorr with tariff info");
|
|
||||||
|
|
||||||
private final Integer code;
|
private final Integer code;
|
||||||
|
|
||||||
|
|||||||
+1
-9
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -13,13 +13,5 @@ import java.util.Map;
|
|||||||
public class RegAnswer {
|
public class RegAnswer {
|
||||||
private String Token;
|
private String Token;
|
||||||
|
|
||||||
private boolean isActive;
|
|
||||||
|
|
||||||
private boolean isVerified;
|
|
||||||
|
|
||||||
private Long userId;
|
|
||||||
|
|
||||||
private String email;
|
|
||||||
|
|
||||||
private List<Map<String, String>> fieldErrors;
|
private List<Map<String, String>> fieldErrors;
|
||||||
}
|
}
|
||||||
+1
-10
@@ -1,21 +1,16 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
|
||||||
public class RegRequest {
|
public class RegRequest {
|
||||||
@NotEmpty(message = "Full name is required")
|
@NotEmpty(message = "Full name is required")
|
||||||
private String fullName;
|
private String fullName;
|
||||||
|
|
||||||
private String companyName;
|
private String companyName;
|
||||||
|
|
||||||
@NotEmpty(message = "Need account type")
|
|
||||||
private String accountType;
|
|
||||||
|
|
||||||
@Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
|
@Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
|
||||||
private String phone;
|
private String phone;
|
||||||
|
|
||||||
@@ -27,8 +22,4 @@ public class RegRequest {
|
|||||||
@NotBlank(message = "Password is required")
|
@NotBlank(message = "Password is required")
|
||||||
@Size(min = 8, message = "Password must be at least 8 characters")
|
@Size(min = 8, message = "Password must be at least 8 characters")
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
private String authToken;
|
|
||||||
|
|
||||||
private String referralLink;
|
|
||||||
}
|
}
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class TokenProcessRequest {
|
|
||||||
|
|
||||||
@JsonProperty("token")
|
|
||||||
private String token;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class UserContentDTO {
|
||||||
|
String fileName;
|
||||||
|
String originalFilename;
|
||||||
|
String fileType;
|
||||||
|
String fileExtension;
|
||||||
|
Long fileSize;
|
||||||
|
String filePath;
|
||||||
|
Integer protectionLevel;
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto.user;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import ru.soune.nocopy.entity.ContentStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
public record UserContentResponse(
|
||||||
|
Long id,
|
||||||
|
String filename,
|
||||||
|
String originalFilename,
|
||||||
|
FileType fileType,
|
||||||
|
long fileSize,
|
||||||
|
String filePath,
|
||||||
|
ContentStatus status,
|
||||||
|
LocalDateTime uploadDate
|
||||||
|
) {}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto.user;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
+3
-9
@@ -1,17 +1,14 @@
|
|||||||
package ru.soune.nocopy.dto.user;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import ru.soune.nocopy.dto.tarriff.TariffDTO;
|
import ru.soune.nocopy.entity.GenderType;
|
||||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
import ru.soune.nocopy.entity.SubscriptionType;
|
||||||
import ru.soune.nocopy.entity.user.GenderType;
|
|
||||||
import ru.soune.nocopy.entity.user.SubscriptionType;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@@ -27,7 +24,4 @@ public class UserDTO {
|
|||||||
private LocalDate birthday;
|
private LocalDate birthday;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private SubscriptionType subscriptionType;
|
private SubscriptionType subscriptionType;
|
||||||
private List<TariffDTO> tariffs;
|
|
||||||
private TariffInfoDTO tariffInfo;
|
|
||||||
private Long permission;
|
|
||||||
}
|
}
|
||||||
+2
-3
@@ -1,16 +1,15 @@
|
|||||||
package ru.soune.nocopy.dto.user;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.Past;
|
import jakarta.validation.constraints.Past;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import ru.soune.nocopy.entity.user.GenderType;
|
import ru.soune.nocopy.entity.GenderType;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
|
||||||
public class UserRequest {
|
public class UserRequest {
|
||||||
@Size(min = 2)
|
@Size(min = 2)
|
||||||
private String fullName;
|
private String fullName;
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.company;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class CompanyActionRequestDto {
|
|
||||||
private String action;
|
|
||||||
private String companyId;
|
|
||||||
private String companyName;
|
|
||||||
private Map<String, Object> companyData;
|
|
||||||
private Long userId;
|
|
||||||
private Map<String, Object> searchParams;
|
|
||||||
private PageableParams pageable;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public static class PageableParams {
|
|
||||||
private int page;
|
|
||||||
private int size;
|
|
||||||
private String sort;
|
|
||||||
private String direction;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.company;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class CompanyResponseDto {
|
|
||||||
private String id;
|
|
||||||
private String companyName;
|
|
||||||
private String phone;
|
|
||||||
private String address;
|
|
||||||
private String email;
|
|
||||||
private LocalDateTime registerDate;
|
|
||||||
private LocalDateTime updateDate;
|
|
||||||
private long userCount;
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class DaDataAddress {
|
|
||||||
private String value;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class DaDataData {
|
|
||||||
private String inn;
|
|
||||||
private DaDataAddress address;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class DaDataRequest {
|
|
||||||
|
|
||||||
@JsonProperty("inn")
|
|
||||||
private String inn;
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class DaDataResponse {
|
|
||||||
@JsonProperty("companyName")
|
|
||||||
private String companyName;
|
|
||||||
|
|
||||||
@JsonProperty("inn")
|
|
||||||
private String inn;
|
|
||||||
|
|
||||||
@JsonProperty("address")
|
|
||||||
private String address;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class DaDataSuggestion {
|
|
||||||
private String value;
|
|
||||||
private DaDataData data;
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class DaDataWrapper {
|
|
||||||
private List<DaDataSuggestion> suggestions;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
public class CheckIncrementResult {
|
|
||||||
private boolean success;
|
|
||||||
private Integer countChecked;
|
|
||||||
private Integer remainingLimit;
|
|
||||||
private String message;
|
|
||||||
|
|
||||||
public static CheckIncrementResult success(Integer countChecked) {
|
|
||||||
return CheckIncrementResult.builder()
|
|
||||||
.success(true)
|
|
||||||
.countChecked(countChecked)
|
|
||||||
.message("Check count incremented successfully")
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
public class CheckStatus {
|
|
||||||
private Long userId;
|
|
||||||
private Integer countChecked;
|
|
||||||
private Integer remainingLimit;
|
|
||||||
private LocalDateTime lastCheckAt;
|
|
||||||
}
|
|
||||||
@@ -20,9 +20,6 @@ public class ChunkUploadResponse {
|
|||||||
@JsonProperty("chunk_size")
|
@JsonProperty("chunk_size")
|
||||||
private Long chunkSize;
|
private Long chunkSize;
|
||||||
|
|
||||||
@JsonProperty("file_id")
|
|
||||||
private String fileId;
|
|
||||||
|
|
||||||
@JsonProperty("message")
|
@JsonProperty("message")
|
||||||
private String message;
|
private String message;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class FileApiResponse<T> {
|
||||||
|
|
||||||
|
private boolean success;
|
||||||
|
private String message;
|
||||||
|
private T data;
|
||||||
|
private String error;
|
||||||
|
|
||||||
|
public static <T> FileApiResponse<T> success(T data) {
|
||||||
|
return FileApiResponse.<T>builder()
|
||||||
|
.success(true)
|
||||||
|
.message("Operation completed successfully")
|
||||||
|
.data(data)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T> FileApiResponse<T> success(String message, T data) {
|
||||||
|
return FileApiResponse.<T>builder()
|
||||||
|
.success(true)
|
||||||
|
.message(message)
|
||||||
|
.data(data)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T> FileApiResponse<T> error(String error) {
|
||||||
|
return FileApiResponse.<T>builder()
|
||||||
|
.success(false)
|
||||||
|
.error(error)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,9 +17,6 @@ public class FileEntityRequest {
|
|||||||
@JsonProperty("file_id")
|
@JsonProperty("file_id")
|
||||||
private String fileId;
|
private String fileId;
|
||||||
|
|
||||||
@JsonProperty("full_delete")
|
|
||||||
private Integer fullDelete;
|
|
||||||
|
|
||||||
@JsonProperty("upload_session_id")
|
@JsonProperty("upload_session_id")
|
||||||
private String uploadSessionId;
|
private String uploadSessionId;
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ public class FileEntityResponse {
|
|||||||
private String originalFileName;
|
private String originalFileName;
|
||||||
private String storedFileName;
|
private String storedFileName;
|
||||||
private String filePath;
|
private String filePath;
|
||||||
private String protectedFilePath;
|
|
||||||
private Long fileSize;
|
private Long fileSize;
|
||||||
private String mimeType;
|
private String mimeType;
|
||||||
private String fileExtension;
|
private String fileExtension;
|
||||||
@@ -31,13 +30,4 @@ public class FileEntityResponse {
|
|||||||
private String formattedSize;
|
private String formattedSize;
|
||||||
private String downloadUrl;
|
private String downloadUrl;
|
||||||
private boolean existsOnDisk;
|
private boolean existsOnDisk;
|
||||||
private Integer supportId;
|
|
||||||
private String protectStatus;
|
|
||||||
private String ownerName;
|
|
||||||
private String ownerEmail;
|
|
||||||
private String ownerCompany;
|
|
||||||
private String fileName;
|
|
||||||
private String fileFormat;
|
|
||||||
private Integer checksCount;
|
|
||||||
private LocalDateTime fileUploadDate;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,31 +58,4 @@ public class FileInfoUserResponse {
|
|||||||
|
|
||||||
@JsonProperty("audios_violations")
|
@JsonProperty("audios_violations")
|
||||||
private Integer audiosViolations;
|
private Integer audiosViolations;
|
||||||
|
|
||||||
@JsonProperty("document_size")
|
|
||||||
private Long documentSize;
|
|
||||||
|
|
||||||
@JsonProperty("document_quantity")
|
|
||||||
private Integer documentCount;
|
|
||||||
|
|
||||||
@JsonProperty("document_check")
|
|
||||||
private Integer documentCheck;
|
|
||||||
|
|
||||||
@JsonProperty("document_violations")
|
|
||||||
private Integer documentViolations;
|
|
||||||
|
|
||||||
@JsonProperty("protected_document_files_count")
|
|
||||||
private Long protectedDocumentFilesCount;
|
|
||||||
|
|
||||||
@JsonProperty("protected_files_count")
|
|
||||||
private Long protectedFilesCount;
|
|
||||||
|
|
||||||
@JsonProperty("protected_audio_files_count")
|
|
||||||
private Long protectedAudioFilesCount;
|
|
||||||
|
|
||||||
@JsonProperty("protected_video_files_count")
|
|
||||||
private Long protectedVideoFilesCount;
|
|
||||||
|
|
||||||
@JsonProperty("protected_image_files_count")
|
|
||||||
private Long protectedImageFilesCount;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class FileTypeStatsDto {
|
|
||||||
private String fileType;
|
|
||||||
private Integer count;
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class GoogleVisionSearchResponse {
|
|
||||||
|
|
||||||
@JsonProperty("bestGuessLabels")
|
|
||||||
private List<BestGuessLabel> bestGuessLabels;
|
|
||||||
|
|
||||||
@JsonProperty("fullMatchingImages")
|
|
||||||
private List<ImageResult> fullMatchingImages;
|
|
||||||
|
|
||||||
@JsonProperty("visuallySimilarImages")
|
|
||||||
private List<ImageResult> visuallySimilarImages;
|
|
||||||
|
|
||||||
@JsonProperty("pagesWithMatchingImages")
|
|
||||||
private List<PageResult> pagesWithMatchingImages;
|
|
||||||
|
|
||||||
@JsonProperty("partialMatchingImages")
|
|
||||||
private List<ImageResult> partialMatchingImages;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public static class BestGuessLabel {
|
|
||||||
@JsonProperty("label")
|
|
||||||
private String label;
|
|
||||||
|
|
||||||
@JsonProperty("languageCode")
|
|
||||||
private String languageCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public static class ImageResult {
|
|
||||||
@JsonProperty("url")
|
|
||||||
private String url;
|
|
||||||
|
|
||||||
@JsonProperty("score")
|
|
||||||
private Float score;
|
|
||||||
|
|
||||||
@JsonProperty("height")
|
|
||||||
private Integer height;
|
|
||||||
|
|
||||||
@JsonProperty("width")
|
|
||||||
private Integer width;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public static class PageResult {
|
|
||||||
@JsonProperty("url")
|
|
||||||
private String url;
|
|
||||||
|
|
||||||
@JsonProperty("pageTitle")
|
|
||||||
private String pageTitle;
|
|
||||||
|
|
||||||
@JsonProperty("fullMatchingImages")
|
|
||||||
private List<ImageResult> fullMatchingImages;
|
|
||||||
|
|
||||||
@JsonProperty("partialMatchingImages")
|
|
||||||
private List<ImageResult> partialMatchingImages;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class ImageSearchRequest {
|
|
||||||
@JsonProperty("file_id")
|
|
||||||
private String fileId;
|
|
||||||
|
|
||||||
@JsonProperty("page")
|
|
||||||
private Integer page = 1;
|
|
||||||
|
|
||||||
@JsonProperty("page_size")
|
|
||||||
private Integer pageSize = 10;
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
class PeriodHistoryDto {
|
|
||||||
private LocalDate periodStart;
|
|
||||||
private LocalDate periodEnd;
|
|
||||||
private Integer totalChecks;
|
|
||||||
private Map<String, Integer> checksByType;
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class ProtectionLimitsDto {
|
|
||||||
private Long userId;
|
|
||||||
private String userName;
|
|
||||||
private String userEmail;
|
|
||||||
private LocalDate lastResetDate;
|
|
||||||
private Integer totalChecksAllTime;
|
|
||||||
private Integer periodChecksCount;
|
|
||||||
private Map<String, Integer> checksByFileType;
|
|
||||||
private LocalDate periodStartDate;
|
|
||||||
private LocalDate periodEndDate;
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private LocalDateTime lastCheckAt;
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Value;
|
|
||||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Value
|
|
||||||
@Builder
|
|
||||||
public class SimilarFileDTO {
|
|
||||||
String fileId;
|
|
||||||
String originalFileName;
|
|
||||||
Long fileSize;
|
|
||||||
Integer hammingDistance;
|
|
||||||
String similarityLevel;
|
|
||||||
Long ownerId;
|
|
||||||
Long supportId;
|
|
||||||
ProtectionStatus status;
|
|
||||||
LocalDateTime uploadDate;
|
|
||||||
String url;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class SimilarityFilter {
|
|
||||||
private List<String> similarityLevels;
|
|
||||||
private Integer page;
|
|
||||||
private Integer size;
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class YandexSearchResponse {
|
|
||||||
|
|
||||||
@JsonProperty("images")
|
|
||||||
private List<ImageResult> images;
|
|
||||||
|
|
||||||
// @JsonProperty("images")
|
|
||||||
// public void setImages(List<ImageResult> images) {
|
|
||||||
// this.images = images;
|
|
||||||
// }
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public static class ImageResult {
|
|
||||||
@JsonProperty("url")
|
|
||||||
private String url;
|
|
||||||
|
|
||||||
@JsonProperty("pageUrl")
|
|
||||||
private String pageUrl;
|
|
||||||
|
|
||||||
@JsonProperty("pageTitle")
|
|
||||||
private String pageTitle;
|
|
||||||
|
|
||||||
@JsonProperty("width")
|
|
||||||
private Integer width;
|
|
||||||
|
|
||||||
@JsonProperty("height")
|
|
||||||
private Integer height;
|
|
||||||
|
|
||||||
@JsonProperty("host")
|
|
||||||
private String host;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int page;
|
|
||||||
|
|
||||||
private int pageSize;
|
|
||||||
|
|
||||||
private int totalResults;
|
|
||||||
|
|
||||||
private int totalPages;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.referral;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@Builder
|
|
||||||
public class ReferralRequest {
|
|
||||||
private String token;
|
|
||||||
private Integer amount;
|
|
||||||
private Integer pageSize;
|
|
||||||
private Integer pageNumber;
|
|
||||||
private String action;
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
|
||||||
|
|
||||||
public enum AccountType {
|
|
||||||
B2B, B2C
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
public class VerifyUserRequest {
|
|
||||||
@JsonProperty("verify_token")
|
|
||||||
private String verifyToken;
|
|
||||||
|
|
||||||
@JsonProperty("user_id")
|
|
||||||
private Long userId;
|
|
||||||
|
|
||||||
@JsonProperty("resend")
|
|
||||||
private Integer resend;
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.tarriff;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class TariffDTO {
|
|
||||||
private Long id;
|
|
||||||
private String type;
|
|
||||||
private String name;
|
|
||||||
private double price;
|
|
||||||
private int tokens;
|
|
||||||
private int maxFilesCount;
|
|
||||||
private Long diskSize;
|
|
||||||
private Long maxUsers;
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.tarriff;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@Builder
|
|
||||||
public class TariffInfoDTO {
|
|
||||||
private String id;
|
|
||||||
private String status;
|
|
||||||
private LocalDateTime startTariff;
|
|
||||||
private LocalDateTime endTariff;
|
|
||||||
private Long tariffId;
|
|
||||||
private String tariffName;
|
|
||||||
private Integer tokens;
|
|
||||||
private Long maxFileOnDisk;
|
|
||||||
private Long currentFileOnDisk;
|
|
||||||
private Integer currentFileCounts;
|
|
||||||
private Integer maxFileCounts;
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.tarriff;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import jakarta.validation.constraints.NotNull;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class TariffInfoRequest {
|
|
||||||
private String id;
|
|
||||||
|
|
||||||
@NotNull(message = "Action is required")
|
|
||||||
@JsonProperty("action")
|
|
||||||
private String action;
|
|
||||||
|
|
||||||
@JsonProperty("status")
|
|
||||||
private String status;
|
|
||||||
|
|
||||||
@JsonProperty("start_tariff")
|
|
||||||
private LocalDateTime startTariff;
|
|
||||||
|
|
||||||
@JsonProperty("end_tariff")
|
|
||||||
private LocalDateTime endTariff;
|
|
||||||
|
|
||||||
@JsonProperty("tariff_id")
|
|
||||||
private Long tariffId;
|
|
||||||
|
|
||||||
@JsonProperty("tariff_type")
|
|
||||||
private String tariffType;
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.tarriff;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class TariffInfoResponse {
|
|
||||||
@JsonProperty("id")
|
|
||||||
private String id;
|
|
||||||
|
|
||||||
@JsonProperty("status")
|
|
||||||
private String status;
|
|
||||||
|
|
||||||
@JsonProperty("start_tariff")
|
|
||||||
private LocalDateTime startTariff;
|
|
||||||
|
|
||||||
@JsonProperty("end_tariff")
|
|
||||||
private LocalDateTime endTariff;
|
|
||||||
|
|
||||||
@JsonProperty("tariff_id")
|
|
||||||
private Long tariffId;
|
|
||||||
|
|
||||||
@JsonProperty("tariff_name")
|
|
||||||
private String tariffName;
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.tarriff;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import jakarta.validation.constraints.Min;
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import jakarta.validation.constraints.NotNull;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class TariffRequest {
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@NotBlank
|
|
||||||
@JsonProperty("type")
|
|
||||||
private String type;
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@NotBlank
|
|
||||||
@JsonProperty("tariff_name")
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
@Min(value = 0, message = "Price cannot be negative")
|
|
||||||
@JsonProperty("tariff_price")
|
|
||||||
private double price;
|
|
||||||
|
|
||||||
@Min(value = 0, message = "Tokens must be at least 0")
|
|
||||||
@JsonProperty("tariff_tokens")
|
|
||||||
private int tokens;
|
|
||||||
|
|
||||||
@Min(value = 0, message = "Max files count must be at least 0")
|
|
||||||
@JsonProperty("max_files")
|
|
||||||
private int maxFilesCount;
|
|
||||||
|
|
||||||
@Min(value = 0, message = "Disk size must be at least 0")
|
|
||||||
@JsonProperty("disk_size")
|
|
||||||
private int diskSize;
|
|
||||||
|
|
||||||
@Min(value = 0, message = "Max users must be at least 0")
|
|
||||||
@JsonProperty("max_users")
|
|
||||||
private int maxUsers;
|
|
||||||
|
|
||||||
@JsonProperty("action")
|
|
||||||
private String action;
|
|
||||||
|
|
||||||
@JsonProperty("user_token")
|
|
||||||
private String userToken;
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.tarriff;
|
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
public class TariffResponse {
|
|
||||||
private String tariffName;
|
|
||||||
private String tariffType;
|
|
||||||
}
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.entity.file;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.entity.user;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
public enum GenderType {
|
public enum GenderType {
|
||||||
MALE, FEMALE
|
MALE, FEMALE
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.*;
|
||||||
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "image_protection")
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@ToString
|
||||||
|
@EntityListeners(AuditingEntityListener.class)
|
||||||
|
public class ImageProtection {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long protectionId;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "user_id", nullable = false)
|
||||||
|
@ToString.Exclude
|
||||||
|
private User user;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "content_id", nullable = false)
|
||||||
|
@ToString.Exclude
|
||||||
|
private UserContent content;
|
||||||
|
|
||||||
|
@Column(name = "protection_method", nullable = false, length = 50)
|
||||||
|
private String protectionMethod;
|
||||||
|
|
||||||
|
@Column(name = "protection_level", nullable = false)
|
||||||
|
private Integer protectionLevel;
|
||||||
|
|
||||||
|
@Column(name = "is_active", nullable = false)
|
||||||
|
private Boolean isActive = true;
|
||||||
|
|
||||||
|
@CreatedDate
|
||||||
|
@Column(name = "applied_at", nullable = false, updatable = false)
|
||||||
|
private LocalDateTime appliedAt;
|
||||||
|
|
||||||
|
@Column(name = "metadata", columnDefinition = "JSON")
|
||||||
|
private String metadata;
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.entity.user;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
|
import lombok.*;
|
||||||
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
import ru.soune.nocopy.entity.auth.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "users")
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@ToString
|
||||||
|
@Builder
|
||||||
|
@EntityListeners(AuditingEntityListener.class)
|
||||||
|
public class User {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Column(name = "full_name", nullable = false)
|
||||||
|
private String fullName;
|
||||||
|
|
||||||
|
@Size(max = 255)
|
||||||
|
@Column(name = "email", nullable = false, length = 255, unique = true)
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
@Column(name = "company")
|
||||||
|
private String company;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
@Size(min = 6)
|
||||||
|
@JsonIgnore
|
||||||
|
private String password;
|
||||||
|
|
||||||
|
@Size(min = 11, max = 14)
|
||||||
|
@Column(unique = true)
|
||||||
|
private String phone;
|
||||||
|
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
@Column(name = "subscription_type", nullable = false, length = 20)
|
||||||
|
private SubscriptionType subscriptionType = SubscriptionType.DEMO;
|
||||||
|
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
@Column(name = "gender")
|
||||||
|
private GenderType genderType = GenderType.MALE;
|
||||||
|
|
||||||
|
@Column(name = "birthday")
|
||||||
|
private LocalDate birthday;
|
||||||
|
|
||||||
|
@CreatedDate
|
||||||
|
@Column(name = "created_at", updatable = false, nullable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
|
@Column(name = "last_login_at")
|
||||||
|
private LocalDateTime lastLoginAt;
|
||||||
|
|
||||||
|
@Column(name = "is_active")
|
||||||
|
private Boolean isActive = true;
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
@JsonIgnore
|
||||||
|
@ToString.Exclude
|
||||||
|
private List<AuthToken> tokens = new ArrayList<>();
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
@JsonIgnore
|
||||||
|
@ToString.Exclude
|
||||||
|
private List<UserContent> userContents = new ArrayList<>();
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
@JsonIgnore
|
||||||
|
@ToString.Exclude
|
||||||
|
private List<UserAction> userActions = new ArrayList<>();
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
@JsonIgnore
|
||||||
|
@ToString.Exclude
|
||||||
|
private List<Violation> violations = new ArrayList<>();
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
@JsonIgnore
|
||||||
|
@ToString.Exclude
|
||||||
|
private List<ImageProtection> imageProtections = new ArrayList<>();
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||||
|
@ToString.Exclude
|
||||||
|
private List<ExternalAuthProvider> externalAuthProviders = new ArrayList<>();
|
||||||
|
|
||||||
|
public Optional<ExternalAuthProvider> getProvider(ExternalAuthProvider.ProviderType providerType) {
|
||||||
|
return externalAuthProviders.stream()
|
||||||
|
.filter(p -> p.getProviderType() == providerType)
|
||||||
|
.findFirst();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.*;
|
||||||
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "user_actions")
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@ToString
|
||||||
|
@EntityListeners(AuditingEntityListener.class)
|
||||||
|
public class UserAction {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long actionId;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "user_id", nullable = false)
|
||||||
|
@ToString.Exclude
|
||||||
|
private User user;
|
||||||
|
|
||||||
|
@Column(name = "action", nullable = false, length = 100)
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
@Column(name = "details", columnDefinition = "TEXT")
|
||||||
|
private String details;
|
||||||
|
|
||||||
|
@Column(name = "ip_address", length = 45)
|
||||||
|
private String ipAddress;
|
||||||
|
|
||||||
|
@Column(name = "user_agent", columnDefinition = "TEXT")
|
||||||
|
private String userAgent;
|
||||||
|
|
||||||
|
@CreatedDate
|
||||||
|
@Column(name = "created_at", nullable = false, updatable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
}
|
||||||
+1
-2
@@ -1,10 +1,9 @@
|
|||||||
package ru.soune.nocopy.entity.user;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
import ru.soune.nocopy.entity.file.ContentStatus;
|
|
||||||
import ru.soune.nocopy.entity.file.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
+1
-2
@@ -1,10 +1,9 @@
|
|||||||
package ru.soune.nocopy.entity.file;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
import ru.soune.nocopy.entity.user.User;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
+6
-1
@@ -1,9 +1,10 @@
|
|||||||
package ru.soune.nocopy.entity.user;
|
package ru.soune.nocopy.entity.auth;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
import ru.soune.nocopy.entity.User;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@@ -41,4 +42,8 @@ public class AuthToken {
|
|||||||
|
|
||||||
@Column(name = "is_active")
|
@Column(name = "is_active")
|
||||||
private Boolean isActive = true;
|
private Boolean isActive = true;
|
||||||
|
|
||||||
|
public boolean isValid() {
|
||||||
|
return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user