Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c2ffcdcd6e | ||
|
|
5027920199 | ||
|
|
0ed3f958ff | ||
|
|
de810e32b4 | ||
|
|
1a6823f7a9 | ||
|
|
82a57a2983 | ||
|
|
d3e50aa8d1 | ||
|
|
5c6309e228 | ||
|
|
2b7a8b97e1 | ||
|
|
344ec075d4 | ||
|
|
7b8546fd4d | ||
|
|
eb12e219ec | ||
|
|
920cde3cdf | ||
|
|
5b4dca23fb | ||
|
|
7b1ed5fe67 | ||
|
|
8102d72982 | ||
|
|
b3a3d57ee3 | ||
|
|
d896f23872 | ||
|
|
3e06040123 | ||
|
|
18d35cb0fb | ||
|
|
edd508e5d8 | ||
|
|
63baaf7c80 | ||
|
|
3a9a5b48a2 | ||
|
|
6fff5884d2 | ||
|
|
f8673dd581 | ||
|
|
b9a401f113 | ||
|
|
918b4894fc | ||
|
|
bf4d1ca450 | ||
|
|
f1222ede57 | ||
|
|
0da0404488 | ||
|
|
bd9ecd4f84 | ||
|
|
0f73c8319e | ||
|
|
28b0356b03 | ||
|
|
72a4516b7d | ||
|
|
851676b895 | ||
|
|
254fdc0fbd | ||
|
|
a33c53fa6b | ||
|
|
86e7371ffe | ||
|
|
9541e89651 | ||
|
|
291586dbf4 | ||
|
|
91e9b0c785 | ||
|
|
4fa6b83a10 | ||
|
|
2c1a2aeb16 | ||
|
|
2a9f33068a | ||
|
|
1ebe8b852f | ||
|
|
84993dec00 | ||
|
|
a2c20ae645 | ||
|
|
18ec9b51f3 | ||
|
|
45b7acc774 | ||
|
|
b2cf06a512 | ||
|
|
d842af2c62 | ||
|
|
c5ef58ddd4 | ||
|
|
f6d4ebfe0e | ||
|
|
a77a51f519 | ||
|
|
1aef1dcd96 | ||
|
|
7dc32d055b | ||
|
|
19d8f61e1d | ||
|
|
8fe4d854a6 | ||
|
|
4c607f5bf9 | ||
|
|
ce879fea18 | ||
|
|
33479ea9af | ||
|
|
ffb147d716 | ||
|
|
647fd6e1a7 | ||
|
|
76e8f4ab1d | ||
|
|
c03ca2566d | ||
|
|
1932784264 | ||
|
|
bd78b88f33 | ||
|
|
22c2eed8a1 | ||
|
|
f3266ee0e5 | ||
|
|
280bd91257 | ||
|
|
31b90f942c | ||
|
|
d167e92d90 | ||
|
|
f3aa6324c2 | ||
|
|
e2747fc999 | ||
|
|
7e2dd4a654 | ||
|
|
a030837d45 | ||
|
|
651b92cb59 | ||
|
|
11a7ab6a73 | ||
|
|
641e983b89 | ||
|
|
8b6f0f1072 | ||
|
|
9e8c7f0fa1 | ||
|
|
6797a47df5 | ||
|
|
58b4a2f95f | ||
|
|
4a6de6ad9a | ||
|
|
fade754c7c | ||
|
|
b3f29935f6 | ||
|
|
997daae639 | ||
|
|
4ddf2f5dde | ||
|
|
07aad9f51c | ||
|
|
f164370989 | ||
|
|
015f2f516c | ||
|
|
d34a304763 | ||
|
|
0635b9b4ac | ||
|
|
a30b0488e8 | ||
|
|
76da2e94c9 | ||
|
|
420734ff87 | ||
|
|
9ef192ed32 | ||
|
|
8a33bd33a2 | ||
|
|
b5b8bebb69 | ||
|
|
c2ffe08e7d | ||
|
|
92d0cbbf3b | ||
|
|
b2daaa1010 | ||
|
|
d97b7e679f | ||
|
|
530477fb75 | ||
|
|
fc941f97e4 | ||
|
|
6a78475844 | ||
|
|
8a4b8e49f1 | ||
|
|
235ea7143a | ||
|
|
520d2df3a9 | ||
|
|
3b0803bef3 | ||
|
|
7d17b8d617 | ||
|
|
c51608276d |
@@ -1,10 +1,10 @@
|
|||||||
POSTGRES_DB=no_copy_
|
POSTGRES_DB=no_copy_
|
||||||
POSTGRES_USER=postgres
|
POSTGRES_USER=ncp_db
|
||||||
POSTGRES_PASSWORD=postgres
|
POSTGRES_PASSWORD=ncpDbApp
|
||||||
POSTGRES_PORT=5432
|
POSTGRES_PORT=5432
|
||||||
POSTGRES_HOST=postgres
|
POSTGRES_HOST=postgres
|
||||||
|
|
||||||
REDIS_HOST=redis
|
REDIS_HOST=redis
|
||||||
REDIS_PORT=6379
|
REDIS_PORT=6379
|
||||||
|
|
||||||
SERVER_PORT=8080
|
SERVER_PORT=8080
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
name: Test Workflow
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Print environment variables
|
||||||
|
run: |
|
||||||
|
echo "GITHUB_REPOSITORY: $GITHUB_REPOSITORY"
|
||||||
|
echo "GITHUB_SHA: $GITHUB_SHA"
|
||||||
|
echo "GITHUB_REF: $GITHUB_REF"
|
||||||
|
echo "GITHUB_ACTOR: $GITHUB_ACTOR"
|
||||||
|
echo "PATH: $PATH"
|
||||||
+3
-1
@@ -12,6 +12,8 @@ WORKDIR /app
|
|||||||
|
|
||||||
COPY --from=build /app/build/libs/*.jar app.jar
|
COPY --from=build /app/build/libs/*.jar app.jar
|
||||||
|
|
||||||
|
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
CMD ["java", "-jar", "app.jar"]
|
CMD ["java", "-jar", "app.jar"]
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
Создаем сеть:
|
||||||
|
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
|
||||||
|
|
||||||
|
|||||||
+11
-1
@@ -29,13 +29,23 @@ dependencies {
|
|||||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
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 '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'
|
||||||
|
|
||||||
compileOnly 'org.projectlombok:lombok'
|
compileOnly 'org.projectlombok:lombok'
|
||||||
|
|
||||||
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
||||||
|
|
||||||
runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
|
runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
|
||||||
runtimeOnly 'com.mysql:mysql-connector-j'
|
runtimeOnly 'com.mysql:mysql-connector-j'
|
||||||
runtimeOnly 'org.postgresql:postgresql'
|
runtimeOnly 'org.postgresql:postgresql'
|
||||||
annotationProcessor 'org.projectlombok:lombok'
|
|
||||||
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'
|
||||||
|
|||||||
+102
-5
@@ -1,17 +1,44 @@
|
|||||||
version: '3.9'
|
version: '3.9'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
storage:
|
||||||
|
image: alpine:latest
|
||||||
|
container_name: file-storage
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: 128M
|
||||||
|
reservations:
|
||||||
|
memory: 64M
|
||||||
|
networks:
|
||||||
|
- app-network
|
||||||
|
volumes:
|
||||||
|
- uploads_data:/storage:rw
|
||||||
|
command: tail -f /dev/null
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:17
|
image: postgres:17.7
|
||||||
restart: always
|
restart: always
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '2.0'
|
||||||
|
memory: 2G
|
||||||
|
reservations:
|
||||||
|
cpus: '1.0'
|
||||||
|
memory: 1G
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
|
POSTGRES_SHARED_BUFFERS: 512MB
|
||||||
|
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:
|
||||||
@@ -21,12 +48,28 @@ services:
|
|||||||
app:
|
app:
|
||||||
build: .
|
build: .
|
||||||
container_name: app-backend
|
container_name: app-backend
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '1.5'
|
||||||
|
memory: 1G
|
||||||
|
reservations:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 512M
|
||||||
environment:
|
environment:
|
||||||
|
FILE_STORAGE_PATH: /data/uploads
|
||||||
|
MAX_FILE_SIZE: 10737418240
|
||||||
|
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
|
||||||
|
SPRING_PROFILES_ACTIVE: docker
|
||||||
|
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
||||||
|
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
||||||
|
YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
ports:
|
ports:
|
||||||
@@ -37,10 +80,23 @@ services:
|
|||||||
- app
|
- app
|
||||||
- backend
|
- backend
|
||||||
- api
|
- api
|
||||||
|
volumes:
|
||||||
|
- 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
|
||||||
container_name: grafana
|
container_name: grafana
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 512M
|
||||||
|
reservations:
|
||||||
|
memory: 256M
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -57,6 +113,8 @@ services:
|
|||||||
GF_SECURITY_ADMIN_USER: admin
|
GF_SECURITY_ADMIN_USER: admin
|
||||||
GF_SECURITY_ADMIN_PASSWORD: admin
|
GF_SECURITY_ADMIN_PASSWORD: admin
|
||||||
GF_METRICS_ENABLED: "true"
|
GF_METRICS_ENABLED: "true"
|
||||||
|
GF_DATABASE_MAX_IDLE_CONN: "2"
|
||||||
|
GF_DATABASE_MAX_OPEN_CONN: "10"
|
||||||
volumes:
|
volumes:
|
||||||
- ./infrastructure/grafana/provisioning:/etc/grafana/provisioning
|
- ./infrastructure/grafana/provisioning:/etc/grafana/provisioning
|
||||||
- ./infrastructure/grafana/dashboards:/var/lib/grafana/dashboards
|
- ./infrastructure/grafana/dashboards:/var/lib/grafana/dashboards
|
||||||
@@ -71,10 +129,23 @@ services:
|
|||||||
prometheus:
|
prometheus:
|
||||||
image: prom/prometheus:latest
|
image: prom/prometheus:latest
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 1G
|
||||||
|
reservations:
|
||||||
|
memory: 512M
|
||||||
ports:
|
ports:
|
||||||
- "9090:9090"
|
- "9090:9090"
|
||||||
volumes:
|
volumes:
|
||||||
- ./infrastructure/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
|
- ./infrastructure/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
|
||||||
|
- prometheus_data:/prometheus
|
||||||
|
command:
|
||||||
|
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||||
|
- '--storage.tsdb.path=/prometheus'
|
||||||
|
- '--storage.tsdb.retention.time=15d' # Удерживать 15 дней
|
||||||
|
- '--web.enable-lifecycle'
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
@@ -86,10 +157,20 @@ services:
|
|||||||
loki:
|
loki:
|
||||||
image: grafana/loki:2.9.2
|
image: grafana/loki:2.9.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '1.0'
|
||||||
|
memory: 2G
|
||||||
|
reservations:
|
||||||
|
memory: 1G
|
||||||
ports:
|
ports:
|
||||||
- "3100:3100"
|
- "3100:3100"
|
||||||
volumes:
|
volumes:
|
||||||
- ./infrastructure/loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro
|
- ./infrastructure/loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro
|
||||||
|
- loki_data:/loki
|
||||||
|
command:
|
||||||
|
- -config.file=/etc/loki/loki-config.yaml
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "--spider", "-q", "http://localhost:3100/ready" ]
|
test: [ "CMD", "wget", "--spider", "-q", "http://localhost:3100/ready" ]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
@@ -101,6 +182,13 @@ services:
|
|||||||
tempo:
|
tempo:
|
||||||
image: grafana/tempo:2.4.1
|
image: grafana/tempo:2.4.1
|
||||||
container_name: tempo
|
container_name: tempo
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 512M
|
||||||
|
reservations:
|
||||||
|
memory: 256M
|
||||||
command: [ "-config.file=/etc/tempo/tempo.yaml" ]
|
command: [ "-config.file=/etc/tempo/tempo.yaml" ]
|
||||||
volumes:
|
volumes:
|
||||||
- ./infrastructure/tempo/tempo.yaml:/etc/tempo/tempo.yaml
|
- ./infrastructure/tempo/tempo.yaml:/etc/tempo/tempo.yaml
|
||||||
@@ -113,6 +201,13 @@ services:
|
|||||||
alloy:
|
alloy:
|
||||||
image: grafana/alloy:latest
|
image: grafana/alloy:latest
|
||||||
container_name: alloy
|
container_name: alloy
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 256M
|
||||||
|
reservations:
|
||||||
|
memory: 128M
|
||||||
user: root
|
user: root
|
||||||
ports:
|
ports:
|
||||||
- "9080:9080"
|
- "9080:9080"
|
||||||
@@ -141,6 +236,8 @@ volumes:
|
|||||||
loki_chunks:
|
loki_chunks:
|
||||||
loki_index:
|
loki_index:
|
||||||
loki_rules:
|
loki_rules:
|
||||||
|
uploads_data:
|
||||||
|
prometheus_data:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
app-network:
|
app-network:
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ pipeline {
|
|||||||
elif [ -f 'docker-compose.yml' ]; then
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
docker-compose -f docker-compose.yml build
|
docker-compose -f docker-compose.yml build
|
||||||
else
|
else
|
||||||
echo 'Exception:don't found docker-compose'
|
echo 'Exception: docker-compose file not found'
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
"
|
"
|
||||||
@@ -120,6 +120,9 @@ pipeline {
|
|||||||
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}
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
# Проверяем и подключаем к сети app-network если нужно
|
||||||
|
docker network inspect app-network 2>/dev/null || echo 'Warning: app-network not found'
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
docker-compose -f docker-compose.yaml up -d
|
docker-compose -f docker-compose.yaml up -d
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
@@ -150,16 +153,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 "
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||||
echo 'Container start'
|
echo 'Container started'
|
||||||
|
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
||||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||||
echo 'HTTP код: ' \$HTTP_CODE
|
echo 'HTTP code: \$HTTP_CODE'
|
||||||
|
|
||||||
echo 'Frong start on http://92.242.61.23:2998'
|
echo 'Frontend available on http://92.242.61.23:2998'
|
||||||
else
|
else
|
||||||
echo 'Exception: container don't start'
|
echo 'Exception: container did not start'
|
||||||
docker ps -a | grep frontend
|
docker ps -a | grep frontend
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -173,11 +176,11 @@ pipeline {
|
|||||||
|
|
||||||
post {
|
post {
|
||||||
success {
|
success {
|
||||||
echo "Front branch ${params.BRANCH} completed"
|
echo "Front branch ${params.BRANCH} deployment completed"
|
||||||
echo "Use on http://92.242.61.23:2998"
|
echo "Frontend available on http://92.242.61.23:2998"
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Failed"
|
echo "Deployment failed"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,6 @@ pipeline {
|
|||||||
defaultValue: 'dev',
|
defaultValue: 'dev',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
|
|
||||||
string(
|
string(
|
||||||
name: 'SERVER',
|
name: 'SERVER',
|
||||||
defaultValue: '92.242.61.23',
|
defaultValue: '92.242.61.23',
|
||||||
@@ -31,44 +30,8 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Stop old container') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
echo "Stop old container by branch ${params.BRANCH}..."
|
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
|
||||||
cd /opt/deployments/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/${params.BRANCH}
|
|
||||||
|
|
||||||
# Stop old container if have docker-compose
|
|
||||||
if [ -f 'docker-compose.yaml' ] || [ -f 'docker-compose.yml' ]; then
|
|
||||||
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
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Stop and delete container by name
|
|
||||||
docker stop app-${params.BRANCH} 2>/dev/null || true
|
|
||||||
docker rm app-${params.BRANCH} 2>/dev/null || true
|
|
||||||
|
|
||||||
echo "Old containder deleted"
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Copy to server') {
|
stage('Deploy with docker-compose') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
withCredentials([
|
withCredentials([
|
||||||
@@ -76,130 +39,73 @@ pipeline {
|
|||||||
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 "Copy files on server..."
|
echo "Deploying branch: ${params.BRANCH}"
|
||||||
|
|
||||||
# Clean mkdir
|
echo "Copying files to server..."
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||||
rm -rf /opt/deployments/${params.BRANCH}/*
|
sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||||
mkdir -p /opt/deployments/${params.BRANCH}
|
|
||||||
"
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||||
|
cd /opt/deployments/${params.BRANCH}
|
||||||
# Copy all files
|
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/ 2>/dev/null || true
|
echo '1. Остановка старого приложения...'
|
||||||
|
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
echo "Files copied"
|
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
"""
|
|
||||||
}
|
echo '2. Удаление старых образов...'
|
||||||
}
|
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||||
}
|
|
||||||
}
|
echo '3. Создание сети если нужно...'
|
||||||
|
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||||
stage('Build on server') {
|
|
||||||
steps {
|
echo '4. Запуск инфраструктуры...'
|
||||||
script {
|
docker-compose up -d db storage
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
echo '5. Ожидание PostgreSQL...'
|
||||||
credentialsId: 'server-root-password',
|
sleep 10
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
echo '6. Сборка нового образа приложения...'
|
||||||
)
|
docker build --no-cache -t app-backend:latest .
|
||||||
]) {
|
|
||||||
sh """
|
echo '7. Запуск приложения...'
|
||||||
echo "Build on server..."
|
docker run -d \\
|
||||||
|
--name app-backend \\
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
--network app-network \\
|
||||||
cd /opt/deployments/${params.BRANCH}
|
--network-alias app \\
|
||||||
|
-p 80:8080 \\
|
||||||
echo "Build Docker for branch ${params.BRANCH}..."
|
-v uploads_data:/data/uploads:rw \\
|
||||||
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
# delete old docker image
|
-e POSTGRES_USER=$DB_USER \\
|
||||||
docker rmi app:${params.BRANCH} 2>/dev/null || true
|
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||||
|
-e POSTGRES_PORT=5432 \\
|
||||||
# build from branch
|
-e POSTGRES_HOST=db \\
|
||||||
if [ -f 'Dockerfile' ]; then
|
--restart unless-stopped \\
|
||||||
docker build -t app:${params.BRANCH} .
|
app-backend:latest
|
||||||
echo "Docker образ app:${params.BRANCH} собран"
|
|
||||||
fi
|
echo '8. Запуск мониторинга...'
|
||||||
|
docker-compose up -d grafana prometheus loki tempo alloy
|
||||||
# or from docker-compose
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
echo '9. Проверка...'
|
||||||
docker-compose -f docker-compose.yaml build
|
sleep 5
|
||||||
echo "Build from docker-compose.yaml completed"
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
echo 'Статус контейнеров:'
|
||||||
docker-compose -f docker-compose.yml build
|
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||||
echo "Build from docker-compose.yml completed"
|
|
||||||
fi
|
echo '10. Проверка health...'
|
||||||
|
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
||||||
echo 'Build completed'
|
echo 'Приложение работает'
|
||||||
"
|
echo 'URL: http://${params.SERVER}:80'
|
||||||
"""
|
else
|
||||||
}
|
echo 'Проверка health не удалась'
|
||||||
}
|
docker logs app-backend --tail=20
|
||||||
}
|
fi
|
||||||
}
|
"
|
||||||
|
"""
|
||||||
stage('Start on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
echo "Start container..."
|
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
|
||||||
cd /opt/deployments/${params.BRANCH}
|
|
||||||
|
|
||||||
# If have docker-compose - use them
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
echo "Start docker-compose.yaml..."
|
|
||||||
docker-compose -f docker-compose.yaml up -d
|
|
||||||
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
|
||||||
echo "Start docker-compose.yml..."
|
|
||||||
docker-compose -f docker-compose.yml up -d
|
|
||||||
|
|
||||||
# If have Dockerfile - start
|
|
||||||
elif [ -f 'Dockerfile' ]; then
|
|
||||||
echo "Start app-${params.BRANCH}..."
|
|
||||||
docker run -d \\
|
|
||||||
--name app-${params.BRANCH} \\
|
|
||||||
-p 8080:8080 \\
|
|
||||||
app:${params.BRANCH}
|
|
||||||
else
|
|
||||||
echo "Error:Dockerfile NOT FOUND, docker-compose.yaml or docker-compose.yml"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'Container start'
|
|
||||||
|
|
||||||
# Wait start
|
|
||||||
sleep 10
|
|
||||||
|
|
||||||
# Check status
|
|
||||||
echo 'status container:'
|
|
||||||
if [ -f 'docker-compose.yaml' ] || [ -f 'docker-compose.yml' ]; then
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
docker-compose -f docker-compose.yaml ps
|
|
||||||
else
|
|
||||||
docker-compose -f docker-compose.yml ps
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
docker ps --filter "name=app-${params.BRANCH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ''
|
|
||||||
echo 'Apps start on:'
|
|
||||||
echo 'http://$SERVER:80'
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -208,11 +114,14 @@ pipeline {
|
|||||||
|
|
||||||
post {
|
post {
|
||||||
success {
|
success {
|
||||||
echo "Deploy branch ${params.BRANCH} completed"
|
echo "Deployment successful"
|
||||||
echo "App : http://$SERVER:80"
|
echo "Application URL: http://${params.SERVER}:80"
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Deploy failed"
|
echo "Deployment failed for branch ${params.BRANCH}"
|
||||||
|
}
|
||||||
|
always {
|
||||||
|
echo "Deployment process finished"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
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;
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
package ru.soune.no_copy.controller;
|
|
||||||
|
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.no_copy.dto.AuthResponse;
|
|
||||||
import ru.soune.no_copy.dto.LoginRequest;
|
|
||||||
import ru.soune.no_copy.dto.LoginResponse;
|
|
||||||
import ru.soune.no_copy.dto.RegisterRequest;
|
|
||||||
import ru.soune.no_copy.entity.AuthToken;
|
|
||||||
import ru.soune.no_copy.exception.TokenNotFoundException;
|
|
||||||
import ru.soune.no_copy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.no_copy.service.AuthService;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("v1/api/auth")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class AuthController {
|
|
||||||
|
|
||||||
private final AuthService authService;
|
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
@PostMapping("/register")
|
|
||||||
public ResponseEntity<AuthResponse> register(@Valid @RequestBody RegisterRequest registerRequest) {
|
|
||||||
AuthToken authToken = authService.register(registerRequest);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(new AuthResponse(true, "success.user.register", authToken.getToken(),
|
|
||||||
authToken.getExpiresAt()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/login")
|
|
||||||
public ResponseEntity<LoginResponse> login(@Valid @RequestBody LoginRequest request) {
|
|
||||||
AuthToken login = authService.login(request);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(new LoginResponse(true, login.getUser().getEmail(),
|
|
||||||
login.getToken(),login.getExpiresAt().toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/logout")
|
|
||||||
public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
|
|
||||||
Optional<AuthToken> opToken = authTokenRepository.findByToken(token);
|
|
||||||
|
|
||||||
if (opToken.isEmpty()) {
|
|
||||||
throw new TokenNotFoundException("Token not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
authService.logout(token);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(Map.of("success", true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package ru.soune.no_copy.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import ru.soune.no_copy.entity.User;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class LoginResponse {
|
|
||||||
private boolean success;
|
|
||||||
private String email;
|
|
||||||
private String token;
|
|
||||||
private String expiresAt;
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
package ru.soune.no_copy.dto;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import jakarta.validation.constraints.Email;
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import jakarta.validation.constraints.Past;
|
|
||||||
import jakarta.validation.constraints.Size;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
import ru.soune.no_copy.entity.GenderType;
|
|
||||||
import ru.soune.no_copy.entity.SubscriptionType;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
|
||||||
|
|
||||||
public record RegisterRequest(
|
|
||||||
@NotBlank(message = "error.name.length")
|
|
||||||
String fullName,
|
|
||||||
|
|
||||||
String companyName,
|
|
||||||
|
|
||||||
@Size(min = 11, max = 14)
|
|
||||||
String phone,
|
|
||||||
|
|
||||||
@NotBlank(message = "error.not.blank")
|
|
||||||
@Email(message = "error.not.email")
|
|
||||||
@Size(max = 128)
|
|
||||||
String email,
|
|
||||||
|
|
||||||
@DateTimeFormat(pattern = "dd-MM-yyyy")
|
|
||||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
|
||||||
@Past
|
|
||||||
LocalDate birthday,
|
|
||||||
|
|
||||||
@NotBlank(message = "error.not.blank")
|
|
||||||
@Size(min = 8)
|
|
||||||
String password,
|
|
||||||
|
|
||||||
SubscriptionType subscriptionType,
|
|
||||||
|
|
||||||
GenderType genderType
|
|
||||||
) {}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
package ru.soune.no_copy.entity;
|
|
||||||
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
public enum FileType {
|
|
||||||
PHOTO("photo"),
|
|
||||||
VIDEO("video"),
|
|
||||||
AUDIO("audio"),
|
|
||||||
DOCUMENT("document");
|
|
||||||
|
|
||||||
private final String code;
|
|
||||||
|
|
||||||
FileType(String code) {
|
|
||||||
this.code = code;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getCode() {
|
|
||||||
return code;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package ru.soune.no_copy.exception;
|
|
||||||
|
|
||||||
public class UserAlreadyExistsException extends RuntimeException {
|
|
||||||
public UserAlreadyExistsException(String message) {
|
|
||||||
super(message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+3
-1
@@ -1,9 +1,11 @@
|
|||||||
package ru.soune.no_copy;
|
package ru.soune.nocopy;
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
|
@EnableScheduling
|
||||||
public class NoCopyApplication {
|
public class NoCopyApplication {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import ru.soune.nocopy.handler.*;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class HandlerConfig {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public Map<Integer, RequestHandler> handlers(
|
||||||
|
RegRequestHandler reg,
|
||||||
|
LoginRequestHandler login,
|
||||||
|
FileUploadHandler upload,
|
||||||
|
FileEntityHandler file,
|
||||||
|
LogoutRequestHandler logoutHandler,
|
||||||
|
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||||
|
AuthRequestHandler authRequestHandler
|
||||||
|
) {
|
||||||
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
|
map.put(20001, login);
|
||||||
|
map.put(20002, reg);
|
||||||
|
map.put(20004, upload);
|
||||||
|
map.put(20005, file);
|
||||||
|
map.put(20006, logoutHandler);
|
||||||
|
map.put(20007, imageFoundRequestHandler);
|
||||||
|
map.put(20008, authRequestHandler);
|
||||||
|
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
import com.fasterxml.jackson.databind.SerializationFeature;
|
||||||
@@ -35,6 +35,8 @@ 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
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
|
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package ru.soune.nocopy.configuration.file;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.scheduling.annotation.EnableAsync;
|
||||||
|
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||||
|
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableAsync
|
||||||
|
public class AsyncConfig {
|
||||||
|
|
||||||
|
@Bean(name = "fileUploadTaskExecutor")
|
||||||
|
public Executor fileUploadTaskExecutor() {
|
||||||
|
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
||||||
|
executor.setCorePoolSize(3);
|
||||||
|
executor.setMaxPoolSize(10);
|
||||||
|
executor.setQueueCapacity(50);
|
||||||
|
executor.setThreadNamePrefix("FileUpload-");
|
||||||
|
executor.initialize();
|
||||||
|
return executor;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,384 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.core.io.Resource;
|
||||||
|
import org.springframework.core.io.UrlResource;
|
||||||
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.validation.FieldError;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.RegAnswer;
|
||||||
|
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
||||||
|
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.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
import ru.soune.nocopy.exception.*;
|
||||||
|
import ru.soune.nocopy.handler.*;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ApiController {
|
||||||
|
private final FileUploadService fileUploadService;
|
||||||
|
|
||||||
|
private final Map<Integer, RequestHandler> handlers;
|
||||||
|
|
||||||
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/data")
|
||||||
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
|
@PathVariable("version") int version) {
|
||||||
|
Integer msgId = request.getMsgId();
|
||||||
|
BaseResponse response;
|
||||||
|
|
||||||
|
try {
|
||||||
|
RequestHandler handler = handlers.get(msgId);
|
||||||
|
|
||||||
|
if (handler == null) {
|
||||||
|
response = new BaseResponse(msgId,
|
||||||
|
MessageCode.MSG_ID_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.MSG_ID_NOT_FOUND.getDescription(),
|
||||||
|
new HashMap<>());
|
||||||
|
} else {
|
||||||
|
response = handler.handle(request);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(response);
|
||||||
|
} catch (ValidationException e) {
|
||||||
|
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
||||||
|
} 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) {
|
||||||
|
throw e;
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Handler execution failed for msgId: {}", msgId, e);
|
||||||
|
|
||||||
|
BaseResponse errorResponse = new BaseResponse(msgId,
|
||||||
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
|
MessageCode.INVALID_JSON_BODY.getDescription(),
|
||||||
|
new HashMap<>());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(errorResponse);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/files/chunk")
|
||||||
|
public ResponseEntity<BaseResponse> uploadChunk(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@RequestParam(value = "upload_id", required = false) String uploadId,
|
||||||
|
@RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
|
||||||
|
@RequestParam(value = "chunk", required = false) MultipartFile chunk) {
|
||||||
|
try {
|
||||||
|
if (chunk == null || chunk.isEmpty()) {
|
||||||
|
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()) {
|
||||||
|
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) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Valid chunk number is required", ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build()));
|
||||||
|
}
|
||||||
|
|
||||||
|
fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
||||||
|
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.chunkSize(chunk.getSize())
|
||||||
|
.message("Chunk uploaded successfully")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
|
"Chunk uploaded successfully", responseBody));
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error uploading chunk", e);
|
||||||
|
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to upload chunk: " + e.getMessage(), responseBody));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
|
public ResponseEntity<BaseResponse> getUploadProgress(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String uploadId) {
|
||||||
|
|
||||||
|
log.info("Getting progress for upload session: {}, version: {}", uploadId, version);
|
||||||
|
|
||||||
|
try {
|
||||||
|
var progress = fileUploadService.getUploadProgress(uploadId);
|
||||||
|
|
||||||
|
UploadProgress responseBody = UploadProgress.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.fileName(progress.getFileName())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.progressPercentage(progress.getProgressPercentage())
|
||||||
|
.filePath(progress.getFilePath())
|
||||||
|
.remainingChunks(progress.getTotalChunks() - progress.getUploadedChunks())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting progress for upload: {}", uploadId, e);
|
||||||
|
|
||||||
|
UploadProgress responseBody = UploadProgress.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get upload progress: " + e.getMessage(), responseBody));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/files/{uploadId}/complete")
|
||||||
|
public ResponseEntity<BaseResponse> completeUpload(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String uploadId) {
|
||||||
|
|
||||||
|
log.info("Completing upload session: {}, version: {}", uploadId, version);
|
||||||
|
|
||||||
|
try {
|
||||||
|
var progress = fileUploadService.getUploadProgress(uploadId);
|
||||||
|
|
||||||
|
if (progress.getStatus() == UploadStatus.COMPLETED) {
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("Upload already completed")
|
||||||
|
.filePath(progress.getFilePath())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
|
"Upload already completed", responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (progress.getUploadedChunks() < progress.getTotalChunks()) {
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("Not all chunks uploaded")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.INCOMPLETE_UPLOAD.getCode(),
|
||||||
|
"Not all chunks uploaded", responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("File assembly in progress")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
|
"File assembly in progress", responseBody));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error completing upload: {}", uploadId, e);
|
||||||
|
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to complete upload: " + e.getMessage(), responseBody));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/files/download/{fileId}")
|
||||||
|
public ResponseEntity<?> downloadFile(
|
||||||
|
@PathVariable(required = false) String fileId,
|
||||||
|
@PathVariable(required = false) Integer version,
|
||||||
|
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
|
try {
|
||||||
|
if (tokenHeader == null) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
errorData.put("fileId", fileId);
|
||||||
|
errorData.put("version", version);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
|
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||||
|
|
||||||
|
if (!entityResponse.getUserId().equals(userId)) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (entityResponse.getStatus().equals(FileStatus.DELETED)) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("file_status", entityResponse.getStatus());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!entityResponse.isExistsOnDisk()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
Path filePath = Paths.get(entityResponse.getFilePath());
|
||||||
|
Resource resource = new UrlResource(filePath.toUri());
|
||||||
|
|
||||||
|
if (!resource.exists()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("resource", resource.exists());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
String contentType = determineContentType(filePath);
|
||||||
|
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.contentType(MediaType.parseMediaType(contentType))
|
||||||
|
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||||
|
"attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
|
||||||
|
.header(HttpHeaders.CONTENT_LENGTH, String.valueOf(entityResponse.getFileSize()))
|
||||||
|
.body(resource);
|
||||||
|
} catch (FileEntityNotFoundException e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("fileId", fileId);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
errorData));
|
||||||
|
} catch (NotFoundAuthToken | IOException e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
errorData.put("fileId", fileId);
|
||||||
|
errorData.put("version", version);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
|
||||||
|
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
||||||
|
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||||
|
.stream()
|
||||||
|
.map(this::createErrorDetail)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
|
regAnswer.setFieldErrors(fieldErrors);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.INVALID_FIELD.getCode(),
|
||||||
|
MessageCode.INVALID_FIELD.getDescription(), regAnswer));
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<String, String> createErrorDetail(FieldError fieldError) {
|
||||||
|
Map<String, String> errorDetail = new HashMap<>();
|
||||||
|
errorDetail.put("field", fieldError.getField());
|
||||||
|
errorDetail.put("code", fieldError.getCode() != null ? fieldError.getCode() : "VALIDATION_ERROR");
|
||||||
|
errorDetail.put("message", fieldError.getDefaultMessage());
|
||||||
|
|
||||||
|
if (fieldError.getRejectedValue() != null &&
|
||||||
|
!fieldError.getField().toLowerCase().contains("password")) {
|
||||||
|
errorDetail.put("rejected_value", fieldError.getRejectedValue().toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return errorDetail;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private String determineContentType(Path filePath) throws IOException {
|
||||||
|
String contentType = Files.probeContentType(filePath);
|
||||||
|
if (contentType == null) {
|
||||||
|
contentType = "application/octet-stream";
|
||||||
|
}
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("check/api")
|
||||||
|
public class HealtCheckController {
|
||||||
|
|
||||||
|
@GetMapping("/healt")
|
||||||
|
public HttpStatus healtCheck() {
|
||||||
|
return HttpStatus.OK;
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
+12
-12
@@ -1,19 +1,19 @@
|
|||||||
package ru.soune.no_copy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import ru.soune.no_copy.dto.ChangePasswordRequest;
|
import ru.soune.nocopy.dto.ChangePasswordRequest;
|
||||||
import ru.soune.no_copy.dto.UserDTO;
|
import ru.soune.nocopy.dto.UserDTO;
|
||||||
import ru.soune.no_copy.dto.UserRequest;
|
import ru.soune.nocopy.dto.UserRequest;
|
||||||
import ru.soune.no_copy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.no_copy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.no_copy.exception.InvalidUserEmail;
|
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||||
import ru.soune.no_copy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.no_copy.mapper.UserMapper;
|
import ru.soune.nocopy.mapper.UserMapper;
|
||||||
import ru.soune.no_copy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.no_copy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.no_copy.service.UserService;
|
import ru.soune.nocopy.service.UserService;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
|
public class BaseRequest {
|
||||||
|
@JsonProperty("version")
|
||||||
|
Integer version;
|
||||||
|
|
||||||
|
@JsonProperty("msg_id")
|
||||||
|
Integer msgId;
|
||||||
|
|
||||||
|
@JsonProperty("message_body")
|
||||||
|
Object messageBody;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
|
public class BaseResponse {
|
||||||
|
@JsonProperty("msg_id")
|
||||||
|
private Integer msgId;
|
||||||
|
|
||||||
|
@JsonProperty("message_code")
|
||||||
|
private Integer messageCode;
|
||||||
|
|
||||||
|
@JsonProperty("message_desc")
|
||||||
|
private String messageDesc;
|
||||||
|
|
||||||
|
@JsonProperty("message_body")
|
||||||
|
private Object messageBody;
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class LogOutAnswer {
|
||||||
|
private String email;
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class LoginAnswer {
|
||||||
|
private String Token;
|
||||||
|
|
||||||
|
private List<Map<String, String>> fieldErrors;
|
||||||
|
}
|
||||||
+3
-1
@@ -1,5 +1,6 @@
|
|||||||
package ru.soune.no_copy.dto;
|
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;
|
||||||
@@ -10,6 +11,7 @@ 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)
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.Email;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class LogoutRequest {
|
||||||
|
@NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
@NotBlank(message = "error.not.blank")
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
public enum MessageCode {
|
||||||
|
SUCCESS(0, "Operation successful"),
|
||||||
|
REG_EMAIL_EXISTS(1, "Email already registered"),
|
||||||
|
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||||
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
|
INVALID_TOKEN(2, "Invalid token"),
|
||||||
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
|
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"),
|
||||||
|
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||||
|
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
||||||
|
FILE_ENTITY_ERROR(2, "File entity error"),
|
||||||
|
ACCESS_DENIED(2, "Access denied"),
|
||||||
|
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
||||||
|
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
||||||
|
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
|
||||||
|
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
|
||||||
|
FILE_NOT_FOUND(4, "File not found"),
|
||||||
|
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
|
||||||
|
|
||||||
|
private final Integer code;
|
||||||
|
|
||||||
|
private final String description;
|
||||||
|
|
||||||
|
MessageCode(Integer code, String description) {
|
||||||
|
this.code = code;
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getCode() {
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class RegAnswer {
|
||||||
|
private String Token;
|
||||||
|
|
||||||
|
private List<Map<String, String>> fieldErrors;
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import jakarta.validation.constraints.*;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
|
public class RegRequest {
|
||||||
|
@NotEmpty(message = "Full name is required")
|
||||||
|
private String fullName;
|
||||||
|
|
||||||
|
private String companyName;
|
||||||
|
|
||||||
|
@Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
|
||||||
|
private String phone;
|
||||||
|
|
||||||
|
@NotBlank(message = "Email is required")
|
||||||
|
@Email(message = "Invalid email format")
|
||||||
|
@Size(max = 128, message = "Email too long")
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
@NotBlank(message = "Password is required")
|
||||||
|
@Size(min = 8, message = "Password must be at least 8 characters")
|
||||||
|
private String password;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class TokenProcessRequest {
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
+1
-2
@@ -1,7 +1,6 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import ru.soune.no_copy.entity.FileType;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class UserContentDTO {
|
public class UserContentDTO {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.dto;
|
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
-3
@@ -1,7 +1,7 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import ru.soune.no_copy.entity.ContentStatus;
|
import ru.soune.nocopy.entity.ContentStatus;
|
||||||
import ru.soune.no_copy.entity.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.dto;
|
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
-3
@@ -1,11 +1,11 @@
|
|||||||
package ru.soune.no_copy.dto;
|
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.no_copy.entity.GenderType;
|
import ru.soune.nocopy.entity.GenderType;
|
||||||
import ru.soune.no_copy.entity.SubscriptionType;
|
import ru.soune.nocopy.entity.SubscriptionType;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
+3
-3
@@ -1,16 +1,16 @@
|
|||||||
package ru.soune.no_copy.dto;
|
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.no_copy.entity.GenderType;
|
import ru.soune.nocopy.entity.GenderType;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@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;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class ActionResponse {
|
||||||
|
private List<String> availableActions;
|
||||||
|
private String action;
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class CanceledUploadResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class ChunkStatusResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_status")
|
||||||
|
private Map<String, Boolean> chunkStatus;
|
||||||
|
|
||||||
|
@JsonProperty("uploaded_chunks")
|
||||||
|
private Integer uploadedChunks;
|
||||||
|
|
||||||
|
@JsonProperty("missing_chunks")
|
||||||
|
private Integer missingChunks;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class ChunkUploadResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_number")
|
||||||
|
private Integer chunkNumber;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_size")
|
||||||
|
private Long chunkSize;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class CompleteUploadResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("uploaded_chunks")
|
||||||
|
private Integer uploadedChunks;
|
||||||
|
|
||||||
|
@JsonProperty("total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
@JsonProperty("file_path")
|
||||||
|
private String filePath;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class DeleteFileResponse {
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class FileEntityRequest {
|
||||||
|
@JsonProperty("action")
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("upload_session_id")
|
||||||
|
private String uploadSessionId;
|
||||||
|
|
||||||
|
@JsonProperty("query")
|
||||||
|
private String query;
|
||||||
|
|
||||||
|
@JsonProperty("page")
|
||||||
|
private Integer page;
|
||||||
|
|
||||||
|
@JsonProperty("page_size")
|
||||||
|
private Integer pageSize;
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class FileEntityResponse {
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
private Long userId;
|
||||||
|
private String originalFileName;
|
||||||
|
private String storedFileName;
|
||||||
|
private String filePath;
|
||||||
|
private Long fileSize;
|
||||||
|
private String mimeType;
|
||||||
|
private String fileExtension;
|
||||||
|
private String checksum;
|
||||||
|
private String uploadSessionId;
|
||||||
|
private FileStatus status;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
private LocalDateTime updatedAt;
|
||||||
|
private String formattedSize;
|
||||||
|
private String downloadUrl;
|
||||||
|
private boolean existsOnDisk;
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class FileExtensionResponse {
|
||||||
|
@JsonProperty("file_extension")
|
||||||
|
private List<String> extension;
|
||||||
|
|
||||||
|
@JsonProperty("count")
|
||||||
|
private Integer count;
|
||||||
|
|
||||||
|
@JsonProperty("max_file_size")
|
||||||
|
private Long maxFileSize;
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class FileInfoUserResponse {
|
||||||
|
@JsonProperty("all_files_size")
|
||||||
|
private Long allFileSize;
|
||||||
|
|
||||||
|
@JsonProperty("all_files_quantity")
|
||||||
|
private Integer fileCount;
|
||||||
|
|
||||||
|
@JsonProperty("all_files_check")
|
||||||
|
private Integer filesCheck;
|
||||||
|
|
||||||
|
@JsonProperty("all_files_violation")
|
||||||
|
private Integer filesViolation;
|
||||||
|
|
||||||
|
@JsonProperty("images_size")
|
||||||
|
private Long imagesSize;
|
||||||
|
|
||||||
|
@JsonProperty("images_quantity")
|
||||||
|
private Integer imagesCount;
|
||||||
|
|
||||||
|
@JsonProperty("images_check")
|
||||||
|
private Integer imagesCheck;
|
||||||
|
|
||||||
|
@JsonProperty("images_violations")
|
||||||
|
private Integer imagesViolations;
|
||||||
|
|
||||||
|
@JsonProperty("videos_size")
|
||||||
|
private Long videosSize;
|
||||||
|
|
||||||
|
@JsonProperty("videos_quantity")
|
||||||
|
private Integer videosCount;
|
||||||
|
|
||||||
|
@JsonProperty("videos_check")
|
||||||
|
private Integer videosCheck;
|
||||||
|
|
||||||
|
@JsonProperty("videos_violations")
|
||||||
|
private Integer videosViolations;
|
||||||
|
|
||||||
|
@JsonProperty("audios_size")
|
||||||
|
private Long audiosSize;
|
||||||
|
|
||||||
|
@JsonProperty("audios_quantity")
|
||||||
|
private Integer audiosCount;
|
||||||
|
|
||||||
|
@JsonProperty("audios_check")
|
||||||
|
private Integer audiosCheck;
|
||||||
|
|
||||||
|
@JsonProperty("audios_violations")
|
||||||
|
private Integer audiosViolations;
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class FileListResponse {
|
||||||
|
@JsonProperty("files")
|
||||||
|
private List<FileEntityResponse> files;
|
||||||
|
|
||||||
|
@JsonProperty("total_count")
|
||||||
|
private Integer totalCount;
|
||||||
|
|
||||||
|
@JsonProperty("total_size")
|
||||||
|
private Long totalSize;
|
||||||
|
|
||||||
|
@JsonProperty("formatted_total_size")
|
||||||
|
private String formattedTotalSize;
|
||||||
|
|
||||||
|
@JsonProperty("page")
|
||||||
|
private Integer page;
|
||||||
|
|
||||||
|
@JsonProperty("page_size")
|
||||||
|
private Integer pageSize;
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
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 FileResponse {
|
||||||
|
|
||||||
|
private List<FileEntityResponse> files;
|
||||||
|
private int totalCount;
|
||||||
|
private long totalSize;
|
||||||
|
private String formattedTotalSize;
|
||||||
|
private int page;
|
||||||
|
private int pageSize;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class FileTypesResponse {
|
||||||
|
@JsonProperty("file_types")
|
||||||
|
private List<FileType> fileTypes;
|
||||||
|
|
||||||
|
@JsonProperty("count")
|
||||||
|
private Integer count;
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class FileUploadRequest {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("file_name")
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@JsonProperty("file_type")
|
||||||
|
private String fileType;
|
||||||
|
|
||||||
|
@JsonProperty("extension")
|
||||||
|
private String extension;
|
||||||
|
|
||||||
|
@JsonProperty("file_size")
|
||||||
|
private Long fileSize;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_number")
|
||||||
|
private Integer chunkNumber;
|
||||||
|
|
||||||
|
@JsonProperty("action")
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class InitFileResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("file_name")
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@JsonProperty("total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_size")
|
||||||
|
private Long chunkSize;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("field_errors")
|
||||||
|
private List<Map<String, String>> fieldErrors;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import jakarta.validation.constraints.Positive;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class InitUploadRequest {
|
||||||
|
|
||||||
|
@NotBlank(message = "File name is required")
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@NotBlank(message = "File type is required")
|
||||||
|
private String fileType;
|
||||||
|
|
||||||
|
@NotBlank(message = "File extension is required")
|
||||||
|
private String extension;
|
||||||
|
|
||||||
|
@NotNull(message = "File size is required")
|
||||||
|
@Positive(message = "File size must be positive")
|
||||||
|
private Long fileSize;
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class RetryUploadResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class StorageUsageResponse {
|
||||||
|
@JsonProperty("user_id")
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
@JsonProperty("storage_used")
|
||||||
|
private Long storageUsed;
|
||||||
|
|
||||||
|
@JsonProperty("formatted_storage_used")
|
||||||
|
private String formattedStorageUsed;
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Builder
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class UploadProgress {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("file_name")
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@JsonProperty("total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@JsonProperty("uploaded_chunks")
|
||||||
|
private Integer uploadedChunks;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("progress_percentage")
|
||||||
|
private Integer progressPercentage;
|
||||||
|
|
||||||
|
@JsonProperty("file_path")
|
||||||
|
private String filePath;
|
||||||
|
|
||||||
|
@JsonProperty("remaining_chunks")
|
||||||
|
private Integer remainingChunks;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class UploadProgressResponse {
|
||||||
|
|
||||||
|
private String uploadId;
|
||||||
|
private String fileName;
|
||||||
|
private Integer totalChunks;
|
||||||
|
private Integer uploadedChunks;
|
||||||
|
private UploadStatus status;
|
||||||
|
private Integer progressPercentage;
|
||||||
|
private String filePath;
|
||||||
|
|
||||||
|
public static UploadProgressResponse fromSession(FileUploadSession session) {
|
||||||
|
int progress = session.getTotalChunks() == 0 ? 0 :
|
||||||
|
(session.getChunksUploaded() * 100) / session.getTotalChunks();
|
||||||
|
|
||||||
|
return UploadProgressResponse.builder()
|
||||||
|
.uploadId(session.getUploadId())
|
||||||
|
.fileName(session.getFileName())
|
||||||
|
.totalChunks(session.getTotalChunks())
|
||||||
|
.uploadedChunks(session.getChunksUploaded())
|
||||||
|
.status(session.getStatus())
|
||||||
|
.progressPercentage(progress)
|
||||||
|
.filePath(session.getFilePath())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
@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;
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-6
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
@@ -30,7 +30,7 @@ public class AuthToken {
|
|||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
@Column(name = "expires_at", nullable = false)
|
@Column(name = "expires_at", nullable = false)
|
||||||
private LocalDateTime expiresAt = LocalDateTime.now().plusDays(30);
|
private LocalDateTime expiresAt = LocalDateTime.now().plusHours(1);
|
||||||
|
|
||||||
@CreatedDate
|
@CreatedDate
|
||||||
@Column(name = "created_at", updatable = false, nullable = false)
|
@Column(name = "created_at", updatable = false, nullable = false)
|
||||||
@@ -41,8 +41,4 @@ 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());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
public enum GenderType {
|
public enum GenderType {
|
||||||
MALE, FEMALE
|
MALE, FEMALE
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
+2
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
@@ -42,6 +42,7 @@ public class User {
|
|||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
@Size(min = 11, max = 14)
|
@Size(min = 11, max = 14)
|
||||||
|
@Column(unique = true)
|
||||||
private String phone;
|
private String phone;
|
||||||
|
|
||||||
@Enumerated(EnumType.STRING)
|
@Enumerated(EnumType.STRING)
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
+2
-2
@@ -1,10 +1,10 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.hibernate.annotations.CreationTimestamp;
|
|
||||||
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.FileType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.*;
|
||||||
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
|
import org.springframework.data.annotation.LastModifiedDate;
|
||||||
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Entity
|
||||||
|
@Table(name = "file_entities")
|
||||||
|
@EntityListeners(AuditingEntityListener.class)
|
||||||
|
public class FileEntity {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.UUID)
|
||||||
|
private String id;
|
||||||
|
|
||||||
|
@Column(name = "user_id", nullable = false)
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
@Column(name = "original_file_name", nullable = false)
|
||||||
|
private String originalFileName;
|
||||||
|
|
||||||
|
@Column(name = "stored_file_name", nullable = false)
|
||||||
|
private String storedFileName;
|
||||||
|
|
||||||
|
@Column(name = "file_path", nullable = false, unique = true)
|
||||||
|
private String filePath;
|
||||||
|
|
||||||
|
@Column(name = "file_size", nullable = false)
|
||||||
|
private Long fileSize;
|
||||||
|
|
||||||
|
@Column(name = "mime_type")
|
||||||
|
private String mimeType;
|
||||||
|
|
||||||
|
@Column(name = "file_extension")
|
||||||
|
private String fileExtension;
|
||||||
|
|
||||||
|
@Column(name = "checksum")
|
||||||
|
private String checksum;
|
||||||
|
|
||||||
|
@Column(name = "upload_session_id")
|
||||||
|
private String uploadSessionId;
|
||||||
|
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
@Column(name = "status")
|
||||||
|
private FileStatus status;
|
||||||
|
|
||||||
|
@CreatedDate
|
||||||
|
@Column(name = "created_at", updatable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
|
@LastModifiedDate
|
||||||
|
@Column(name = "updated_at")
|
||||||
|
private LocalDateTime updatedAt;
|
||||||
|
|
||||||
|
@PrePersist
|
||||||
|
public void prePersist() {
|
||||||
|
if (this.status == null) {
|
||||||
|
this.status = FileStatus.ACTIVE;
|
||||||
|
}
|
||||||
|
if (this.createdAt == null) {
|
||||||
|
this.createdAt = LocalDateTime.now();
|
||||||
|
}
|
||||||
|
this.updatedAt = LocalDateTime.now();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreUpdate
|
||||||
|
public void preUpdate() {
|
||||||
|
this.updatedAt = LocalDateTime.now();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
public enum FileStatus {
|
||||||
|
ACTIVE,
|
||||||
|
DELETED,
|
||||||
|
PROCESSING,
|
||||||
|
VIOLATION,
|
||||||
|
CHECKED,
|
||||||
|
ERROR
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public enum FileType {
|
||||||
|
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
|
||||||
|
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
||||||
|
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
||||||
|
AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
|
||||||
|
|
||||||
|
private final String displayName;
|
||||||
|
private final List<String> allowedExtensions;
|
||||||
|
|
||||||
|
FileType(String displayName, List<String> allowedExtensions) {
|
||||||
|
this.displayName = displayName;
|
||||||
|
this.allowedExtensions = allowedExtensions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDisplayName() {
|
||||||
|
return displayName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getAllowedExtensions() {
|
||||||
|
return allowedExtensions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean supportsExtension(String extension) {
|
||||||
|
return allowedExtensions.contains(extension.toLowerCase());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.*;
|
||||||
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Entity
|
||||||
|
@Table(name = "file_upload_sessions")
|
||||||
|
public class FileUploadSession {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.UUID)
|
||||||
|
@Column(name = "upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@Column(name = "user_id", nullable = false)
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
@Column(name = "file_name", nullable = false)
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@Column(name = "file_type")
|
||||||
|
private String fileType;
|
||||||
|
|
||||||
|
@Column(name = "file_size")
|
||||||
|
private Long fileSize;
|
||||||
|
|
||||||
|
@Column(name = "chunk_size")
|
||||||
|
private Long chunkSize;
|
||||||
|
|
||||||
|
@Column(name = "total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@Column(name = "chunks_uploaded")
|
||||||
|
private Integer chunksUploaded;
|
||||||
|
|
||||||
|
@Column(name = "status")
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
private UploadStatus status;
|
||||||
|
|
||||||
|
@Column(name = "file_path")
|
||||||
|
private String filePath;
|
||||||
|
|
||||||
|
@Column(name = "checksum")
|
||||||
|
private String checksum;
|
||||||
|
|
||||||
|
@CreatedDate
|
||||||
|
@Column(name = "created_at", updatable = false, nullable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
|
@Column(name = "expires_at")
|
||||||
|
private LocalDateTime expiresAt;
|
||||||
|
|
||||||
|
@Version
|
||||||
|
private Long version;
|
||||||
|
|
||||||
|
@Column(name = "last_error")
|
||||||
|
private String lastError;
|
||||||
|
|
||||||
|
@Column(name = "extension")
|
||||||
|
private String extension;
|
||||||
|
|
||||||
|
@Column(name = "retry_count")
|
||||||
|
private Integer retryCount = 0;
|
||||||
|
|
||||||
|
@Column(name = "completed_at")
|
||||||
|
private LocalDateTime completedAt;
|
||||||
|
|
||||||
|
@ElementCollection
|
||||||
|
@CollectionTable(
|
||||||
|
name = "uploaded_chunks",
|
||||||
|
joinColumns = @JoinColumn(name = "upload_id")
|
||||||
|
)
|
||||||
|
@MapKeyColumn(name = "chunk_number")
|
||||||
|
@Column(name = "chunk_path")
|
||||||
|
private Map<Integer, String> chunkPaths = new HashMap<>();
|
||||||
|
|
||||||
|
@PrePersist
|
||||||
|
public void prePersist() {
|
||||||
|
this.createdAt = LocalDateTime.now();
|
||||||
|
this.expiresAt = LocalDateTime.now().plusMinutes(1);
|
||||||
|
if (this.chunksUploaded == null) {
|
||||||
|
this.chunksUploaded = 0;
|
||||||
|
}
|
||||||
|
if (this.status == null) {
|
||||||
|
this.status = UploadStatus.INITIATED;
|
||||||
|
}
|
||||||
|
if (this.retryCount == null) {
|
||||||
|
this.retryCount = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
public enum UploadStatus {
|
||||||
|
INITIATED,
|
||||||
|
UPLOADING,
|
||||||
|
COMPLETED,
|
||||||
|
FAILED,
|
||||||
|
CANCELLED
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class ChunkSizeExceededException extends RuntimeException {
|
||||||
|
public ChunkSizeExceededException(long actualSize, long maxSize) {
|
||||||
|
super(String.format("Chunk size not valid: " + actualSize));
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class ContentNotFoundException extends RuntimeException {
|
public class ContentNotFoundException extends RuntimeException {
|
||||||
public ContentNotFoundException(String message) {
|
public ContentNotFoundException(String message) {
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class FileEntityNotFoundException extends RuntimeException {
|
||||||
|
public FileEntityNotFoundException(String fileId) {
|
||||||
|
super("FileEntity not found with ID: " + fileId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FileEntityNotFoundException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class FileIntegrityException extends RuntimeException {
|
||||||
|
public FileIntegrityException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class FileUploadException extends RuntimeException {
|
||||||
|
public FileUploadException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FileUploadException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class InvalidPasswordException extends RuntimeException {
|
public class InvalidPasswordException extends RuntimeException {
|
||||||
public InvalidPasswordException(String message) {
|
public InvalidPasswordException(String message) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class InvalidUserEmail extends RuntimeException {
|
public class InvalidUserEmail extends RuntimeException {
|
||||||
public InvalidUserEmail(String message) {
|
public InvalidUserEmail(String message) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class NotFoundAuthToken extends RuntimeException {
|
public class NotFoundAuthToken extends RuntimeException {
|
||||||
public NotFoundAuthToken(String message) {
|
public NotFoundAuthToken(String message) {
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class NotValidFieldException extends RuntimeException {
|
||||||
|
|
||||||
|
private final String message;
|
||||||
|
|
||||||
|
private final BaseResponse baseResponse;
|
||||||
|
|
||||||
|
public NotValidFieldException(String message, BaseResponse baseResponse) {
|
||||||
|
super(message);
|
||||||
|
this.message = message;
|
||||||
|
this.baseResponse = baseResponse;
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class NotValidationPasswordException extends RuntimeException {
|
public class NotValidationPasswordException extends RuntimeException {
|
||||||
public NotValidationPasswordException(String message) {
|
public NotValidationPasswordException(String message) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class TokenNotFoundException extends RuntimeException {
|
public class TokenNotFoundException extends RuntimeException {
|
||||||
public TokenNotFoundException(String message) {
|
public TokenNotFoundException(String message) {
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class UploadSessionNotFoundException extends RuntimeException {
|
||||||
|
public UploadSessionNotFoundException(String uploadId) {
|
||||||
|
super("Upload session not found: " + uploadId);
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class UserNotFoundException extends RuntimeException {
|
public class UserNotFoundException extends RuntimeException {
|
||||||
public UserNotFoundException(String message) {
|
public UserNotFoundException(String message) {
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class ValidationException extends RuntimeException {
|
||||||
|
private final BindingResult bindingResult;
|
||||||
|
private final Integer msgId;
|
||||||
|
|
||||||
|
public ValidationException(BindingResult bindingResult, Integer msgId) {
|
||||||
|
super("Validation failed");
|
||||||
|
this.bindingResult = bindingResult;
|
||||||
|
this.msgId = msgId;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.TokenProcessRequest;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class AuthRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) throws NotFoundAuthToken {
|
||||||
|
TokenProcessRequest tokenProcessRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||||
|
TokenProcessRequest.class);
|
||||||
|
|
||||||
|
authService.useUserAuthToken(tokenProcessRequest.getToken());
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
"Token processed successfully",
|
||||||
|
Map.of("token", tokenProcessRequest.getToken()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,314 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.dto.*;
|
||||||
|
import ru.soune.nocopy.dto.file.*;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
import ru.soune.nocopy.service.file.FileStatsService;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileEntityHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final FileStatsService fileStatsService;
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) {
|
||||||
|
try {
|
||||||
|
FileEntityRequest fileRequest = objectMapper.convertValue(
|
||||||
|
request.getMessageBody(), FileEntityRequest.class);
|
||||||
|
|
||||||
|
String action = fileRequest.getAction();
|
||||||
|
|
||||||
|
switch (action) {
|
||||||
|
case "file_info":
|
||||||
|
return handleGetFileInfo(request, fileRequest);
|
||||||
|
case "user_files_info":
|
||||||
|
return handleGetFilesUserInfo(request, fileRequest);
|
||||||
|
case "file_by_session":
|
||||||
|
return handleGetFileBySession(request, fileRequest);
|
||||||
|
case "user_files":
|
||||||
|
return handleGetUserFiles(request, fileRequest);
|
||||||
|
case "search_files":
|
||||||
|
return handleSearchFiles(request, fileRequest);
|
||||||
|
case "storage_usage":
|
||||||
|
return handleGetStorageUsage(request, fileRequest);
|
||||||
|
case "delete_file":
|
||||||
|
return handleDeleteFile(request, fileRequest);
|
||||||
|
default:
|
||||||
|
ActionResponse response = ActionResponse.builder()
|
||||||
|
.action(action)
|
||||||
|
.availableActions(Arrays.asList(
|
||||||
|
"file_info", "file_by_session", "user_files",
|
||||||
|
"search_files", "storage_usage", "delete_file",
|
||||||
|
"user_files_info"))
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.INVALID_ACTION.getCode(),
|
||||||
|
"Invalid action: " + action,
|
||||||
|
response);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error in FileEntityHandler", e);
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Handler error: " + e.getMessage(),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
|
FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(),
|
||||||
|
userFileStats);
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
|
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
|
||||||
|
|
||||||
|
if (!fileInfo.getUserId().equals(userId)) {
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.ACCESS_DENIED.getCode(),
|
||||||
|
"Access denied",
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(),
|
||||||
|
fileInfo);
|
||||||
|
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.INVALID_TOKEN.getCode(),
|
||||||
|
"Authentication required",
|
||||||
|
null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting file info", e);
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get file info: " + e.getMessage(),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
|
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
|
||||||
|
request.getVersion());
|
||||||
|
|
||||||
|
if (!fileInfo.getUserId().equals(userId)) {
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.ACCESS_DENIED.getCode(),
|
||||||
|
"Access denied",
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(),
|
||||||
|
fileInfo);
|
||||||
|
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.INVALID_TOKEN.getCode(),
|
||||||
|
"Authentication required",
|
||||||
|
null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting file by session", e);
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get file: " + e.getMessage(),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
|
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
||||||
|
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
||||||
|
|
||||||
|
FileResponse files = fileEntityService.getUserFiles(userId, page, pageSize, request.getVersion());
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(),
|
||||||
|
files);
|
||||||
|
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.INVALID_TOKEN.getCode(),
|
||||||
|
"Authentication required",
|
||||||
|
null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting user files", e);
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get files: " + e.getMessage(),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
|
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
||||||
|
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
||||||
|
|
||||||
|
if (fileRequest.getQuery() == null || fileRequest.getQuery().isBlank()) {
|
||||||
|
return handleGetUserFiles(request, fileRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
FileResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000, request.getVersion());
|
||||||
|
|
||||||
|
var filteredFiles = allFiles.getFiles().stream()
|
||||||
|
.filter(f -> (f.getOriginalFileName() + f.getFileExtension()).toLowerCase()
|
||||||
|
.contains(fileRequest.getQuery().toLowerCase()))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
int start = (page - 1) * pageSize;
|
||||||
|
int end = Math.min(start + pageSize, filteredFiles.size());
|
||||||
|
List<FileEntityResponse> fileEntityResponses = filteredFiles.subList(start, Math.min(end, filteredFiles.size()));
|
||||||
|
long sumSize = fileEntityResponses.stream()
|
||||||
|
.mapToLong(FileEntityResponse::getFileSize)
|
||||||
|
.sum();
|
||||||
|
|
||||||
|
FileListResponse response = FileListResponse.builder()
|
||||||
|
.files(fileEntityResponses)
|
||||||
|
.totalCount(filteredFiles.size())
|
||||||
|
.totalSize(sumSize)
|
||||||
|
.formattedTotalSize(fileEntityService.formatFileSize(sumSize))
|
||||||
|
.page(page)
|
||||||
|
.pageSize(pageSize)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(),
|
||||||
|
response);
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
|
||||||
|
"Authentication required", null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error searching files", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to search files: " + e.getMessage(), null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
|
long usage = fileEntityService.getUserStorageUsed(userId);
|
||||||
|
|
||||||
|
StorageUsageResponse response = StorageUsageResponse.builder()
|
||||||
|
.userId(userId)
|
||||||
|
.storageUsed(usage)
|
||||||
|
.formattedStorageUsed(formatFileSize(usage))
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(),
|
||||||
|
response);
|
||||||
|
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.INVALID_TOKEN.getCode(),
|
||||||
|
"Authentication required",
|
||||||
|
null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting storage usage", e);
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get storage usage: " + e.getMessage(),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
|
String fileId = fileRequest.getFileId();
|
||||||
|
FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
|
||||||
|
DeleteFileResponse response;
|
||||||
|
|
||||||
|
if (!fileInfo.getUserId().equals(userId)) {
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.ACCESS_DENIED.getCode(),
|
||||||
|
"Access denied",
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new FileEntityNotFoundException(fileId));
|
||||||
|
|
||||||
|
if (fileEntity.getStatus().equals(FileStatus.DELETED)) {
|
||||||
|
fileEntityService.deleteFromDisk(fileEntity);
|
||||||
|
response = DeleteFileResponse.builder()
|
||||||
|
.fileId(fileRequest.getFileId())
|
||||||
|
.message("File deleted from disk")
|
||||||
|
.build();
|
||||||
|
} else {
|
||||||
|
fileEntityService.markAsDeleted(fileEntity);
|
||||||
|
response = DeleteFileResponse.builder()
|
||||||
|
.fileId(fileRequest.getFileId())
|
||||||
|
.message("File marked as deleted")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
"File marked as deleted",
|
||||||
|
response);
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.INVALID_TOKEN.getCode(),
|
||||||
|
"Authentication required",
|
||||||
|
null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error deleting file", e);
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to delete file: " + e.getMessage(),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String formatFileSize(long size) {
|
||||||
|
if (size < 1024) return size + " B";
|
||||||
|
int exp = (int) (Math.log(size) / Math.log(1024));
|
||||||
|
String pre = "KMGTPE".charAt(exp-1) + "";
|
||||||
|
return String.format("%.1f %sB", size / Math.pow(1024, exp), pre);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,276 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.validation.BeanPropertyBindingResult;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.validation.FieldError;
|
||||||
|
import ru.soune.nocopy.dto.*;
|
||||||
|
import ru.soune.nocopy.dto.file.*;
|
||||||
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.exception.*;
|
||||||
|
import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileUploadHandler implements RequestHandler {
|
||||||
|
private final FileUploadService fileUploadService;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
private final FileUploadSessionRepository fileUploadSessionRepository;
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final FileUploadRequestValidator fileUploadRequestValidator;
|
||||||
|
|
||||||
|
@Value("${file.storage.max-file-size}")
|
||||||
|
private long maxFileSize;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) {
|
||||||
|
try {
|
||||||
|
FileUploadRequest fileRequest = objectMapper.convertValue(
|
||||||
|
request.getMessageBody(), FileUploadRequest.class);
|
||||||
|
|
||||||
|
String action = fileRequest.getAction();
|
||||||
|
|
||||||
|
switch (action) {
|
||||||
|
case "init":
|
||||||
|
return handleInitUpload(request, fileRequest);
|
||||||
|
case "file_types":
|
||||||
|
return handleGetFileTypes(request);
|
||||||
|
case "file_extension":
|
||||||
|
return handleGetFileExtensions(fileRequest, request);
|
||||||
|
case "chunks":
|
||||||
|
return handleGetChunkStatus(request, fileRequest);
|
||||||
|
case "cancel":
|
||||||
|
return handleCancelUpload(request, fileRequest);
|
||||||
|
case "progress":
|
||||||
|
return handleGetProgress(request, fileRequest);
|
||||||
|
default:
|
||||||
|
ActionResponse response = ActionResponse.builder()
|
||||||
|
.action(action)
|
||||||
|
.availableActions(Arrays.asList("init", "file_types", "chunks", "cancel", "progress"))
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.INVALID_ACTION.getCode(),
|
||||||
|
"Invalid action: " + action, response);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error in FileUploadHandler", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Handler error: " + e.getMessage(), null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleInitUpload(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
String token = fileRequest.getToken();
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
if (tokenOptional.isEmpty()) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
|
||||||
|
MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
|
||||||
|
}
|
||||||
|
|
||||||
|
Long userId = authService.useUserAuthToken(token);
|
||||||
|
BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
|
||||||
|
fileUploadRequestValidator.validate(fileRequest, bindingResult);
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
Map<String, String> fieldErrors = bindingResult.getFieldErrors()
|
||||||
|
.stream()
|
||||||
|
.collect(Collectors.toMap(
|
||||||
|
FieldError::getField,
|
||||||
|
fieldError -> fieldError.getDefaultMessage() != null
|
||||||
|
? fieldError.getDefaultMessage()
|
||||||
|
: "Validation error"));
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.INVALID_FIELD.getCode(),
|
||||||
|
MessageCode.INVALID_FIELD.getDescription(), fieldErrors);
|
||||||
|
}
|
||||||
|
|
||||||
|
FileUploadSession session = fileUploadService.initUpload(
|
||||||
|
userId,
|
||||||
|
fileRequest.getFileName(),
|
||||||
|
fileRequest.getFileType(),
|
||||||
|
fileRequest.getExtension(),
|
||||||
|
fileRequest.getFileSize());
|
||||||
|
|
||||||
|
InitFileResponse fileResponse = InitFileResponse.builder()
|
||||||
|
.uploadId(session.getUploadId())
|
||||||
|
.fileName(session.getFileName())
|
||||||
|
.totalChunks(session.getTotalChunks())
|
||||||
|
.chunkSize(session.getChunkSize())
|
||||||
|
.status(session.getStatus().toString())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), fileResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetProgress(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
ru.soune.nocopy.dto.file.UploadProgressResponse progress =
|
||||||
|
fileUploadService.getUploadProgress(fileRequest.getUploadId());
|
||||||
|
|
||||||
|
UploadProgressResponse responseDto = UploadProgressResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.fileName(progress.getFileName())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.status(progress.getStatus())
|
||||||
|
.progressPercentage(progress.getProgressPercentage())
|
||||||
|
.filePath(progress.getFilePath())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), responseDto);
|
||||||
|
|
||||||
|
} catch (UploadSessionNotFoundException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.FILE_NOT_FOUND.getDescription(), null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting progress", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getDescription(), null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleCancelUpload(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
fileUploadService.cancelUpload(fileRequest.getUploadId());
|
||||||
|
|
||||||
|
CanceledUploadResponse response = CanceledUploadResponse.builder()
|
||||||
|
.uploadId(fileRequest.getUploadId())
|
||||||
|
.message("Upload cancelled successfully")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
"Upload cancelled successfully", response);
|
||||||
|
|
||||||
|
} catch (UploadSessionNotFoundException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
"Upload session not found", null);
|
||||||
|
} catch (FileUploadException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(), null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error cancelling upload", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to cancel upload", null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleRetryUpload(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
fileUploadService.retryFailedUpload(fileRequest.getUploadId());
|
||||||
|
ru.soune.nocopy.dto.file.UploadProgressResponse progress =
|
||||||
|
fileUploadService.getUploadProgress(fileRequest.getUploadId());
|
||||||
|
|
||||||
|
RetryUploadResponse response = RetryUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.message("Upload retry initiated")
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), "Upload retry initiated",
|
||||||
|
response);
|
||||||
|
|
||||||
|
} catch (UploadSessionNotFoundException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
"Upload session not found", null);
|
||||||
|
} catch (FileUploadException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(),
|
||||||
|
null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error retrying upload", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to retry upload", null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetChunkStatus(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
FileUploadSession session = fileUploadSessionRepository.findById(fileRequest.getUploadId())
|
||||||
|
.orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
|
||||||
|
|
||||||
|
Map<String, Boolean> chunkStatus = new HashMap<>();
|
||||||
|
for (int i = 0; i < session.getTotalChunks(); i++) {
|
||||||
|
chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
|
||||||
|
}
|
||||||
|
|
||||||
|
ChunkStatusResponse response = ChunkStatusResponse.builder()
|
||||||
|
.uploadId(fileRequest.getUploadId())
|
||||||
|
.totalChunks(session.getTotalChunks())
|
||||||
|
.uploadedChunks(session.getChunksUploaded())
|
||||||
|
.missingChunks(session.getTotalChunks() - session.getChunksUploaded())
|
||||||
|
.chunkStatus(chunkStatus)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
|
||||||
|
} catch (UploadSessionNotFoundException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
"Upload session not found", null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting chunk status", e);
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(), "Failed to get chunk status",
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetFileTypes(BaseRequest request) {
|
||||||
|
try {
|
||||||
|
FileTypesResponse response = FileTypesResponse.builder()
|
||||||
|
.fileTypes(Arrays.asList(FileType.values()))
|
||||||
|
.count(FileType.values().length)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting file types", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get file types", null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetFileExtensions(FileUploadRequest fileRequest, BaseRequest request) {
|
||||||
|
try {
|
||||||
|
FileType fileType = FileType.valueOf(fileRequest.getFileType().toUpperCase());
|
||||||
|
List<String> allowedExtensions = fileType.getAllowedExtensions();
|
||||||
|
|
||||||
|
FileExtensionResponse response = FileExtensionResponse.builder()
|
||||||
|
.extension(allowedExtensions)
|
||||||
|
.count(allowedExtensions.size())
|
||||||
|
.maxFileSize(maxFileSize)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting file extensions", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get file extensions", null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+9
-11
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.handler;
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.context.support.DefaultMessageSourceResolvable;
|
import org.springframework.context.support.DefaultMessageSourceResolvable;
|
||||||
@@ -8,7 +8,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
|
|||||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||||
import org.springframework.web.bind.annotation.ResponseStatus;
|
import org.springframework.web.bind.annotation.ResponseStatus;
|
||||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||||
import ru.soune.no_copy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -29,15 +29,13 @@ public class GlobalExceptionHandler {
|
|||||||
"message" ,message));
|
"message" ,message));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ExceptionHandler(UserAlreadyExistsException.class)
|
@ExceptionHandler(NotValidFieldException.class)
|
||||||
@ResponseStatus(HttpStatus.CONFLICT)
|
@ResponseStatus(HttpStatus.OK)
|
||||||
public ResponseEntity<?> handleUserContainsException(UserAlreadyExistsException ex) {
|
public ResponseEntity<?> handleUserContainsException(NotValidFieldException ex) {
|
||||||
return ResponseEntity.
|
|
||||||
badRequest()
|
return ResponseEntity
|
||||||
.body(Map.of(
|
.ok()
|
||||||
"success", false,
|
.body(ex.getBaseResponse());
|
||||||
"message" ,ex.getMessage()
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ExceptionHandler(UserNotFoundException.class)
|
@ExceptionHandler(UserNotFoundException.class)
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user