Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d026a485f | ||
|
|
204e13ca85 | ||
|
|
79b13731a6 | ||
|
|
4314032a3b | ||
|
|
c2a780db2d | ||
|
|
ad9cbd96f6 | ||
|
|
211b99b986 | ||
|
|
60678ef889 | ||
|
|
f0a87648cf | ||
|
|
c2ffcdcd6e | ||
|
|
0c0fadf5ec | ||
|
|
e979712b7c | ||
|
|
5027920199 | ||
|
|
3d679440f6 | ||
|
|
4a45f40e9f | ||
|
|
bbb0d7b17a | ||
|
|
0ed3f958ff | ||
|
|
de810e32b4 | ||
|
|
1a6823f7a9 | ||
|
|
82a57a2983 | ||
|
|
d3e50aa8d1 | ||
|
|
5c6309e228 | ||
|
|
8ac73ff045 | ||
|
|
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 | ||
|
|
58b4a2f95f | ||
|
|
4a6de6ad9a | ||
|
|
b3f29935f6 | ||
|
|
997daae639 | ||
|
|
4ddf2f5dde | ||
|
|
07aad9f51c | ||
|
|
d34a304763 |
@@ -1,6 +1,6 @@
|
|||||||
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
|
||||||
|
|
||||||
|
|||||||
@@ -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,78 @@
|
|||||||
|
Создаем сеть:
|
||||||
|
docker network create app-network
|
||||||
|
|
||||||
|
Войти в БД:
|
||||||
|
docker exec -it postgres psql -U ncp_db -d no_copy_
|
||||||
|
|
||||||
|
Выполнить команду:
|
||||||
|
\du
|
||||||
|
|
||||||
|
Должен быть один пользователь:
|
||||||
|
List of roles
|
||||||
|
Role name | Attributes
|
||||||
|
-----------+------------------------------------------------------------
|
||||||
|
ncp_db | Superuser, Create role, Create DB, Replication, Bypass RLS
|
||||||
|
|
||||||
|
суперпользователь БД:
|
||||||
|
postgres/postgres
|
||||||
|
пользователь бд для бэка
|
||||||
|
ncp_db / ncpDbApp
|
||||||
|
|
||||||
|
Подключение к БД для приложения,если volume не существует :
|
||||||
|
|
||||||
|
Создаться автоматически.
|
||||||
|
|
||||||
|
Если уже существует volume :
|
||||||
|
|
||||||
|
docker exec -it postgres psql -U postgres -d postgres
|
||||||
|
|
||||||
|
CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
|
||||||
|
|
||||||
|
\du
|
||||||
|
|
||||||
|
\q
|
||||||
|
|
||||||
|
-------
|
||||||
|
|
||||||
|
psql -U postgres -d no_copy_
|
||||||
|
|
||||||
|
-- база
|
||||||
|
|
||||||
|
GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
|
||||||
|
|
||||||
|
-- схема
|
||||||
|
|
||||||
|
GRANT USAGE ON SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- существующие таблицы
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- существующие sequence (очень важно для id)
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- будущие таблицы
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON TABLES TO ncp_db;
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON SEQUENCES TO ncp_db;
|
||||||
|
|
||||||
|
|
||||||
|
Зайти в контейнер:
|
||||||
|
docker exec -it {name} bash
|
||||||
|
|
||||||
|
------
|
||||||
|
|
||||||
|
Создать для сущности FileEntity sequence для икремента индетификатора
|
||||||
|
|
||||||
|
CREATE SEQUENCE IF NOT EXISTS file_support_id_seq START 1;
|
||||||
|
|
||||||
|
ALTER TABLE file_entities
|
||||||
|
ALTER COLUMN support_id
|
||||||
|
SET DEFAULT nextval('file_support_id_seq');
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,12 @@ dependencies {
|
|||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
implementation 'commons-validator:commons-validator:1.7'
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
|
|
||||||
|
implementation 'org.flywaydb:flyway-core:9.22.0'
|
||||||
|
|
||||||
|
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
||||||
|
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
||||||
|
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
|
||||||
|
|
||||||
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
||||||
annotationProcessor 'org.projectlombok:lombok'
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
|
|
||||||
|
|||||||
+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,6 +30,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
stage('Deploy with docker-compose') {
|
stage('Deploy with docker-compose') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
@@ -39,70 +39,70 @@ 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 "Deploying branch: ${params.BRANCH}"
|
echo "Deploying branch: ${params.BRANCH}"
|
||||||
|
|
||||||
echo "Copying files to server..."
|
echo "Copying files to server..."
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||||
cd /opt/deployments/${params.BRANCH}
|
cd /opt/deployments/${params.BRANCH}
|
||||||
|
|
||||||
echo 'Step 1: Checking current state...'
|
echo '1. Остановка старого приложения...'
|
||||||
|
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
|
||||||
# Смотрим что запущено
|
echo '2. Удаление старых образов...'
|
||||||
docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
|
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||||
|
|
||||||
echo 'Step 2: Stopping only application (keeping DB)...'
|
echo '3. Создание сети если нужно...'
|
||||||
|
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||||
|
|
||||||
# Останавливаем только приложение, БД оставляем работать
|
echo '4. Запуск инфраструктуры...'
|
||||||
docker stop app-backend 2>/dev/null || echo 'App not running'
|
docker-compose up -d db storage
|
||||||
docker rm app-backend 2>/dev/null || echo 'App not found'
|
|
||||||
|
|
||||||
# Проверяем что БД работает, если нет - запускаем
|
echo '5. Ожидание PostgreSQL...'
|
||||||
if ! docker ps | grep -q postgres; then
|
|
||||||
echo 'Starting PostgreSQL...'
|
|
||||||
docker-compose up -d db
|
|
||||||
sleep 10
|
sleep 10
|
||||||
else
|
|
||||||
echo 'PostgreSQL already running'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'Step 3: Building new application image...'
|
echo '6. Сборка нового образа приложения...'
|
||||||
docker build --no-cache -t app-backend:latest .
|
docker build --no-cache -t app-backend:latest .
|
||||||
|
|
||||||
echo 'Step 4: Starting application...'
|
echo '7. Запуск приложения...'
|
||||||
docker run -d \\
|
docker run -d \\
|
||||||
--name app-backend \\
|
--name app-backend \\
|
||||||
--network app-network \\
|
--network app-network \\
|
||||||
|
--network-alias app \\
|
||||||
-p 80:8080 \\
|
-p 80:8080 \\
|
||||||
|
-v uploads_data:/data/uploads:rw \\
|
||||||
-e POSTGRES_DB=no_copy_ \\
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
-e POSTGRES_USER=postgres \\
|
-e POSTGRES_USER=$DB_USER \\
|
||||||
-e POSTGRES_PASSWORD=postgres \\
|
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||||
-e POSTGRES_PORT=5432 \\
|
-e POSTGRES_PORT=5432 \\
|
||||||
-e POSTGRES_HOST=db \\
|
-e POSTGRES_HOST=db \\
|
||||||
--restart unless-stopped \\
|
--restart unless-stopped \\
|
||||||
app-backend:latest
|
app-backend:latest
|
||||||
|
|
||||||
echo 'Step 5: Checking deployment...'
|
echo '8. Запуск мониторинга...'
|
||||||
sleep 10
|
docker-compose up -d grafana prometheus loki tempo alloy
|
||||||
|
|
||||||
echo 'Containers status:'
|
echo '9. Проверка...'
|
||||||
docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
|
sleep 5
|
||||||
|
|
||||||
echo 'Application logs (last 5 lines):'
|
echo 'Статус контейнеров:'
|
||||||
docker logs --tail=5 app-backend 2>/dev/null || echo 'Logs not available yet'
|
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||||
|
|
||||||
if docker ps | grep -q app-backend; then
|
echo '10. Проверка health...'
|
||||||
echo 'Deployment successful'
|
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
||||||
echo 'Application URL: http://${params.SERVER}:80'
|
echo 'Приложение работает'
|
||||||
|
echo 'URL: http://${params.SERVER}:80'
|
||||||
else
|
else
|
||||||
echo 'Application failed to start'
|
echo 'Проверка health не удалась'
|
||||||
docker logs app-backend
|
docker logs app-backend --tail=20
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
plugins {
|
||||||
|
kotlin("jvm") version "2.1.10"
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "ru.soune"
|
||||||
|
version = "1.0.0"
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
|
||||||
|
|
||||||
|
implementation("io.insert-koin:koin-core:4.1.1")
|
||||||
|
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
||||||
|
|
||||||
|
testImplementation(kotlin("test"))
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.test {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
||||||
|
kotlin {
|
||||||
|
jvmToolchain(21)
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
fun main() {
|
||||||
|
println("Hello World!")
|
||||||
|
}
|
||||||
@@ -1 +1,6 @@
|
|||||||
|
plugins {
|
||||||
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
|
||||||
|
}
|
||||||
rootProject.name = 'no-copy'
|
rootProject.name = 'no-copy'
|
||||||
|
include 'referral'
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,10 @@ 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) {
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,26 +1,47 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import jakarta.annotation.PostConstruct;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.core.io.Resource;
|
||||||
|
import org.springframework.core.io.UrlResource;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.web.PageableDefault;
|
||||||
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.validation.BindingResult;
|
import org.springframework.validation.BindingResult;
|
||||||
import org.springframework.validation.FieldError;
|
import org.springframework.validation.FieldError;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import ru.soune.nocopy.dto.BaseRequest;
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
import ru.soune.nocopy.dto.BaseResponse;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.RegAnswer;
|
import ru.soune.nocopy.dto.RegAnswer;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.dto.file.*;
|
||||||
import ru.soune.nocopy.exception.ValidationException;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.handler.LoginRequestHandler;
|
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
||||||
import ru.soune.nocopy.handler.RegRequestHandler;
|
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
||||||
import ru.soune.nocopy.handler.RequestHandler;
|
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.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
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.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -28,18 +49,17 @@ import java.util.stream.Collectors;
|
|||||||
@RequestMapping("/api")
|
@RequestMapping("/api")
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class ApiController {
|
public class ApiController {
|
||||||
private final ApplicationContext applicationContext;
|
private final FileUploadService fileUploadService;
|
||||||
|
|
||||||
private Map<Integer, RequestHandler> handlers = new HashMap<>();
|
private final Map<Integer, RequestHandler> handlers;
|
||||||
|
|
||||||
@PostConstruct
|
private final FileEntityService fileEntityService;
|
||||||
public void init() {
|
|
||||||
RegRequestHandler regHandler = applicationContext.getBean(RegRequestHandler.class);
|
|
||||||
LoginRequestHandler loginHandler = applicationContext.getBean(LoginRequestHandler.class);
|
|
||||||
|
|
||||||
handlers.put(20002, regHandler);
|
private final AuthService authService;
|
||||||
handlers.put(20001, loginHandler);
|
|
||||||
}
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
@PostMapping("/v{version}/data")
|
@PostMapping("/v{version}/data")
|
||||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
@@ -62,6 +82,9 @@ public class ApiController {
|
|||||||
return ResponseEntity.ok().body(response);
|
return ResponseEntity.ok().body(response);
|
||||||
} catch (ValidationException e) {
|
} catch (ValidationException e) {
|
||||||
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
|
||||||
} catch (NotValidFieldException e) {
|
} catch (NotValidFieldException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -76,6 +99,332 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@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 buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
|
||||||
|
}
|
||||||
|
if (uploadId == null || uploadId.isBlank()) {
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, "Upload ID is required");
|
||||||
|
}
|
||||||
|
if (chunkNumber == null || chunkNumber < 0) {
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
||||||
|
|
||||||
|
return buildSuccessResponse(uploadId, chunkNumber, chunk);
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
|
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
||||||
|
Map.of("duplicateOwnerId", e.userId(), "duplicateFileId", e.duplicateFileId())));
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error uploading chunk", e);
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/files/{fileId}/similar")
|
||||||
|
public ResponseEntity<BaseResponse> findSimilarFiles(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String fileId,
|
||||||
|
@RequestParam(required = false) List<String> similarityLevels,
|
||||||
|
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
||||||
|
SimilarityFilter filter = SimilarityFilter.builder()
|
||||||
|
.similarityLevels(similarityLevels)
|
||||||
|
.build();
|
||||||
|
Page<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
|
||||||
|
|
||||||
|
String messageDesc;
|
||||||
|
MessageCode success;
|
||||||
|
|
||||||
|
if (similarFiles.isEmpty()) {
|
||||||
|
messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
|
||||||
|
success = MessageCode.FILE_NOT_FOUND;
|
||||||
|
} else {
|
||||||
|
messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
|
||||||
|
success = MessageCode.SIMILAR_FILES_FOUND;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, Object> responseData = new HashMap<>();
|
||||||
|
responseData.put("content", similarFiles.getContent());
|
||||||
|
responseData.put("page", similarFiles.getNumber());
|
||||||
|
responseData.put("size", similarFiles.getSize());
|
||||||
|
responseData.put("totalElements", similarFiles.getTotalElements());
|
||||||
|
responseData.put("totalPages", similarFiles.getTotalPages());
|
||||||
|
responseData.put("hasNext", similarFiles.hasNext());
|
||||||
|
responseData.put("hasPrevious", similarFiles.hasPrevious());
|
||||||
|
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
|
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> checkForDuplicates(String uploadId) throws IOException {
|
||||||
|
Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
|
||||||
|
|
||||||
|
if (uploadedFile.isEmpty() || !uploadedFile.get().getMimeType().equals("image")) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
FileEntity fileEntity = uploadedFile.get();
|
||||||
|
List<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
|
||||||
|
|
||||||
|
if (hasDuplicate(similarFiles)) {
|
||||||
|
return handleDuplicate(fileEntity, similarFiles);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hasDuplicate(List<SimilarFileResponse> similarFiles) {
|
||||||
|
return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileResponse> similarFiles)
|
||||||
|
throws IOException {
|
||||||
|
fileEntityService.deleteFromDisk(fileEntity);
|
||||||
|
|
||||||
|
fileEntityService.markAsDeleted(fileEntity);
|
||||||
|
|
||||||
|
Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
|
||||||
|
|
||||||
|
if (originalFile.isPresent()) {
|
||||||
|
Map<String, String> duplicateInfo = Map.of(
|
||||||
|
"duplicate_file_id", originalFile.get().getId(),
|
||||||
|
"owner_user_id", String.valueOf(originalFile.get().getUserId()));
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004,
|
||||||
|
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
|
"Failed to upload chunk, duplicate",
|
||||||
|
duplicateInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk) {
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.chunkSize(chunk.getSize())
|
||||||
|
.message("Chunk uploaded successfully")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20000,
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
"Chunk uploaded successfully",
|
||||||
|
responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004,
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
errorMessage,
|
||||||
|
responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
||||||
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||||
.stream()
|
.stream()
|
||||||
@@ -102,4 +451,25 @@ public class ApiController {
|
|||||||
|
|
||||||
return errorDetail;
|
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");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
|
||||||
import ru.soune.nocopy.exception.TokenNotFoundException;
|
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.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("/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));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
public record AuthResponse (
|
||||||
|
boolean success,
|
||||||
|
String message,
|
||||||
|
String token,
|
||||||
|
LocalDateTime expiresAt
|
||||||
|
) {}
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class BaseRequest {
|
public class BaseRequest {
|
||||||
@JsonProperty("version")
|
@JsonProperty("version")
|
||||||
Integer version;
|
Integer version;
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class BaseResponse {
|
public class BaseResponse {
|
||||||
@JsonProperty("msg_id")
|
@JsonProperty("msg_id")
|
||||||
private Integer msgId;
|
private Integer msgId;
|
||||||
|
|||||||
@@ -4,14 +4,9 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
public class LogOutAnswer {
|
public class LogOutAnswer {
|
||||||
private String Token;
|
private String email;
|
||||||
|
|
||||||
private List<Map<String, String>> fieldErrors;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package ru.soune.nocopy.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;
|
||||||
|
}
|
||||||
@@ -5,11 +5,25 @@ public enum MessageCode {
|
|||||||
REG_EMAIL_EXISTS(1, "Email already registered"),
|
REG_EMAIL_EXISTS(1, "Email already registered"),
|
||||||
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||||
INVALID_FIELD(2, "Invalid field"),
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
|
INVALID_TOKEN(2, "Invalid token"),
|
||||||
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
|
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
||||||
|
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"),
|
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"),
|
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_NOT_FOUND(4, "Email not found"),
|
||||||
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
|
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"),
|
||||||
|
SIMILAR_FILES_FOUND(0, "Similar files found");
|
||||||
|
|
||||||
private final Integer code;
|
private final Integer code;
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class RegRequest {
|
public class RegRequest {
|
||||||
@NotEmpty(message = "Full name is required")
|
@NotEmpty(message = "Full name is required")
|
||||||
private String fullName;
|
private String fullName;
|
||||||
|
|||||||
@@ -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,7 +1,7 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import ru.soune.nocopy.entity.ContentStatus;
|
import ru.soune.nocopy.entity.ContentStatus;
|
||||||
import ru.soune.nocopy.entity.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import ru.soune.nocopy.entity.GenderType;
|
|||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class UserRequest {
|
public class UserRequest {
|
||||||
@Size(min = 2)
|
@Size(min = 2)
|
||||||
private String fullName;
|
private String fullName;
|
||||||
|
|||||||
@@ -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,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,34 @@
|
|||||||
|
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;
|
||||||
|
private Integer supportId;
|
||||||
|
}
|
||||||
@@ -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,14 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Value;
|
||||||
|
|
||||||
|
@Value
|
||||||
|
@Builder
|
||||||
|
public class SimilarFileResponse {
|
||||||
|
String fileId;
|
||||||
|
String originalFileName;
|
||||||
|
Long fileSize;
|
||||||
|
Integer hammingDistance;
|
||||||
|
String similarityLevel;
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class SimilarityFilter {
|
||||||
|
private List<String> similarityLevels;
|
||||||
|
private Integer page;
|
||||||
|
private Integer size;
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,21 +0,0 @@
|
|||||||
package ru.soune.nocopy.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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,6 +4,7 @@ import jakarta.persistence.*;
|
|||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.*;
|
||||||
|
import org.hibernate.annotations.GenerationTime;
|
||||||
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
|
import org.springframework.data.annotation.LastModifiedDate;
|
||||||
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
|
||||||
|
import java.sql.DriverManager;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
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 = "support_id", unique = true, updatable = false)
|
||||||
|
private Integer supportId;
|
||||||
|
|
||||||
|
@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;
|
||||||
|
|
||||||
|
@OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
@JsonIgnore
|
||||||
|
private ImageHashEntity imageHash;
|
||||||
|
|
||||||
|
@PrePersist
|
||||||
|
public void prePersist() {
|
||||||
|
if (this.status == null) {
|
||||||
|
this.status = FileStatus.ACTIVE;
|
||||||
|
}
|
||||||
|
if (this.createdAt == null) {
|
||||||
|
this.createdAt = LocalDateTime.now();
|
||||||
|
}
|
||||||
|
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,102 @@
|
|||||||
|
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")
|
||||||
|
@Builder.Default
|
||||||
|
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")
|
||||||
|
@Builder.Default
|
||||||
|
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,39 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "image_hashes")
|
||||||
|
@Data
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Builder
|
||||||
|
public class ImageHashEntity {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@Column(name = "file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@OneToOne(fetch = FetchType.LAZY)
|
||||||
|
@MapsId
|
||||||
|
@JoinColumn(name = "file_id")
|
||||||
|
private FileEntity file;
|
||||||
|
|
||||||
|
@Column(name = "hash64_hi")
|
||||||
|
private Integer hash64Hi;
|
||||||
|
|
||||||
|
@Column(name = "hash64_lo")
|
||||||
|
private Integer hash64Lo;
|
||||||
|
|
||||||
|
@Column(name = "hash_algorithm", nullable = false)
|
||||||
|
private String hashAlgorithm;
|
||||||
|
|
||||||
|
@Column(name = "created_at")
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
}
|
||||||
@@ -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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class DuplicateImageException extends RuntimeException {
|
||||||
|
private final String duplicateFileId;
|
||||||
|
private final Long userId;
|
||||||
|
|
||||||
|
public DuplicateImageException(String message, String duplicateFileId, Long userId) {
|
||||||
|
super(message);
|
||||||
|
this.duplicateFileId = duplicateFileId;
|
||||||
|
this.userId = userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String duplicateFileId() {
|
||||||
|
return duplicateFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long userId() {
|
||||||
|
return userId;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class UploadSessionNotFoundException extends RuntimeException {
|
||||||
|
public UploadSessionNotFoundException(String uploadId) {
|
||||||
|
super("Upload session not found: " + uploadId);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,248 @@
|
|||||||
|
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 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,15 +5,16 @@ import org.springframework.context.support.DefaultMessageSourceResolvable;
|
|||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.MethodArgumentNotValidException;
|
import org.springframework.web.bind.MethodArgumentNotValidException;
|
||||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.ResponseStatus;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@RestControllerAdvice
|
@RestControllerAdvice
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
@ControllerAdvice
|
||||||
public class GlobalExceptionHandler {
|
public class GlobalExceptionHandler {
|
||||||
|
|
||||||
@ExceptionHandler(MethodArgumentNotValidException.class)
|
@ExceptionHandler(MethodArgumentNotValidException.class)
|
||||||
@@ -81,4 +82,12 @@ public class GlobalExceptionHandler {
|
|||||||
"message" ,ex.getMessage()
|
"message" ,ex.getMessage()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ExceptionHandler(DuplicateImageException.class)
|
||||||
|
@ResponseBody
|
||||||
|
public ResponseEntity<BaseResponse> handleDuplicateImage(DuplicateImageException e) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
|
"Duplicate image detected", e.getMessage()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
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.Autowired;
|
||||||
|
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.file.ImageSearchRequest;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
import ru.soune.nocopy.service.YandexSearchService;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ImageFoundRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final YandexSearchService yandexSearchService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||||
|
ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||||
|
ImageSearchRequest.class);
|
||||||
|
|
||||||
|
String fileId = imageSearchRequest.getFileId();
|
||||||
|
|
||||||
|
YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class JwtTokenProvider {
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ import ru.soune.nocopy.dto.*;
|
|||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -17,7 +17,9 @@ import java.util.Map;
|
|||||||
public class LoginRequestHandler implements RequestHandler {
|
public class LoginRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
private final AuthService authService;
|
private final AuthService authService;
|
||||||
|
|
||||||
private final ObjectMapper objectMapper;
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -34,9 +36,12 @@ public class LoginRequestHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = authService.login(loginRequest);
|
AuthToken authToken = authService.login(loginRequest);
|
||||||
|
String token = authToken.getToken();
|
||||||
|
|
||||||
LoginAnswer loginAnswer = new LoginAnswer();
|
LoginAnswer loginAnswer = new LoginAnswer();
|
||||||
loginAnswer.setToken(authToken.getToken());
|
loginAnswer.setToken(token);
|
||||||
|
|
||||||
|
authService.useUserAuthToken(token);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.dto.*;
|
||||||
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.User;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class LogoutRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) {
|
||||||
|
LogoutRequest logoutRequest = objectMapper.convertValue(request.getMessageBody(), LogoutRequest.class);
|
||||||
|
|
||||||
|
Optional<AuthToken> opToken = authTokenRepository.findByToken(logoutRequest.getToken());
|
||||||
|
Optional<User> user = userRepository.findByEmail(logoutRequest.getEmail());
|
||||||
|
|
||||||
|
if (opToken.isEmpty() || user.isEmpty()) {
|
||||||
|
throw new NotValidFieldException("User with email or token not found",
|
||||||
|
new BaseResponse(request.getMsgId(), MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getDescription(),
|
||||||
|
new LogoutRequest(logoutRequest.getEmail(), logoutRequest.getToken())));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Objects.equals(opToken.get().getUser().getId(), user.get().getId())) {
|
||||||
|
throw new NotValidFieldException("User token mismatch with user",
|
||||||
|
new BaseResponse(request.getMsgId(), MessageCode.AUTH_TOKEN_MISMATCH.getCode(),
|
||||||
|
MessageCode.AUTH_TOKEN_MISMATCH.getDescription(),
|
||||||
|
new LogoutRequest(logoutRequest.getEmail(), logoutRequest.getToken())));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
authService.logout(logoutRequest.getToken());
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(),
|
||||||
|
new LogOutAnswer(logoutRequest.getEmail()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,7 +12,7 @@ import ru.soune.nocopy.exception.NotValidFieldException;
|
|||||||
import ru.soune.nocopy.exception.ValidationException;
|
import ru.soune.nocopy.exception.ValidationException;
|
||||||
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -52,9 +52,11 @@ public class RegRequestHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = authService.register(regRequest);
|
AuthToken authToken = authService.register(regRequest);
|
||||||
|
String token = authToken.getToken();
|
||||||
|
authService.useUserAuthToken(token);
|
||||||
|
|
||||||
RegAnswer regAnswer = new RegAnswer();
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
regAnswer.setToken(authToken.getToken());
|
regAnswer.setToken(token);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
MessageCode.SUCCESS.getDescription(), regAnswer);
|
MessageCode.SUCCESS.getDescription(), regAnswer);
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
package ru.soune.nocopy.handler.validator;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.validation.Errors;
|
||||||
|
import org.springframework.validation.Validator;
|
||||||
|
import ru.soune.nocopy.dto.file.FileUploadRequest;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class FileUploadRequestValidator implements Validator {
|
||||||
|
private final List<FileType> supportedFileTypes = Arrays.asList(FileType.values());
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean supports(Class<?> clazz) {
|
||||||
|
return FileUploadRequest.class.isAssignableFrom(clazz);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void validate(Object target, Errors errors) {
|
||||||
|
FileUploadRequest request = (FileUploadRequest) target;
|
||||||
|
|
||||||
|
validateType(request.getFileType(), errors);
|
||||||
|
validateFileName(request.getFileName(), errors);
|
||||||
|
validateExtension(request.getExtension(), request.getFileType(), errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateType(String fileType, Errors errors) {
|
||||||
|
if (fileType == null || fileType.isBlank()) {
|
||||||
|
errors.rejectValue("fileType", "fileType.required", "File type is required");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
FileType parsedType = FileType.valueOf(fileType.toUpperCase());
|
||||||
|
|
||||||
|
if (!supportedFileTypes.contains(parsedType)) {
|
||||||
|
errors.rejectValue("fileType", "fileType.unsupported",
|
||||||
|
"Unsupported file type. Valid types: " + Arrays.toString(FileType.values()));
|
||||||
|
}
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
errors.rejectValue("fileType", "fileType.invalid",
|
||||||
|
"Invalid file type. Valid types: " + Arrays.toString(FileType.values()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateFileName(String fileName, Errors errors) {
|
||||||
|
if (fileName == null || fileName.isBlank()) {
|
||||||
|
errors.rejectValue("fileName", "fileName.required", "File name is required");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fileName.length() > 255) {
|
||||||
|
errors.rejectValue("fileName", "fileName.too.long",
|
||||||
|
"File name too long, max 255 characters");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateExtension(String extension, String fileType, Errors errors) {
|
||||||
|
if (extension == null || extension.isBlank()) {
|
||||||
|
errors.rejectValue("fileType", "fileType.required", "File type is required");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (extension.contains(".")) {
|
||||||
|
errors.rejectValue("extension", "extension.required", "Extension contains comma");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
FileType parsedType = FileType.valueOf(fileType.toUpperCase());
|
||||||
|
|
||||||
|
if (!parsedType.supportsExtension(extension)) {
|
||||||
|
errors.rejectValue("fileName", "fileType.extension.mismatch",
|
||||||
|
String.format("File extension '%s' does not match file type '%s'. Allowed extensions for %s: %s",
|
||||||
|
extension, parsedType.getDisplayName(), parsedType.getDisplayName(),
|
||||||
|
parsedType.getAllowedExtensions()));
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
errors.rejectValue("fileType", "fileType.invalid",
|
||||||
|
"Invalid file type. Valid types: " + Arrays.toString(FileType.values()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getFileExtension(String fileName) {
|
||||||
|
return fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,7 +13,7 @@ import java.util.*;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class RegRequestValidator implements Validator {
|
public class RegRequestValidator implements Validator {
|
||||||
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
|
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"«»„‟”“”‘'’‹›❛❜❝❞〝〞〟]{1,200}$";
|
||||||
|
|
||||||
private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
|
private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
|
||||||
|
|
||||||
@@ -74,21 +74,6 @@ public class RegRequestValidator implements Validator {
|
|||||||
errors.rejectValue("companyName", "companyName.invalid.chars",
|
errors.rejectValue("companyName", "companyName.invalid.chars",
|
||||||
"Company name contains invalid characters");
|
"Company name contains invalid characters");
|
||||||
}
|
}
|
||||||
|
|
||||||
validateForbiddenWords(trimmedCompany, "companyName", errors,
|
|
||||||
Arrays.asList("admin", "root", "system", "test"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void validateForbiddenWords(String text, String fieldName,
|
|
||||||
Errors errors, List<String> forbiddenWords) {
|
|
||||||
String lowerText = text.toLowerCase();
|
|
||||||
for (String word : forbiddenWords) {
|
|
||||||
if (lowerText.contains(word)) {
|
|
||||||
errors.rejectValue(fieldName, fieldName + ".forbidden.word",
|
|
||||||
"Contains forbidden word: " + word);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateEmail(String email, Errors errors) {
|
private void validateEmail(String email, Errors errors) {
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ import org.springframework.data.jpa.repository.JpaRepository;
|
|||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
|
public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
|
||||||
Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
|
List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
|
||||||
|
Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
|
||||||
Optional<AuthToken> findByToken(String token);
|
Optional<AuthToken> findByToken(String token);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.data.jpa.repository.Query;
|
||||||
|
import org.springframework.data.repository.query.Param;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
||||||
|
|
||||||
|
List<FileEntity> findByUserId(Long userId);
|
||||||
|
Optional<FileEntity> findByUserIdAndChecksum(Long userId, String imageHash);
|
||||||
|
|
||||||
|
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
||||||
|
|
||||||
|
Optional<FileEntity> findByFilePath(String filePath);
|
||||||
|
|
||||||
|
Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
|
||||||
|
|
||||||
|
boolean existsByFilePath(String filePath);
|
||||||
|
|
||||||
|
@Query("SELECT SUM(f.fileSize) FROM FileEntity f WHERE f.userId = :userId AND f.status = 'ACTIVE'")
|
||||||
|
Long getTotalSizeByUserId(@Param("userId") Long userId);
|
||||||
|
|
||||||
|
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
|
||||||
|
List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
|
||||||
|
|
||||||
|
@Query("SELECT f FROM FileEntity f WHERE f.status = :status")
|
||||||
|
List<FileEntity> searchFileEntityByStatus(@Param("status") FileStatus status);
|
||||||
|
|
||||||
|
long countByUserId(Long userId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.data.jpa.repository.Query;
|
||||||
|
import org.springframework.data.repository.query.Param;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface FileUploadSessionRepository extends JpaRepository<FileUploadSession, String> {
|
||||||
|
|
||||||
|
List<FileUploadSession> findByUserId(Long userId);
|
||||||
|
|
||||||
|
List<FileUploadSession> findByStatus(UploadStatus status);
|
||||||
|
|
||||||
|
@Query("SELECT s FROM FileUploadSession s WHERE s.status IN :statuses AND s.createdAt < :threshold")
|
||||||
|
List<FileUploadSession> findByStatusInAndCreatedAtBefore(
|
||||||
|
@Param("statuses") Set<UploadStatus> statuses,
|
||||||
|
@Param("threshold") LocalDateTime threshold);
|
||||||
|
|
||||||
|
@Query("SELECT s FROM FileUploadSession s WHERE s.expiresAt < :now AND s.status IN :statuses")
|
||||||
|
List<FileUploadSession> findExpiredSessions(
|
||||||
|
@Param("now") LocalDateTime now,
|
||||||
|
@Param("statuses") Set<UploadStatus> statuses);
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
|
||||||
|
void deleteByFileId(String fileId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.data.jpa.repository.Query;
|
||||||
|
import org.springframework.data.repository.query.Param;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface ImageSimilarityRepository
|
||||||
|
extends JpaRepository<FileEntity, String> {
|
||||||
|
|
||||||
|
@Query(value = """
|
||||||
|
|
||||||
|
SELECT
|
||||||
|
f.id AS similarFileId,
|
||||||
|
f.original_file_name AS originalFileName,
|
||||||
|
f.file_size AS fileSize,
|
||||||
|
h.hash64_hi AS hash64Hi,
|
||||||
|
h.hash64_lo AS hash64Lo
|
||||||
|
FROM image_hashes ref
|
||||||
|
JOIN image_hashes h
|
||||||
|
ON ref.file_id <> h.file_id
|
||||||
|
JOIN file_entities f
|
||||||
|
ON f.id = h.file_id
|
||||||
|
WHERE ref.file_id = :fileId
|
||||||
|
""",
|
||||||
|
nativeQuery = true)
|
||||||
|
List<SimilarImageProjection> findCandidates(
|
||||||
|
@Param("fileId") String fileId
|
||||||
|
);
|
||||||
|
|
||||||
|
@Query(value = """
|
||||||
|
SELECT
|
||||||
|
h.hash64_hi AS hash64Hi,
|
||||||
|
h.hash64_lo AS hash64Lo,
|
||||||
|
h.file_id AS fileId,
|
||||||
|
f.user_id AS userId,
|
||||||
|
f.original_file_name AS originalFileName,
|
||||||
|
f.file_size AS fileSize,
|
||||||
|
f.stored_file_name AS similarFileId
|
||||||
|
FROM image_hashes h
|
||||||
|
JOIN file_entities f ON f.id = h.file_id
|
||||||
|
WHERE h.hash64_hi = :hash64Hi
|
||||||
|
AND h.hash64_lo = :hash64Lo
|
||||||
|
""",
|
||||||
|
nativeQuery = true)
|
||||||
|
List<SimilarImageProjection> findExactDuplicates(
|
||||||
|
@Param("hash64Hi") Integer hash64_hi,
|
||||||
|
@Param("hash64Lo") Integer hash64_lo);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
public interface SimilarImageProjection {
|
||||||
|
Integer getHash64Hi();
|
||||||
|
Integer getHash64Lo();
|
||||||
|
String getId();
|
||||||
|
Long getUserId();
|
||||||
|
String getOriginalFileName();
|
||||||
|
Long getFileSize();
|
||||||
|
}
|
||||||
@@ -2,7 +2,7 @@ package ru.soune.nocopy.repository;
|
|||||||
|
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import ru.soune.nocopy.entity.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
import ru.soune.nocopy.entity.UserContent;
|
import ru.soune.nocopy.entity.UserContent;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -0,0 +1,135 @@
|
|||||||
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.PageImpl;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.file.SimilarFileResponse;
|
||||||
|
import ru.soune.nocopy.dto.file.SimilarityFilter;
|
||||||
|
import ru.soune.nocopy.repository.ImageHashRepository;
|
||||||
|
import ru.soune.nocopy.repository.ImageSimilarityRepository;
|
||||||
|
import ru.soune.nocopy.repository.SimilarImageProjection;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileSimilarityService {
|
||||||
|
private final ImageSimilarityRepository repository;
|
||||||
|
|
||||||
|
private final ImageHashRepository hashRepository;
|
||||||
|
|
||||||
|
public List<SimilarFileResponse> findSimilarFiles(String fileId) {
|
||||||
|
var imageHashEntity = hashRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new RuntimeException("Hash not found"));
|
||||||
|
|
||||||
|
Integer hash64Hi = imageHashEntity.getHash64Hi();
|
||||||
|
Integer hash64Lo = imageHashEntity.getHash64Lo();
|
||||||
|
|
||||||
|
List<SimilarImageProjection> candidates =
|
||||||
|
repository.findCandidates(fileId);
|
||||||
|
|
||||||
|
return candidates.stream()
|
||||||
|
.map(c -> {
|
||||||
|
Integer cHi = c.getHash64Hi();
|
||||||
|
Integer cLo = c.getHash64Lo();
|
||||||
|
|
||||||
|
int hamming = hamming64(hash64Hi, hash64Lo, cHi, cLo);
|
||||||
|
|
||||||
|
String level;
|
||||||
|
if (hamming <= 5) {
|
||||||
|
level = "DUPLICATE";
|
||||||
|
} else if (hamming <= 12) {
|
||||||
|
level = "SIMILAR";
|
||||||
|
} else {
|
||||||
|
level = "DIFFERENT";
|
||||||
|
}
|
||||||
|
|
||||||
|
return SimilarFileResponse.builder()
|
||||||
|
.fileId(c.getId())
|
||||||
|
.originalFileName(c.getOriginalFileName())
|
||||||
|
.fileSize(c.getFileSize())
|
||||||
|
.hammingDistance(hamming)
|
||||||
|
.similarityLevel(level)
|
||||||
|
.build();
|
||||||
|
})
|
||||||
|
.sorted((a, b) ->
|
||||||
|
Integer.compare(a.getHammingDistance(), b.getHammingDistance()))
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<SimilarImageProjection> findDuplicatedByHash(Integer hash64Hi, Integer hash64Lo) {
|
||||||
|
List<SimilarImageProjection> duplicates = repository.findExactDuplicates(hash64Hi,hash64Lo);
|
||||||
|
|
||||||
|
if (duplicates.isEmpty()) {
|
||||||
|
return new ArrayList<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
return duplicates;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Page<SimilarFileResponse> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable) {
|
||||||
|
var imageHashEntity = hashRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new RuntimeException("Hash not found"));
|
||||||
|
|
||||||
|
Integer hash64Hi = imageHashEntity.getHash64Hi();
|
||||||
|
Integer hash64Lo = imageHashEntity.getHash64Lo();
|
||||||
|
|
||||||
|
List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
|
||||||
|
|
||||||
|
List<String> similarityLevels = (filter != null && filter.getSimilarityLevels() != null)
|
||||||
|
? filter.getSimilarityLevels()
|
||||||
|
: List.of("DUPLICATE", "SIMILAR", "DIFFERENT");
|
||||||
|
|
||||||
|
List<SimilarFileResponse> allResults = candidates.stream()
|
||||||
|
.map(c -> createSimilarFileResponse(c, hash64Hi, hash64Lo))
|
||||||
|
.filter(response -> similarityLevels.contains(response.getSimilarityLevel()))
|
||||||
|
.sorted(Comparator.comparingInt(SimilarFileResponse::getHammingDistance))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
int total = allResults.size();
|
||||||
|
int page = (pageable != null) ? pageable.getPageNumber() : 0;
|
||||||
|
int size = (pageable != null) ? pageable.getPageSize() : 20;
|
||||||
|
|
||||||
|
int fromIndex = Math.min(page * size, total);
|
||||||
|
int toIndex = Math.min(fromIndex + size, total);
|
||||||
|
|
||||||
|
List<SimilarFileResponse> pageContent = allResults.subList(fromIndex, toIndex);
|
||||||
|
|
||||||
|
return new PageImpl<>(pageContent, pageable, total);
|
||||||
|
}
|
||||||
|
|
||||||
|
private SimilarFileResponse createSimilarFileResponse(SimilarImageProjection similarImageProjection,
|
||||||
|
Integer hash64Hi, Integer hash64Lo) {
|
||||||
|
Integer imageProjectionHash64Hi = similarImageProjection.getHash64Hi();
|
||||||
|
Integer similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo();
|
||||||
|
|
||||||
|
int hamming = hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
|
||||||
|
|
||||||
|
String level;
|
||||||
|
if (hamming <= 5) {
|
||||||
|
level = "DUPLICATE";
|
||||||
|
} else if (hamming <= 12) {
|
||||||
|
level = "SIMILAR";
|
||||||
|
} else {
|
||||||
|
level = "DIFFERENT";
|
||||||
|
}
|
||||||
|
|
||||||
|
return SimilarFileResponse.builder()
|
||||||
|
.fileId(similarImageProjection.getId())
|
||||||
|
.originalFileName(similarImageProjection.getOriginalFileName())
|
||||||
|
.fileSize(similarImageProjection.getFileSize())
|
||||||
|
.hammingDistance(hamming)
|
||||||
|
.similarityLevel(level)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private int hamming64(int aHi, int aLo, int bHi, int bLo) {
|
||||||
|
return Integer.bitCount(aHi ^ bHi)
|
||||||
|
+ Integer.bitCount(aLo ^ bLo);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
||||||
|
import ru.soune.nocopy.repository.ImageHashRepository;
|
||||||
|
|
||||||
|
import javax.imageio.ImageIO;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Slf4j
|
||||||
|
public class ImageHashService {
|
||||||
|
|
||||||
|
private final ImageHashRepository repository;
|
||||||
|
|
||||||
|
public Map<String, Integer> calculateHash(Path imagePath) throws IOException {
|
||||||
|
long hash64 = computePhash64(imagePath);
|
||||||
|
|
||||||
|
return Map.of(
|
||||||
|
"hi", high32(hash64),
|
||||||
|
"low", low32(hash64));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void create(FileEntity file, Map<String, Integer> stringIntegerMap) {
|
||||||
|
ImageHashEntity entity = ImageHashEntity.builder()
|
||||||
|
.file(file)
|
||||||
|
.hash64Hi(stringIntegerMap.get("hi"))
|
||||||
|
.hash64Lo(stringIntegerMap.get("low"))
|
||||||
|
.hashAlgorithm("PHASH64")
|
||||||
|
.createdAt(LocalDateTime.now())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
repository.save(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
private long computePhash64(Path path) throws IOException {
|
||||||
|
try (InputStream is = Files.newInputStream(path)) {
|
||||||
|
BufferedImage image = ImageIO.read(is);
|
||||||
|
if (image == null) throw new IOException("Cannot read image file: " + path);
|
||||||
|
|
||||||
|
BufferedImage gray = toGrayScale(image);
|
||||||
|
BufferedImage resized = resizeImage(gray, 32, 32);
|
||||||
|
|
||||||
|
double[][] dct = applyDCT(resized);
|
||||||
|
double[][] topLeft = extractTopLeft8x8(dct);
|
||||||
|
double median = calculateMedian(topLeft, true);
|
||||||
|
|
||||||
|
return create64BitHashLong(topLeft, median);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BufferedImage toGrayScale(BufferedImage image) {
|
||||||
|
BufferedImage gray = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
|
||||||
|
Graphics2D g = gray.createGraphics();
|
||||||
|
g.drawImage(image, 0, 0, null);
|
||||||
|
g.dispose();
|
||||||
|
return gray;
|
||||||
|
}
|
||||||
|
|
||||||
|
private BufferedImage resizeImage(BufferedImage image, int width, int height) {
|
||||||
|
BufferedImage resized = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_GRAY);
|
||||||
|
Graphics2D g = resized.createGraphics();
|
||||||
|
g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
|
||||||
|
g.drawImage(image, 0, 0, width, height, null);
|
||||||
|
g.dispose();
|
||||||
|
return resized;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double[][] applyDCT(BufferedImage image) {
|
||||||
|
int w = image.getWidth();
|
||||||
|
int h = image.getHeight();
|
||||||
|
double[][] pixels = new double[h][w];
|
||||||
|
|
||||||
|
for (int y = 0; y < h; y++) {
|
||||||
|
for (int x = 0; x < w; x++) {
|
||||||
|
int gray = image.getRGB(x, y) & 0xFF;
|
||||||
|
pixels[y][x] = gray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
double[][] dct = new double[h][w];
|
||||||
|
for (int u = 0; u < h; u++) {
|
||||||
|
double au = u == 0 ? 1.0 / Math.sqrt(h) : Math.sqrt(2.0 / h);
|
||||||
|
for (int v = 0; v < w; v++) {
|
||||||
|
double av = v == 0 ? 1.0 / Math.sqrt(w) : Math.sqrt(2.0 / w);
|
||||||
|
double sum = 0.0;
|
||||||
|
for (int x = 0; x < h; x++) {
|
||||||
|
for (int y = 0; y < w; y++) {
|
||||||
|
sum += pixels[x][y] *
|
||||||
|
Math.cos((2 * x + 1) * u * Math.PI / (2.0 * h)) *
|
||||||
|
Math.cos((2 * y + 1) * v * Math.PI / (2.0 * w));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dct[u][v] = au * av * sum;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dct;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double[][] extractTopLeft8x8(double[][] dct) {
|
||||||
|
double[][] block = new double[8][8];
|
||||||
|
for (int i = 0; i < 8; i++) System.arraycopy(dct[i], 0, block[i], 0, 8);
|
||||||
|
return block;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double calculateMedian(double[][] block, boolean excludeDC) {
|
||||||
|
double[] vals = new double[63];
|
||||||
|
int idx = 0;
|
||||||
|
for (int i = 0; i < 8; i++) {
|
||||||
|
for (int j = 0; j < 8; j++) {
|
||||||
|
if (i == 0 && j == 0 && excludeDC) continue;
|
||||||
|
vals[idx++] = block[i][j];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Arrays.sort(vals);
|
||||||
|
return (vals.length % 2 == 0) ?
|
||||||
|
(vals[vals.length / 2 - 1] + vals[vals.length / 2]) / 2.0 :
|
||||||
|
vals[vals.length / 2];
|
||||||
|
}
|
||||||
|
|
||||||
|
private long create64BitHashLong(double[][] block, double median) {
|
||||||
|
long hash = 0L;
|
||||||
|
|
||||||
|
for (int i = 0; i < 8; i++) {
|
||||||
|
for (int j = 0; j < 8; j++) {
|
||||||
|
if (i == 0 && j == 0) continue;
|
||||||
|
hash <<= 1;
|
||||||
|
if (block[i][j] > median) hash |= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int high32(long hash64) {
|
||||||
|
return (int) (hash64 >>> 32);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int low32(long hash64) {
|
||||||
|
return (int) hash64;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service;
|
|||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import ru.soune.nocopy.dto.UserContentRequest;
|
import ru.soune.nocopy.dto.UserContentRequest;
|
||||||
import ru.soune.nocopy.dto.UserContentUpdateRequest;
|
import ru.soune.nocopy.dto.UserContentUpdateRequest;
|
||||||
import ru.soune.nocopy.entity.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.nocopy.entity.UserContent;
|
import ru.soune.nocopy.entity.UserContent;
|
||||||
import ru.soune.nocopy.exception.ContentNotFoundException;
|
import ru.soune.nocopy.exception.ContentNotFoundException;
|
||||||
|
|||||||
@@ -0,0 +1,162 @@
|
|||||||
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||||
|
import jakarta.annotation.PostConstruct;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class YandexSearchService {
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
@Value("${yandex.api-key}")
|
||||||
|
private String apiKey;
|
||||||
|
|
||||||
|
@Value("${yandex.folder-id}")
|
||||||
|
private String folderId;
|
||||||
|
|
||||||
|
@Value("${yandex.search-url}")
|
||||||
|
private String searchUrl;
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
public void init() {
|
||||||
|
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public YandexSearchResponse searchByFileEntity(String fileId) throws IOException {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> {
|
||||||
|
throw new NotValidFieldException("File not found", new BaseResponse(20007,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
Map.of("fileId",fileId)));
|
||||||
|
});
|
||||||
|
byte[] fileBytes;
|
||||||
|
|
||||||
|
if (!isImageFile(fileEntity)) {
|
||||||
|
log.error("File not image: {}", fileEntity.getMimeType());
|
||||||
|
throw new NotValidFieldException("File not image", new BaseResponse(20007,
|
||||||
|
MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
|
||||||
|
Map.of("file_type", fileEntity.getMimeType())));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
fileBytes = readFileFromDisk(fileEntity);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
Map.of("fileId", fileId,
|
||||||
|
"filePath", fileEntity.getFilePath())));
|
||||||
|
}
|
||||||
|
|
||||||
|
return callYandexApi(fileBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isImageFile(FileEntity fileEntity) {
|
||||||
|
String mimeType = fileEntity.getMimeType();
|
||||||
|
return mimeType != null && mimeType.startsWith("image");
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
|
||||||
|
Path filePath = Path.of(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
if (!Files.exists(filePath)) {
|
||||||
|
throw new IOException("File not found: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Files.isReadable(filePath)) {
|
||||||
|
throw new IOException("Cannot read file: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Files.readAllBytes(filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
private YandexSearchResponse callYandexApi(byte[] imageBytes) throws IOException {
|
||||||
|
String imageBase64 = Base64.getEncoder().encodeToString(imageBytes);
|
||||||
|
String jsonRequest = String.format("{\"folderId\":\"%s\",\"data\":\"%s\",\"page\":0,\"showSimilarImages\":true}",
|
||||||
|
folderId, imageBase64);
|
||||||
|
|
||||||
|
URL url = new URL(searchUrl);
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||||
|
|
||||||
|
try {
|
||||||
|
connection.setRequestMethod("POST");
|
||||||
|
connection.setRequestProperty("Authorization", "Api-Key " + apiKey);
|
||||||
|
connection.setRequestProperty("Content-Type", "application/json");
|
||||||
|
connection.setRequestProperty("Accept", "application/json");
|
||||||
|
connection.setConnectTimeout(30000);
|
||||||
|
connection.setReadTimeout(30000);
|
||||||
|
connection.setDoOutput(true);
|
||||||
|
|
||||||
|
try (OutputStream os = connection.getOutputStream()) {
|
||||||
|
byte[] input = jsonRequest.getBytes("utf-8");
|
||||||
|
os.write(input, 0, input.length);
|
||||||
|
os.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
int responseCode = connection.getResponseCode();
|
||||||
|
|
||||||
|
String responseBody;
|
||||||
|
if (responseCode == HttpURLConnection.HTTP_OK) {
|
||||||
|
try (BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(connection.getInputStream(), "utf-8"))) {
|
||||||
|
responseBody = readAll(br);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
try (BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(connection.getErrorStream(), "utf-8"))) {
|
||||||
|
responseBody = readAll(br);
|
||||||
|
}
|
||||||
|
throw new IOException("Error Yandex API: " + responseCode + " - " + responseBody);
|
||||||
|
}
|
||||||
|
|
||||||
|
return parseJsonResponse(responseBody);
|
||||||
|
|
||||||
|
} finally {
|
||||||
|
connection.disconnect();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String readAll(BufferedReader reader) throws IOException {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
String line;
|
||||||
|
while ((line = reader.readLine()) != null) {
|
||||||
|
sb.append(line);
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private YandexSearchResponse parseJsonResponse(String json) {
|
||||||
|
YandexSearchResponse response = null;
|
||||||
|
try {
|
||||||
|
response = objectMapper.readValue(json, YandexSearchResponse.class);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
}
|
||||||
+22
-4
@@ -1,13 +1,13 @@
|
|||||||
package ru.soune.nocopy.service;
|
package ru.soune.nocopy.service.auth;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.context.MessageSource;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
@@ -29,8 +29,6 @@ public class AuthService {
|
|||||||
|
|
||||||
private final PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
private final MessageSource messageSource;
|
|
||||||
|
|
||||||
private final SecureRandom secureRandom = new SecureRandom();
|
private final SecureRandom secureRandom = new SecureRandom();
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
@@ -81,6 +79,26 @@ public class AuthService {
|
|||||||
return authTokenRepository.save(authToken);
|
return authTokenRepository.save(authToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public Long useUserAuthToken(String token) {
|
||||||
|
if (token == null || token.isBlank()) {
|
||||||
|
throw new NotFoundAuthToken("Token is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (token.startsWith("Bearer ")) {
|
||||||
|
token = token.replace("Bearer ", "");
|
||||||
|
}
|
||||||
|
|
||||||
|
AuthToken authToken = authTokenRepository.findByToken(token)
|
||||||
|
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
||||||
|
authToken.setLastUsedAt(LocalDateTime.now());
|
||||||
|
authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
|
||||||
|
|
||||||
|
authTokenRepository.save(authToken);
|
||||||
|
|
||||||
|
return authToken.getUser().getId();
|
||||||
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void logout(String token) {
|
public void logout(String token) {
|
||||||
authTokenRepository.findByToken(token)
|
authTokenRepository.findByToken(token)
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package ru.soune.nocopy.service.auth;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class CleanupTokenSessionsService {
|
||||||
|
@Autowired
|
||||||
|
private AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
@Value("${file.storage.auth-token-life-hours}")
|
||||||
|
private int authTokenLife;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Scheduled(fixedDelay = 30000)
|
||||||
|
public void cleanupExpiredTokens() {
|
||||||
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
|
||||||
|
List<AuthToken> expiredTokens = authTokenRepository.findByExpiresAtBefore(now);
|
||||||
|
|
||||||
|
if (!expiredTokens.isEmpty()) {
|
||||||
|
authTokenRepository.deleteAll(expiredTokens);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.*;
|
||||||
|
import java.nio.file.attribute.BasicFileAttributes;
|
||||||
|
import java.time.Instant;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.ZoneId;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileCleanupService {
|
||||||
|
|
||||||
|
@Value("${file.storage.base-path}")
|
||||||
|
private String basePath;
|
||||||
|
|
||||||
|
@Value("${file.storage.temp-ttl-hours}")
|
||||||
|
private int tempTtlHours;
|
||||||
|
|
||||||
|
@Scheduled(cron = "0 0 3 * * *")
|
||||||
|
public void cleanupExpiredFiles() {
|
||||||
|
log.info("Starting cleanup of expired temporary files");
|
||||||
|
|
||||||
|
Path tempDir = Paths.get(basePath, "temp");
|
||||||
|
if (!Files.exists(tempDir)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
Files.walkFileTree(tempDir, new SimpleFileVisitor<Path>() {
|
||||||
|
@Override
|
||||||
|
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
|
||||||
|
throws IOException {
|
||||||
|
|
||||||
|
LocalDateTime fileTime = LocalDateTime.ofInstant(
|
||||||
|
Instant.ofEpochMilli(attrs.lastModifiedTime().toMillis()),
|
||||||
|
ZoneId.systemDefault()
|
||||||
|
);
|
||||||
|
|
||||||
|
LocalDateTime cutoffTime = LocalDateTime.now()
|
||||||
|
.minusHours(tempTtlHours);
|
||||||
|
|
||||||
|
if (fileTime.isBefore(cutoffTime)) {
|
||||||
|
Files.delete(file);
|
||||||
|
log.debug("Deleted expired file: {}", file);
|
||||||
|
}
|
||||||
|
|
||||||
|
return FileVisitResult.CONTINUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FileVisitResult postVisitDirectory(Path dir, IOException exc)
|
||||||
|
throws IOException {
|
||||||
|
|
||||||
|
if (exc == null) {
|
||||||
|
if (Files.list(dir).count() == 0 &&
|
||||||
|
!dir.equals(tempDir)) {
|
||||||
|
Files.delete(dir);
|
||||||
|
log.debug("Deleted empty directory: {}", dir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return FileVisitResult.CONTINUE;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
log.info("Cleanup completed successfully");
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error("Error during cleanup", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||||
|
import ru.soune.nocopy.dto.file.FileResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.exception.DuplicateImageException;
|
||||||
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.repository.SimilarImageProjection;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
import ru.soune.nocopy.service.ImageHashService;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileEntityService {
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final ImageHashService imageHashService;
|
||||||
|
|
||||||
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
|
@Transactional(noRollbackFor = DuplicateImageException.class)
|
||||||
|
public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
|
||||||
|
log.info("Creating FileEntity for upload session: {}", session.getUploadId());
|
||||||
|
|
||||||
|
try {
|
||||||
|
Path filePath = Paths.get(session.getFilePath());
|
||||||
|
|
||||||
|
if (!Files.exists(filePath)) {
|
||||||
|
throw new IOException("File not found on disk: " + filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, Integer> imageHash = Map.of();
|
||||||
|
|
||||||
|
if (session.getFileType().startsWith("image")) {
|
||||||
|
imageHash = imageHashService.calculateHash(filePath);
|
||||||
|
List<SimilarImageProjection> duplicatedByHash = fileSimilarityService.findDuplicatedByHash(
|
||||||
|
imageHash.get("hi"), imageHash.get("low"));
|
||||||
|
|
||||||
|
if (!duplicatedByHash.isEmpty()) {
|
||||||
|
SimilarImageProjection similarImageProjection = duplicatedByHash.get(0);
|
||||||
|
|
||||||
|
throw new DuplicateImageException("Duplicate", similarImageProjection.getFileId(),
|
||||||
|
similarImageProjection.getUserId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
long fileSize = Files.size(filePath);
|
||||||
|
String originalName = session.getFileName();
|
||||||
|
String storedName = filePath.getFileName().toString();
|
||||||
|
|
||||||
|
FileEntity fileEntity = FileEntity.builder()
|
||||||
|
.userId(session.getUserId())
|
||||||
|
.originalFileName(originalName)
|
||||||
|
.storedFileName(storedName)
|
||||||
|
.filePath(session.getFilePath())
|
||||||
|
.fileSize(fileSize)
|
||||||
|
.mimeType(session.getFileType())
|
||||||
|
.fileExtension(session.getExtension())
|
||||||
|
.checksum(checksum)
|
||||||
|
.uploadSessionId(session.getUploadId())
|
||||||
|
.status(FileStatus.ACTIVE)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
FileEntity saved = fileEntityRepository.save(fileEntity);
|
||||||
|
|
||||||
|
if (!imageHash.isEmpty()) {
|
||||||
|
imageHashService.create(saved, imageHash);
|
||||||
|
}
|
||||||
|
|
||||||
|
return saved;
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error("Failed to create FileEntity for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage(), e);
|
||||||
|
throw new RuntimeException("Failed to create file entity: " + e.getMessage(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public FileEntityResponse getById(String fileId, int version) {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new FileEntityNotFoundException(fileId));
|
||||||
|
|
||||||
|
return convertToResponse(fileEntity, version);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public FileEntityResponse getByUploadSessionId(String uploadSessionId, int version) {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findByUploadSessionId(uploadSessionId)
|
||||||
|
.orElseThrow(() -> new FileEntityNotFoundException(
|
||||||
|
"Not found for upload session: " + uploadSessionId));
|
||||||
|
|
||||||
|
return convertToResponse(fileEntity, version);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
|
||||||
|
List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
|
||||||
|
userId, FileStatus.ACTIVE);
|
||||||
|
|
||||||
|
int start = (page - 1) * pageSize;
|
||||||
|
int end = Math.min(start + pageSize, allFiles.size());
|
||||||
|
|
||||||
|
if (start >= allFiles.size()) {
|
||||||
|
return FileResponse.builder()
|
||||||
|
.files(List.of())
|
||||||
|
.totalCount(allFiles.size())
|
||||||
|
.totalSize(0)
|
||||||
|
.formattedTotalSize("0 B")
|
||||||
|
.page(page)
|
||||||
|
.pageSize(pageSize)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
List<FileEntity> pageFiles = allFiles.subList(start, end);
|
||||||
|
|
||||||
|
List<FileEntityResponse> files = pageFiles.stream()
|
||||||
|
.map(file -> convertToResponse(file, version))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
long totalSize = allFiles.stream()
|
||||||
|
.mapToLong(FileEntity::getFileSize)
|
||||||
|
.sum();
|
||||||
|
|
||||||
|
return FileResponse.builder()
|
||||||
|
.files(files)
|
||||||
|
.totalCount(allFiles.size())
|
||||||
|
.totalSize(totalSize)
|
||||||
|
.formattedTotalSize(formatFileSize(totalSize))
|
||||||
|
.page(page)
|
||||||
|
.pageSize(pageSize)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public void markAsDeleted(FileEntity fileEntity) {
|
||||||
|
fileEntity.setStatus(FileStatus.DELETED);
|
||||||
|
fileEntity.setUpdatedAt(LocalDateTime.now());
|
||||||
|
|
||||||
|
fileEntityRepository.save(fileEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public boolean deleteFromDisk(FileEntity fileEntity) throws IOException {
|
||||||
|
Path path = Paths.get(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
if (!Files.exists(path)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Files.delete(path);
|
||||||
|
|
||||||
|
markAsDeleted(fileEntity);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public long getUserStorageUsed(Long userId) {
|
||||||
|
Long totalSize = fileEntityRepository.getTotalSizeByUserId(userId);
|
||||||
|
return totalSize != null ? totalSize : 0L;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean checkFileExistsOnDisk(String filePath) {
|
||||||
|
try {
|
||||||
|
return Files.exists(Paths.get(filePath));
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.warn("Error checking file existence: {}", filePath, e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
|
||||||
|
boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
return FileEntityResponse.builder()
|
||||||
|
.id(fileEntity.getId())
|
||||||
|
.userId(fileEntity.getUserId())
|
||||||
|
.originalFileName(fileEntity.getOriginalFileName())
|
||||||
|
.storedFileName(fileEntity.getStoredFileName())
|
||||||
|
.filePath(fileEntity.getFilePath())
|
||||||
|
.fileSize(fileEntity.getFileSize())
|
||||||
|
.mimeType(fileEntity.getMimeType())
|
||||||
|
.fileExtension(fileEntity.getFileExtension())
|
||||||
|
.checksum(fileEntity.getChecksum())
|
||||||
|
.uploadSessionId(fileEntity.getUploadSessionId())
|
||||||
|
.status(fileEntity.getStatus())
|
||||||
|
.createdAt(fileEntity.getCreatedAt())
|
||||||
|
.updatedAt(fileEntity.getUpdatedAt())
|
||||||
|
.formattedSize(formatFileSize(fileEntity.getFileSize()))
|
||||||
|
.downloadUrl("/api/v" + version + "/files/download/" + fileEntity.getId())
|
||||||
|
.existsOnDisk(existsOnDisk)
|
||||||
|
.supportId(fileEntity.getSupportId())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String formatFileSize(long size) {
|
||||||
|
if (size < 1024) {
|
||||||
|
return size + " B";
|
||||||
|
} else if (size < 1024 * 1024) {
|
||||||
|
return String.format("%.1f KB", size / 1024.0);
|
||||||
|
} else if (size < 1024 * 1024 * 1024) {
|
||||||
|
return String.format("%.1f MB", size / (1024.0 * 1024.0));
|
||||||
|
} else {
|
||||||
|
return String.format("%.1f GB", size / (1024.0 * 1024.0 * 1024.0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.file.FileInfoUserResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileStatsService {
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
public FileInfoUserResponse getUserFileStats(Long userId) {
|
||||||
|
List<FileEntity> userFiles = fileEntityRepository.findByUserId(userId);
|
||||||
|
return calculateStats(userFiles);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FileInfoUserResponse calculateStats(List<FileEntity> files) {
|
||||||
|
return FileInfoUserResponse.builder()
|
||||||
|
.allFileSize(calculateTotalSize(files))
|
||||||
|
.fileCount(calculateTotalCount(files))
|
||||||
|
.filesCheck(calculateByStatus(files, FileStatus.CHECKED))
|
||||||
|
.filesViolation(calculateByStatus(files, FileStatus.VIOLATION))
|
||||||
|
|
||||||
|
.imagesSize(calculateMediaSize(files, FileType.IMAGE))
|
||||||
|
.imagesCount(calculateMediaCount(files, FileType.IMAGE))
|
||||||
|
.imagesCheck(calculateMediaByStatus(files, FileType.IMAGE, FileStatus.CHECKED))
|
||||||
|
.imagesViolations(calculateMediaByStatus(files, FileType.IMAGE, FileStatus.VIOLATION))
|
||||||
|
|
||||||
|
.videosSize(calculateMediaSize(files, FileType.VIDEO))
|
||||||
|
.videosCount(calculateMediaCount(files, FileType.VIDEO))
|
||||||
|
.videosCheck(calculateMediaByStatus(files, FileType.VIDEO, FileStatus.CHECKED))
|
||||||
|
.videosViolations(calculateMediaByStatus(files, FileType.VIDEO, FileStatus.VIOLATION))
|
||||||
|
|
||||||
|
.audiosSize(calculateMediaSize(files, FileType.AUDIO))
|
||||||
|
.audiosCount(calculateMediaCount(files, FileType.AUDIO))
|
||||||
|
.audiosCheck(calculateMediaByStatus(files, FileType.AUDIO, FileStatus.CHECKED))
|
||||||
|
.audiosViolations(calculateMediaByStatus(files, FileType.AUDIO, FileStatus.VIOLATION))
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
private Long calculateTotalSize(List<FileEntity> files) {
|
||||||
|
return files.stream()
|
||||||
|
.filter(file -> file.getStatus() != FileStatus.DELETED)
|
||||||
|
.mapToLong(FileEntity::getFileSize)
|
||||||
|
.sum();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Integer calculateTotalCount(List<FileEntity> files) {
|
||||||
|
return (int) files.stream()
|
||||||
|
.filter(file -> file.getStatus() != FileStatus.DELETED)
|
||||||
|
.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Integer calculateByStatus(List<FileEntity> files, FileStatus status) {
|
||||||
|
return (int) files.stream()
|
||||||
|
.filter(file -> file.getStatus() == status)
|
||||||
|
.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Long calculateMediaSize(List<FileEntity> files, FileType fileType) {
|
||||||
|
return files.stream()
|
||||||
|
.filter(file -> file.getStatus() != FileStatus.DELETED)
|
||||||
|
.filter(file -> isFileType(file, fileType))
|
||||||
|
.mapToLong(FileEntity::getFileSize)
|
||||||
|
.sum();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Integer calculateMediaCount(List<FileEntity> files, FileType fileType) {
|
||||||
|
return (int) files.stream()
|
||||||
|
.filter(file -> file.getStatus() != FileStatus.DELETED)
|
||||||
|
.filter(file -> isFileType(file, fileType))
|
||||||
|
.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Integer calculateMediaByStatus(List<FileEntity> files, FileType fileType, FileStatus status) {
|
||||||
|
return (int) files.stream()
|
||||||
|
.filter(file -> isFileType(file, fileType))
|
||||||
|
.filter(file -> file.getStatus() == status)
|
||||||
|
.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isFileType(FileEntity file, FileType fileType) {
|
||||||
|
if (file.getFileExtension() == null) return false;
|
||||||
|
|
||||||
|
String extension = file.getFileExtension().toLowerCase().replace(".", "");
|
||||||
|
return fileType.supportsExtension(extension);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import ru.soune.nocopy.dto.file.UploadProgressResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public interface FileUploadService {
|
||||||
|
FileUploadSession initUpload(Long userId, String fileName,
|
||||||
|
String fileType, String extension, long fileSize);
|
||||||
|
|
||||||
|
UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
|
||||||
|
MultipartFile chunkFile) throws IOException;
|
||||||
|
|
||||||
|
UploadProgressResponse getUploadProgress(String uploadId);
|
||||||
|
|
||||||
|
void handleExpiredSession(FileUploadSession session);
|
||||||
|
|
||||||
|
public void cancelUpload(String uploadId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,737 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import jakarta.annotation.PostConstruct;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.scheduling.annotation.Async;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import ru.soune.nocopy.dto.file.UploadProgressResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
import ru.soune.nocopy.exception.ChunkSizeExceededException;
|
||||||
|
import ru.soune.nocopy.exception.DuplicateImageException;
|
||||||
|
import ru.soune.nocopy.exception.FileUploadException;
|
||||||
|
import ru.soune.nocopy.exception.UploadSessionNotFoundException;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||||
|
import ru.soune.nocopy.repository.SimilarImageProjection;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
import ru.soune.nocopy.service.ImageHashService;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
import java.nio.file.*;
|
||||||
|
import java.nio.file.attribute.PosixFilePermission;
|
||||||
|
import java.security.MessageDigest;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileUploadServiceImpl implements FileUploadService {
|
||||||
|
|
||||||
|
private final FileUploadSessionRepository sessionRepository;
|
||||||
|
|
||||||
|
@Value("${file.storage.base-path}")
|
||||||
|
private String basePath;
|
||||||
|
|
||||||
|
@Value("${file.storage.chunk-size}")
|
||||||
|
private int chunkSize;
|
||||||
|
|
||||||
|
@Value("${file.storage.max-file-size}")
|
||||||
|
private long maxFileSize;
|
||||||
|
|
||||||
|
@Value("${file.storage.max-retry-attempts:3}")
|
||||||
|
private int maxRetryAttempts;
|
||||||
|
|
||||||
|
@Value("${file.storage.chunk-timeout-ms:300000}") // 5 минут
|
||||||
|
private long chunkTimeoutMs;
|
||||||
|
|
||||||
|
@Value("${file.storage.session-expiry-hours:24}")
|
||||||
|
private int sessionExpiryHours;
|
||||||
|
|
||||||
|
private Path storageRoot;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ImageHashService imageHashService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
public void init() {
|
||||||
|
try {
|
||||||
|
storageRoot = Paths.get(basePath).toAbsolutePath().normalize();
|
||||||
|
log.info("Initializing file storage at: {}", storageRoot);
|
||||||
|
|
||||||
|
createDirectoryIfNotExists(storageRoot);
|
||||||
|
createDirectoryIfNotExists(storageRoot.resolve("temp"));
|
||||||
|
createDirectoryIfNotExists(storageRoot.resolve("uploads"));
|
||||||
|
|
||||||
|
if (!System.getProperty("os.name").toLowerCase().contains("win")) {
|
||||||
|
setDirectoryPermissions(storageRoot);
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info("File storage initialized successfully");
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error("Failed to initialize file storage at: {}", basePath, e);
|
||||||
|
throw new RuntimeException("Storage initialization failed", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional
|
||||||
|
public FileUploadSession initUpload(Long userId, String fileName,
|
||||||
|
String fileType, String extension, long fileSize) {
|
||||||
|
log.info("Initializing upload for user {}: {} ({} bytes, type: {})",
|
||||||
|
userId, fileName, fileSize, fileType);
|
||||||
|
|
||||||
|
if (fileSize > maxFileSize) {
|
||||||
|
throw new FileUploadException(
|
||||||
|
String.format("File size %d exceeds maximum allowed size %d",
|
||||||
|
fileSize, maxFileSize));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fileSize <= 0) {
|
||||||
|
throw new FileUploadException("File size must be positive");
|
||||||
|
}
|
||||||
|
|
||||||
|
int totalChunks = (int) Math.ceil((double) fileSize / chunkSize);
|
||||||
|
log.debug("File will be split into {} chunks (chunk size: {} bytes)",
|
||||||
|
totalChunks, chunkSize);
|
||||||
|
Long chunkSize = totalChunks == 1 ? fileSize : 1000000L;
|
||||||
|
|
||||||
|
FileUploadSession session = FileUploadSession.builder()
|
||||||
|
.userId(userId)
|
||||||
|
.extension(extension)
|
||||||
|
.fileName(fileName)
|
||||||
|
.fileType(fileType)
|
||||||
|
.chunkSize(chunkSize)
|
||||||
|
.fileSize(fileSize)
|
||||||
|
.totalChunks(totalChunks)
|
||||||
|
.chunksUploaded(0)
|
||||||
|
.status(UploadStatus.INITIATED)
|
||||||
|
.expiresAt(LocalDateTime.now().plusHours(sessionExpiryHours))
|
||||||
|
.retryCount(0)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
FileUploadSession savedSession = sessionRepository.save(session);
|
||||||
|
log.info("Upload session created: {} for file: {}",
|
||||||
|
savedSession.getUploadId(), fileName);
|
||||||
|
|
||||||
|
return savedSession;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional
|
||||||
|
public UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
|
||||||
|
MultipartFile chunkFile) {
|
||||||
|
FileUploadSession session = sessionRepository.findById(uploadId)
|
||||||
|
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
||||||
|
|
||||||
|
validateSession(session);
|
||||||
|
|
||||||
|
if (session.getExpiresAt().isBefore(LocalDateTime.now())) {
|
||||||
|
handleExpiredSession(session);
|
||||||
|
throw new FileUploadException("Upload session expired");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chunkNumber < 0 || chunkNumber >= session.getTotalChunks()) {
|
||||||
|
throw new FileUploadException(
|
||||||
|
String.format("Invalid chunk number %d. Expected number: %d",
|
||||||
|
chunkNumber, session.getTotalChunks() - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chunkNumber == 0 && chunkFile.getSize() > chunkSize || chunkNumber + 1 == (session.getTotalChunks())
|
||||||
|
&& chunkFile.getSize() > chunkSize) {
|
||||||
|
throw new ChunkSizeExceededException(chunkFile.getSize(), chunkSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chunkNumber > 0 && chunkNumber + 1 < session.getTotalChunks() && chunkFile.getSize() != chunkSize) {
|
||||||
|
throw new ChunkSizeExceededException(chunkFile.getSize(), chunkSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
return processChunk(session, chunkNumber, chunkFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional
|
||||||
|
public void handleExpiredSession(FileUploadSession session) {
|
||||||
|
session.setStatus(UploadStatus.FAILED);
|
||||||
|
session.setLastError("Upload session expired");
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Async("fileUploadTaskExecutor")
|
||||||
|
@Transactional
|
||||||
|
public void assembleFileAsync(FileUploadSession session) throws DuplicateImageException {
|
||||||
|
try {
|
||||||
|
assembleFile(session);
|
||||||
|
log.info("File assembly completed successfully for session: {}",
|
||||||
|
session.getUploadId());
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
throw new DuplicateImageException("DUBL", e.duplicateFileId(), e.userId());
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to assemble file for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage(), e);
|
||||||
|
|
||||||
|
handleAssemblyFailure(session, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional
|
||||||
|
public void cancelUpload(String uploadId) {
|
||||||
|
FileUploadSession session = sessionRepository.findById(uploadId)
|
||||||
|
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
||||||
|
|
||||||
|
if (session.getStatus() == UploadStatus.COMPLETED || session.getStatus() == UploadStatus.CANCELLED) {
|
||||||
|
throw new FileUploadException("Cannot cancel completed or cancelled upload");
|
||||||
|
}
|
||||||
|
|
||||||
|
session.setStatus(UploadStatus.CANCELLED);
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
|
||||||
|
|
||||||
|
log.info("Upload cancelled: {}", uploadId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public UploadProgressResponse getUploadProgress(String uploadId) {
|
||||||
|
FileUploadSession session = sessionRepository.findById(uploadId)
|
||||||
|
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
||||||
|
|
||||||
|
return UploadProgressResponse.fromSession(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateSession(FileUploadSession session) {
|
||||||
|
UploadStatus status = session.getStatus();
|
||||||
|
|
||||||
|
if (status == UploadStatus.FAILED) {
|
||||||
|
if (session.getRetryCount() >= maxRetryAttempts) {
|
||||||
|
throw new FileUploadException(
|
||||||
|
"Upload failed after maximum retry attempts");
|
||||||
|
}
|
||||||
|
session.setStatus(UploadStatus.UPLOADING);
|
||||||
|
session.setRetryCount(session.getRetryCount() + 1);
|
||||||
|
sessionRepository.save(session);
|
||||||
|
log.info("Retrying failed upload session: {}, attempt: {}",
|
||||||
|
session.getUploadId(), session.getRetryCount());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status == UploadStatus.COMPLETED) {
|
||||||
|
throw new FileUploadException("Upload already completed");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status == UploadStatus.CANCELLED) {
|
||||||
|
throw new FileUploadException("Upload was cancelled");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status == UploadStatus.INITIATED) {
|
||||||
|
session.setStatus(UploadStatus.UPLOADING);
|
||||||
|
sessionRepository.save(session);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Async("fileUploadTaskExecutor")
|
||||||
|
@Transactional
|
||||||
|
public void completeFileProcessingAsync(FileUploadSession session) {
|
||||||
|
try {
|
||||||
|
Path filePath = Paths.get(session.getFilePath());
|
||||||
|
String checksum = calculateChecksum(filePath);
|
||||||
|
|
||||||
|
FileEntity fileEntity = FileEntity.builder()
|
||||||
|
.userId(session.getUserId())
|
||||||
|
.originalFileName(session.getFileName())
|
||||||
|
.storedFileName(filePath.getFileName().toString())
|
||||||
|
.filePath(session.getFilePath())
|
||||||
|
.fileSize(session.getFileSize())
|
||||||
|
.mimeType(session.getFileType())
|
||||||
|
.fileExtension(session.getExtension())
|
||||||
|
.checksum(checksum)
|
||||||
|
.uploadSessionId(session.getUploadId())
|
||||||
|
.status(FileStatus.ACTIVE)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
FileEntity saved = fileEntityRepository.save(fileEntity);
|
||||||
|
|
||||||
|
Map<String, Integer> hash = imageHashService.calculateHash(filePath);
|
||||||
|
imageHashService.create(saved, hash);
|
||||||
|
|
||||||
|
cleanupSessionFiles(session);
|
||||||
|
|
||||||
|
log.info("File processing completed for session: {}", session.getUploadId());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to complete file processing for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private UploadProgressResponse processChunk(FileUploadSession session, Integer chunkNumber, MultipartFile chunkFile) {
|
||||||
|
String chunkPath = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (session.getChunkPaths().containsKey(chunkNumber)) {
|
||||||
|
return handleExistingChunk(session, chunkNumber, chunkFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
chunkPath = saveChunkWithIntegrityCheck(session, chunkNumber, chunkFile);
|
||||||
|
|
||||||
|
session.getChunkPaths().put(chunkNumber, chunkPath);
|
||||||
|
session.setChunksUploaded(session.getChunksUploaded() + 1);
|
||||||
|
session.setStatus(UploadStatus.UPLOADING);
|
||||||
|
session.setExpiresAt(LocalDateTime.now().plusMinutes(1));
|
||||||
|
|
||||||
|
log.debug("Chunk {} saved successfully. Uploaded: {}/{}",
|
||||||
|
chunkNumber, session.getChunksUploaded(), session.getTotalChunks());
|
||||||
|
|
||||||
|
boolean isLastChunk = session.getChunksUploaded().equals(session.getTotalChunks());
|
||||||
|
|
||||||
|
if (isLastChunk) {
|
||||||
|
log.info("All chunks uploaded for session {}. Starting assembly...",
|
||||||
|
session.getUploadId());
|
||||||
|
|
||||||
|
String finalFilePath = assembleFileSynchronously(session);
|
||||||
|
|
||||||
|
if (session.getFileType().startsWith("image")) {
|
||||||
|
checkForDuplicatesSynchronously(finalFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
session.setStatus(UploadStatus.COMPLETED);
|
||||||
|
session.setFilePath(finalFilePath);
|
||||||
|
|
||||||
|
completeFileProcessingAsync(session);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
sessionRepository.save(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
return UploadProgressResponse.fromSession(session);
|
||||||
|
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
if (chunkPath != null) {
|
||||||
|
cleanupFailedChunk(chunkPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
log.warn("Duplicate image found for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage());
|
||||||
|
|
||||||
|
session.setStatus(UploadStatus.FAILED);
|
||||||
|
session.setLastError(e.getMessage());
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
throw e;
|
||||||
|
} catch (Exception e) {
|
||||||
|
if (chunkPath != null) {
|
||||||
|
cleanupFailedChunk(chunkPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
log.error("Failed to process chunk {} for session {}: {}",
|
||||||
|
chunkNumber, session.getUploadId(), e.getMessage(), e);
|
||||||
|
|
||||||
|
session.setStatus(UploadStatus.FAILED);
|
||||||
|
session.setLastError(e.getMessage());
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
throw new FileUploadException("Failed to upload chunk: " + e.getMessage(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String assembleFileSynchronously(FileUploadSession session) throws IOException {
|
||||||
|
Path finalFilePath = prepareFinalFile(session);
|
||||||
|
|
||||||
|
validateAllChunksExist(session);
|
||||||
|
mergeChunksToFile(session, finalFilePath);
|
||||||
|
validateFinalFile(session, finalFilePath);
|
||||||
|
|
||||||
|
return finalFilePath.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkForDuplicatesSynchronously(String filePath)
|
||||||
|
throws IOException {
|
||||||
|
Path path = Paths.get(filePath);
|
||||||
|
Map<String, Integer> hash = imageHashService.calculateHash(path);
|
||||||
|
List<SimilarImageProjection> duplicates = fileSimilarityService.findDuplicatedByHash(
|
||||||
|
hash.get("hi"), hash.get("low"));
|
||||||
|
|
||||||
|
if (!duplicates.isEmpty()) {
|
||||||
|
throw new DuplicateImageException("Duplicate", duplicates.get(0).getFileId(),
|
||||||
|
duplicates.get(0).getUserId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private UploadProgressResponse handleExistingChunk(FileUploadSession session,
|
||||||
|
Integer chunkNumber,
|
||||||
|
MultipartFile chunkFile) throws IOException {
|
||||||
|
String existingPath = session.getChunkPaths().get(chunkNumber);
|
||||||
|
Path chunkPath = Paths.get(existingPath);
|
||||||
|
|
||||||
|
if (!Files.exists(chunkPath)) {
|
||||||
|
session.getChunkPaths().remove(chunkNumber);
|
||||||
|
session.setChunksUploaded(session.getChunksUploaded() - 1);
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
return processChunk(session, chunkNumber, chunkFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
long existingSize = Files.size(chunkPath);
|
||||||
|
|
||||||
|
if (existingSize != chunkFile.getSize()) {
|
||||||
|
Files.deleteIfExists(chunkPath);
|
||||||
|
session.getChunkPaths().remove(chunkNumber);
|
||||||
|
session.setChunksUploaded(session.getChunksUploaded() - 1);
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
return processChunk(session, chunkNumber, chunkFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
return UploadProgressResponse.fromSession(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String saveChunkWithIntegrityCheck(FileUploadSession session,
|
||||||
|
Integer chunkNumber,
|
||||||
|
MultipartFile chunkFile) throws IOException {
|
||||||
|
|
||||||
|
Long userId = session.getUserId();
|
||||||
|
String uploadId = session.getUploadId();
|
||||||
|
|
||||||
|
Path chunkDir = getChunkDirectory(userId, uploadId);
|
||||||
|
Files.createDirectories(chunkDir);
|
||||||
|
|
||||||
|
String tempFileName = String.format("chunk_%04d.%s.tmp",
|
||||||
|
chunkNumber, UUID.randomUUID());
|
||||||
|
String finalFileName = String.format("chunk_%04d.tmp", chunkNumber);
|
||||||
|
|
||||||
|
Path tempPath = chunkDir.resolve(tempFileName);
|
||||||
|
Path finalPath = chunkDir.resolve(finalFileName);
|
||||||
|
|
||||||
|
try {
|
||||||
|
chunkFile.transferTo(tempPath.toFile());
|
||||||
|
|
||||||
|
long savedSize = Files.size(tempPath);
|
||||||
|
long uploadedSize = chunkFile.getSize();
|
||||||
|
|
||||||
|
if (uploadedSize > 0 && savedSize != uploadedSize) {
|
||||||
|
throw new IOException(
|
||||||
|
String.format("Size mismatch: saved %d, uploaded %d",
|
||||||
|
savedSize, uploadedSize));
|
||||||
|
}
|
||||||
|
|
||||||
|
Files.move(tempPath, finalPath, StandardCopyOption.ATOMIC_MOVE);
|
||||||
|
|
||||||
|
log.debug("Chunk {} saved successfully: {} bytes",
|
||||||
|
chunkNumber, savedSize);
|
||||||
|
|
||||||
|
return finalPath.toString();
|
||||||
|
|
||||||
|
} finally {
|
||||||
|
Files.deleteIfExists(tempPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cleanupFailedChunk(String chunkPath) {
|
||||||
|
try {
|
||||||
|
Files.deleteIfExists(Paths.get(chunkPath));
|
||||||
|
log.debug("Cleaned up failed chunk: {}", chunkPath);
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.warn("Failed to cleanup chunk: {}", chunkPath, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void assembleFile(FileUploadSession session) throws IOException {
|
||||||
|
log.info("Starting file assembly for session: {} ({})",
|
||||||
|
session.getUploadId(), session.getFileName());
|
||||||
|
|
||||||
|
Path finalFilePath = null;
|
||||||
|
String checksum;
|
||||||
|
|
||||||
|
try {
|
||||||
|
finalFilePath = prepareFinalFile(session);
|
||||||
|
log.info("Final file path: {}", finalFilePath);
|
||||||
|
|
||||||
|
validateAllChunksExist(session);
|
||||||
|
|
||||||
|
mergeChunksToFile(session, finalFilePath);
|
||||||
|
|
||||||
|
validateFinalFile(session, finalFilePath);
|
||||||
|
|
||||||
|
checksum = calculateChecksum(finalFilePath);
|
||||||
|
log.debug("File checksum calculated: {}", checksum);
|
||||||
|
|
||||||
|
session.setFilePath(finalFilePath.toString());
|
||||||
|
session.setChecksum(checksum);
|
||||||
|
session.setStatus(UploadStatus.COMPLETED);
|
||||||
|
session.setCompletedAt(LocalDateTime.now());
|
||||||
|
sessionRepository.save(session);
|
||||||
|
log.info("Upload session updated to COMPLETED: {}", session.getUploadId());
|
||||||
|
|
||||||
|
try {
|
||||||
|
fileEntityService.createFromUploadSession(session, checksum);
|
||||||
|
log.info("FileEntity successfully created for session: {}",
|
||||||
|
session.getUploadId());
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
throw new DuplicateImageException("Duplicate", e.duplicateFileId(), e.userId());
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to create FileEntity for session {} (file uploaded, but metadata not saved): {}",
|
||||||
|
session.getUploadId(), e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanupSessionFiles(session);
|
||||||
|
|
||||||
|
log.info("File assembly completed successfully: {} -> {} ({} bytes)",
|
||||||
|
session.getFileName(), finalFilePath, session.getFileSize());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("File assembly failed for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage(), e);
|
||||||
|
|
||||||
|
if (finalFilePath != null) {
|
||||||
|
try {
|
||||||
|
Files.deleteIfExists(finalFilePath);
|
||||||
|
log.debug("Cleaned up partial file: {}", finalFilePath);
|
||||||
|
} catch (IOException ioException) {
|
||||||
|
log.warn("Failed to cleanup partial file: {}", finalFilePath, ioException);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
session.setStatus(UploadStatus.FAILED);
|
||||||
|
session.setLastError(e.getMessage());
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
throw new IOException("File assembly failed: " + e.getMessage(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Path prepareFinalFile(FileUploadSession session) throws IOException {
|
||||||
|
Path userUploadsDir = storageRoot.resolve("uploads")
|
||||||
|
.resolve(String.valueOf(session.getUserId()))
|
||||||
|
.resolve(extractCategory(session.getFileType()));
|
||||||
|
|
||||||
|
Files.createDirectories(userUploadsDir);
|
||||||
|
|
||||||
|
String safeFileName = generateUniqueFileName(session.getFileName(), session.getExtension());
|
||||||
|
Path finalPath = userUploadsDir.resolve(safeFileName);
|
||||||
|
|
||||||
|
if (Files.exists(finalPath)) {
|
||||||
|
throw new IOException("File already exists: " + finalPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
return finalPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String generateUniqueFileName(String originalName, String extension) {
|
||||||
|
int dotIndex = originalName.lastIndexOf('.');
|
||||||
|
log.info("dotIndex: {}", dotIndex);
|
||||||
|
log.info("originalName: {}", originalName);
|
||||||
|
String nameWithoutExtension;
|
||||||
|
|
||||||
|
if (dotIndex > 0) {
|
||||||
|
nameWithoutExtension = originalName.substring(0, dotIndex)
|
||||||
|
.replaceAll("[^a-zA-Z0-9\\-_]", "_");
|
||||||
|
} else {
|
||||||
|
nameWithoutExtension = originalName.replaceAll("[^a-zA-Z0-9\\-_]", "_");
|
||||||
|
}
|
||||||
|
|
||||||
|
String timestamp = String.valueOf(System.currentTimeMillis());
|
||||||
|
String uuid = UUID.randomUUID().toString().substring(0, 8);
|
||||||
|
|
||||||
|
return String.format("%s_%s_%s.%s",
|
||||||
|
nameWithoutExtension, timestamp, uuid, extension);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateAllChunksExist(FileUploadSession session) throws IOException {
|
||||||
|
Path chunkDir = getChunkDirectory(session.getUserId(), session.getUploadId());
|
||||||
|
|
||||||
|
for (int i = 0; i < session.getTotalChunks(); i++) {
|
||||||
|
Path chunkPath = chunkDir.resolve(String.format("chunk_%04d.tmp", i));
|
||||||
|
if (!Files.exists(chunkPath)) {
|
||||||
|
throw new IOException("Missing chunk: " + chunkPath.getFileName());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Files.size(chunkPath) == 0) {
|
||||||
|
throw new IOException("Empty chunk: " + chunkPath.getFileName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void mergeChunksToFile(FileUploadSession session, Path finalPath)
|
||||||
|
throws IOException {
|
||||||
|
|
||||||
|
Path chunkDir = getChunkDirectory(session.getUserId(), session.getUploadId());
|
||||||
|
byte[] buffer = new byte[8192];
|
||||||
|
|
||||||
|
try (BufferedOutputStream outputStream = new BufferedOutputStream(
|
||||||
|
Files.newOutputStream(finalPath, StandardOpenOption.CREATE_NEW))) {
|
||||||
|
|
||||||
|
long totalWritten = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < session.getTotalChunks(); i++) {
|
||||||
|
Path chunkPath = chunkDir.resolve(String.format("chunk_%04d.tmp", i));
|
||||||
|
|
||||||
|
try (BufferedInputStream inputStream = new BufferedInputStream(
|
||||||
|
Files.newInputStream(chunkPath))) {
|
||||||
|
|
||||||
|
int bytesRead;
|
||||||
|
while ((bytesRead = inputStream.read(buffer)) != -1) {
|
||||||
|
outputStream.write(buffer, 0, bytesRead);
|
||||||
|
totalWritten += bytesRead;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (log.isDebugEnabled()) {
|
||||||
|
log.debug("Processed chunk {}: {} bytes (total: {})",
|
||||||
|
i, Files.size(chunkPath), totalWritten);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
outputStream.flush();
|
||||||
|
log.info("Total bytes written to final file: {}", totalWritten);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateFinalFile(FileUploadSession session, Path finalPath)
|
||||||
|
throws IOException {
|
||||||
|
|
||||||
|
long actualSize = Files.size(finalPath);
|
||||||
|
|
||||||
|
if (actualSize != session.getFileSize()) {
|
||||||
|
throw new IOException(
|
||||||
|
String.format("File size mismatch: expected %d, got %d",
|
||||||
|
session.getFileSize(), actualSize));
|
||||||
|
}
|
||||||
|
|
||||||
|
String checksum = calculateChecksum(finalPath);
|
||||||
|
log.debug("Final file checksum: {}", checksum);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cleanupSessionFiles(FileUploadSession session) {
|
||||||
|
try {
|
||||||
|
Path chunkDir = getChunkDirectory(session.getUserId(), session.getUploadId());
|
||||||
|
if (Files.exists(chunkDir)) {
|
||||||
|
deleteDirectoryRecursively(chunkDir);
|
||||||
|
log.info("Cleaned up temp directory for session: {}",
|
||||||
|
session.getUploadId());
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.warn("Failed to cleanup temp files for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void deleteDirectoryRecursively(Path directory) throws IOException {
|
||||||
|
try (Stream<Path> walk = Files.walk(directory)) {
|
||||||
|
walk.sorted(Comparator.reverseOrder())
|
||||||
|
.forEach(path -> {
|
||||||
|
try {
|
||||||
|
Files.deleteIfExists(path);
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.warn("Failed to delete: {}", path, e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleAssemblyFailure(FileUploadSession session, Exception e) {
|
||||||
|
session.setStatus(UploadStatus.FAILED);
|
||||||
|
session.setLastError(e.getMessage());
|
||||||
|
|
||||||
|
sessionRepository.save(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Path getChunkDirectory(Long userId, String uploadId) {
|
||||||
|
return storageRoot.resolve("temp")
|
||||||
|
.resolve("user")
|
||||||
|
.resolve(String.valueOf(userId))
|
||||||
|
.resolve(uploadId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String extractCategory(String fileType) {
|
||||||
|
if (fileType == null) {
|
||||||
|
return "other";
|
||||||
|
}
|
||||||
|
|
||||||
|
String lowerType = fileType.toLowerCase();
|
||||||
|
if (lowerType.startsWith("image")) {
|
||||||
|
return "images";
|
||||||
|
} else if (lowerType.startsWith("video")) {
|
||||||
|
return "videos";
|
||||||
|
} else if (lowerType.startsWith("audio")) {
|
||||||
|
return "audio";
|
||||||
|
} else if (lowerType.contains("document")) {
|
||||||
|
return "documents";
|
||||||
|
} else {
|
||||||
|
return "other";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String calculateChecksum(Path filePath) {
|
||||||
|
try {
|
||||||
|
MessageDigest md = MessageDigest.getInstance("SHA-256");
|
||||||
|
byte[] buffer = new byte[8192];
|
||||||
|
|
||||||
|
try (InputStream inputStream = Files.newInputStream(filePath)) {
|
||||||
|
int bytesRead;
|
||||||
|
while ((bytesRead = inputStream.read(buffer)) != -1) {
|
||||||
|
md.update(buffer, 0, bytesRead);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
byte[] digest = md.digest();
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (byte b : digest) {
|
||||||
|
sb.append(String.format("%02x", b));
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
|
||||||
|
} catch (NoSuchAlgorithmException | IOException e) {
|
||||||
|
log.warn("Failed to calculate checksum for file: {}", filePath, e);
|
||||||
|
return "N/A";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void createDirectoryIfNotExists(Path directory) throws IOException {
|
||||||
|
if (!Files.exists(directory)) {
|
||||||
|
Files.createDirectories(directory);
|
||||||
|
log.debug("Created directory: {}", directory);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setDirectoryPermissions(Path directory) throws IOException {
|
||||||
|
try {
|
||||||
|
Set<PosixFilePermission> permissions = new HashSet<>();
|
||||||
|
permissions.add(PosixFilePermission.OWNER_READ);
|
||||||
|
permissions.add(PosixFilePermission.OWNER_WRITE);
|
||||||
|
permissions.add(PosixFilePermission.OWNER_EXECUTE);
|
||||||
|
permissions.add(PosixFilePermission.GROUP_READ);
|
||||||
|
permissions.add(PosixFilePermission.GROUP_EXECUTE);
|
||||||
|
permissions.add(PosixFilePermission.OTHERS_READ);
|
||||||
|
|
||||||
|
Files.setPosixFilePermissions(directory, permissions);
|
||||||
|
log.debug("Set permissions for directory: {}", directory);
|
||||||
|
|
||||||
|
} catch (UnsupportedOperationException e) {
|
||||||
|
log.debug("Posix permissions not supported on this system");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class NotExistFilesCleanupService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Scheduled(fixedDelay = 30000)
|
||||||
|
public void cleanUpNotExistFiles() {
|
||||||
|
List<FileEntity> fileEntities = fileEntityRepository.searchFileEntityByStatus(FileStatus.DELETED);
|
||||||
|
|
||||||
|
for (FileEntity fileEntity : fileEntities) {
|
||||||
|
boolean exists = Files.exists(Paths.get(fileEntity.getFilePath()));
|
||||||
|
if (!exists) {
|
||||||
|
fileEntityRepository.delete(fileEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class UploadSessionCleanupService {
|
||||||
|
@Autowired
|
||||||
|
private FileUploadSessionRepository fileUploadSessionRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileUploadService fileUploadService;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Scheduled(fixedDelay = 30000)
|
||||||
|
public void cleanupSessions() {
|
||||||
|
List<FileUploadSession> expiredSessions = fileUploadSessionRepository.findExpiredSessions(
|
||||||
|
LocalDateTime.now(), Set.of(UploadStatus.INITIATED, UploadStatus.UPLOADING));
|
||||||
|
|
||||||
|
for (FileUploadSession session : expiredSessions) {
|
||||||
|
fileUploadService.handleExpiredSession(session);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,8 @@
|
|||||||
spring:
|
spring:
|
||||||
|
flyway:
|
||||||
|
enabled: true
|
||||||
|
baseline-on-migrate: true
|
||||||
|
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
|
url: jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
|
||||||
username: ${POSTGRES_USER}
|
username: ${POSTGRES_USER}
|
||||||
@@ -9,10 +13,50 @@ spring:
|
|||||||
hibernate:
|
hibernate:
|
||||||
ddl-auto: update
|
ddl-auto: update
|
||||||
show-sql: true
|
show-sql: true
|
||||||
|
properties:
|
||||||
|
hibernate:
|
||||||
|
dialect: org.hibernate.dialect.PostgreSQLDialect
|
||||||
|
format_sql: true
|
||||||
|
|
||||||
|
servlet:
|
||||||
|
multipart:
|
||||||
|
max-file-size: 10MB
|
||||||
|
max-request-size: 100MB
|
||||||
|
enabled: true
|
||||||
|
resolve-lazily: false
|
||||||
|
|
||||||
|
file:
|
||||||
|
storage:
|
||||||
|
base-path: ${FILE_STORAGE_PATH:/data/uploads}
|
||||||
|
chunk-size: ${FILE_CHUNK_SIZE:1000000} # 1MB
|
||||||
|
max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB
|
||||||
|
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
||||||
|
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
||||||
|
temp-ttl-hours: ${TEMP_TTL_HOURS:72} # 3 дня
|
||||||
|
auth-token-life-hours: ${AUTH_TOKEN_LIFE:1} # 1 час
|
||||||
|
session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
|
||||||
|
|
||||||
|
security:
|
||||||
|
cors:
|
||||||
|
allowed-origins: "*"
|
||||||
|
allowed-methods: GET,POST,PUT,DELETE,OPTIONS
|
||||||
|
allowed-headers: "*"
|
||||||
|
allow-credentials: true
|
||||||
|
|
||||||
server:
|
server:
|
||||||
port: ${SERVER_PORT:8080}
|
port: ${SERVER_PORT:8080}
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
level:
|
level:
|
||||||
root: INFO
|
com.example.fileupload: DEBUG
|
||||||
|
org.springframework.web: DEBUG
|
||||||
|
org.hibernate.SQL: DEBUG
|
||||||
|
file:
|
||||||
|
name: logs/application.log
|
||||||
|
pattern:
|
||||||
|
console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
|
||||||
|
|
||||||
|
yandex:
|
||||||
|
api-key: ${YANDEX_API_KEY:AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q}
|
||||||
|
folder-id: ${YANDEX_FOLDER_ID:b1gokpdbm6qfpsou8pcd}
|
||||||
|
search-url: ${YANDEX_SEARCH_URL:https://searchapi.api.cloud.yandex.net/v2/image/search_by_image}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
CREATE INDEX idx_image_hash_prefix
|
||||||
|
ON image_hashes ((hash_value >> 48));
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user