Compare commits
34
Commits
NCP-3
...
a030837d45
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a030837d45 | ||
|
|
11a7ab6a73 | ||
|
|
641e983b89 | ||
|
|
8b6f0f1072 | ||
|
|
6797a47df5 | ||
|
|
58b4a2f95f | ||
|
|
4a6de6ad9a | ||
|
|
fade754c7c | ||
|
|
b3f29935f6 | ||
|
|
997daae639 | ||
|
|
4ddf2f5dde | ||
|
|
07aad9f51c | ||
|
|
f164370989 | ||
|
|
015f2f516c | ||
|
|
0635b9b4ac | ||
|
|
a30b0488e8 | ||
|
|
76da2e94c9 | ||
|
|
420734ff87 | ||
|
|
9ef192ed32 | ||
|
|
8a33bd33a2 | ||
|
|
b5b8bebb69 | ||
|
|
c2ffe08e7d | ||
|
|
92d0cbbf3b | ||
|
|
b2daaa1010 | ||
|
|
d97b7e679f | ||
|
|
530477fb75 | ||
|
|
fc941f97e4 | ||
|
|
6a78475844 | ||
|
|
8a4b8e49f1 | ||
|
|
235ea7143a | ||
|
|
520d2df3a9 | ||
|
|
3b0803bef3 | ||
|
|
7d17b8d617 | ||
|
|
c51608276d |
@@ -0,0 +1,17 @@
|
|||||||
|
name: Test Workflow
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Print environment variables
|
||||||
|
run: |
|
||||||
|
echo "GITHUB_REPOSITORY: $GITHUB_REPOSITORY"
|
||||||
|
echo "GITHUB_SHA: $GITHUB_SHA"
|
||||||
|
echo "GITHUB_REF: $GITHUB_REF"
|
||||||
|
echo "GITHUB_ACTOR: $GITHUB_ACTOR"
|
||||||
|
echo "PATH: $PATH"
|
||||||
+7
-1
@@ -29,13 +29,19 @@ dependencies {
|
|||||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
implementation 'org.springframework.security:spring-security-crypto:6.5.3'
|
implementation 'org.springframework.security:spring-security-crypto:6.5.3'
|
||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
|
|
||||||
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
||||||
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
|
|
||||||
compileOnly 'org.projectlombok:lombok'
|
compileOnly 'org.projectlombok:lombok'
|
||||||
|
|
||||||
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
||||||
|
|
||||||
runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
|
runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
|
||||||
runtimeOnly 'com.mysql:mysql-connector-j'
|
runtimeOnly 'com.mysql:mysql-connector-j'
|
||||||
runtimeOnly 'org.postgresql:postgresql'
|
runtimeOnly 'org.postgresql:postgresql'
|
||||||
annotationProcessor 'org.projectlombok:lombok'
|
|
||||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ services:
|
|||||||
build: .
|
build: .
|
||||||
container_name: app-backend
|
container_name: app-backend
|
||||||
environment:
|
environment:
|
||||||
|
FILE_STORAGE_PATH: /data/uploads
|
||||||
|
MAX_FILE_SIZE: 1073741824
|
||||||
|
FILE_CHUNK_SIZE: 5242880
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: postgres
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: postgres
|
||||||
@@ -37,6 +40,8 @@ services:
|
|||||||
- app
|
- app
|
||||||
- backend
|
- backend
|
||||||
- api
|
- api
|
||||||
|
volumes:
|
||||||
|
- ./uploads:/data/uploads:rw
|
||||||
|
|
||||||
grafana:
|
grafana:
|
||||||
image: grafana/grafana:10.3.1
|
image: grafana/grafana:10.3.1
|
||||||
@@ -141,6 +146,7 @@ volumes:
|
|||||||
loki_chunks:
|
loki_chunks:
|
||||||
loki_index:
|
loki_index:
|
||||||
loki_rules:
|
loki_rules:
|
||||||
|
# uploads_volume:
|
||||||
|
|
||||||
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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -31,7 +31,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Stop old container') {
|
stage('Deploy with docker-compose') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
withCredentials([
|
withCredentials([
|
||||||
@@ -42,162 +42,68 @@ pipeline {
|
|||||||
)
|
)
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
echo "Stop old container by branch ${params.BRANCH}..."
|
echo "Deploying branch: ${params.BRANCH}"
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
echo "Copying files to server..."
|
||||||
cd /opt/deployments/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/${params.BRANCH}
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||||
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||||
# Stop old container if have docker-compose
|
|
||||||
if [ -f 'docker-compose.yaml' ] || [ -f 'docker-compose.yml' ]; then
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
|
||||||
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Stop and delete container by name
|
|
||||||
docker stop app-${params.BRANCH} 2>/dev/null || true
|
|
||||||
docker rm app-${params.BRANCH} 2>/dev/null || true
|
|
||||||
|
|
||||||
echo "Old containder deleted"
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Copy to server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
echo "Copy files on server..."
|
|
||||||
|
|
||||||
# Clean mkdir
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
|
||||||
rm -rf /opt/deployments/${params.BRANCH}/*
|
|
||||||
mkdir -p /opt/deployments/${params.BRANCH}
|
|
||||||
"
|
|
||||||
|
|
||||||
# Copy all files
|
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/ 2>/dev/null || true
|
|
||||||
|
|
||||||
echo "Files copied"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Build on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
echo "Build on server..."
|
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
||||||
cd /opt/deployments/${params.BRANCH}
|
cd /opt/deployments/${params.BRANCH}
|
||||||
|
|
||||||
echo "Build Docker for branch ${params.BRANCH}..."
|
echo 'Step 1: Checking current state...'
|
||||||
|
|
||||||
# delete old docker image
|
# Смотрим что запущено
|
||||||
docker rmi app:${params.BRANCH} 2>/dev/null || true
|
docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
|
||||||
|
|
||||||
# build from branch
|
echo 'Step 2: Stopping only application (keeping DB)...'
|
||||||
if [ -f 'Dockerfile' ]; then
|
|
||||||
docker build -t app:${params.BRANCH} .
|
|
||||||
echo "Docker образ app:${params.BRANCH} собран"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# or from docker-compose
|
# Останавливаем только приложение, БД оставляем работать
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
docker stop app-backend 2>/dev/null || echo 'App not running'
|
||||||
docker-compose -f docker-compose.yaml build
|
docker rm app-backend 2>/dev/null || echo 'App not found'
|
||||||
echo "Build from docker-compose.yaml completed"
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
|
||||||
docker-compose -f docker-compose.yml build
|
|
||||||
echo "Build from docker-compose.yml completed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'Build completed'
|
# Проверяем что БД работает, если нет - запускаем
|
||||||
"
|
if ! docker ps | grep -q postgres; then
|
||||||
"""
|
echo 'Starting PostgreSQL...'
|
||||||
}
|
docker-compose up -d db
|
||||||
}
|
sleep 10
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Start on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
echo "Start container..."
|
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
|
||||||
cd /opt/deployments/${params.BRANCH}
|
|
||||||
|
|
||||||
# If have docker-compose - use them
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
echo "Start docker-compose.yaml..."
|
|
||||||
docker-compose -f docker-compose.yaml up -d
|
|
||||||
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
|
||||||
echo "Start docker-compose.yml..."
|
|
||||||
docker-compose -f docker-compose.yml up -d
|
|
||||||
|
|
||||||
# If have Dockerfile - start
|
|
||||||
elif [ -f 'Dockerfile' ]; then
|
|
||||||
echo "Start app-${params.BRANCH}..."
|
|
||||||
docker run -d \\
|
|
||||||
--name app-${params.BRANCH} \\
|
|
||||||
-p 8080:8080 \\
|
|
||||||
app:${params.BRANCH}
|
|
||||||
else
|
else
|
||||||
echo "Error:Dockerfile NOT FOUND, docker-compose.yaml or docker-compose.yml"
|
echo 'PostgreSQL already running'
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo 'Container start'
|
echo 'Step 3: Building new application image...'
|
||||||
|
docker build --no-cache -t app-backend:latest .
|
||||||
|
|
||||||
# Wait start
|
echo 'Step 4: Starting application...'
|
||||||
|
docker run -d \\
|
||||||
|
--name app-backend \\
|
||||||
|
--network app-network \\
|
||||||
|
-p 80:8080 \\
|
||||||
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
|
-e POSTGRES_USER=postgres \\
|
||||||
|
-e POSTGRES_PASSWORD=postgres \\
|
||||||
|
-e POSTGRES_PORT=5432 \\
|
||||||
|
-e POSTGRES_HOST=db \\
|
||||||
|
--restart unless-stopped \\
|
||||||
|
app-backend:latest
|
||||||
|
|
||||||
|
echo 'Step 5: Checking deployment...'
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
||||||
# Check status
|
echo 'Containers status:'
|
||||||
echo 'status container:'
|
docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
|
||||||
if [ -f 'docker-compose.yaml' ] || [ -f 'docker-compose.yml' ]; then
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
docker-compose -f docker-compose.yaml ps
|
|
||||||
else
|
|
||||||
docker-compose -f docker-compose.yml ps
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
docker ps --filter "name=app-${params.BRANCH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ''
|
echo 'Application logs (last 5 lines):'
|
||||||
echo 'Apps start on:'
|
docker logs --tail=5 app-backend 2>/dev/null || echo 'Logs not available yet'
|
||||||
echo 'http://$SERVER:80'
|
|
||||||
|
if docker ps | grep -q app-backend; then
|
||||||
|
echo 'Deployment successful'
|
||||||
|
echo 'Application URL: http://${params.SERVER}:80'
|
||||||
|
else
|
||||||
|
echo 'Application failed to start'
|
||||||
|
docker logs app-backend
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@@ -208,11 +114,14 @@ pipeline {
|
|||||||
|
|
||||||
post {
|
post {
|
||||||
success {
|
success {
|
||||||
echo "Deploy branch ${params.BRANCH} completed"
|
echo "Deployment successful"
|
||||||
echo "App : http://$SERVER:80"
|
echo "Application URL: http://${params.SERVER}:80"
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Deploy failed"
|
echo "Deployment failed for branch ${params.BRANCH}"
|
||||||
|
}
|
||||||
|
always {
|
||||||
|
echo "Deployment process finished"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,183 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
parameters {
|
||||||
|
string(
|
||||||
|
name: 'BRANCH',
|
||||||
|
defaultValue: 'main',
|
||||||
|
description: 'Ветка для деплоя'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Git pull') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
checkout([
|
||||||
|
$class: 'GitSCM',
|
||||||
|
branches: [[name: params.BRANCH]],
|
||||||
|
userRemoteConfigs: [[
|
||||||
|
url: 'https://code.3err0.ru/frontdev/no-copy-frontend.git',
|
||||||
|
credentialsId: 'nx-jen'
|
||||||
|
]]
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Stop old') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
docker stop no-copy-frontend 2>/dev/null || true
|
||||||
|
docker rm no-copy-frontend 2>/dev/null || true
|
||||||
|
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Copy to server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
||||||
|
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
"
|
||||||
|
|
||||||
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml build
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml build
|
||||||
|
else
|
||||||
|
echo 'Exception:don't found docker-compose'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Start on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml up -d
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml up -d
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 10
|
||||||
|
|
||||||
|
echo 'Status container:'
|
||||||
|
docker ps --filter name=no-copy-frontend
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Check status') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||||
|
echo 'Container start'
|
||||||
|
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||||
|
echo 'HTTP код: ' \$HTTP_CODE
|
||||||
|
|
||||||
|
echo 'Frong start on http://92.242.61.23:2998'
|
||||||
|
else
|
||||||
|
echo 'Exception: container don't start'
|
||||||
|
docker ps -a | grep frontend
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
echo "Front branch ${params.BRANCH} completed"
|
||||||
|
echo "Use on http://92.242.61.23:2998"
|
||||||
|
}
|
||||||
|
failure {
|
||||||
|
echo "Failed"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
package ru.soune.no_copy.controller;
|
|
||||||
|
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.no_copy.dto.AuthResponse;
|
|
||||||
import ru.soune.no_copy.dto.LoginRequest;
|
|
||||||
import ru.soune.no_copy.dto.LoginResponse;
|
|
||||||
import ru.soune.no_copy.dto.RegisterRequest;
|
|
||||||
import ru.soune.no_copy.entity.AuthToken;
|
|
||||||
import ru.soune.no_copy.exception.TokenNotFoundException;
|
|
||||||
import ru.soune.no_copy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.no_copy.service.AuthService;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("v1/api/auth")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class AuthController {
|
|
||||||
|
|
||||||
private final AuthService authService;
|
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
@PostMapping("/register")
|
|
||||||
public ResponseEntity<AuthResponse> register(@Valid @RequestBody RegisterRequest registerRequest) {
|
|
||||||
AuthToken authToken = authService.register(registerRequest);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(new AuthResponse(true, "success.user.register", authToken.getToken(),
|
|
||||||
authToken.getExpiresAt()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/login")
|
|
||||||
public ResponseEntity<LoginResponse> login(@Valid @RequestBody LoginRequest request) {
|
|
||||||
AuthToken login = authService.login(request);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(new LoginResponse(true, login.getUser().getEmail(),
|
|
||||||
login.getToken(),login.getExpiresAt().toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/logout")
|
|
||||||
public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
|
|
||||||
Optional<AuthToken> opToken = authTokenRepository.findByToken(token);
|
|
||||||
|
|
||||||
if (opToken.isEmpty()) {
|
|
||||||
throw new TokenNotFoundException("Token not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
authService.logout(token);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(Map.of("success", true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune.no_copy.dto;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
public record AuthResponse (
|
|
||||||
boolean success,
|
|
||||||
String message,
|
|
||||||
String token,
|
|
||||||
LocalDateTime expiresAt
|
|
||||||
) {}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package ru.soune.no_copy.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import ru.soune.no_copy.entity.User;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class LoginResponse {
|
|
||||||
private boolean success;
|
|
||||||
private String email;
|
|
||||||
private String token;
|
|
||||||
private String expiresAt;
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
package ru.soune.no_copy.dto;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import jakarta.validation.constraints.Email;
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import jakarta.validation.constraints.Past;
|
|
||||||
import jakarta.validation.constraints.Size;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
import ru.soune.no_copy.entity.GenderType;
|
|
||||||
import ru.soune.no_copy.entity.SubscriptionType;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
|
||||||
|
|
||||||
public record RegisterRequest(
|
|
||||||
@NotBlank(message = "error.name.length")
|
|
||||||
String fullName,
|
|
||||||
|
|
||||||
String companyName,
|
|
||||||
|
|
||||||
@Size(min = 11, max = 14)
|
|
||||||
String phone,
|
|
||||||
|
|
||||||
@NotBlank(message = "error.not.blank")
|
|
||||||
@Email(message = "error.not.email")
|
|
||||||
@Size(max = 128)
|
|
||||||
String email,
|
|
||||||
|
|
||||||
@DateTimeFormat(pattern = "dd-MM-yyyy")
|
|
||||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
|
||||||
@Past
|
|
||||||
LocalDate birthday,
|
|
||||||
|
|
||||||
@NotBlank(message = "error.not.blank")
|
|
||||||
@Size(min = 8)
|
|
||||||
String password,
|
|
||||||
|
|
||||||
SubscriptionType subscriptionType,
|
|
||||||
|
|
||||||
GenderType genderType
|
|
||||||
) {}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package ru.soune.no_copy.exception;
|
|
||||||
|
|
||||||
public class UserAlreadyExistsException extends RuntimeException {
|
|
||||||
public UserAlreadyExistsException(String message) {
|
|
||||||
super(message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy;
|
package ru.soune.nocopy;
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
import com.fasterxml.jackson.databind.SerializationFeature;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
|
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package ru.soune.nocopy.configuration.file;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.scheduling.annotation.EnableAsync;
|
||||||
|
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||||
|
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableAsync
|
||||||
|
public class AsyncConfig {
|
||||||
|
|
||||||
|
@Bean(name = "fileUploadTaskExecutor")
|
||||||
|
public Executor fileUploadTaskExecutor() {
|
||||||
|
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
||||||
|
executor.setCorePoolSize(3);
|
||||||
|
executor.setMaxPoolSize(10);
|
||||||
|
executor.setQueueCapacity(50);
|
||||||
|
executor.setThreadNamePrefix("FileUpload-");
|
||||||
|
executor.initialize();
|
||||||
|
return executor;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,264 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import jakarta.annotation.PostConstruct;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.context.ApplicationContext;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.validation.FieldError;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.RegAnswer;
|
||||||
|
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
||||||
|
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
||||||
|
import ru.soune.nocopy.dto.file.UploadProgress;
|
||||||
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
|
import ru.soune.nocopy.exception.ValidationException;
|
||||||
|
import ru.soune.nocopy.handler.FileUploadHandler;
|
||||||
|
import ru.soune.nocopy.handler.LoginRequestHandler;
|
||||||
|
import ru.soune.nocopy.handler.RegRequestHandler;
|
||||||
|
import ru.soune.nocopy.handler.RequestHandler;
|
||||||
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ApiController {
|
||||||
|
private final ApplicationContext applicationContext;
|
||||||
|
private final FileUploadService fileUploadService;
|
||||||
|
|
||||||
|
private Map<Integer, RequestHandler> handlers = new HashMap<>();
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
public void init() {
|
||||||
|
RegRequestHandler regHandler = applicationContext.getBean(RegRequestHandler.class);
|
||||||
|
LoginRequestHandler loginHandler = applicationContext.getBean(LoginRequestHandler.class);
|
||||||
|
FileUploadHandler fileUploadHandler = applicationContext.getBean(FileUploadHandler.class);
|
||||||
|
|
||||||
|
handlers.put(20004, fileUploadHandler);
|
||||||
|
handlers.put(20002, regHandler);
|
||||||
|
handlers.put(20001, loginHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/data")
|
||||||
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
|
@PathVariable("version") int version) {
|
||||||
|
Integer msgId = request.getMsgId();
|
||||||
|
BaseResponse response;
|
||||||
|
|
||||||
|
try {
|
||||||
|
RequestHandler handler = handlers.get(msgId);
|
||||||
|
|
||||||
|
if (handler == null) {
|
||||||
|
response = new BaseResponse(msgId,
|
||||||
|
MessageCode.MSG_ID_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.MSG_ID_NOT_FOUND.getDescription(),
|
||||||
|
new HashMap<>());
|
||||||
|
} else {
|
||||||
|
response = handler.handle(request);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(response);
|
||||||
|
} catch (ValidationException e) {
|
||||||
|
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
||||||
|
} catch (NotValidFieldException e) {
|
||||||
|
throw e;
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Handler execution failed for msgId: {}", msgId, e);
|
||||||
|
|
||||||
|
BaseResponse errorResponse = new BaseResponse(msgId,
|
||||||
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
|
MessageCode.INVALID_JSON_BODY.getDescription(),
|
||||||
|
new HashMap<>());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(errorResponse);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/files/chunk")
|
||||||
|
public ResponseEntity<BaseResponse> uploadChunk(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@RequestParam("upload_id") String uploadId,
|
||||||
|
@RequestParam("chunk_number") Integer chunkNumber,
|
||||||
|
@RequestParam("chunk") MultipartFile chunk) {
|
||||||
|
|
||||||
|
log.info("Uploading chunk {} for session {}, file size: {} bytes, version: {}",
|
||||||
|
chunkNumber, uploadId, chunk.getSize(), version);
|
||||||
|
|
||||||
|
if (chunk.isEmpty()) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Chunk file is empty", null));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (uploadId == null || uploadId.isBlank()) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Upload ID is required", null));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chunkNumber == null || chunkNumber < 0) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Valid chunk number is required", null));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
||||||
|
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.chunkSize(chunk.getSize())
|
||||||
|
.message("Chunk uploaded successfully")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
|
"Chunk uploaded successfully", responseBody));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error uploading chunk", e);
|
||||||
|
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to upload chunk: " + e.getMessage(), responseBody));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
|
public ResponseEntity<BaseResponse> getUploadProgress(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String uploadId) {
|
||||||
|
|
||||||
|
log.info("Getting progress for upload session: {}, version: {}", uploadId, version);
|
||||||
|
|
||||||
|
try {
|
||||||
|
var progress = fileUploadService.getUploadProgress(uploadId);
|
||||||
|
|
||||||
|
UploadProgress responseBody = UploadProgress.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.fileName(progress.getFileName())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.progressPercentage(progress.getProgressPercentage())
|
||||||
|
.filePath(progress.getFilePath())
|
||||||
|
.remainingChunks(progress.getTotalChunks() - progress.getUploadedChunks())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting progress for upload: {}", uploadId, e);
|
||||||
|
|
||||||
|
UploadProgress responseBody = UploadProgress.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get upload progress: " + e.getMessage(), responseBody));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/files/{uploadId}/complete")
|
||||||
|
public ResponseEntity<BaseResponse> completeUpload(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String uploadId) {
|
||||||
|
|
||||||
|
log.info("Completing upload session: {}, version: {}", uploadId, version);
|
||||||
|
|
||||||
|
try {
|
||||||
|
var progress = fileUploadService.getUploadProgress(uploadId);
|
||||||
|
|
||||||
|
if (progress.getStatus() == UploadStatus.COMPLETED) {
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("Upload already completed")
|
||||||
|
.filePath(progress.getFilePath())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
|
"Upload already completed", responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (progress.getUploadedChunks() < progress.getTotalChunks()) {
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("Not all chunks uploaded")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.INCOMPLETE_UPLOAD.getCode(),
|
||||||
|
"Not all chunks uploaded", responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("File assembly in progress")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
|
"File assembly in progress", responseBody));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error completing upload: {}", uploadId, e);
|
||||||
|
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to complete upload: " + e.getMessage(), responseBody));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
||||||
|
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||||
|
.stream()
|
||||||
|
.map(this::createErrorDetail)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
|
regAnswer.setFieldErrors(fieldErrors);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.INVALID_FIELD.getCode(),
|
||||||
|
MessageCode.INVALID_FIELD.getDescription(), regAnswer));
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<String, String> createErrorDetail(FieldError fieldError) {
|
||||||
|
Map<String, String> errorDetail = new HashMap<>();
|
||||||
|
errorDetail.put("field", fieldError.getField());
|
||||||
|
errorDetail.put("code", fieldError.getCode() != null ? fieldError.getCode() : "VALIDATION_ERROR");
|
||||||
|
errorDetail.put("message", fieldError.getDefaultMessage());
|
||||||
|
|
||||||
|
if (fieldError.getRejectedValue() != null &&
|
||||||
|
!fieldError.getField().toLowerCase().contains("password")) {
|
||||||
|
errorDetail.put("rejected_value", fieldError.getRejectedValue().toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return errorDetail;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
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,14 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("check/api")
|
||||||
|
public class HealtCheckController {
|
||||||
|
|
||||||
|
@GetMapping("/healt")
|
||||||
|
public HttpStatus healtCheck() {
|
||||||
|
return HttpStatus.OK;
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
+12
-12
@@ -1,19 +1,19 @@
|
|||||||
package ru.soune.no_copy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import ru.soune.no_copy.dto.ChangePasswordRequest;
|
import ru.soune.nocopy.dto.ChangePasswordRequest;
|
||||||
import ru.soune.no_copy.dto.UserDTO;
|
import ru.soune.nocopy.dto.UserDTO;
|
||||||
import ru.soune.no_copy.dto.UserRequest;
|
import ru.soune.nocopy.dto.UserRequest;
|
||||||
import ru.soune.no_copy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.no_copy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.no_copy.exception.InvalidUserEmail;
|
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||||
import ru.soune.no_copy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.no_copy.mapper.UserMapper;
|
import ru.soune.nocopy.mapper.UserMapper;
|
||||||
import ru.soune.no_copy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.no_copy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.no_copy.service.UserService;
|
import ru.soune.nocopy.service.UserService;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package ru.soune.nocopy.controller.file;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import ru.soune.nocopy.dto.file.FileApiResponse;
|
||||||
|
import ru.soune.nocopy.dto.file.InitUploadRequest;
|
||||||
|
import ru.soune.nocopy.dto.file.UploadProgressResponse;
|
||||||
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
import ru.soune.nocopy.exception.FileUploadException;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.exception.UploadSessionNotFoundException;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||||
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/files")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileUploadController {
|
||||||
|
|
||||||
|
private final FileUploadService fileUploadService;
|
||||||
|
|
||||||
|
@PostMapping("/chunk")
|
||||||
|
public ResponseEntity<FileApiResponse<UploadProgressResponse>> uploadChunk(
|
||||||
|
@RequestParam("uploadId") String uploadId,
|
||||||
|
@RequestParam("chunkNumber") Integer chunkNumber,
|
||||||
|
@RequestParam("chunk") MultipartFile chunk) {
|
||||||
|
|
||||||
|
log.info("Uploading chunk {} for session {}, file size: {} bytes",
|
||||||
|
chunkNumber, uploadId, chunk.getSize());
|
||||||
|
|
||||||
|
if (chunk.isEmpty()) {
|
||||||
|
return ResponseEntity.badRequest()
|
||||||
|
.body(FileApiResponse.error("Chunk file is empty"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (uploadId == null || uploadId.isBlank()) {
|
||||||
|
return ResponseEntity.badRequest()
|
||||||
|
.body(FileApiResponse.error("Upload ID is required"));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
UploadProgressResponse progress = fileUploadService.uploadChunk(
|
||||||
|
uploadId, chunkNumber, chunk);
|
||||||
|
|
||||||
|
return ResponseEntity.ok(FileApiResponse.success(progress));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error uploading chunk", e);
|
||||||
|
return ResponseEntity.badRequest()
|
||||||
|
.body(FileApiResponse.error(e.getMessage()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class BaseRequest {
|
||||||
|
@JsonProperty("version")
|
||||||
|
Integer version;
|
||||||
|
|
||||||
|
@JsonProperty("msg_id")
|
||||||
|
Integer msgId;
|
||||||
|
|
||||||
|
@JsonProperty("message_body")
|
||||||
|
Object messageBody;
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class BaseResponse {
|
||||||
|
@JsonProperty("msg_id")
|
||||||
|
private Integer msgId;
|
||||||
|
|
||||||
|
@JsonProperty("message_code")
|
||||||
|
private Integer messageCode;
|
||||||
|
|
||||||
|
@JsonProperty("message_desc")
|
||||||
|
private String messageDesc;
|
||||||
|
|
||||||
|
@JsonProperty("message_body")
|
||||||
|
private Object messageBody;
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class LogOutAnswer {
|
||||||
|
private String Token;
|
||||||
|
|
||||||
|
private List<Map<String, String>> fieldErrors;
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class LoginAnswer {
|
||||||
|
private String Token;
|
||||||
|
|
||||||
|
private List<Map<String, String>> fieldErrors;
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
public enum MessageCode {
|
||||||
|
SUCCESS(0, "Operation successful"),
|
||||||
|
REG_EMAIL_EXISTS(1, "Email already registered"),
|
||||||
|
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||||
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
|
INVALID_TOKEN(2, "Invalid token"),
|
||||||
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
|
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"),
|
||||||
|
|
||||||
|
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
||||||
|
FILE_NOT_FOUND(4, "File not found"),
|
||||||
|
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
|
||||||
|
|
||||||
|
private final Integer code;
|
||||||
|
|
||||||
|
private final String description;
|
||||||
|
|
||||||
|
MessageCode(Integer code, String description) {
|
||||||
|
this.code = code;
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getCode() {
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class RegAnswer {
|
||||||
|
private String Token;
|
||||||
|
|
||||||
|
private List<Map<String, String>> fieldErrors;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.*;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class RegRequest {
|
||||||
|
@NotEmpty(message = "Full name is required")
|
||||||
|
private String fullName;
|
||||||
|
|
||||||
|
private String companyName;
|
||||||
|
|
||||||
|
@Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
|
||||||
|
private String phone;
|
||||||
|
|
||||||
|
@NotBlank(message = "Email is required")
|
||||||
|
@Email(message = "Invalid email format")
|
||||||
|
@Size(max = 128, message = "Email too long")
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
@NotBlank(message = "Password is required")
|
||||||
|
@Size(min = 8, message = "Password must be at least 8 characters")
|
||||||
|
private String password;
|
||||||
|
}
|
||||||
+1
-2
@@ -1,7 +1,6 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import ru.soune.no_copy.entity.FileType;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class UserContentDTO {
|
public class UserContentDTO {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import ru.soune.no_copy.entity.ContentStatus;
|
import ru.soune.nocopy.entity.ContentStatus;
|
||||||
import ru.soune.no_copy.entity.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
+3
-3
@@ -1,11 +1,11 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import ru.soune.no_copy.entity.GenderType;
|
import ru.soune.nocopy.entity.GenderType;
|
||||||
import ru.soune.no_copy.entity.SubscriptionType;
|
import ru.soune.nocopy.entity.SubscriptionType;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
+2
-3
@@ -1,14 +1,13 @@
|
|||||||
package ru.soune.no_copy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.Past;
|
import jakarta.validation.constraints.Past;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import ru.soune.no_copy.entity.GenderType;
|
import ru.soune.nocopy.entity.GenderType;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class UserRequest {
|
public class UserRequest {
|
||||||
@@ -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,41 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class FileApiResponse<T> {
|
||||||
|
|
||||||
|
private boolean success;
|
||||||
|
private String message;
|
||||||
|
private T data;
|
||||||
|
private String error;
|
||||||
|
|
||||||
|
public static <T> FileApiResponse<T> success(T data) {
|
||||||
|
return FileApiResponse.<T>builder()
|
||||||
|
.success(true)
|
||||||
|
.message("Operation completed successfully")
|
||||||
|
.data(data)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T> FileApiResponse<T> success(String message, T data) {
|
||||||
|
return FileApiResponse.<T>builder()
|
||||||
|
.success(true)
|
||||||
|
.message(message)
|
||||||
|
.data(data)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T> FileApiResponse<T> error(String error) {
|
||||||
|
return FileApiResponse.<T>builder()
|
||||||
|
.success(false)
|
||||||
|
.error(error)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,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,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,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();
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
public enum GenderType {
|
public enum GenderType {
|
||||||
MALE, FEMALE
|
MALE, FEMALE
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
+2
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
@@ -42,6 +42,7 @@ public class User {
|
|||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
@Size(min = 11, max = 14)
|
@Size(min = 11, max = 14)
|
||||||
|
@Column(unique = true)
|
||||||
private String phone;
|
private String phone;
|
||||||
|
|
||||||
@Enumerated(EnumType.STRING)
|
@Enumerated(EnumType.STRING)
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
+2
-2
@@ -1,10 +1,10 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.hibernate.annotations.CreationTimestamp;
|
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.entity;
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.*;
|
||||||
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Entity
|
||||||
|
@Table(name = "file_upload_sessions")
|
||||||
|
public class FileUploadSession {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.UUID)
|
||||||
|
@Column(name = "upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@Column(name = "user_id", nullable = false)
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
@Column(name = "file_name", nullable = false)
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@Column(name = "file_type")
|
||||||
|
private String fileType;
|
||||||
|
|
||||||
|
@Column(name = "file_size")
|
||||||
|
private Long fileSize;
|
||||||
|
|
||||||
|
@Column(name = "chunk_size")
|
||||||
|
private Long chunkSize;
|
||||||
|
|
||||||
|
@Column(name = "total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@Column(name = "chunks_uploaded")
|
||||||
|
private Integer chunksUploaded;
|
||||||
|
|
||||||
|
@Column(name = "status")
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
private UploadStatus status;
|
||||||
|
|
||||||
|
@Column(name = "file_path")
|
||||||
|
private String filePath;
|
||||||
|
|
||||||
|
@Column(name = "checksum")
|
||||||
|
private String checksum;
|
||||||
|
|
||||||
|
@CreatedDate
|
||||||
|
@Column(name = "created_at", updatable = false, nullable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
|
@Column(name = "expires_at")
|
||||||
|
private LocalDateTime expiresAt;
|
||||||
|
|
||||||
|
@Version
|
||||||
|
private Long version;
|
||||||
|
|
||||||
|
@Column(name = "last_error")
|
||||||
|
private String lastError;
|
||||||
|
|
||||||
|
@Column(name = "extension")
|
||||||
|
private String extension;
|
||||||
|
|
||||||
|
@Column(name = "retry_count")
|
||||||
|
private Integer retryCount = 0;
|
||||||
|
|
||||||
|
@Column(name = "completed_at")
|
||||||
|
private LocalDateTime completedAt;
|
||||||
|
|
||||||
|
@ElementCollection
|
||||||
|
@CollectionTable(
|
||||||
|
name = "uploaded_chunks",
|
||||||
|
joinColumns = @JoinColumn(name = "upload_id")
|
||||||
|
)
|
||||||
|
@MapKeyColumn(name = "chunk_number")
|
||||||
|
@Column(name = "chunk_path")
|
||||||
|
private Map<Integer, String> chunkPaths = new HashMap<>();
|
||||||
|
|
||||||
|
@PrePersist
|
||||||
|
public void prePersist() {
|
||||||
|
this.createdAt = LocalDateTime.now();
|
||||||
|
this.expiresAt = LocalDateTime.now().plusHours(24);
|
||||||
|
if (this.chunksUploaded == null) {
|
||||||
|
this.chunksUploaded = 0;
|
||||||
|
}
|
||||||
|
if (this.status == null) {
|
||||||
|
this.status = UploadStatus.INITIATED;
|
||||||
|
}
|
||||||
|
if (this.retryCount == null) {
|
||||||
|
this.retryCount = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
public enum UploadStatus {
|
||||||
|
INITIATED,
|
||||||
|
UPLOADING,
|
||||||
|
COMPLETED,
|
||||||
|
FAILED,
|
||||||
|
CANCELLED
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class ChunkSizeExceededException extends RuntimeException {
|
||||||
|
public ChunkSizeExceededException(long actualSize, long maxSize) {
|
||||||
|
super(String.format("Chunk size exceeded: %d > %d", actualSize, maxSize));
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class ContentNotFoundException extends RuntimeException {
|
public class ContentNotFoundException extends RuntimeException {
|
||||||
public ContentNotFoundException(String message) {
|
public ContentNotFoundException(String message) {
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class FileIntegrityException extends RuntimeException {
|
||||||
|
public FileIntegrityException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class FileUploadException extends RuntimeException {
|
||||||
|
public FileUploadException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FileUploadException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class InvalidPasswordException extends RuntimeException {
|
public class InvalidPasswordException extends RuntimeException {
|
||||||
public InvalidPasswordException(String message) {
|
public InvalidPasswordException(String message) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class InvalidUserEmail extends RuntimeException {
|
public class InvalidUserEmail extends RuntimeException {
|
||||||
public InvalidUserEmail(String message) {
|
public InvalidUserEmail(String message) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class NotFoundAuthToken extends RuntimeException {
|
public class NotFoundAuthToken extends RuntimeException {
|
||||||
public NotFoundAuthToken(String message) {
|
public NotFoundAuthToken(String message) {
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class NotValidFieldException extends RuntimeException {
|
||||||
|
|
||||||
|
private final String message;
|
||||||
|
|
||||||
|
private final BaseResponse baseResponse;
|
||||||
|
|
||||||
|
public NotValidFieldException(String message, BaseResponse baseResponse) {
|
||||||
|
super(message);
|
||||||
|
this.message = message;
|
||||||
|
this.baseResponse = baseResponse;
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class NotValidationPasswordException extends RuntimeException {
|
public class NotValidationPasswordException extends RuntimeException {
|
||||||
public NotValidationPasswordException(String message) {
|
public NotValidationPasswordException(String message) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class TokenNotFoundException extends RuntimeException {
|
public class TokenNotFoundException extends RuntimeException {
|
||||||
public TokenNotFoundException(String message) {
|
public TokenNotFoundException(String message) {
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class UploadSessionNotFoundException extends RuntimeException {
|
||||||
|
public UploadSessionNotFoundException(String uploadId) {
|
||||||
|
super("Upload session not found: " + uploadId);
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class UserNotFoundException extends RuntimeException {
|
public class UserNotFoundException extends RuntimeException {
|
||||||
public UserNotFoundException(String message) {
|
public UserNotFoundException(String message) {
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class ValidationException extends RuntimeException {
|
||||||
|
private final BindingResult bindingResult;
|
||||||
|
private final Integer msgId;
|
||||||
|
|
||||||
|
public ValidationException(BindingResult bindingResult, Integer msgId) {
|
||||||
|
super("Validation failed");
|
||||||
|
this.bindingResult = bindingResult;
|
||||||
|
this.msgId = msgId;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,243 @@
|
|||||||
|
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 org.springframework.validation.BeanPropertyBindingResult;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
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.file.FileUploadService;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileUploadHandler implements RequestHandler {
|
||||||
|
private final FileUploadService fileUploadService;
|
||||||
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
private final FileUploadSessionRepository fileUploadSessionRepository;
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
private final FileUploadRequestValidator fileUploadRequestValidator;
|
||||||
|
|
||||||
|
@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 "chunks":
|
||||||
|
return handleGetChunkStatus(request, fileRequest);
|
||||||
|
case "cancel":
|
||||||
|
return handleCancelUpload(request, fileRequest);
|
||||||
|
case "progress":
|
||||||
|
return handleGetProgress(request, fileRequest);
|
||||||
|
case "retry":
|
||||||
|
return handleRetryUpload(request, fileRequest);
|
||||||
|
default:
|
||||||
|
ActionResponse response = ActionResponse.builder()
|
||||||
|
.action(action)
|
||||||
|
.availableActions(Arrays.asList("init", "file_types", "chunks", "cancel", "progress", "retry"))
|
||||||
|
.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) {
|
||||||
|
try {
|
||||||
|
String token = fileRequest.getToken();
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
||||||
|
|
||||||
|
BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
|
||||||
|
fileUploadRequestValidator.validate(fileRequest, bindingResult);
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
throw new ValidationException(bindingResult, request.getMsgId());
|
||||||
|
}
|
||||||
|
|
||||||
|
FileUploadSession session = fileUploadService.initUpload(
|
||||||
|
authToken.getUser().getId(),
|
||||||
|
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);
|
||||||
|
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
InitFileResponse initFileResponse = InitFileResponse.builder()
|
||||||
|
.build();
|
||||||
|
|
||||||
|
throw new NotValidFieldException("Invalid or expired token: " + fileRequest.getToken(),
|
||||||
|
new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
|
||||||
|
MessageCode.INVALID_TOKEN.getDescription(), initFileResponse));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetProgress(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
ru.soune.nocopy.dto.file.UploadProgressResponse progress =
|
||||||
|
fileUploadService.getUploadProgress(fileRequest.getUploadId());
|
||||||
|
|
||||||
|
UploadProgressResponse responseDto = UploadProgressResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.fileName(progress.getFileName())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.status(progress.getStatus())
|
||||||
|
.progressPercentage(progress.getProgressPercentage())
|
||||||
|
.filePath(progress.getFilePath())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), responseDto);
|
||||||
|
|
||||||
|
} catch (UploadSessionNotFoundException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.FILE_NOT_FOUND.getDescription(), null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting progress", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getDescription(), null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleCancelUpload(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
fileUploadService.cancelUpload(fileRequest.getUploadId());
|
||||||
|
|
||||||
|
CanceledUploadResponse response = CanceledUploadResponse.builder()
|
||||||
|
.uploadId(fileRequest.getUploadId())
|
||||||
|
.message("Upload cancelled successfully")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
"Upload cancelled successfully", response);
|
||||||
|
|
||||||
|
} catch (UploadSessionNotFoundException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
"Upload session not found", null);
|
||||||
|
} catch (FileUploadException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(), null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error cancelling upload", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to cancel upload", null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleRetryUpload(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
fileUploadService.retryFailedUpload(fileRequest.getUploadId());
|
||||||
|
ru.soune.nocopy.dto.file.UploadProgressResponse progress =
|
||||||
|
fileUploadService.getUploadProgress(fileRequest.getUploadId());
|
||||||
|
|
||||||
|
RetryUploadResponse response = RetryUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.message("Upload retry initiated")
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), "Upload retry initiated",
|
||||||
|
response);
|
||||||
|
|
||||||
|
} catch (UploadSessionNotFoundException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
"Upload session not found", null);
|
||||||
|
} catch (FileUploadException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(),
|
||||||
|
null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error retrying upload", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to retry upload", null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetChunkStatus(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
|
try {
|
||||||
|
FileUploadSession session = fileUploadSessionRepository.findById(fileRequest.getUploadId())
|
||||||
|
.orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
|
||||||
|
|
||||||
|
Map<String, Boolean> chunkStatus = new HashMap<>();
|
||||||
|
for (int i = 0; i < session.getTotalChunks(); i++) {
|
||||||
|
chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
|
||||||
|
}
|
||||||
|
|
||||||
|
ChunkStatusResponse response = ChunkStatusResponse.builder()
|
||||||
|
.uploadId(fileRequest.getUploadId())
|
||||||
|
.totalChunks(session.getTotalChunks())
|
||||||
|
.uploadedChunks(session.getChunksUploaded())
|
||||||
|
.missingChunks(session.getTotalChunks() - session.getChunksUploaded())
|
||||||
|
.chunkStatus(chunkStatus)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
|
||||||
|
} catch (UploadSessionNotFoundException e) {
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
"Upload session not found", null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting chunk status", e);
|
||||||
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(), "Failed to get chunk status",
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse handleGetFileTypes(BaseRequest request) {
|
||||||
|
try {
|
||||||
|
FileTypesResponse response = FileTypesResponse.builder()
|
||||||
|
.fileTypes(Arrays.asList(FileType.values()))
|
||||||
|
.count(FileType.values().length)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting file types", e);
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get file types", null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+9
-11
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.handler;
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.context.support.DefaultMessageSourceResolvable;
|
import org.springframework.context.support.DefaultMessageSourceResolvable;
|
||||||
@@ -8,7 +8,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
|
|||||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||||
import org.springframework.web.bind.annotation.ResponseStatus;
|
import org.springframework.web.bind.annotation.ResponseStatus;
|
||||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||||
import ru.soune.no_copy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -29,15 +29,13 @@ public class GlobalExceptionHandler {
|
|||||||
"message" ,message));
|
"message" ,message));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ExceptionHandler(UserAlreadyExistsException.class)
|
@ExceptionHandler(NotValidFieldException.class)
|
||||||
@ResponseStatus(HttpStatus.CONFLICT)
|
@ResponseStatus(HttpStatus.OK)
|
||||||
public ResponseEntity<?> handleUserContainsException(UserAlreadyExistsException ex) {
|
public ResponseEntity<?> handleUserContainsException(NotValidFieldException ex) {
|
||||||
return ResponseEntity.
|
|
||||||
badRequest()
|
return ResponseEntity
|
||||||
.body(Map.of(
|
.ok()
|
||||||
"success", false,
|
.body(ex.getBaseResponse());
|
||||||
"message" ,ex.getMessage()
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ExceptionHandler(UserNotFoundException.class)
|
@ExceptionHandler(UserNotFoundException.class)
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.handler;
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
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.exception.NotValidFieldException;
|
||||||
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
|
import ru.soune.nocopy.service.AuthService;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class LoginRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
private final AuthService authService;
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) {
|
||||||
|
LoginRequest loginRequest = objectMapper.convertValue(request.getMessageBody(), LoginRequest.class);
|
||||||
|
|
||||||
|
if (!userRepository.existsByEmail(loginRequest.getEmail())) {
|
||||||
|
LoginAnswer loginAnswer = new LoginAnswer();
|
||||||
|
loginAnswer.setFieldErrors(Arrays.asList(Map.of("email", loginRequest.getEmail())));
|
||||||
|
|
||||||
|
throw new NotValidFieldException("User with email not found: " + loginRequest.getEmail(),
|
||||||
|
new BaseResponse(request.getMsgId(), MessageCode.AUTH_EMAIL_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.AUTH_EMAIL_NOT_FOUND.getDescription(), loginAnswer));
|
||||||
|
}
|
||||||
|
|
||||||
|
AuthToken authToken = authService.login(loginRequest);
|
||||||
|
|
||||||
|
LoginAnswer loginAnswer = new LoginAnswer();
|
||||||
|
loginAnswer.setToken(authToken.getToken());
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
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 org.springframework.validation.BeanPropertyBindingResult;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import ru.soune.nocopy.dto.*;
|
||||||
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
|
import ru.soune.nocopy.exception.ValidationException;
|
||||||
|
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
||||||
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
|
import ru.soune.nocopy.service.AuthService;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class RegRequestHandler implements RequestHandler {
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
|
private final RegRequestValidator regRequestValidator;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) throws ValidationException {
|
||||||
|
RegRequest regRequest = objectMapper.convertValue(request.getMessageBody(), RegRequest.class);
|
||||||
|
|
||||||
|
if (userRepository.existsByEmail(regRequest.getEmail()) || userRepository.existsByPhone(regRequest.getPhone())) {
|
||||||
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
|
regAnswer.setFieldErrors(Arrays.asList(Map.of("email", regRequest.getEmail())));
|
||||||
|
regAnswer.setFieldErrors(Arrays.asList(Map.of("phone", regRequest.getPhone())));
|
||||||
|
|
||||||
|
throw new NotValidFieldException("User already exists with email:" + regRequest.getEmail() + " or phone: " +
|
||||||
|
regRequest.getPhone(), new BaseResponse(request.getMsgId(),
|
||||||
|
MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getCode(),
|
||||||
|
MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer));
|
||||||
|
}
|
||||||
|
|
||||||
|
BindingResult bindingResult = new BeanPropertyBindingResult(regRequest, "regRequest");
|
||||||
|
regRequestValidator.validate(regRequest, bindingResult);
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
throw new ValidationException(bindingResult, request.getMsgId());
|
||||||
|
}
|
||||||
|
|
||||||
|
AuthToken authToken = authService.register(regRequest);
|
||||||
|
|
||||||
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
|
regAnswer.setToken(authToken.getToken());
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), regAnswer);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
|
||||||
|
public interface RequestHandler {
|
||||||
|
BaseResponse handle(BaseRequest request) throws Exception;
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class FileUploadRequestValidator implements Validator {
|
||||||
|
@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(), 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.valueOf(fileType.toUpperCase());
|
||||||
|
} 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, Errors errors) {
|
||||||
|
if (extension == null || extension.isBlank()) {
|
||||||
|
errors.rejectValue("extension", "extension.required", "Extension is required");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!extension.startsWith(".")) {
|
||||||
|
errors.rejectValue("extension", "extension.invalid.format",
|
||||||
|
"Extension must start with '.'");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
package ru.soune.nocopy.handler.validator;
|
||||||
|
|
||||||
|
import org.apache.commons.validator.routines.DomainValidator;
|
||||||
|
import org.apache.commons.validator.routines.EmailValidator;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.validation.Errors;
|
||||||
|
import org.springframework.validation.Validator;
|
||||||
|
import ru.soune.nocopy.dto.RegRequest;
|
||||||
|
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.UnknownHostException;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class RegRequestValidator implements Validator {
|
||||||
|
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
|
||||||
|
|
||||||
|
private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean supports(Class<?> clazz) {
|
||||||
|
return RegRequest.class.isAssignableFrom(clazz);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void validate(Object target, Errors errors) {
|
||||||
|
RegRequest request = (RegRequest) target;
|
||||||
|
|
||||||
|
validatePhone(request.getPhone(), errors);
|
||||||
|
validatePassword(request.getPassword(), errors);
|
||||||
|
validateEmail(request.getEmail(), errors);
|
||||||
|
validateCompanyName(request.getCompanyName(), errors);
|
||||||
|
validateFullName(request.getFullName(), errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateFullName(String fullName, Errors errors) {
|
||||||
|
if (fullName == null || fullName.trim().isEmpty()) {
|
||||||
|
errors.rejectValue("fullName", "fullName.required",
|
||||||
|
"Full name is required");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String trimmedName = fullName.trim();
|
||||||
|
|
||||||
|
if (trimmedName.length() < 2) {
|
||||||
|
errors.rejectValue("fullName", "fullName.too.short",
|
||||||
|
"Full name must be at least 2 characters");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (trimmedName.length() > 100) {
|
||||||
|
errors.rejectValue("fullName", "fullName.too.long",
|
||||||
|
"Full name must be less than 100 characters");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!trimmedName.matches(NAME_REGEX)) {
|
||||||
|
errors.rejectValue("fullName", "fullName.invalid.chars",
|
||||||
|
"Name can only contain letters, spaces, hyphens and apostrophes");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateCompanyName(String companyName, Errors errors) {
|
||||||
|
if (companyName == null || companyName.trim().isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String trimmedCompany = companyName.trim();
|
||||||
|
|
||||||
|
if (trimmedCompany.length() > 200) {
|
||||||
|
errors.rejectValue("companyName", "companyName.too.long",
|
||||||
|
"Company name must be less than 200 characters");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!trimmedCompany.matches(COMPANY_REGEX)) {
|
||||||
|
errors.rejectValue("companyName", "companyName.invalid.chars",
|
||||||
|
"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) {
|
||||||
|
if (email == null || email.trim().isEmpty()) {
|
||||||
|
errors.rejectValue("email", "email.is.empty", "Email must not be empty");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String trimmedEmail = email.trim().toLowerCase();
|
||||||
|
|
||||||
|
if (trimmedEmail.length() > 254) {
|
||||||
|
errors.rejectValue("email", "email.too.long", "Email is too long");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
EmailValidator emailValidator = EmailValidator.getInstance(true, true);
|
||||||
|
if (!emailValidator.isValid(trimmedEmail)) {
|
||||||
|
errors.rejectValue("email", "email.invalid", "Invalid email address");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void validatePhone(String phone, Errors errors) {
|
||||||
|
if (phone == null || phone.trim().isEmpty()) {
|
||||||
|
errors.rejectValue("phone", "phone.empty",
|
||||||
|
"Test phone numbers are not allowed");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String trimmedPhone = phone.trim();
|
||||||
|
String digitsOnly = trimmedPhone.replaceAll("[^0-9+]", "");
|
||||||
|
|
||||||
|
if (digitsOnly.length() < 11 || digitsOnly.length() > 14) {
|
||||||
|
errors.rejectValue("phone", "phone.invalid.length",
|
||||||
|
"Phone number must contain 11-14 digits");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!digitsOnly.matches("^(\\+7|8|7)[0-9]{10}$")) {
|
||||||
|
errors.rejectValue("phone", "phone.invalid.format",
|
||||||
|
"Invalid phone number format");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validatePassword(String password, Errors errors) {
|
||||||
|
if (password == null || password.isEmpty()) {
|
||||||
|
errors.rejectValue("password", "password.empty",
|
||||||
|
"Password are not allowed");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (password.length() < 8) {
|
||||||
|
errors.rejectValue("password", "password.too.short",
|
||||||
|
"Password must be at least 8 characters");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (password.length() > 50) {
|
||||||
|
errors.rejectValue("password", "password.too.long",
|
||||||
|
"Password must be less than 50 characters");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (password.contains(" ")) {
|
||||||
|
errors.rejectValue("password", "password.contains.spaces",
|
||||||
|
"Password cannot contain spaces");
|
||||||
|
}
|
||||||
|
|
||||||
|
// recomment if need complexity
|
||||||
|
// checkPasswordComplexity(password, errors);
|
||||||
|
|
||||||
|
// reccoment if need check simply standart password
|
||||||
|
// checkCommonPasswords(password, errors);
|
||||||
|
|
||||||
|
// reccoment if need check simply standart password
|
||||||
|
// checkForSequences(password, errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkPasswordComplexity(String password, Errors errors) {
|
||||||
|
boolean hasUpper = false;
|
||||||
|
boolean hasLower = false;
|
||||||
|
boolean hasDigit = false;
|
||||||
|
boolean hasSpecial = false;
|
||||||
|
|
||||||
|
for (char c : password.toCharArray()) {
|
||||||
|
if (Character.isUpperCase(c)) hasUpper = true;
|
||||||
|
if (Character.isLowerCase(c)) hasLower = true;
|
||||||
|
if (Character.isDigit(c)) hasDigit = true;
|
||||||
|
if ("!@#$%^&*()_+-=[]{}|;:,.<>?".indexOf(c) >= 0) hasSpecial = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<String> missing = new ArrayList<>();
|
||||||
|
if (!hasUpper) missing.add("uppercase letter");
|
||||||
|
if (!hasLower) missing.add("lowercase letter");
|
||||||
|
if (!hasDigit) missing.add("digit");
|
||||||
|
if (!hasSpecial) missing.add("special character");
|
||||||
|
|
||||||
|
if (!missing.isEmpty()) {
|
||||||
|
String message = "Password must contain: " + String.join(", ", missing);
|
||||||
|
errors.rejectValue("password", "password.complexity.missing", message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkCommonPasswords(String password, Errors errors) {
|
||||||
|
Set<String> commonPasswords = Set.of(
|
||||||
|
"password", "12345678", "qwerty123", "admin123",
|
||||||
|
"welcome1", "password1", "123456789", "qwertyuiop"
|
||||||
|
);
|
||||||
|
|
||||||
|
if (commonPasswords.contains(password.toLowerCase())) {
|
||||||
|
errors.rejectValue("password", "password.too.common",
|
||||||
|
"This password is too common, please choose another");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkForSequences(String password, Errors errors) {
|
||||||
|
String lower = password.toLowerCase();
|
||||||
|
|
||||||
|
if (lower.matches(".*123456.*") || lower.matches(".*987654.*")) {
|
||||||
|
errors.rejectValue("password", "password.sequence.numbers",
|
||||||
|
"Password contains predictable number sequence");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lower.matches(".*abcdef.*") || lower.matches(".*qwerty.*")) {
|
||||||
|
errors.rejectValue("password", "password.sequence.letters",
|
||||||
|
"Password contains predictable letter sequence");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lower.matches(".*(.)\\1{3,}.*")) {
|
||||||
|
errors.rejectValue("password", "password.repeating.chars",
|
||||||
|
"Password contains too many repeating characters");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
-3
@@ -1,11 +1,11 @@
|
|||||||
package ru.soune.no_copy.mapper;
|
package ru.soune.nocopy.mapper;
|
||||||
|
|
||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
import org.mapstruct.MappingTarget;
|
import org.mapstruct.MappingTarget;
|
||||||
import org.mapstruct.NullValuePropertyMappingStrategy;
|
import org.mapstruct.NullValuePropertyMappingStrategy;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
||||||
import ru.soune.no_copy.dto.UserContentUpdateRequest;
|
import ru.soune.nocopy.dto.UserContentUpdateRequest;
|
||||||
import ru.soune.no_copy.entity.UserContent;
|
import ru.soune.nocopy.entity.UserContent;
|
||||||
|
|
||||||
@Mapper(componentModel = "spring",
|
@Mapper(componentModel = "spring",
|
||||||
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
|
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
|
||||||
+3
-3
@@ -1,10 +1,10 @@
|
|||||||
package ru.soune.no_copy.mapper;
|
package ru.soune.nocopy.mapper;
|
||||||
|
|
||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
import org.mapstruct.NullValuePropertyMappingStrategy;
|
import org.mapstruct.NullValuePropertyMappingStrategy;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
||||||
import ru.soune.no_copy.dto.UserDTO;
|
import ru.soune.nocopy.dto.UserDTO;
|
||||||
import ru.soune.no_copy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
|
|
||||||
@Mapper(componentModel = "spring",
|
@Mapper(componentModel = "spring",
|
||||||
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
|
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
|
||||||
+2
-2
@@ -1,8 +1,8 @@
|
|||||||
package ru.soune.no_copy.repository;
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
import ru.soune.no_copy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
+3
-3
@@ -1,9 +1,9 @@
|
|||||||
package ru.soune.no_copy.repository;
|
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.no_copy.entity.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
import ru.soune.no_copy.entity.UserContent;
|
import ru.soune.nocopy.entity.UserContent;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
+4
-2
@@ -1,11 +1,13 @@
|
|||||||
package ru.soune.no_copy.repository;
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import ru.soune.no_copy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
public interface UserRepository extends JpaRepository<User, Long> {
|
public interface UserRepository extends JpaRepository<User, Long> {
|
||||||
Optional<User> findByEmail(String email);
|
Optional<User> findByEmail(String email);
|
||||||
boolean existsByEmail(String email);
|
boolean existsByEmail(String email);
|
||||||
|
boolean existsByPhone(@Size(min = 11, max = 14) String phone);
|
||||||
}
|
}
|
||||||
+23
-29
@@ -1,24 +1,22 @@
|
|||||||
package ru.soune.no_copy.service;
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.context.MessageSource;
|
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.no_copy.dto.LoginRequest;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.no_copy.dto.RegisterRequest;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.no_copy.entity.AuthToken;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.no_copy.entity.User;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.no_copy.exception.NotValidationPasswordException;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.no_copy.exception.UserAlreadyExistsException;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.no_copy.exception.UserNotFoundException;
|
|
||||||
import ru.soune.no_copy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.no_copy.repository.UserRepository;
|
|
||||||
|
|
||||||
import java.security.SecureRandom;
|
import java.security.SecureRandom;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Base64;
|
import java.util.Base64;
|
||||||
import java.util.Locale;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@@ -36,22 +34,18 @@ public class AuthService {
|
|||||||
private final SecureRandom secureRandom = new SecureRandom();
|
private final SecureRandom secureRandom = new SecureRandom();
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public AuthToken register(RegisterRequest registerRequest) {
|
public AuthToken register(RegRequest registerRequest) {
|
||||||
if (userRepository.existsByEmail(registerRequest.email())) {
|
|
||||||
throw new UserAlreadyExistsException("User already exists with email: " + registerRequest.email());
|
|
||||||
}
|
|
||||||
|
|
||||||
User user = new User();
|
User user = new User();
|
||||||
user.setFullName(registerRequest.fullName());
|
user.setFullName(registerRequest.getFullName());
|
||||||
user.setEmail(registerRequest.email());
|
user.setEmail(registerRequest.getEmail());
|
||||||
user.setPassword(passwordEncoder.encode(registerRequest.password()));
|
user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
|
||||||
|
|
||||||
if (registerRequest.companyName() != null) {
|
if (registerRequest.getCompanyName() != null) {
|
||||||
user.setCompany(registerRequest.companyName());
|
user.setCompany(registerRequest.getCompanyName());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (registerRequest.phone() != null) {
|
if (registerRequest.getPhone() != null) {
|
||||||
user.setPhone(registerRequest.phone());
|
user.setPhone(registerRequest.getPhone());
|
||||||
}
|
}
|
||||||
|
|
||||||
User savedUser = userRepository.save(user);
|
User savedUser = userRepository.save(user);
|
||||||
@@ -66,15 +60,15 @@ public class AuthService {
|
|||||||
@Transactional
|
@Transactional
|
||||||
public AuthToken login(LoginRequest request) {
|
public AuthToken login(LoginRequest request) {
|
||||||
Optional<User> userOpt = userRepository.findByEmail(request.getEmail());
|
Optional<User> userOpt = userRepository.findByEmail(request.getEmail());
|
||||||
|
|
||||||
if (userOpt.isEmpty()) {
|
|
||||||
throw new UserNotFoundException("User with email " + request.getEmail() + " not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
User user = userOpt.get();
|
User user = userOpt.get();
|
||||||
|
|
||||||
if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
|
if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
|
||||||
throw new NotValidationPasswordException("Invalid password");
|
LoginAnswer loginAnswer = new LoginAnswer();
|
||||||
|
loginAnswer.setFieldErrors(Arrays.asList(Map.of("password", request.getPassword())));
|
||||||
|
|
||||||
|
throw new NotValidFieldException("Invalid password", new BaseResponse(20003,
|
||||||
|
MessageCode.AUTH_PASSWORD_NOT_MATCHES.getCode(),
|
||||||
|
MessageCode.AUTH_PASSWORD_NOT_MATCHES.getDescription(), loginAnswer));
|
||||||
}
|
}
|
||||||
|
|
||||||
user.setLastLoginAt(LocalDateTime.now());
|
user.setLastLoginAt(LocalDateTime.now());
|
||||||
+11
-11
@@ -1,18 +1,18 @@
|
|||||||
package ru.soune.no_copy.service;
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
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.no_copy.dto.UserContentRequest;
|
import ru.soune.nocopy.dto.UserContentRequest;
|
||||||
import ru.soune.no_copy.dto.UserContentUpdateRequest;
|
import ru.soune.nocopy.dto.UserContentUpdateRequest;
|
||||||
import ru.soune.no_copy.entity.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
import ru.soune.no_copy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.no_copy.entity.UserContent;
|
import ru.soune.nocopy.entity.UserContent;
|
||||||
import ru.soune.no_copy.exception.ContentNotFoundException;
|
import ru.soune.nocopy.exception.ContentNotFoundException;
|
||||||
import ru.soune.no_copy.exception.UserNotFoundException;
|
import ru.soune.nocopy.exception.UserNotFoundException;
|
||||||
import ru.soune.no_copy.mapper.UserContentMapper;
|
import ru.soune.nocopy.mapper.UserContentMapper;
|
||||||
import ru.soune.no_copy.repository.UserContentRepository;
|
import ru.soune.nocopy.repository.UserContentRepository;
|
||||||
import ru.soune.no_copy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
+9
-9
@@ -1,17 +1,17 @@
|
|||||||
package ru.soune.no_copy.service;
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
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.no_copy.dto.ChangePasswordRequest;
|
import ru.soune.nocopy.dto.ChangePasswordRequest;
|
||||||
import ru.soune.no_copy.dto.UserDTO;
|
import ru.soune.nocopy.dto.UserDTO;
|
||||||
import ru.soune.no_copy.dto.UserRequest;
|
import ru.soune.nocopy.dto.UserRequest;
|
||||||
import ru.soune.no_copy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.no_copy.exception.InvalidUserEmail;
|
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||||
import ru.soune.no_copy.exception.NotValidationPasswordException;
|
import ru.soune.nocopy.exception.NotValidationPasswordException;
|
||||||
import ru.soune.no_copy.exception.UserNotFoundException;
|
import ru.soune.nocopy.exception.UserNotFoundException;
|
||||||
import ru.soune.no_copy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@@ -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,23 @@
|
|||||||
|
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 cleanupExpiredSessions();
|
||||||
|
|
||||||
|
public void retryFailedUpload(String uploadId);
|
||||||
|
|
||||||
|
public void cancelUpload(String uploadId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,668 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import jakarta.annotation.PostConstruct;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
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.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
import ru.soune.nocopy.exception.ChunkSizeExceededException;
|
||||||
|
import ru.soune.nocopy.exception.FileUploadException;
|
||||||
|
import ru.soune.nocopy.exception.UploadSessionNotFoundException;
|
||||||
|
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||||
|
|
||||||
|
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.Comparator;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
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;
|
||||||
|
|
||||||
|
@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);
|
||||||
|
|
||||||
|
FileUploadSession session = FileUploadSession.builder()
|
||||||
|
.userId(userId)
|
||||||
|
.extension(extension)
|
||||||
|
.fileName(fileName)
|
||||||
|
.fileType(fileType)
|
||||||
|
.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) {
|
||||||
|
|
||||||
|
log.info("Processing chunk {} for session {}, size: {} bytes",
|
||||||
|
chunkNumber, uploadId, chunkFile.getSize());
|
||||||
|
|
||||||
|
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 0-%d",
|
||||||
|
chunkNumber, session.getTotalChunks() - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chunkFile.getSize() > chunkSize) {
|
||||||
|
throw new ChunkSizeExceededException(chunkFile.getSize(), chunkSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
return processChunk(session, chunkNumber, chunkFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleExpiredSession(FileUploadSession session) {
|
||||||
|
session.setStatus(UploadStatus.FAILED);
|
||||||
|
session.setLastError("Upload session expired");
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
log.debug("Chunk {} saved successfully. Uploaded: {}/{}",
|
||||||
|
chunkNumber, session.getChunksUploaded(), session.getTotalChunks());
|
||||||
|
|
||||||
|
if (session.getChunksUploaded().equals(session.getTotalChunks())) {
|
||||||
|
log.info("All chunks uploaded for session {}. Starting assembly...",
|
||||||
|
session.getUploadId());
|
||||||
|
sessionRepository.save(session);
|
||||||
|
assembleFileAsync(session);
|
||||||
|
} else {
|
||||||
|
sessionRepository.save(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
return UploadProgressResponse.fromSession(session);
|
||||||
|
|
||||||
|
} 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 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)) {
|
||||||
|
log.warn("Chunk file missing, re-uploading: {}", 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()) {
|
||||||
|
log.warn("Chunk size mismatch, re-uploading: {} != {}",
|
||||||
|
existingSize, chunkFile.getSize());
|
||||||
|
Files.deleteIfExists(chunkPath);
|
||||||
|
session.getChunkPaths().remove(chunkNumber);
|
||||||
|
session.setChunksUploaded(session.getChunksUploaded() - 1);
|
||||||
|
sessionRepository.save(session);
|
||||||
|
return processChunk(session, chunkNumber, chunkFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
log.debug("Chunk {} already uploaded and valid", chunkNumber);
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Async("fileUploadTaskExecutor")
|
||||||
|
@Transactional
|
||||||
|
public void assembleFileAsync(FileUploadSession session) {
|
||||||
|
try {
|
||||||
|
assembleFile(session);
|
||||||
|
log.info("File assembly completed successfully for session: {}",
|
||||||
|
session.getUploadId());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to assemble file for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage(), e);
|
||||||
|
|
||||||
|
handleAssemblyFailure(session, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void assembleFile(FileUploadSession session) throws IOException {
|
||||||
|
log.info("Starting file assembly for session: {} ({})",
|
||||||
|
session.getUploadId(), session.getFileName());
|
||||||
|
|
||||||
|
Path finalFilePath = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
finalFilePath = prepareFinalFile(session);
|
||||||
|
|
||||||
|
validateAllChunksExist(session);
|
||||||
|
|
||||||
|
mergeChunksToFile(session, finalFilePath);
|
||||||
|
|
||||||
|
validateFinalFile(session, finalFilePath);
|
||||||
|
|
||||||
|
updateSessionOnSuccess(session, finalFilePath);
|
||||||
|
|
||||||
|
cleanupSessionFiles(session);
|
||||||
|
|
||||||
|
log.info("File assembly completed: {} -> {} ({} bytes)",
|
||||||
|
session.getFileName(), finalFilePath, session.getFileSize());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
if (finalFilePath != null) {
|
||||||
|
Files.deleteIfExists(finalFilePath);
|
||||||
|
}
|
||||||
|
throw 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 updateSessionOnSuccess(FileUploadSession session, Path finalPath) {
|
||||||
|
session.setFilePath(finalPath.toString());
|
||||||
|
session.setChecksum(calculateChecksum(finalPath));
|
||||||
|
session.setStatus(UploadStatus.COMPLETED);
|
||||||
|
session.setCompletedAt(LocalDateTime.now());
|
||||||
|
sessionRepository.save(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
log.error("File assembly failed for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
@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
|
||||||
|
@Transactional
|
||||||
|
public void retryFailedUpload(String uploadId) {
|
||||||
|
FileUploadSession session = sessionRepository.findById(uploadId)
|
||||||
|
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
||||||
|
|
||||||
|
if (session.getStatus() != UploadStatus.FAILED) {
|
||||||
|
throw new FileUploadException("Only failed uploads can be retried");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (session.getRetryCount() >= maxRetryAttempts) {
|
||||||
|
throw new FileUploadException("Max retry attempts exceeded");
|
||||||
|
}
|
||||||
|
|
||||||
|
session.setStatus(UploadStatus.UPLOADING);
|
||||||
|
session.setRetryCount(session.getRetryCount() + 1);
|
||||||
|
session.setLastError(null);
|
||||||
|
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
if (session.getChunksUploaded().equals(session.getTotalChunks())) {
|
||||||
|
log.info("Retrying file assembly for session: {}", uploadId);
|
||||||
|
assembleFileAsync(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info("Upload retry initiated for session: {} (attempt {})",
|
||||||
|
uploadId, session.getRetryCount());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public UploadProgressResponse getUploadProgress(String uploadId) {
|
||||||
|
FileUploadSession session = sessionRepository.findById(uploadId)
|
||||||
|
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
||||||
|
|
||||||
|
return UploadProgressResponse.fromSession(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional
|
||||||
|
public void cleanupExpiredSessions() {
|
||||||
|
log.info("Starting cleanup of expired upload sessions");
|
||||||
|
|
||||||
|
LocalDateTime expiryThreshold = LocalDateTime.now().minusHours(sessionExpiryHours);
|
||||||
|
|
||||||
|
try {
|
||||||
|
var expiredSessions = sessionRepository.findByStatusInAndCreatedAtBefore(
|
||||||
|
Set.of(UploadStatus.INITIATED, UploadStatus.UPLOADING, UploadStatus.FAILED),
|
||||||
|
expiryThreshold
|
||||||
|
);
|
||||||
|
|
||||||
|
int cleanedCount = 0;
|
||||||
|
for (FileUploadSession session : expiredSessions) {
|
||||||
|
session.setStatus(UploadStatus.FAILED);
|
||||||
|
session.setLastError("Session expired during cleanup");
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
|
||||||
|
cleanedCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info("Cleaned up {} expired upload sessions", cleanedCount);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error during session cleanup", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,10 +9,37 @@ 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:5242880} # 5MB
|
||||||
|
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 дня
|
||||||
|
session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
|
||||||
|
|
||||||
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"
|
||||||
+8
-49
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.no_copy.service;
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -8,22 +8,18 @@ import org.mockito.Mock;
|
|||||||
import org.mockito.MockitoAnnotations;
|
import org.mockito.MockitoAnnotations;
|
||||||
import org.springframework.context.MessageSource;
|
import org.springframework.context.MessageSource;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import ru.soune.no_copy.dto.LoginRequest;
|
import ru.soune.nocopy.dto.LoginRequest;
|
||||||
import ru.soune.no_copy.dto.RegisterRequest;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.no_copy.entity.AuthToken;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.no_copy.entity.User;
|
import ru.soune.nocopy.exception.NotValidationPasswordException;
|
||||||
import ru.soune.no_copy.exception.NotValidationPasswordException;
|
import ru.soune.nocopy.exception.UserNotFoundException;
|
||||||
import ru.soune.no_copy.exception.UserAlreadyExistsException;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.no_copy.exception.UserNotFoundException;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.no_copy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.no_copy.repository.UserRepository;
|
|
||||||
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.ArgumentMatchers.anyString;
|
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@@ -49,43 +45,6 @@ public class AuthServiceTest {
|
|||||||
MockitoAnnotations.openMocks(this);
|
MockitoAnnotations.openMocks(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
void registerSuccess() {
|
|
||||||
RegisterRequest request = new RegisterRequest("John","A.","124124",
|
|
||||||
"john@example.com", null,"password123", null, null);
|
|
||||||
|
|
||||||
when(userRepository.existsByEmail(request.email())).thenReturn(false);
|
|
||||||
when(passwordEncoder.encode(request.password())).thenReturn("hashed");
|
|
||||||
when(userRepository.save(any(User.class))).thenAnswer(invocation -> invocation.getArgument(0));
|
|
||||||
when(authTokenRepository.save(any(AuthToken.class))).thenAnswer(invocation -> invocation.getArgument(0));
|
|
||||||
|
|
||||||
AuthToken token = authService.register(request);
|
|
||||||
User user = token.getUser();
|
|
||||||
String email = user.getEmail();
|
|
||||||
|
|
||||||
assertNotNull(token);
|
|
||||||
assertNotNull(token.getToken());
|
|
||||||
assertNotNull(token.getUser());
|
|
||||||
assertEquals("john@example.com", email);
|
|
||||||
assertNotNull(token.getExpiresAt());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void registerExistingEmailThrows() {
|
|
||||||
RegisterRequest request = new RegisterRequest("John","A.","124124",
|
|
||||||
"john@example.com", null,"password123", null, null);
|
|
||||||
|
|
||||||
when(userRepository.existsByEmail(request.email()))
|
|
||||||
.thenReturn(true);
|
|
||||||
when(messageSource.getMessage(anyString(), any(), any(Locale.class)))
|
|
||||||
.thenReturn("User exists");
|
|
||||||
|
|
||||||
UserAlreadyExistsException ex = assertThrows(UserAlreadyExistsException.class,
|
|
||||||
() -> authService.register(request));
|
|
||||||
|
|
||||||
assertEquals("User exists", ex.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void login_success() {
|
void login_success() {
|
||||||
LoginRequest request = new LoginRequest("test@mail.com", "password");
|
LoginRequest request = new LoginRequest("test@mail.com", "password");
|
||||||
Reference in New Issue
Block a user