Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8ac73ff045 | ||
|
|
344ec075d4 | ||
|
|
7b8546fd4d | ||
|
|
eb12e219ec | ||
|
|
920cde3cdf | ||
|
|
5b4dca23fb | ||
|
|
7b1ed5fe67 | ||
|
|
8102d72982 | ||
|
|
b3a3d57ee3 | ||
|
|
d896f23872 | ||
|
|
edd508e5d8 | ||
|
|
63baaf7c80 | ||
|
|
3a9a5b48a2 | ||
|
|
6fff5884d2 | ||
|
|
f8673dd581 | ||
|
|
b9a401f113 | ||
|
|
918b4894fc | ||
|
|
ffb147d716 | ||
|
|
647fd6e1a7 |
@@ -31,6 +31,12 @@ dependencies {
|
|||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
implementation 'commons-validator:commons-validator:1.7'
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
|
|
||||||
|
implementation 'org.flywaydb:flyway-core:9.22.0'
|
||||||
|
|
||||||
|
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
||||||
|
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
||||||
|
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
|
||||||
|
|
||||||
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
||||||
annotationProcessor 'org.projectlombok:lombok'
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
|
|
||||||
|
|||||||
+9
-4
@@ -58,13 +58,18 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
FILE_STORAGE_PATH: /data/uploads
|
FILE_STORAGE_PATH: /data/uploads
|
||||||
MAX_FILE_SIZE: 10737418240
|
MAX_FILE_SIZE: 10737418240
|
||||||
FILE_CHUNK_SIZE: 1048576
|
# FILE_CHUNK_SIZE: 1048576
|
||||||
|
FILE_CHUNK_SIZE: 1000000
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: postgres
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: postgres
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
POSTGRES_HOST: db
|
POSTGRES_HOST: db
|
||||||
STORAGE_SERVICE_URL: http://storage:8081
|
STORAGE_SERVICE_URL: http://storage:8081
|
||||||
|
SPRING_PROFILES_ACTIVE: docker
|
||||||
|
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
||||||
|
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
||||||
|
YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
ports:
|
ports:
|
||||||
@@ -120,7 +125,7 @@ services:
|
|||||||
prometheus:
|
prometheus:
|
||||||
image: prom/prometheus:latest
|
image: prom/prometheus:latest
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
deploy: # ← ДОБАВЛЕНО
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
@@ -148,7 +153,7 @@ services:
|
|||||||
loki:
|
loki:
|
||||||
image: grafana/loki:2.9.2
|
image: grafana/loki:2.9.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
deploy: # ← ДОБАВЛЕНО
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '1.0'
|
cpus: '1.0'
|
||||||
@@ -173,7 +178,7 @@ services:
|
|||||||
tempo:
|
tempo:
|
||||||
image: grafana/tempo:2.4.1
|
image: grafana/tempo:2.4.1
|
||||||
container_name: tempo
|
container_name: tempo
|
||||||
deploy: # ← ДОБАВЛЕНО
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ pipeline {
|
|||||||
defaultValue: 'dev',
|
defaultValue: 'dev',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
|
|
||||||
string(
|
string(
|
||||||
name: 'SERVER',
|
name: 'SERVER',
|
||||||
defaultValue: '92.242.61.23',
|
defaultValue: '92.242.61.23',
|
||||||
@@ -51,156 +50,57 @@ pipeline {
|
|||||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||||
cd /opt/deployments/${params.BRANCH}
|
cd /opt/deployments/${params.BRANCH}
|
||||||
|
|
||||||
echo '========================================'
|
echo '1. Остановка старого приложения...'
|
||||||
echo 'Step 1: Checking current state...'
|
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
echo '========================================'
|
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
|
||||||
docker ps --filter 'name=postgres|app-backend|storage|grafana|prometheus|loki|tempo|alloy' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
echo '2. Удаление старых образов...'
|
||||||
|
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||||
|
|
||||||
echo '========================================'
|
echo '3. Создание сети если нужно...'
|
||||||
echo 'Step 2: Setup environment for compatibility...'
|
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
docker network create app-network 2>/dev/null || echo 'Network app-network already exists'
|
echo '4. Запуск инфраструктуры...'
|
||||||
|
docker-compose up -d db storage
|
||||||
|
|
||||||
echo 'COMPOSE_COMPATIBILITY=true' > .env
|
echo '5. Ожидание PostgreSQL...'
|
||||||
|
sleep 10
|
||||||
|
|
||||||
echo '========================================'
|
echo '6. Сборка нового образа приложения...'
|
||||||
echo 'Step 3: Force cleanup old application...'
|
docker build --no-cache -t app-backend:latest .
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
docker-compose --compatibility down 2>/dev/null || echo 'No previous compose stack'
|
echo '7. Запуск приложения...'
|
||||||
|
docker run -d \\
|
||||||
|
--name app-backend \\
|
||||||
|
--network app-network \\
|
||||||
|
--network-alias app \\
|
||||||
|
-p 80:8080 \\
|
||||||
|
-v uploads_data:/data/uploads:rw \\
|
||||||
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
|
-e POSTGRES_USER=postgres \\
|
||||||
|
-e POSTGRES_PASSWORD=postgres \\
|
||||||
|
-e POSTGRES_PORT=5432 \\
|
||||||
|
-e POSTGRES_HOST=db \\
|
||||||
|
--restart unless-stopped \\
|
||||||
|
app-backend:latest
|
||||||
|
|
||||||
docker images --filter 'reference=*app-backend*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'No images to remove'
|
echo '8. Запуск мониторинга...'
|
||||||
|
docker-compose up -d grafana prometheus loki tempo alloy
|
||||||
|
|
||||||
echo '========================================'
|
echo '9. Проверка...'
|
||||||
echo 'Step 4: Verify files and fix compose...'
|
sleep 5
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
if [ ! -f docker-compose.yaml ]; then
|
echo 'Статус контейнеров:'
|
||||||
echo 'ERROR: docker-compose.yaml not found!'
|
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||||
ls -la
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'Checking docker-compose.yaml syntax...'
|
echo '10. Проверка health...'
|
||||||
docker-compose --compatibility config 2>&1 | head -20 || echo 'Config check output'
|
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
||||||
|
echo 'Приложение работает'
|
||||||
echo '========================================'
|
echo 'URL: http://${params.SERVER}:80'
|
||||||
echo 'Step 5: Start infrastructure services...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
echo 'Starting PostgreSQL with resource limits...'
|
|
||||||
docker-compose --compatibility up -d db
|
|
||||||
|
|
||||||
echo 'Starting storage service...'
|
|
||||||
docker-compose --compatibility up -d storage
|
|
||||||
|
|
||||||
echo 'Waiting for PostgreSQL to be ready...'
|
|
||||||
for i in {1..30}; do
|
|
||||||
if docker-compose --compatibility exec db pg_isready -U postgres 2>/dev/null; then
|
|
||||||
echo 'PostgreSQL is ready'
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo 'Waiting... attempt ' \$i
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 6: Build application image...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
if [ ! -f Dockerfile ]; then
|
|
||||||
echo 'ERROR: Dockerfile not found!'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'Building Docker image...'
|
|
||||||
docker build --no-cache -t app-backend:latest . 2>&1 | tail -30
|
|
||||||
|
|
||||||
echo 'Image created successfully'
|
|
||||||
docker images app-backend:latest --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.Size}}\\t{{.CreatedAt}}'
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 7: Start application with resource limits...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
docker volume create uploads_data 2>/dev/null || echo 'Volume uploads_data already exists'
|
|
||||||
|
|
||||||
echo 'Starting main application...'
|
|
||||||
docker-compose --compatibility up -d app
|
|
||||||
|
|
||||||
echo 'Waiting for application to start...'
|
|
||||||
sleep 15
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 8: Start monitoring stack...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
docker-compose --compatibility up -d grafana prometheus loki tempo alloy
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 9: Verify deployment...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
echo 'All containers status:'
|
|
||||||
docker-compose --compatibility ps
|
|
||||||
|
|
||||||
echo ''
|
|
||||||
echo 'Resource limits check:'
|
|
||||||
echo 'App backend limits:'
|
|
||||||
docker inspect app-backend --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
|
|
||||||
|
|
||||||
echo ''
|
|
||||||
echo 'PostgreSQL limits:'
|
|
||||||
docker inspect postgres --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
|
|
||||||
|
|
||||||
echo ''
|
|
||||||
echo 'Container resource usage:'
|
|
||||||
docker stats --no-stream --format 'table {{.Name}}\\t{{.CPUPerc}}\\t{{.MemUsage}}\\t{{.MemPerc}}' postgres app-backend storage 2>/dev/null || echo 'Stats not available'
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 10: Health checks...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
echo 'Application health check...'
|
|
||||||
for i in {1..10}; do
|
|
||||||
if curl -s -f http://localhost:80/health 2>/dev/null; then
|
|
||||||
echo '✓ Application health check PASSED'
|
|
||||||
break
|
|
||||||
elif [ \$i -eq 10 ]; then
|
|
||||||
echo '✗ Application health check FAILED'
|
|
||||||
echo 'Last logs:'
|
|
||||||
docker-compose --compatibility logs --tail=20 app
|
|
||||||
else
|
|
||||||
echo 'Waiting for application... attempt ' \$i
|
|
||||||
sleep 5
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo 'Checking monitoring services...'
|
|
||||||
if curl -s -f http://localhost:3000/api/health 2>/dev/null; then
|
|
||||||
echo '✓ Grafana is healthy'
|
|
||||||
else
|
else
|
||||||
echo '⚠ Grafana may be starting'
|
echo 'Проверка health не удалась'
|
||||||
|
docker logs app-backend --tail=20
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if curl -s -f http://localhost:9090/-/healthy 2>/dev/null; then
|
|
||||||
echo '✓ Prometheus is healthy'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Deployment Summary:'
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Application URL: http://${params.SERVER}:80'
|
|
||||||
echo 'Grafana: http://${params.SERVER}:3000 (admin/admin)'
|
|
||||||
echo 'Prometheus: http://${params.SERVER}:9090'
|
|
||||||
echo 'Loki: http://${params.SERVER}:3100'
|
|
||||||
echo ''
|
|
||||||
echo 'To view logs: docker-compose logs -f app'
|
|
||||||
echo 'To view all containers: docker-compose ps'
|
|
||||||
echo 'To stop: docker-compose down'
|
|
||||||
echo '========================================'
|
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@@ -213,8 +113,6 @@ pipeline {
|
|||||||
success {
|
success {
|
||||||
echo "Deployment successful"
|
echo "Deployment successful"
|
||||||
echo "Application URL: http://${params.SERVER}:80"
|
echo "Application URL: http://${params.SERVER}:80"
|
||||||
echo "Grafana: http://${params.SERVER}:3000"
|
|
||||||
echo "Prometheus: http://${params.SERVER}:9090"
|
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Deployment failed for branch ${params.BRANCH}"
|
echo "Deployment failed for branch ${params.BRANCH}"
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ public class HandlerConfig {
|
|||||||
LoginRequestHandler login,
|
LoginRequestHandler login,
|
||||||
FileUploadHandler upload,
|
FileUploadHandler upload,
|
||||||
FileEntityHandler file,
|
FileEntityHandler file,
|
||||||
LogoutRequestHandler logoutHandler
|
LogoutRequestHandler logoutHandler,
|
||||||
|
ImageFoundRequestHandler imageFoundRequestHandler
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
map.put(20001, login);
|
map.put(20001, login);
|
||||||
@@ -24,6 +25,7 @@ public class HandlerConfig {
|
|||||||
map.put(20004, upload);
|
map.put(20004, upload);
|
||||||
map.put(20005, file);
|
map.put(20005, file);
|
||||||
map.put(20006, logoutHandler);
|
map.put(20006, logoutHandler);
|
||||||
|
map.put(20007, imageFoundRequestHandler);
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,8 @@ public class JacksonConfig {
|
|||||||
|
|
||||||
mapper.registerModule(javaTimeModule);
|
mapper.registerModule(javaTimeModule);
|
||||||
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
||||||
|
mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
mapper.enable(SerializationFeature.INDENT_OUTPUT);
|
||||||
|
|
||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,16 +15,14 @@ import ru.soune.nocopy.dto.BaseRequest;
|
|||||||
import ru.soune.nocopy.dto.BaseResponse;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.RegAnswer;
|
import ru.soune.nocopy.dto.RegAnswer;
|
||||||
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
import ru.soune.nocopy.dto.file.*;
|
||||||
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
|
||||||
import ru.soune.nocopy.dto.file.UploadProgress;
|
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
import ru.soune.nocopy.handler.*;
|
import ru.soune.nocopy.handler.*;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
@@ -50,6 +48,8 @@ public class ApiController {
|
|||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
@PostMapping("/v{version}/data")
|
@PostMapping("/v{version}/data")
|
||||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
@PathVariable("version") int version) {
|
@PathVariable("version") int version) {
|
||||||
@@ -127,6 +127,16 @@ public class ApiController {
|
|||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
"Chunk uploaded successfully", responseBody));
|
"Chunk uploaded successfully", responseBody));
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
log.error("Error uploading chunk", e);
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
|
"Failed to upload chunk: " + e.getMessage(), responseBody));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error uploading chunk", e);
|
log.error("Error uploading chunk", e);
|
||||||
|
|
||||||
@@ -141,6 +151,11 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/files/{fileId}/similar")
|
||||||
|
public List<SimilarFileResponse> getSimilarFiles(@PathVariable String fileId) {
|
||||||
|
return fileSimilarityService.findSimilarFiles(fileId);
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/progress/{uploadId}")
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
public ResponseEntity<BaseResponse> getUploadProgress(
|
public ResponseEntity<BaseResponse> getUploadProgress(
|
||||||
@PathVariable("version") int version,
|
@PathVariable("version") int version,
|
||||||
@@ -368,18 +383,6 @@ public class ApiController {
|
|||||||
return contentType;
|
return contentType;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isPreviewSupported(String mimeType) {
|
|
||||||
if (mimeType == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return mimeType.startsWith("image") ||
|
|
||||||
mimeType.startsWith("text") ||
|
|
||||||
mimeType.equals("pdf") ||
|
|
||||||
mimeType.startsWith("video") ||
|
|
||||||
mimeType.startsWith("audio");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Long getUserIdFromToken(String tokenHeader) {
|
private Long getUserIdFromToken(String tokenHeader) {
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
AuthToken authToken = authTokenRepository.findByToken(token)
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
import ru.soune.nocopy.dto.ChangePasswordRequest;
|
import ru.soune.nocopy.dto.ChangePasswordRequest;
|
||||||
import ru.soune.nocopy.dto.UserDTO;
|
import ru.soune.nocopy.dto.UserDTO;
|
||||||
import ru.soune.nocopy.dto.UserRequest;
|
import ru.soune.nocopy.dto.UserRequest;
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.nocopy.exception.InvalidUserEmail;
|
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
|||||||
@@ -1,93 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.dto.BaseResponse;
|
|
||||||
import ru.soune.nocopy.dto.LoginAnswer;
|
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
|
||||||
import ru.soune.nocopy.entity.User;
|
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
|
||||||
import ru.soune.nocopy.service.AuthService;
|
|
||||||
import ru.soune.nocopy.service.VkOAuthService;
|
|
||||||
import ru.soune.nocopy.service.auth.ExternalAuthUserService;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@Slf4j
|
|
||||||
public class VkAuthController {
|
|
||||||
|
|
||||||
private final VkOAuthService vkOAuthService;
|
|
||||||
|
|
||||||
private final AuthService authService;
|
|
||||||
|
|
||||||
private final ExternalAuthUserService externalAuthUserService;
|
|
||||||
|
|
||||||
@GetMapping("/v{version}/vk/authorization/{code}/{state}/{codeVerifier}/{deviceId}")
|
|
||||||
public BaseResponse vkAuth(@PathVariable("code") String code,
|
|
||||||
@PathVariable("state") String state,
|
|
||||||
@PathVariable("codeVerifier") String codeVerifier,
|
|
||||||
@PathVariable("deviceId") String deviceId) {
|
|
||||||
try {
|
|
||||||
Map<String, Object> authMap = vkOAuthService.authTokenMap(code, state, codeVerifier, deviceId);
|
|
||||||
ObjectMapper mapper = new ObjectMapper();
|
|
||||||
|
|
||||||
String bodyJson = (String) authMap.get("body");
|
|
||||||
Map<String, Object> body = mapper.readValue(bodyJson, Map.class);
|
|
||||||
|
|
||||||
String accessToken = (String) body.get("access_token");
|
|
||||||
long vkUserId = ((Number) body.get("user_id")).longValue();
|
|
||||||
Integer expiresIn = (Integer) body.get("expires_in");
|
|
||||||
String refreshToken = (String) body.get("refresh_token");
|
|
||||||
|
|
||||||
Map<String, Object> vkUserInfo = vkOAuthService.userVkInfo(accessToken);
|
|
||||||
log.info("vkUserInfo {}", vkUserInfo);
|
|
||||||
|
|
||||||
String userInfoBodyJson = (String) vkUserInfo.get("body");
|
|
||||||
Map<String, Object> userInfoBody = mapper.readValue(userInfoBodyJson, Map.class);
|
|
||||||
Map<String, Object> user = (Map<String, Object>) userInfoBody.get("user");
|
|
||||||
|
|
||||||
String firstName = (String) user.get("first_name");
|
|
||||||
String lastName = (String) user.get("last_name");
|
|
||||||
String fullName = firstName + " " + lastName;
|
|
||||||
|
|
||||||
User userEntity = externalAuthUserService.findOrCreateUserFromVK(Long.toString(vkUserId), fullName,
|
|
||||||
null, accessToken, refreshToken, expiresIn);
|
|
||||||
|
|
||||||
AuthToken ourToken = authService.createTokenForUser(userEntity);
|
|
||||||
|
|
||||||
LoginAnswer loginAnswer = new LoginAnswer();
|
|
||||||
loginAnswer.setToken(ourToken.getToken());
|
|
||||||
loginAnswer.setFieldErrors(new ArrayList<>());
|
|
||||||
|
|
||||||
return new BaseResponse(20009, MessageCode.SUCCESS.getCode(),
|
|
||||||
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("VK auth error: ", e);
|
|
||||||
|
|
||||||
LoginAnswer loginAnswer = new LoginAnswer();
|
|
||||||
loginAnswer.setToken(null);
|
|
||||||
|
|
||||||
List<Map<String, String>> errors = new ArrayList<>();
|
|
||||||
Map<String, String> error = new HashMap<>();
|
|
||||||
error.put("field", "vk_auth");
|
|
||||||
error.put("message", e.getMessage());
|
|
||||||
errors.add(error);
|
|
||||||
|
|
||||||
loginAnswer.setFieldErrors(errors);
|
|
||||||
|
|
||||||
return new BaseResponse(20009, MessageCode.SUCCESS.getCode(),
|
|
||||||
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
public record AuthResponse (
|
||||||
|
boolean success,
|
||||||
|
String message,
|
||||||
|
String token,
|
||||||
|
LocalDateTime expiresAt
|
||||||
|
) {}
|
||||||
@@ -8,8 +8,10 @@ public enum MessageCode {
|
|||||||
INVALID_TOKEN(2, "Invalid token"),
|
INVALID_TOKEN(2, "Invalid token"),
|
||||||
INVALID_ACTION(2, "Invalid action"),
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
|
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
||||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
||||||
|
IMAGE_FOUND_ERROR(2, "Image found error"),
|
||||||
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
||||||
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||||
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ImageSearchRequest {
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Value;
|
||||||
|
|
||||||
|
@Value
|
||||||
|
@Builder
|
||||||
|
public class SimilarFileResponse {
|
||||||
|
String fileId;
|
||||||
|
String originalFileName;
|
||||||
|
Long fileSize;
|
||||||
|
Integer hammingDistance;
|
||||||
|
String similarityLevel;
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public class YandexSearchResponse {
|
||||||
|
|
||||||
|
@JsonProperty("images")
|
||||||
|
private List<ImageResult> images;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public static class ImageResult {
|
||||||
|
@JsonProperty("url")
|
||||||
|
private String url;
|
||||||
|
|
||||||
|
@JsonProperty("pageUrl")
|
||||||
|
private String pageUrl;
|
||||||
|
|
||||||
|
@JsonProperty("pageTitle")
|
||||||
|
private String pageTitle;
|
||||||
|
|
||||||
|
@JsonProperty("width")
|
||||||
|
private Integer width;
|
||||||
|
|
||||||
|
@JsonProperty("height")
|
||||||
|
private Integer height;
|
||||||
|
|
||||||
|
@JsonProperty("host")
|
||||||
|
private String host;
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-3
@@ -1,10 +1,9 @@
|
|||||||
package ru.soune.nocopy.entity.auth;
|
package ru.soune.nocopy.entity;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
import ru.soune.nocopy.entity.User;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@@ -31,7 +30,7 @@ public class AuthToken {
|
|||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
@Column(name = "expires_at", nullable = false)
|
@Column(name = "expires_at", nullable = false)
|
||||||
private LocalDateTime expiresAt = LocalDateTime.now().plusHours(1);
|
private LocalDateTime expiresAt = LocalDateTime.now().plusDays(30);
|
||||||
|
|
||||||
@CreatedDate
|
@CreatedDate
|
||||||
@Column(name = "created_at", updatable = false, nullable = false)
|
@Column(name = "created_at", updatable = false, nullable = false)
|
||||||
@@ -6,14 +6,11 @@ import jakarta.validation.constraints.Size;
|
|||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "users")
|
@Table(name = "users")
|
||||||
@@ -22,19 +19,18 @@ import java.util.Optional;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ToString
|
@ToString
|
||||||
@Builder
|
|
||||||
@EntityListeners(AuditingEntityListener.class)
|
@EntityListeners(AuditingEntityListener.class)
|
||||||
public class User {
|
public class User {
|
||||||
|
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long id;
|
private Long Id;
|
||||||
|
|
||||||
@Column(name = "full_name", nullable = false)
|
@Column(name = "full_name", nullable = false)
|
||||||
private String fullName;
|
private String fullName;
|
||||||
|
|
||||||
@Size(max = 255)
|
@Size(max = 1024)
|
||||||
@Column(name = "email", nullable = false, length = 255, unique = true)
|
@Column(name = "email", nullable = false, length = 1024, unique = true)
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
@Column(name = "company")
|
@Column(name = "company")
|
||||||
@@ -94,14 +90,4 @@ public class User {
|
|||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
@ToString.Exclude
|
@ToString.Exclude
|
||||||
private List<ImageProtection> imageProtections = new ArrayList<>();
|
private List<ImageProtection> imageProtections = new ArrayList<>();
|
||||||
|
|
||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
|
||||||
@ToString.Exclude
|
|
||||||
private List<ExternalAuthProvider> externalAuthProviders = new ArrayList<>();
|
|
||||||
|
|
||||||
public Optional<ExternalAuthProvider> getProvider(ExternalAuthProvider.ProviderType providerType) {
|
|
||||||
return externalAuthProviders.stream()
|
|
||||||
.filter(p -> p.getProviderType() == providerType)
|
|
||||||
.findFirst();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
package ru.soune.nocopy.entity.auth;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import lombok.*;
|
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
|
||||||
import ru.soune.nocopy.entity.User;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "external_auth_providers",
|
|
||||||
uniqueConstraints = @UniqueConstraint(
|
|
||||||
columnNames = {"provider_type", "provider_user_id"}
|
|
||||||
),
|
|
||||||
indexes = {
|
|
||||||
@Index(name = "idx_provider_type_user_id",
|
|
||||||
columnList = "provider_type, provider_user_id"),
|
|
||||||
@Index(name = "idx_user_id_provider_type",
|
|
||||||
columnList = "user_id, provider_type")
|
|
||||||
})
|
|
||||||
@Getter @Setter
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@Builder
|
|
||||||
@EntityListeners(AuditingEntityListener.class)
|
|
||||||
public class ExternalAuthProvider {
|
|
||||||
|
|
||||||
public enum ProviderType {
|
|
||||||
VK, YANDEX
|
|
||||||
}
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "user_id", nullable = false, foreignKey = @ForeignKey(name = "fk_extauth_user"))
|
|
||||||
@ToString.Exclude
|
|
||||||
private User user;
|
|
||||||
|
|
||||||
@Enumerated(EnumType.STRING)
|
|
||||||
@Column(name = "provider_type", nullable = false, length = 20)
|
|
||||||
private ProviderType providerType;
|
|
||||||
|
|
||||||
@Column(name = "provider_user_id", nullable = false, length = 255)
|
|
||||||
private String providerUserId;
|
|
||||||
|
|
||||||
@Column(name = "access_token", length = 2048)
|
|
||||||
private String accessToken;
|
|
||||||
|
|
||||||
@Column(name = "refresh_token", length = 2048)
|
|
||||||
private String refreshToken;
|
|
||||||
|
|
||||||
@Column(name = "token_expires_at")
|
|
||||||
private LocalDateTime tokenExpiresAt;
|
|
||||||
|
|
||||||
@Column(name = "email", length = 255)
|
|
||||||
private String email;
|
|
||||||
|
|
||||||
@Column(name = "phone", length = 20)
|
|
||||||
private String phoneNumber;
|
|
||||||
|
|
||||||
@CreatedDate
|
|
||||||
@Column(name = "linked_at", updatable = false)
|
|
||||||
private LocalDateTime linkedAt;
|
|
||||||
|
|
||||||
@Column(name = "last_used_at")
|
|
||||||
private LocalDateTime lastUsedAt;
|
|
||||||
|
|
||||||
@Column(name = "is_active")
|
|
||||||
@Builder.Default
|
|
||||||
private Boolean isActive = true;
|
|
||||||
|
|
||||||
@PrePersist
|
|
||||||
public void prePersist() {
|
|
||||||
if (this.linkedAt == null) {
|
|
||||||
this.linkedAt = LocalDateTime.now();
|
|
||||||
}
|
|
||||||
if (this.lastUsedAt == null) {
|
|
||||||
this.lastUsedAt = LocalDateTime.now();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PreUpdate
|
|
||||||
public void preUpdate() {
|
|
||||||
this.lastUsedAt = LocalDateTime.now();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,21 +7,10 @@ import java.util.List;
|
|||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public enum FileType {
|
public enum FileType {
|
||||||
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp")),
|
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
|
||||||
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
||||||
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
||||||
AUDIO("audio", Arrays.asList("mp3", "wav", "flac")),
|
AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
|
||||||
DOCUMENT("document", Arrays.asList(
|
|
||||||
"pdf", "txt", "rtf",
|
|
||||||
"doc", "docx", "xls", "xlsx", "ppt", "pptx", "pps", "ppsx", "dot", "dotx", "xlt", "xltx", "pot", "potx",
|
|
||||||
"odt", "ods", "odp", "odg", "odf", "odb", "odc", "odi", "odm", "ott", "ots", "otp", "otg", "oth",
|
|
||||||
"sxw", "sxc", "sxi", "sxd", "sxg", "stc", "sti", "stw", "sxm",
|
|
||||||
"pages", "numbers", "key",
|
|
||||||
"csv", "tsv", "xml", "html", "htm", "tex", "md", "markdown",
|
|
||||||
"epub", "mobi", "azw", "azw3", "fb2",
|
|
||||||
"wps", "wpt", "et", "dps", "vsd", "vsdx",
|
|
||||||
"java", "py", "cpp", "c", "h", "js", "css", "php", "sql", "json", "yaml", "yml", "sh", "bat",
|
|
||||||
"one", "note"));
|
|
||||||
|
|
||||||
private final String displayName;
|
private final String displayName;
|
||||||
private final List<String> allowedExtensions;
|
private final List<String> allowedExtensions;
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ public class FileUploadSession {
|
|||||||
private String extension;
|
private String extension;
|
||||||
|
|
||||||
@Column(name = "retry_count")
|
@Column(name = "retry_count")
|
||||||
|
@Builder.Default
|
||||||
private Integer retryCount = 0;
|
private Integer retryCount = 0;
|
||||||
|
|
||||||
@Column(name = "completed_at")
|
@Column(name = "completed_at")
|
||||||
@@ -81,6 +82,7 @@ public class FileUploadSession {
|
|||||||
)
|
)
|
||||||
@MapKeyColumn(name = "chunk_number")
|
@MapKeyColumn(name = "chunk_number")
|
||||||
@Column(name = "chunk_path")
|
@Column(name = "chunk_path")
|
||||||
|
@Builder.Default
|
||||||
private Map<Integer, String> chunkPaths = new HashMap<>();
|
private Map<Integer, String> chunkPaths = new HashMap<>();
|
||||||
|
|
||||||
@PrePersist
|
@PrePersist
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "image_hashes")
|
||||||
|
@Data
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Builder
|
||||||
|
public class ImageHashEntity {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@Column(name = "file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@OneToOne(fetch = FetchType.LAZY)
|
||||||
|
@MapsId
|
||||||
|
@JoinColumn(name = "file_id")
|
||||||
|
private FileEntity file;
|
||||||
|
|
||||||
|
@Column(name = "hash64_hi")
|
||||||
|
private Integer hash64Hi;
|
||||||
|
|
||||||
|
@Column(name = "hash64_lo")
|
||||||
|
private Integer hash64Lo;
|
||||||
|
|
||||||
|
@Column(name = "hash_algorithm", nullable = false)
|
||||||
|
private String hashAlgorithm;
|
||||||
|
|
||||||
|
@Column(name = "created_at")
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
|
public class DuplicateImageException extends RuntimeException {
|
||||||
|
public DuplicateImageException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.dto.file.*;
|
import ru.soune.nocopy.dto.file.*;
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
@@ -62,7 +62,8 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
.action(action)
|
.action(action)
|
||||||
.availableActions(Arrays.asList(
|
.availableActions(Arrays.asList(
|
||||||
"file_info", "file_by_session", "user_files",
|
"file_info", "file_by_session", "user_files",
|
||||||
"search_files", "storage_usage", "delete_file"))
|
"search_files", "storage_usage", "delete_file",
|
||||||
|
"user_files_info"))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(),
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import org.springframework.validation.BindingResult;
|
|||||||
import org.springframework.validation.FieldError;
|
import org.springframework.validation.FieldError;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.dto.file.*;
|
import ru.soune.nocopy.dto.file.*;
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.file.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
import ru.soune.nocopy.entity.file.FileUploadSession;
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
@@ -209,6 +209,7 @@ public class FileUploadHandler implements RequestHandler {
|
|||||||
.orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
|
.orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
|
||||||
|
|
||||||
Map<String, Boolean> chunkStatus = new HashMap<>();
|
Map<String, Boolean> chunkStatus = new HashMap<>();
|
||||||
|
|
||||||
for (int i = 0; i < session.getTotalChunks(); i++) {
|
for (int i = 0; i < session.getTotalChunks(); i++) {
|
||||||
chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
|
chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
|
||||||
}
|
}
|
||||||
@@ -223,7 +224,6 @@ public class FileUploadHandler implements RequestHandler {
|
|||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
MessageCode.SUCCESS.getDescription(), response);
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
|
||||||
} catch (UploadSessionNotFoundException e) {
|
} catch (UploadSessionNotFoundException e) {
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
"Upload session not found", null);
|
"Upload session not found", null);
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.ImageSearchRequest;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
import ru.soune.nocopy.service.YandexSearchService;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ImageFoundRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final YandexSearchService yandexSearchService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||||
|
ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||||
|
ImageSearchRequest.class);
|
||||||
|
|
||||||
|
String fileId = imageSearchRequest.getFileId();
|
||||||
|
|
||||||
|
YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.AuthService;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
|
|||||||
import org.springframework.validation.BeanPropertyBindingResult;
|
import org.springframework.validation.BeanPropertyBindingResult;
|
||||||
import org.springframework.validation.BindingResult;
|
import org.springframework.validation.BindingResult;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.exception.ValidationException;
|
import ru.soune.nocopy.exception.ValidationException;
|
||||||
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ 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.nocopy.entity.auth.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
package ru.soune.nocopy.repository;
|
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.stereotype.Repository;
|
|
||||||
import ru.soune.nocopy.entity.User;
|
|
||||||
import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Repository
|
|
||||||
public interface ExternalAuthProviderRepository extends JpaRepository<ExternalAuthProvider, Long> {
|
|
||||||
|
|
||||||
Optional<ExternalAuthProvider> findByProviderTypeAndProviderUserId(
|
|
||||||
ExternalAuthProvider.ProviderType providerType,
|
|
||||||
String providerUserId
|
|
||||||
);
|
|
||||||
|
|
||||||
List<ExternalAuthProvider> findByUser(User user);
|
|
||||||
|
|
||||||
boolean existsByProviderTypeAndProviderUserId(
|
|
||||||
ExternalAuthProvider.ProviderType providerType,
|
|
||||||
String providerUserId
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -14,6 +14,7 @@ import java.util.Optional;
|
|||||||
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
||||||
|
|
||||||
List<FileEntity> findByUserId(Long userId);
|
List<FileEntity> findByUserId(Long userId);
|
||||||
|
Optional<FileEntity> findByUserIdAndChecksum(Long userId, String imageHash);
|
||||||
|
|
||||||
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.data.jpa.repository.Query;
|
||||||
|
import org.springframework.data.repository.query.Param;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface ImageSimilarityRepository
|
||||||
|
extends JpaRepository<FileEntity, String> {
|
||||||
|
|
||||||
|
@Query(value = """
|
||||||
|
SELECT
|
||||||
|
f.id AS similarFileId,
|
||||||
|
f.original_file_name AS originalFileName,
|
||||||
|
f.file_size AS fileSize,
|
||||||
|
h.hash64_hi AS hash64Hi,
|
||||||
|
h.hash64_lo AS hash64Lo
|
||||||
|
FROM image_hashes ref
|
||||||
|
JOIN image_hashes h
|
||||||
|
ON ref.file_id <> h.file_id
|
||||||
|
JOIN file_entities f
|
||||||
|
ON f.id = h.file_id
|
||||||
|
WHERE ref.file_id = :fileId
|
||||||
|
""",
|
||||||
|
nativeQuery = true)
|
||||||
|
List<SimilarImageProjection> findCandidates(
|
||||||
|
@Param("fileId") String fileId
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
|
public interface SimilarImageProjection {
|
||||||
|
|
||||||
|
String getSimilarFileId();
|
||||||
|
|
||||||
|
String getOriginalFileName();
|
||||||
|
|
||||||
|
Long getFileSize();
|
||||||
|
|
||||||
|
Integer getHash64Hi();
|
||||||
|
|
||||||
|
Integer getHash64Lo();
|
||||||
|
}
|
||||||
@@ -2,10 +2,7 @@ package ru.soune.nocopy.repository;
|
|||||||
|
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.Query;
|
|
||||||
import org.springframework.data.repository.query.Param;
|
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@@ -13,10 +10,4 @@ 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);
|
boolean existsByPhone(@Size(min = 11, max = 14) String phone);
|
||||||
@Query("SELECT u FROM User u JOIN u.externalAuthProviders p " +
|
|
||||||
"WHERE p.providerType = :providerType AND p.providerUserId = :providerUserId")
|
|
||||||
Optional<User> findByExternalProvider(
|
|
||||||
@Param("providerType") ExternalAuthProvider.ProviderType providerType,
|
|
||||||
@Param("providerUserId") String providerUserId
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
@@ -87,20 +87,6 @@ public class AuthService {
|
|||||||
.ifPresent(authTokenRepository::delete);
|
.ifPresent(authTokenRepository::delete);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public AuthToken createTokenForUser(User user) {
|
|
||||||
AuthToken authToken = new AuthToken();
|
|
||||||
authToken.setToken(generateAuthToken());
|
|
||||||
authToken.setUser(user);
|
|
||||||
authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
|
|
||||||
authToken.setIsActive(true);
|
|
||||||
|
|
||||||
user.setLastLoginAt(LocalDateTime.now());
|
|
||||||
userRepository.save(user);
|
|
||||||
|
|
||||||
return authTokenRepository.save(authToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
private String generateAuthToken() {
|
private String generateAuthToken() {
|
||||||
byte[] bytes = new byte[32];
|
byte[] bytes = new byte[32];
|
||||||
secureRandom.nextBytes(bytes);
|
secureRandom.nextBytes(bytes);
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.file.SimilarFileResponse;
|
||||||
|
import ru.soune.nocopy.repository.ImageHashRepository;
|
||||||
|
import ru.soune.nocopy.repository.ImageSimilarityRepository;
|
||||||
|
import ru.soune.nocopy.repository.SimilarImageProjection;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileSimilarityService {
|
||||||
|
|
||||||
|
private final ImageSimilarityRepository repository;
|
||||||
|
private final ImageHashRepository hashRepository;
|
||||||
|
|
||||||
|
public List<SimilarFileResponse> findSimilarFiles(String fileId) {
|
||||||
|
var imageHashEntity = hashRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new RuntimeException("Hash not found"));
|
||||||
|
|
||||||
|
Integer hash64Hi = imageHashEntity.getHash64Hi();
|
||||||
|
Integer hash64Lo = imageHashEntity.getHash64Lo();
|
||||||
|
|
||||||
|
List<SimilarImageProjection> candidates =
|
||||||
|
repository.findCandidates(fileId);
|
||||||
|
|
||||||
|
return candidates.stream()
|
||||||
|
.map(c -> {
|
||||||
|
Integer cHi = c.getHash64Hi();
|
||||||
|
Integer cLo = c.getHash64Lo();
|
||||||
|
|
||||||
|
int hamming = hamming64(hash64Hi, hash64Lo, cHi, cLo);
|
||||||
|
|
||||||
|
String level;
|
||||||
|
if (hamming <= 5) {
|
||||||
|
level = "DUPLICATE";
|
||||||
|
} else if (hamming <= 12) {
|
||||||
|
level = "SIMILAR";
|
||||||
|
} else {
|
||||||
|
level = "DIFFERENT";
|
||||||
|
}
|
||||||
|
|
||||||
|
return SimilarFileResponse.builder()
|
||||||
|
.fileId(c.getSimilarFileId())
|
||||||
|
.originalFileName(c.getOriginalFileName())
|
||||||
|
.fileSize(c.getFileSize())
|
||||||
|
.hammingDistance(hamming)
|
||||||
|
.similarityLevel(level)
|
||||||
|
.build();
|
||||||
|
})
|
||||||
|
.sorted((a, b) ->
|
||||||
|
Integer.compare(a.getHammingDistance(), b.getHammingDistance()))
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private int hamming64(int aHi, int aLo, int bHi, int bLo) {
|
||||||
|
return Integer.bitCount(aHi ^ bHi)
|
||||||
|
+ Integer.bitCount(aLo ^ bLo);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
||||||
|
import ru.soune.nocopy.repository.ImageHashRepository;
|
||||||
|
|
||||||
|
import javax.imageio.ImageIO;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Slf4j
|
||||||
|
public class ImageHashService {
|
||||||
|
|
||||||
|
private final ImageHashRepository repository;
|
||||||
|
|
||||||
|
public void create(FileEntity file, Path imagePath) {
|
||||||
|
try {
|
||||||
|
long hash64 = computePhash64(imagePath);
|
||||||
|
|
||||||
|
int hi = high32(hash64);
|
||||||
|
int lo = low32(hash64);
|
||||||
|
|
||||||
|
ImageHashEntity entity = ImageHashEntity.builder()
|
||||||
|
.file(file)
|
||||||
|
.hash64Hi(hi)
|
||||||
|
.hash64Lo(lo)
|
||||||
|
.hashAlgorithm("PHASH64")
|
||||||
|
.createdAt(LocalDateTime.now())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
repository.save(entity);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException("Failed to compute image hash", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private long computePhash64(Path path) throws IOException {
|
||||||
|
try (InputStream is = Files.newInputStream(path)) {
|
||||||
|
BufferedImage image = ImageIO.read(is);
|
||||||
|
if (image == null) throw new IOException("Cannot read image file: " + path);
|
||||||
|
|
||||||
|
BufferedImage gray = toGrayScale(image);
|
||||||
|
BufferedImage resized = resizeImage(gray, 32, 32);
|
||||||
|
|
||||||
|
double[][] dct = applyDCT(resized);
|
||||||
|
double[][] topLeft = extractTopLeft8x8(dct);
|
||||||
|
double median = calculateMedian(topLeft, true);
|
||||||
|
|
||||||
|
return create64BitHashLong(topLeft, median);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BufferedImage toGrayScale(BufferedImage image) {
|
||||||
|
BufferedImage gray = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
|
||||||
|
Graphics2D g = gray.createGraphics();
|
||||||
|
g.drawImage(image, 0, 0, null);
|
||||||
|
g.dispose();
|
||||||
|
return gray;
|
||||||
|
}
|
||||||
|
|
||||||
|
private BufferedImage resizeImage(BufferedImage image, int width, int height) {
|
||||||
|
BufferedImage resized = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_GRAY);
|
||||||
|
Graphics2D g = resized.createGraphics();
|
||||||
|
g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
|
||||||
|
g.drawImage(image, 0, 0, width, height, null);
|
||||||
|
g.dispose();
|
||||||
|
return resized;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double[][] applyDCT(BufferedImage image) {
|
||||||
|
int w = image.getWidth();
|
||||||
|
int h = image.getHeight();
|
||||||
|
double[][] pixels = new double[h][w];
|
||||||
|
|
||||||
|
for (int y = 0; y < h; y++) {
|
||||||
|
for (int x = 0; x < w; x++) {
|
||||||
|
int gray = image.getRGB(x, y) & 0xFF;
|
||||||
|
pixels[y][x] = gray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
double[][] dct = new double[h][w];
|
||||||
|
for (int u = 0; u < h; u++) {
|
||||||
|
double au = u == 0 ? 1.0 / Math.sqrt(h) : Math.sqrt(2.0 / h);
|
||||||
|
for (int v = 0; v < w; v++) {
|
||||||
|
double av = v == 0 ? 1.0 / Math.sqrt(w) : Math.sqrt(2.0 / w);
|
||||||
|
double sum = 0.0;
|
||||||
|
for (int x = 0; x < h; x++) {
|
||||||
|
for (int y = 0; y < w; y++) {
|
||||||
|
sum += pixels[x][y] *
|
||||||
|
Math.cos((2 * x + 1) * u * Math.PI / (2.0 * h)) *
|
||||||
|
Math.cos((2 * y + 1) * v * Math.PI / (2.0 * w));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dct[u][v] = au * av * sum;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dct;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double[][] extractTopLeft8x8(double[][] dct) {
|
||||||
|
double[][] block = new double[8][8];
|
||||||
|
for (int i = 0; i < 8; i++) System.arraycopy(dct[i], 0, block[i], 0, 8);
|
||||||
|
return block;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double calculateMedian(double[][] block, boolean excludeDC) {
|
||||||
|
double[] vals = new double[63];
|
||||||
|
int idx = 0;
|
||||||
|
for (int i = 0; i < 8; i++) {
|
||||||
|
for (int j = 0; j < 8; j++) {
|
||||||
|
if (i == 0 && j == 0 && excludeDC) continue;
|
||||||
|
vals[idx++] = block[i][j];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Arrays.sort(vals);
|
||||||
|
return (vals.length % 2 == 0) ?
|
||||||
|
(vals[vals.length / 2 - 1] + vals[vals.length / 2]) / 2.0 :
|
||||||
|
vals[vals.length / 2];
|
||||||
|
}
|
||||||
|
|
||||||
|
private long create64BitHashLong(double[][] block, double median) {
|
||||||
|
long hash = 0L;
|
||||||
|
|
||||||
|
for (int i = 0; i < 8; i++) {
|
||||||
|
for (int j = 0; j < 8; j++) {
|
||||||
|
if (i == 0 && j == 0) continue;
|
||||||
|
hash <<= 1;
|
||||||
|
if (block[i][j] > median) hash |= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int high32(long hash64) {
|
||||||
|
return (int) (hash64 >>> 32);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int low32(long hash64) {
|
||||||
|
return (int) hash64;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
package ru.soune.nocopy.service;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.http.*;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.util.LinkedMultiValueMap;
|
|
||||||
import org.springframework.util.MultiValueMap;
|
|
||||||
import org.springframework.web.client.RestTemplate;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class VkOAuthService {
|
|
||||||
@Value("${auth.vk.oauth2}")
|
|
||||||
String oauthVkPath;
|
|
||||||
|
|
||||||
@Value("${auth.vk.user_info}")
|
|
||||||
String vkUserInfo;
|
|
||||||
|
|
||||||
@Value("${auth.vk.client_id}")
|
|
||||||
String clientId;
|
|
||||||
|
|
||||||
@Value("${auth.vk.redirect_uri}")
|
|
||||||
String redirectUri;
|
|
||||||
|
|
||||||
public Map<String, Object> authTokenMap(String code, String state, String codeVerifier, String deviceId) {
|
|
||||||
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
|
|
||||||
params.add("grant_type", "authorization_code");
|
|
||||||
params.add("code_verifier", codeVerifier);
|
|
||||||
params.add("redirect_uri", redirectUri);
|
|
||||||
params.add("code", code);
|
|
||||||
params.add("client_id", clientId);
|
|
||||||
params.add("device_id", deviceId);
|
|
||||||
params.add("state", state);
|
|
||||||
params.add("scope", "email,phone");
|
|
||||||
|
|
||||||
HttpHeaders headers = new HttpHeaders();
|
|
||||||
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
|
|
||||||
|
|
||||||
return sendRequest(params, headers,oauthVkPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Map<String, Object> userVkInfo(String accessToken) {
|
|
||||||
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
|
|
||||||
params.add("access_token", accessToken);
|
|
||||||
params.add("client_id", clientId);
|
|
||||||
|
|
||||||
HttpHeaders headers = new HttpHeaders();
|
|
||||||
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
|
|
||||||
|
|
||||||
|
|
||||||
return sendRequest(params, headers, vkUserInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Map<String, Object> sendRequest(MultiValueMap<String, String> params, HttpHeaders headers, String url) {
|
|
||||||
Map<String, Object> info = new HashMap<>();
|
|
||||||
RestTemplate restTemplate = new RestTemplate();
|
|
||||||
ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST,
|
|
||||||
new HttpEntity<>(params, headers), String.class);
|
|
||||||
|
|
||||||
info.put("status", response.getStatusCodeValue());
|
|
||||||
info.put("body", response.getBody());
|
|
||||||
info.put("headers", response.getHeaders());
|
|
||||||
info.put("success", response.getStatusCode().is2xxSuccessful());
|
|
||||||
|
|
||||||
return info;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,162 @@
|
|||||||
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||||
|
import jakarta.annotation.PostConstruct;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class YandexSearchService {
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
@Value("${yandex.api-key}")
|
||||||
|
private String apiKey;
|
||||||
|
|
||||||
|
@Value("${yandex.folder-id}")
|
||||||
|
private String folderId;
|
||||||
|
|
||||||
|
@Value("${yandex.search-url}")
|
||||||
|
private String searchUrl;
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
public void init() {
|
||||||
|
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public YandexSearchResponse searchByFileEntity(String fileId) throws IOException {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> {
|
||||||
|
throw new NotValidFieldException("File not found", new BaseResponse(20007,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
Map.of("fileId",fileId)));
|
||||||
|
});
|
||||||
|
byte[] fileBytes;
|
||||||
|
|
||||||
|
if (!isImageFile(fileEntity)) {
|
||||||
|
log.error("File not image: {}", fileEntity.getMimeType());
|
||||||
|
throw new NotValidFieldException("File not image", new BaseResponse(20007,
|
||||||
|
MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
|
||||||
|
Map.of("file_type", fileEntity.getMimeType())));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
fileBytes = readFileFromDisk(fileEntity);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
Map.of("fileId", fileId,
|
||||||
|
"filePath", fileEntity.getFilePath())));
|
||||||
|
}
|
||||||
|
|
||||||
|
return callYandexApi(fileBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isImageFile(FileEntity fileEntity) {
|
||||||
|
String mimeType = fileEntity.getMimeType();
|
||||||
|
return mimeType != null && mimeType.startsWith("image");
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
|
||||||
|
Path filePath = Path.of(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
if (!Files.exists(filePath)) {
|
||||||
|
throw new IOException("File not found: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Files.isReadable(filePath)) {
|
||||||
|
throw new IOException("Cannot read file: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Files.readAllBytes(filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
private YandexSearchResponse callYandexApi(byte[] imageBytes) throws IOException {
|
||||||
|
String imageBase64 = Base64.getEncoder().encodeToString(imageBytes);
|
||||||
|
String jsonRequest = String.format("{\"folderId\":\"%s\",\"data\":\"%s\",\"page\":0,\"showSimilarImages\":true}",
|
||||||
|
folderId, imageBase64);
|
||||||
|
|
||||||
|
URL url = new URL(searchUrl);
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||||
|
|
||||||
|
try {
|
||||||
|
connection.setRequestMethod("POST");
|
||||||
|
connection.setRequestProperty("Authorization", "Api-Key " + apiKey);
|
||||||
|
connection.setRequestProperty("Content-Type", "application/json");
|
||||||
|
connection.setRequestProperty("Accept", "application/json");
|
||||||
|
connection.setConnectTimeout(30000);
|
||||||
|
connection.setReadTimeout(30000);
|
||||||
|
connection.setDoOutput(true);
|
||||||
|
|
||||||
|
try (OutputStream os = connection.getOutputStream()) {
|
||||||
|
byte[] input = jsonRequest.getBytes("utf-8");
|
||||||
|
os.write(input, 0, input.length);
|
||||||
|
os.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
int responseCode = connection.getResponseCode();
|
||||||
|
|
||||||
|
String responseBody;
|
||||||
|
if (responseCode == HttpURLConnection.HTTP_OK) {
|
||||||
|
try (BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(connection.getInputStream(), "utf-8"))) {
|
||||||
|
responseBody = readAll(br);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
try (BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(connection.getErrorStream(), "utf-8"))) {
|
||||||
|
responseBody = readAll(br);
|
||||||
|
}
|
||||||
|
throw new IOException("Error Yandex API: " + responseCode + " - " + responseBody);
|
||||||
|
}
|
||||||
|
|
||||||
|
return parseJsonResponse(responseBody);
|
||||||
|
|
||||||
|
} finally {
|
||||||
|
connection.disconnect();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String readAll(BufferedReader reader) throws IOException {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
String line;
|
||||||
|
while ((line = reader.readLine()) != null) {
|
||||||
|
sb.append(line);
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private YandexSearchResponse parseJsonResponse(String json) {
|
||||||
|
YandexSearchResponse response = null;
|
||||||
|
try {
|
||||||
|
response = objectMapper.readValue(json, YandexSearchResponse.class);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
package ru.soune.nocopy.service.auth;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
|
||||||
import ru.soune.nocopy.entity.User;
|
|
||||||
import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
|
|
||||||
import ru.soune.nocopy.repository.ExternalAuthProviderRepository;
|
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class ExternalAuthUserService {
|
|
||||||
private final UserRepository userRepository;
|
|
||||||
|
|
||||||
private final ExternalAuthProviderRepository externalAuthProviderRepository;
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public User findOrCreateUserFromVK(String vkUserId, String fullName, String email,
|
|
||||||
String vkAccessToken, String vkRefreshToken, Integer expiresIn) {
|
|
||||||
|
|
||||||
Optional<User> existingByVkId = userRepository.findByExternalProvider(ExternalAuthProvider.ProviderType.VK,
|
|
||||||
vkUserId);
|
|
||||||
|
|
||||||
if (existingByVkId.isPresent()) {
|
|
||||||
User user = existingByVkId.get();
|
|
||||||
updateVKProvider(user, vkAccessToken, vkRefreshToken, expiresIn, email);
|
|
||||||
|
|
||||||
return user;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (email != null && !email.isBlank()) {
|
|
||||||
Optional<User> existingByEmail = userRepository.findByEmail(email);
|
|
||||||
|
|
||||||
if (existingByEmail.isPresent()) {
|
|
||||||
User user = existingByEmail.get();
|
|
||||||
linkVKProvider(user, vkUserId, vkAccessToken, vkRefreshToken, expiresIn, email);
|
|
||||||
|
|
||||||
return user;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return createNewUserWithVK(vkUserId, fullName, email, vkAccessToken, vkRefreshToken, expiresIn);
|
|
||||||
}
|
|
||||||
|
|
||||||
private User createNewUserWithVK(String vkUserId, String fullName, String email,
|
|
||||||
String vkAccessToken, String vkRefreshToken, Integer expiresIn) {
|
|
||||||
User newUser = User.builder()
|
|
||||||
.fullName(fullName)
|
|
||||||
.email(email)
|
|
||||||
.password("generateRandomPassword()")
|
|
||||||
.isActive(true)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
User savedUser = userRepository.save(newUser);
|
|
||||||
|
|
||||||
linkVKProvider(savedUser, vkUserId, vkAccessToken, vkRefreshToken, expiresIn, email);
|
|
||||||
|
|
||||||
return savedUser;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void linkVKProvider(User user, String vkUserId, String vkAccessToken, String vkRefreshToken,
|
|
||||||
Integer expiresIn, String email) {
|
|
||||||
ExternalAuthProvider provider = ExternalAuthProvider.builder()
|
|
||||||
.user(user)
|
|
||||||
.providerType(ExternalAuthProvider.ProviderType.VK)
|
|
||||||
.providerUserId(vkUserId)
|
|
||||||
.accessToken(vkAccessToken)
|
|
||||||
.refreshToken(vkRefreshToken)
|
|
||||||
.tokenExpiresAt(LocalDateTime.now().plusSeconds(expiresIn))
|
|
||||||
.email(email)
|
|
||||||
.isActive(true)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
externalAuthProviderRepository.save(provider);
|
|
||||||
|
|
||||||
user.getExternalAuthProviders().add(provider);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateVKProvider(User user, String vkAccessToken, String vkRefreshToken,
|
|
||||||
Integer expiresIn, String email) {
|
|
||||||
Optional<ExternalAuthProvider> existingProvider = user.getProvider(ExternalAuthProvider.ProviderType.VK);
|
|
||||||
|
|
||||||
if (existingProvider.isPresent()) {
|
|
||||||
ExternalAuthProvider provider = existingProvider.get();
|
|
||||||
provider.setAccessToken(vkAccessToken);
|
|
||||||
provider.setTokenExpiresAt(LocalDateTime.now().plusSeconds(expiresIn));
|
|
||||||
provider.setEmail(email);
|
|
||||||
provider.setRefreshToken(vkRefreshToken);
|
|
||||||
provider.setLastUsedAt(LocalDateTime.now());
|
|
||||||
|
|
||||||
externalAuthProviderRepository.save(provider);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String generateRandomPassword() {
|
|
||||||
return java.util.UUID.randomUUID().toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -9,15 +9,17 @@ import ru.soune.nocopy.dto.file.FileResponse;
|
|||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.FileUploadSession;
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.exception.DuplicateImageException;
|
||||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
import ru.soune.nocopy.service.ImageHashService;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.ZoneOffset;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@@ -28,6 +30,10 @@ public class FileEntityService {
|
|||||||
|
|
||||||
private final FileEntityRepository fileEntityRepository;
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final ImageHashService imageHashService;
|
||||||
|
|
||||||
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
|
public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
|
||||||
log.info("Creating FileEntity for upload session: {}", session.getUploadId());
|
log.info("Creating FileEntity for upload session: {}", session.getUploadId());
|
||||||
@@ -57,11 +63,28 @@ public class FileEntityService {
|
|||||||
.build();
|
.build();
|
||||||
|
|
||||||
FileEntity saved = fileEntityRepository.save(fileEntity);
|
FileEntity saved = fileEntityRepository.save(fileEntity);
|
||||||
log.info("FileEntity created successfully: {} (size: {} bytes)",
|
|
||||||
saved.getId(), fileSize);
|
if (saved.getMimeType().startsWith("image")) {
|
||||||
|
imageHashService.create(saved, Path.of(saved.getFilePath()));
|
||||||
|
|
||||||
|
var similarFiles = fileSimilarityService.findSimilarFiles(saved.getId());
|
||||||
|
|
||||||
|
boolean hasDuplicate = similarFiles.stream()
|
||||||
|
.anyMatch(f -> f.getHammingDistance() <= 5);
|
||||||
|
|
||||||
|
if (hasDuplicate) {
|
||||||
|
log.warn("Duplicate image detected for upload session {}. Rolling back.",
|
||||||
|
session.getUploadId());
|
||||||
|
throw new DuplicateImageException("Duplicate image detected for upload session " + session.getUploadId());
|
||||||
|
}
|
||||||
|
|
||||||
|
similarFiles.stream()
|
||||||
|
.filter(f -> f.getHammingDistance() > 5)
|
||||||
|
.forEach(f -> log.info("Similar image found: {} (distance {})",
|
||||||
|
f.getFileId(), f.getHammingDistance()));
|
||||||
|
}
|
||||||
|
|
||||||
return saved;
|
return saved;
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("Failed to create FileEntity for session {}: {}",
|
log.error("Failed to create FileEntity for session {}: {}",
|
||||||
session.getUploadId(), e.getMessage(), e);
|
session.getUploadId(), e.getMessage(), e);
|
||||||
@@ -69,15 +92,6 @@ public class FileEntityService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private String extractFileExtension(String fileName) {
|
|
||||||
int dotIndex = fileName.lastIndexOf('.');
|
|
||||||
if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
|
|
||||||
return fileName.substring(dotIndex + 1).toLowerCase();
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
public FileEntityResponse getById(String fileId, int version) {
|
public FileEntityResponse getById(String fileId, int version) {
|
||||||
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
@@ -95,39 +109,6 @@ public class FileEntityService {
|
|||||||
return convertToResponse(fileEntity, version);
|
return convertToResponse(fileEntity, version);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
|
||||||
public FileEntityResponse getByFilePath(String filePath, int version) {
|
|
||||||
FileEntity fileEntity = fileEntityRepository.findByFilePath(filePath)
|
|
||||||
.orElseThrow(() -> new FileEntityNotFoundException("Path: " + filePath));
|
|
||||||
|
|
||||||
return convertToResponse(fileEntity, version);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
|
||||||
public FileResponse getAllUserFiles(Long userId, int version) {
|
|
||||||
List<FileEntity> fileEntities = fileEntityRepository.findByUserIdAndStatus(
|
|
||||||
userId, FileStatus.ACTIVE);
|
|
||||||
|
|
||||||
List<FileEntityResponse> files = fileEntities.stream()
|
|
||||||
.map(file -> convertToResponse(file, version))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
long totalSize = fileEntities.stream()
|
|
||||||
.mapToLong(FileEntity::getFileSize)
|
|
||||||
.sum();
|
|
||||||
|
|
||||||
return FileResponse.builder()
|
|
||||||
.files(files)
|
|
||||||
.totalCount(files.size())
|
|
||||||
.totalSize(totalSize)
|
|
||||||
.formattedTotalSize(formatFileSize(totalSize))
|
|
||||||
.page(1)
|
|
||||||
.pageSize(files.size())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
|
public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
|
||||||
List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
|
List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
int totalChunks = (int) Math.ceil((double) fileSize / chunkSize);
|
int totalChunks = (int) Math.ceil((double) fileSize / chunkSize);
|
||||||
log.debug("File will be split into {} chunks (chunk size: {} bytes)",
|
log.debug("File will be split into {} chunks (chunk size: {} bytes)",
|
||||||
totalChunks, chunkSize);
|
totalChunks, chunkSize);
|
||||||
Long chunkSize = totalChunks == 1 ? fileSize : 1048576L;
|
Long chunkSize = totalChunks == 1 ? fileSize : 1000000L;
|
||||||
|
|
||||||
FileUploadSession session = FileUploadSession.builder()
|
FileUploadSession session = FileUploadSession.builder()
|
||||||
.userId(userId)
|
.userId(userId)
|
||||||
@@ -402,7 +402,7 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
session.getUploadId(), session.getFileName());
|
session.getUploadId(), session.getFileName());
|
||||||
|
|
||||||
Path finalFilePath = null;
|
Path finalFilePath = null;
|
||||||
String checksum = null;
|
String checksum;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
finalFilePath = prepareFinalFile(session);
|
finalFilePath = prepareFinalFile(session);
|
||||||
@@ -591,44 +591,10 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
private void handleAssemblyFailure(FileUploadSession session, Exception e) {
|
private void handleAssemblyFailure(FileUploadSession session, Exception e) {
|
||||||
session.setStatus(UploadStatus.FAILED);
|
session.setStatus(UploadStatus.FAILED);
|
||||||
session.setLastError(e.getMessage());
|
session.setLastError(e.getMessage());
|
||||||
|
|
||||||
sessionRepository.save(session);
|
sessionRepository.save(session);
|
||||||
|
|
||||||
log.error("File assembly failed for session {}: {}",
|
|
||||||
session.getUploadId(), e.getMessage());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// @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) {
|
private Path getChunkDirectory(Long userId, String uploadId) {
|
||||||
return storageRoot.resolve("temp")
|
return storageRoot.resolve("temp")
|
||||||
.resolve("user")
|
.resolve("user")
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
spring:
|
spring:
|
||||||
|
flyway:
|
||||||
|
enabled: true
|
||||||
|
baseline-on-migrate: true
|
||||||
|
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
|
url: jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
|
||||||
username: ${POSTGRES_USER}
|
username: ${POSTGRES_USER}
|
||||||
@@ -25,20 +29,14 @@ file:
|
|||||||
storage:
|
storage:
|
||||||
base-path: ${FILE_STORAGE_PATH:/data/uploads}
|
base-path: ${FILE_STORAGE_PATH:/data/uploads}
|
||||||
# chunk-size: ${FILE_CHUNK_SIZE:5242880} # 5MB
|
# chunk-size: ${FILE_CHUNK_SIZE:5242880} # 5MB
|
||||||
chunk-size: ${FILE_CHUNK_SIZE:1048576} # 15MB
|
# chunk-size: ${FILE_CHUNK_SIZE:1048576} # 1MB
|
||||||
|
chunk-size: ${FILE_CHUNK_SIZE:1000000} # 1MB
|
||||||
max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB
|
max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB
|
||||||
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
||||||
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
||||||
temp-ttl-hours: ${TEMP_TTL_HOURS:72} # 3 дня
|
temp-ttl-hours: ${TEMP_TTL_HOURS:72} # 3 дня
|
||||||
session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
|
session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
|
||||||
|
|
||||||
auth:
|
|
||||||
vk:
|
|
||||||
oauth2: "https://id.vk.ru/oauth2/auth"
|
|
||||||
user_info: "https://id.vk.ru/oauth2/user_info"
|
|
||||||
client_id: "54389559"
|
|
||||||
redirect_uri: "http://localhost"
|
|
||||||
|
|
||||||
security:
|
security:
|
||||||
cors:
|
cors:
|
||||||
allowed-origins: "*"
|
allowed-origins: "*"
|
||||||
@@ -58,3 +56,8 @@ logging:
|
|||||||
name: logs/application.log
|
name: logs/application.log
|
||||||
pattern:
|
pattern:
|
||||||
console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
|
console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
|
||||||
|
|
||||||
|
yandex:
|
||||||
|
api-key: ${YANDEX_API_KEY:AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q}
|
||||||
|
folder-id: ${YANDEX_FOLDER_ID:b1gokpdbm6qfpsou8pcd}
|
||||||
|
search-url: ${YANDEX_SEARCH_URL:https://searchapi.api.cloud.yandex.net/v2/image/search_by_image}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
CREATE INDEX idx_image_hash_prefix
|
||||||
|
ON image_hashes ((hash_value >> 48));
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
package ru.soune.nocopy.service;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.mockito.ArgumentCaptor;
|
|
||||||
import org.mockito.InjectMocks;
|
|
||||||
import org.mockito.Mock;
|
|
||||||
import org.mockito.MockitoAnnotations;
|
|
||||||
import org.springframework.context.MessageSource;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
||||||
import ru.soune.nocopy.dto.LoginRequest;
|
|
||||||
import ru.soune.nocopy.entity.auth.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.User;
|
|
||||||
import ru.soune.nocopy.exception.NotValidationPasswordException;
|
|
||||||
import ru.soune.nocopy.exception.UserNotFoundException;
|
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
|
||||||
import static org.mockito.Mockito.verify;
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
public class AuthServiceTest {
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private UserRepository userRepository;
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private PasswordEncoder passwordEncoder;
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private MessageSource messageSource;
|
|
||||||
|
|
||||||
@InjectMocks
|
|
||||||
private AuthService authService;
|
|
||||||
|
|
||||||
@BeforeEach
|
|
||||||
void setUp() {
|
|
||||||
MockitoAnnotations.openMocks(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void login_success() {
|
|
||||||
LoginRequest request = new LoginRequest("test@mail.com", "password");
|
|
||||||
|
|
||||||
User user = new User();
|
|
||||||
user.setId(1L);
|
|
||||||
user.setEmail("test@mail.com");
|
|
||||||
user.setPassword("encoded_pass");
|
|
||||||
|
|
||||||
when(userRepository.findByEmail("test@mail.com"))
|
|
||||||
.thenReturn(Optional.of(user));
|
|
||||||
when(passwordEncoder.matches("password", "encoded_pass"))
|
|
||||||
.thenReturn(true);
|
|
||||||
when(authTokenRepository.save(any(AuthToken.class)))
|
|
||||||
.thenAnswer(invocation -> invocation.getArgument(0));
|
|
||||||
|
|
||||||
AuthToken token = authService.login(request);
|
|
||||||
|
|
||||||
assertNotNull(token);
|
|
||||||
assertNotNull(token.getToken());
|
|
||||||
// assertEquals(user.getTokens().get(0), token.getUser());
|
|
||||||
|
|
||||||
ArgumentCaptor<AuthToken> captor = ArgumentCaptor.forClass(AuthToken.class);
|
|
||||||
verify(authTokenRepository).save(captor.capture());
|
|
||||||
|
|
||||||
// assertEquals(user, captor.getValue().getUser());
|
|
||||||
assertNotNull(captor.getValue().getToken());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void login_userNotFound() {
|
|
||||||
LoginRequest request = new LoginRequest("missing@mail.com", "pwd");
|
|
||||||
|
|
||||||
when(userRepository.findByEmail("missing@mail.com")).thenReturn(Optional.empty());
|
|
||||||
|
|
||||||
assertThrows(UserNotFoundException.class, () -> authService.login(request));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void login_invalidPassword() {
|
|
||||||
LoginRequest request = new LoginRequest("test@mail.com", "wrong");
|
|
||||||
|
|
||||||
User user = new User();
|
|
||||||
user.setEmail("test@mail.com");
|
|
||||||
user.setPassword("encoded_pass");
|
|
||||||
|
|
||||||
when(userRepository.findByEmail("test@mail.com")).thenReturn(Optional.of(user));
|
|
||||||
when(passwordEncoder.matches("wrong", "encoded_pass")).thenReturn(false);
|
|
||||||
|
|
||||||
assertThrows(NotValidationPasswordException.class, () -> authService.login(request));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user