Compare commits
111
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7e94639d2 | ||
|
|
f52ce6db3c | ||
|
|
80c53515fb | ||
|
|
511da8321b | ||
|
|
df1fd89c29 | ||
|
|
90e3134e98 | ||
|
|
130fd184b9 | ||
|
|
f90b8a0bce | ||
|
|
adc978bea8 | ||
|
|
7bb48f3944 | ||
|
|
27b812b0da | ||
|
|
6643070999 | ||
|
|
4395d276ed | ||
|
|
e49a944b05 | ||
|
|
8e716f7d20 | ||
|
|
2e8080183c | ||
|
|
dc9215523b | ||
|
|
72691511fa | ||
|
|
135d94e0ef | ||
|
|
d1bacb4ac7 | ||
|
|
7a809e6b8c | ||
|
|
06a6196a26 | ||
|
|
13324d4628 | ||
|
|
c38b86e1b9 | ||
|
|
3ce8edd7e1 | ||
|
|
22b487da22 | ||
|
|
4395654b0d | ||
|
|
7dd057603d | ||
|
|
a4858cf6c5 | ||
|
|
7d52276b31 | ||
|
|
8fe8c566c0 | ||
|
|
36d40a0b8d | ||
|
|
32f0a07e32 | ||
|
|
51ef63e8cd | ||
|
|
b0237fd812 | ||
|
|
de8c53784b | ||
|
|
3cd6b5396c | ||
|
|
615924ea9e | ||
|
|
9a8aa498c0 | ||
|
|
66633d4964 | ||
|
|
ce8c63475f | ||
|
|
30c05b6b24 | ||
|
|
49dc19cd04 | ||
|
|
fb5642db9e | ||
|
|
c539b1fbc2 | ||
|
|
61b8ea902b | ||
|
|
6ee7ab4d04 | ||
|
|
96acf796b2 | ||
|
|
ff7836900b | ||
|
|
ec20d68261 | ||
|
|
31fac0ab93 | ||
|
|
a32f089989 | ||
|
|
c019f23777 | ||
|
|
02bf7868ee | ||
|
|
2215adc37f | ||
|
|
6fcec8d67e | ||
|
|
4a185e6f9a | ||
|
|
cf2f73955b | ||
|
|
f67e172365 | ||
|
|
d32e8dcd75 | ||
|
|
5700adafb2 | ||
|
|
816a984891 | ||
|
|
21e31c7d0f | ||
|
|
e7c6df12d6 | ||
|
|
aa87ae32bc | ||
|
|
9ba3d8b973 | ||
|
|
300383e523 | ||
|
|
329000d284 | ||
|
|
4c8c4bb5c1 | ||
|
|
82eedb02d1 | ||
|
|
b2993e00a1 | ||
|
|
6197b26a81 | ||
|
|
0e2ef1d2e6 | ||
|
|
3e5eef3b42 | ||
|
|
89f83054ef | ||
|
|
f8234291b1 | ||
|
|
4cf36d7b17 | ||
|
|
6dacbde522 | ||
|
|
0a4ab562a4 | ||
|
|
76103b9d96 | ||
|
|
69a79b7ac7 | ||
|
|
c97f205a17 | ||
|
|
ab3eef1668 | ||
|
|
85449d73fd | ||
|
|
859239e77a | ||
|
|
63c3794aa4 | ||
|
|
349edbeb91 | ||
|
|
e26e50454a | ||
|
|
8d026a485f | ||
|
|
204e13ca85 | ||
|
|
79b13731a6 | ||
|
|
8555002415 | ||
|
|
4560925183 | ||
|
|
4314032a3b | ||
|
|
d638819ee9 | ||
|
|
51654fd060 | ||
|
|
e37cc06cd0 | ||
|
|
5a3e26b6a3 | ||
|
|
409c677ba6 | ||
|
|
95deda12f3 | ||
|
|
c2a780db2d | ||
|
|
ad9cbd96f6 | ||
|
|
211b99b986 | ||
|
|
0c0fadf5ec | ||
|
|
e979712b7c | ||
|
|
3d679440f6 | ||
|
|
4a45f40e9f | ||
|
|
bbb0d7b17a | ||
|
|
8ac73ff045 | ||
|
|
20e1ab321d | ||
|
|
f136ac1f0a |
@@ -76,3 +76,49 @@ ALTER TABLE file_entities
|
||||
ALTER COLUMN support_id
|
||||
SET DEFAULT nextval('file_support_id_seq');
|
||||
|
||||
----------
|
||||
Раздать всем лимиты,у кого их нет
|
||||
|
||||
INSERT INTO protect_check (user_id, check_limit, count_checked, last_check_at, version)
|
||||
SELECT
|
||||
id as user_id,
|
||||
10 as check_limit,
|
||||
0 as count_checked,
|
||||
NULL as last_check_at,
|
||||
0 as version
|
||||
FROM users
|
||||
WHERE id NOT IN (SELECT user_id FROM protect_check);
|
||||
|
||||
--------
|
||||
Обновлять констрейнты для file_entities
|
||||
|
||||
ALTER TABLE file_entities DROP CONSTRAINT file_entities_status_check;
|
||||
|
||||
ALTER TABLE file_entities
|
||||
ADD CONSTRAINT file_entities_status_check
|
||||
CHECK (status IN (
|
||||
'ACTIVE',
|
||||
'DELETED',
|
||||
'PROCESSING',
|
||||
'VIOLATION',
|
||||
'CHECKED',
|
||||
'ERROR',
|
||||
'TEMP'
|
||||
));
|
||||
|
||||
-------
|
||||
Записи для лимитов поиска
|
||||
|
||||
INSERT INTO protect_check (user_id, limit_check, count_checked, last_check_at, version)
|
||||
SELECT
|
||||
u.id,
|
||||
100, -- limit_check = 100
|
||||
0, -- count_checked = 0
|
||||
NULL, -- last_check_at = NULL
|
||||
0 -- version = 0
|
||||
FROM users u
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM protect_check pc
|
||||
WHERE pc.user_id = u.id
|
||||
);
|
||||
|
||||
@@ -21,6 +21,9 @@ configurations {
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
flatDir {
|
||||
dirs 'libs'
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -32,6 +35,11 @@ dependencies {
|
||||
implementation 'commons-validator:commons-validator:1.7'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
|
||||
|
||||
implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
|
||||
implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
|
||||
|
||||
implementation 'org.flywaydb:flyway-core:9.22.0'
|
||||
|
||||
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
||||
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
||||
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
|
||||
@@ -50,6 +58,13 @@ dependencies {
|
||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||
|
||||
implementation name: 'testlib-fat-0.2.1-all'
|
||||
|
||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
|
||||
|
||||
implementation project(':referral')
|
||||
|
||||
}
|
||||
|
||||
tasks.named('test') {
|
||||
|
||||
+7
-5
@@ -77,27 +77,29 @@ services:
|
||||
resources:
|
||||
limits:
|
||||
cpus: '1.5'
|
||||
memory: 1G
|
||||
memory: 3G
|
||||
reservations:
|
||||
cpus: '0.5'
|
||||
memory: 512M
|
||||
memory: 2G
|
||||
environment:
|
||||
JAVA_TOOL_OPTIONS: "-Xmx2g -Xms1g -XX:MaxMetaspaceSize=512m -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -XX:+UseContainerSupport -XX:InitialRAMPercentage=50 -XX:MaxRAMPercentage=75"
|
||||
FILE_STORAGE_PATH: /data/uploads
|
||||
MAX_FILE_SIZE: 10737418240
|
||||
# FILE_CHUNK_SIZE: 1048576
|
||||
FILE_CHUNK_SIZE: 1000000
|
||||
POSTGRES_DB: no_copy_
|
||||
# POSTGRES_USER: postgres
|
||||
# POSTGRES_PASSWORD: postgres
|
||||
|
||||
POSTGRES_USER: ${POSTGRES_USER}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||
POSTGRES_PORT: 5432
|
||||
POSTGRES_HOST: db
|
||||
STORAGE_SERVICE_URL: http://storage:8081
|
||||
SPRING_PROFILES_ACTIVE: docker
|
||||
SPRING_PROFILES_ACTIVE: prod
|
||||
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
||||
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
||||
YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
||||
# POSTGRES_USER: postgres
|
||||
# POSTGRES_PASSWORD: postgres
|
||||
# MAIL_HOST: postfix
|
||||
# MAIL_PORT: 25
|
||||
# MAIL_USERNAME: noreply@no-copy.ru
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
plugins {
|
||||
kotlin("jvm") version "2.1.10"
|
||||
}
|
||||
|
||||
group = "ru.soune"
|
||||
version = "1.0.0"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
|
||||
implementation("io.insert-koin:koin-core:4.1.1")
|
||||
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
||||
}
|
||||
|
||||
tasks.test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
kotlin {
|
||||
jvmToolchain(21)
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune
|
||||
|
||||
fun main() {
|
||||
println("Hello World!")
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
package ru.soune.actions
|
||||
|
||||
abstract class NoCopyAction
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune.actions.free
|
||||
|
||||
import ru.soune.actions.NoCopyAction
|
||||
|
||||
sealed class NoCopyFreeAction : NoCopyAction()
|
||||
@@ -0,0 +1,8 @@
|
||||
package ru.soune.actions.paid
|
||||
|
||||
import ru.soune.actions.NoCopyAction
|
||||
|
||||
sealed class NoCopyPaidAction : NoCopyAction() {
|
||||
|
||||
abstract val cost: Double
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
## Команды для помещения в сеть
|
||||
|
||||
Сеть для работы бэка и фронта : Наименование == app-network-{port}
|
||||
|
||||
|
||||
### Проверить состояние:
|
||||
|
||||
|
||||
docker inspect {container-name} --format='{{range $net, $_ := .NetworkSettings.Networks}}{{$net}} {{end}}'
|
||||
|
||||
|
||||
### Создать сеть ,если нет
|
||||
|
||||
docker network create {name-network} 2>/dev/null || echo "Сеть уже существует"
|
||||
|
||||
### Переместить контейнер:
|
||||
|
||||
# Отключить от старой сети
|
||||
docker network disconnect {network-name-old} {container-name}
|
||||
|
||||
# Подключить к новой сети
|
||||
docker network connect {network-name-new} {container-name}
|
||||
|
||||
# Добавить алиас (опционально)
|
||||
docker network connect --alias {alias} {network-name-new} {container-name}
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
parameters {
|
||||
string(
|
||||
name: 'BRANCH',
|
||||
defaultValue: 'main',
|
||||
description: 'Ветка для деплоя админ-панели'
|
||||
)
|
||||
string(
|
||||
name: 'PORT',
|
||||
defaultValue: '2996',
|
||||
description: 'Порт для запуска экземпляра'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
branches: [[name: params.BRANCH]],
|
||||
userRemoteConfigs: [[
|
||||
url: 'https://code.3err0.ru/frontdev/no-copy-admin-panel-frontend.git',
|
||||
credentialsId: 'nx-jen'
|
||||
]]
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Stop old') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker stop no-copy-admin-panel-${params.PORT} 2>/dev/null || true
|
||||
docker rm no-copy-admin-panel-${params.PORT} 2>/dev/null || true
|
||||
mkdir -p /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
|
||||
rm -rf /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/*
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Copy to server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
|
||||
docker build -t no-copy-admin-panel:${params.BRANCH}-${params.PORT} .
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Start on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker run -d \\
|
||||
--name no-copy-admin-panel-${params.PORT} \\
|
||||
--restart unless-stopped \\
|
||||
--network app-network \\
|
||||
-p ${params.PORT}:2996 \\
|
||||
no-copy-admin-panel:${params.BRANCH}-${params.PORT}
|
||||
sleep 5
|
||||
docker ps --filter name=no-copy-admin-panel-${params.PORT}
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Check status') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-admin-panel-${params.PORT}'; then
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
|
||||
echo 'Admin panel available on http://92.242.61.23:${params.PORT}'
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
echo "Admin panel ${params.BRANCH} deployed"
|
||||
}
|
||||
failure {
|
||||
echo "Deployment failed"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,146 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
parameters {
|
||||
string(
|
||||
name: 'BRANCH',
|
||||
defaultValue: 'dev',
|
||||
description: 'Ветка для деплоя'
|
||||
)
|
||||
string(
|
||||
name: 'PORT',
|
||||
defaultValue: '3000',
|
||||
description: 'Порт для запуска экземпляра'
|
||||
)
|
||||
string(
|
||||
name: 'SERVER',
|
||||
defaultValue: '92.242.61.23',
|
||||
description: 'Сервер для деплоя'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
cleanWs()
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
branches: [[name: params.BRANCH]],
|
||||
userRemoteConfigs: [[
|
||||
url: 'https://code.3err0.ru/backdev/no-copy.git',
|
||||
credentialsId: 'nx-jen'
|
||||
]]
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Deploy with docker-compose') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
),
|
||||
string(credentialsId: 'DB_USER', variable: 'DB_USER'),
|
||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
||||
]) {
|
||||
sh """
|
||||
# Тестируем подключение сначала
|
||||
echo "Testing SSH connection..."
|
||||
if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
|
||||
echo "SSH connection OK"
|
||||
else
|
||||
echo "SSH connection failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Основная команда
|
||||
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
||||
cd /opt/deployments/${params.BRANCH}-${params.PORT}
|
||||
|
||||
echo '1. Создаем изолированную сеть для порта ${params.PORT}...'
|
||||
docker network create app-network-${params.PORT} 2>/dev/null || echo 'Сеть уже существует'
|
||||
|
||||
echo '2. Останавливаем старые контейнеры порта ${params.PORT}...'
|
||||
docker stop app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
||||
docker rm app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
||||
docker stop postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
|
||||
docker rm postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
|
||||
docker stop file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
||||
docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
||||
|
||||
echo '3. Запускаем БД...'
|
||||
docker run -d \\
|
||||
--name postgres-${params.PORT} \\
|
||||
--network app-network-${params.PORT} \\
|
||||
--network-alias no_copy_${params.PORT} \\
|
||||
--network-alias database-${params.PORT} \\
|
||||
--network-alias db-${params.PORT} \\
|
||||
-p ${params.PORT}0:5432 \\
|
||||
-e POSTGRES_DB=no_copy_${params.PORT} \\
|
||||
-e POSTGRES_USER=${DB_USER} \\
|
||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
||||
-v pgdata_${params.PORT}:/var/lib/postgresql/data \\
|
||||
postgres:17.7
|
||||
|
||||
echo '4. Запускаем storage...'
|
||||
docker run -d \\
|
||||
--name file-storage-${params.PORT} \\
|
||||
--network app-network-${params.PORT} \\
|
||||
-v uploads_data_${params.PORT}:/storage:rw \\
|
||||
alpine:latest tail -f /dev/null
|
||||
|
||||
echo '5. Ждем БД...'
|
||||
sleep 15
|
||||
|
||||
echo '6. Собираем приложение...'
|
||||
docker build --no-cache -t app-backend-${params.PORT}:latest .
|
||||
|
||||
echo '7. Запускаем приложение...'
|
||||
docker run -d \\
|
||||
--name app-backend-${params.PORT} \\
|
||||
--network app-network-${params.PORT} \\
|
||||
-p ${params.PORT}:8080 \\
|
||||
-v uploads_data_${params.PORT}:/data/uploads:rw \\
|
||||
-e POSTGRES_DB=no_copy_${params.PORT} \\
|
||||
-e POSTGRES_USER=${DB_USER} \\
|
||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
||||
-e POSTGRES_PORT=5432 \\
|
||||
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
||||
-e FILE_STORAGE_PATH=/data/uploads \\
|
||||
app-backend-${params.PORT}:latest
|
||||
|
||||
echo '8. Проверка...'
|
||||
sleep 10
|
||||
|
||||
if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
|
||||
echo 'Приложение работает на порту ${params.PORT}'
|
||||
else
|
||||
echo 'Проверка health не удалась'
|
||||
docker logs app-backend-${params.PORT} --tail=20
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
echo "Deployment successful"
|
||||
echo "Application URL: http://${params.SERVER}:${params.PORT}"
|
||||
}
|
||||
failure {
|
||||
echo "Deployment failed for branch ${params.BRANCH} on port ${params.PORT}"
|
||||
}
|
||||
always {
|
||||
echo "Deployment process finished"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,11 @@ pipeline {
|
||||
defaultValue: 'main',
|
||||
description: 'Ветка для деплоя'
|
||||
)
|
||||
string(
|
||||
name: 'PORT',
|
||||
defaultValue: '2998',
|
||||
description: 'Порт для запуска экземпляра'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
@@ -36,19 +41,19 @@ pipeline {
|
||||
)
|
||||
]) {
|
||||
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
|
||||
"
|
||||
"""
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker stop no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||
docker rm no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||
|
||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml -p frontend-${params.PORT} down 2>/dev/null || true
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} down 2>/dev/null || true
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -65,13 +70,13 @@ pipeline {
|
||||
)
|
||||
]) {
|
||||
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}/
|
||||
"""
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
rm -rf /opt/deployments/frontend/${params.BRANCH}-${params.PORT}/*
|
||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
"
|
||||
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}-${params.PORT}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -88,19 +93,24 @@ pipeline {
|
||||
)
|
||||
]) {
|
||||
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: docker-compose file not found'
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
|
||||
echo '=== Редактируем docker-compose.yml ==='
|
||||
|
||||
# Меняем имя контейнера
|
||||
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
||||
|
||||
# Меняем порт (2998 на нужный порт)
|
||||
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
||||
|
||||
echo 'Проверяем изменения:'
|
||||
grep -n 'container_name\\|ports' docker-compose.yml
|
||||
|
||||
echo '=== Строим образ ==='
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -117,24 +127,26 @@ pipeline {
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
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
|
||||
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
|
||||
"
|
||||
"""
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
|
||||
echo '=== Запускаем контейнер ==='
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} up -d
|
||||
|
||||
sleep 10
|
||||
|
||||
echo '=== Проверяем запуск ==='
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
||||
echo '✓ Контейнер запущен: no-copy-frontend-${params.PORT}'
|
||||
echo '✓ Порт: ${params.PORT}:2999'
|
||||
else
|
||||
echo '✗ Контейнер не запустился'
|
||||
echo 'Логи:'
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} logs
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -151,23 +163,29 @@ pipeline {
|
||||
)
|
||||
]) {
|
||||
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 started'
|
||||
|
||||
sleep 5
|
||||
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||
echo 'HTTP code: \$HTTP_CODE'
|
||||
|
||||
echo 'Frontend available on http://92.242.61.23:2998'
|
||||
else
|
||||
echo 'Exception: container did not start'
|
||||
docker ps -a | grep frontend
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
# Ищем контейнер с правильным именем (с портом)
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
||||
echo 'Container started: no-copy-frontend-${params.PORT}'
|
||||
|
||||
sleep 5
|
||||
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} || echo '000')
|
||||
echo 'HTTP code: \$HTTP_CODE'
|
||||
|
||||
echo 'Frontend available on http://92.242.61.23:${params.PORT}'
|
||||
|
||||
# Показываем все фронтенды
|
||||
echo ''
|
||||
echo 'All frontend containers:'
|
||||
docker ps --filter name=no-copy-frontend --format 'table {{.Names}}\\t{{.Ports}}\\t{{.Status}}'
|
||||
else
|
||||
echo 'Exception: container did not start'
|
||||
docker ps -a | grep frontend
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -177,7 +195,8 @@ pipeline {
|
||||
post {
|
||||
success {
|
||||
echo "Front branch ${params.BRANCH} deployment completed"
|
||||
echo "Frontend available on http://92.242.61.23:2998"
|
||||
echo "Frontend available on http://92.242.61.23:${params.PORT}"
|
||||
echo "Container: no-copy-frontend-${params.PORT}"
|
||||
}
|
||||
failure {
|
||||
echo "Deployment failed"
|
||||
|
||||
@@ -17,6 +17,7 @@ pipeline {
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
cleanWs()
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
@@ -30,7 +31,6 @@ pipeline {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
stage('Deploy with docker-compose') {
|
||||
steps {
|
||||
script {
|
||||
@@ -44,68 +44,76 @@ pipeline {
|
||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
||||
]) {
|
||||
sh """
|
||||
echo "Deploying branch: ${params.BRANCH}"
|
||||
|
||||
echo "Copying files to server..."
|
||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||
sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||
|
||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||
cd /opt/deployments/${params.BRANCH}
|
||||
|
||||
echo '1. Остановка старого приложения...'
|
||||
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||
|
||||
echo '2. Удаление старых образов...'
|
||||
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||
|
||||
echo '3. Создание сети если нужно...'
|
||||
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||
|
||||
echo '4. Запуск инфраструктуры...'
|
||||
docker-compose up -d db storage
|
||||
|
||||
echo '5. Ожидание PostgreSQL...'
|
||||
sleep 10
|
||||
|
||||
echo '6. Сборка нового образа приложения...'
|
||||
docker build --no-cache -t app-backend:latest .
|
||||
|
||||
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=$DB_USER \\
|
||||
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||
-e POSTGRES_PORT=5432 \\
|
||||
-e POSTGRES_HOST=db \\
|
||||
--restart unless-stopped \\
|
||||
app-backend:latest
|
||||
|
||||
echo '8. Запуск мониторинга...'
|
||||
docker-compose up -d grafana prometheus loki tempo alloy
|
||||
|
||||
echo '9. Проверка...'
|
||||
sleep 5
|
||||
|
||||
echo 'Статус контейнеров:'
|
||||
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||
|
||||
echo '10. Проверка health...'
|
||||
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
||||
echo 'Приложение работает'
|
||||
echo 'URL: http://${params.SERVER}:80'
|
||||
else
|
||||
echo 'Проверка health не удалась'
|
||||
docker logs app-backend --tail=20
|
||||
fi
|
||||
"
|
||||
"""
|
||||
echo "Deploying branch: ${params.BRANCH}"
|
||||
|
||||
echo "Copying files to server..."
|
||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||
|
||||
sshpass -p '$SSH_PASS' rsync -av --delete \\
|
||||
--exclude=.git \\
|
||||
--exclude=.gradle \\
|
||||
--exclude=build \\
|
||||
--exclude=**/build \\
|
||||
--exclude=.idea \\
|
||||
--exclude=out \\
|
||||
. $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||
|
||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||
cd /opt/deployments/${params.BRANCH}
|
||||
|
||||
echo '1. Остановка старого приложения...'
|
||||
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||
|
||||
echo '2. Удаление старых образов...'
|
||||
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||
|
||||
echo '3. Создание сети если нужно...'
|
||||
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||
|
||||
echo '4. Запуск инфраструктуры...'
|
||||
docker-compose up -d db storage
|
||||
|
||||
echo '5. Ожидание PostgreSQL...'
|
||||
sleep 10
|
||||
|
||||
echo '6. Сборка нового образа приложения...'
|
||||
docker build --no-cache -t app-backend:latest .
|
||||
|
||||
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=$DB_USER \\
|
||||
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||
-e POSTGRES_PORT=5432 \\
|
||||
-e POSTGRES_HOST=db \\
|
||||
--restart unless-stopped \\
|
||||
app-backend:latest
|
||||
|
||||
echo '8. Запуск мониторинга...'
|
||||
docker-compose up -d grafana prometheus loki tempo alloy
|
||||
|
||||
echo '9. Проверка...'
|
||||
sleep 5
|
||||
|
||||
echo 'Статус контейнеров:'
|
||||
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||
|
||||
echo '10. Проверка health...'
|
||||
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
||||
echo 'Приложение работает'
|
||||
echo 'URL: http://${params.SERVER}:80'
|
||||
else
|
||||
echo 'Проверка health не удалась'
|
||||
docker logs app-backend --tail=20
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -124,4 +132,4 @@ pipeline {
|
||||
echo "Deployment process finished"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,183 +0,0 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
parameters {
|
||||
string(
|
||||
name: 'BRANCH',
|
||||
defaultValue: 'main',
|
||||
description: 'Ветка для деплоя'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
branches: [[name: params.BRANCH]],
|
||||
userRemoteConfigs: [[
|
||||
url: 'https://code.3err0.ru/frontdev/no-copy-frontend.git',
|
||||
credentialsId: 'nx-jen'
|
||||
]]
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Stop old') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker stop no-copy-frontend 2>/dev/null || true
|
||||
docker rm no-copy-frontend 2>/dev/null || true
|
||||
|
||||
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Copy to server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||
"
|
||||
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml build
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml build
|
||||
else
|
||||
echo 'Exception:don't found docker-compose'
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Start on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml up -d
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml up -d
|
||||
fi
|
||||
|
||||
sleep 10
|
||||
|
||||
echo 'Status container:'
|
||||
docker ps --filter name=no-copy-frontend
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Check status') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||
echo 'Container start'
|
||||
|
||||
sleep 5
|
||||
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||
echo 'HTTP код: ' \$HTTP_CODE
|
||||
|
||||
echo 'Frong start on http://92.242.61.23:2998'
|
||||
else
|
||||
echo 'Exception: container don't start'
|
||||
docker ps -a | grep frontend
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
echo "Front branch ${params.BRANCH} completed"
|
||||
echo "Use on http://92.242.61.23:2998"
|
||||
}
|
||||
failure {
|
||||
echo "Failed"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,156 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
parameters {
|
||||
string(
|
||||
name: 'BRANCH',
|
||||
defaultValue: 'main',
|
||||
description: 'Ветка для деплоя легальной панели'
|
||||
)
|
||||
string(
|
||||
name: 'PORT',
|
||||
defaultValue: '2997',
|
||||
description: 'Порт для запуска экземпляра'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
branches: [[name: params.BRANCH]],
|
||||
userRemoteConfigs: [[
|
||||
url: 'https://code.3err0.ru/frontdev/no-copy-legal-panel-frontend.git',
|
||||
credentialsId: 'nx-jen'
|
||||
]]
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Stop old') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker stop no-copy-legal-panel-${params.PORT} 2>/dev/null || true
|
||||
docker rm no-copy-legal-panel-${params.PORT} 2>/dev/null || true
|
||||
mkdir -p /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
|
||||
rm -rf /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/*
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Copy to server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
|
||||
docker build -t no-copy-legal-panel:${params.BRANCH}-${params.PORT} .
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Start on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker run -d \\
|
||||
--name no-copy-legal-panel-${params.PORT} \\
|
||||
--restart unless-stopped \\
|
||||
--network app-network \\
|
||||
-p ${params.PORT}:2997 \\
|
||||
no-copy-legal-panel:${params.BRANCH}-${params.PORT}
|
||||
sleep 5
|
||||
docker ps --filter name=no-copy-legal-panel-${params.PORT}
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Check status') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-legal-panel-${params.PORT}'; then
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
|
||||
echo 'Legal panel available on http://92.242.61.23:${params.PORT}'
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
echo "Legal panel ${params.BRANCH} deployed on port ${params.PORT}"
|
||||
}
|
||||
failure {
|
||||
echo "Deployment failed"
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
@@ -0,0 +1,26 @@
|
||||
plugins {
|
||||
kotlin("jvm") version "2.1.10"
|
||||
}
|
||||
|
||||
group = "ru.soune"
|
||||
version = "1.0.0"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
|
||||
|
||||
implementation("io.insert-koin:koin-core:4.1.1")
|
||||
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
||||
}
|
||||
|
||||
tasks.test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
kotlin {
|
||||
jvmToolchain(21)
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune
|
||||
|
||||
fun main() {
|
||||
println("Hello World!")
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package ru.soune
|
||||
|
||||
interface Referral {
|
||||
|
||||
val userId: Long
|
||||
val referralLink: String
|
||||
val inviter: Long?
|
||||
val currentLevel: String
|
||||
val totalIncome: Int
|
||||
val availableIncome: Int
|
||||
val holdBalance: Int
|
||||
val active: Boolean
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune
|
||||
|
||||
data class ReferralInvitee(
|
||||
val email: String,
|
||||
val isActive: Boolean,
|
||||
val regDate: String,
|
||||
)
|
||||
@@ -0,0 +1,10 @@
|
||||
package ru.soune
|
||||
|
||||
interface ReferralLevel {
|
||||
val id: String
|
||||
val name: String
|
||||
val share: Int
|
||||
val minInvitee: Int
|
||||
val maxInvitee: Int
|
||||
val next: String?
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune
|
||||
|
||||
interface ReferralLevelProvider {
|
||||
|
||||
fun getAvailableReferralLevels(): List<ReferralLevel>
|
||||
|
||||
fun getInitialReferralLevelId(): String
|
||||
|
||||
fun getReferralLevelById(levelId: String): ReferralLevel
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package ru.soune
|
||||
|
||||
interface ReferralRepo {
|
||||
|
||||
fun getUserReferralLink(userId: Long): String
|
||||
|
||||
fun getUserIdByLink(link: String): Long?
|
||||
|
||||
fun getInviterIdForUser(userId: Long): Long?
|
||||
|
||||
fun getReferralLevelForUser(userId: Long): String
|
||||
|
||||
fun getReferralByUserId(userId: Long): Referral
|
||||
|
||||
fun getReferralInvitees(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee>
|
||||
|
||||
// создаем новую запись в БД
|
||||
fun createReferralEntity(entity: Referral)
|
||||
|
||||
// прибавить к totalIncome и availableIncome значение transferAmount
|
||||
fun increaseIncome(userId: Long, transferAmount: Int)
|
||||
|
||||
// установить active в true
|
||||
fun activateUser(userId: Long): Boolean
|
||||
|
||||
// посчитать записи, у которых inviter == userId и active == true
|
||||
fun getActiveInviteeForUser(userId: Long): Int
|
||||
|
||||
// посчитать записи, у которых inviter == userId
|
||||
fun getTotalInviteeForUser(userId: Long): Int
|
||||
|
||||
fun upgradeReferralLevelForUser(userId: Long, newLevelId: String)
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package ru.soune
|
||||
|
||||
class ReferralService(
|
||||
private val referralLevelProvider: ReferralLevelProvider,
|
||||
private val referralRepo: ReferralRepo,
|
||||
) {
|
||||
|
||||
fun onRegister(userId: Long, inviterReferralLink: String?) {
|
||||
val initialReferralLevel = referralLevelProvider.getInitialReferralLevelId()
|
||||
val referralLink = referralRepo.getUserReferralLink(userId)
|
||||
val inviter = inviterReferralLink?.let(referralRepo::getUserIdByLink)
|
||||
|
||||
val referral = object : Referral {
|
||||
override val userId = userId
|
||||
override val referralLink = referralLink
|
||||
override val inviter = inviter
|
||||
override val currentLevel = initialReferralLevel
|
||||
override val totalIncome = 0
|
||||
override val availableIncome = 0
|
||||
override val holdBalance: Int = 0
|
||||
override val active: Boolean = false
|
||||
}
|
||||
|
||||
referralRepo.createReferralEntity(referral)
|
||||
}
|
||||
|
||||
fun onUserAccountRefill(userId: Long, transferAmount: Int) {
|
||||
val wasActivated = referralRepo.activateUser(userId)
|
||||
val inviterId = referralRepo.getInviterIdForUser(userId) ?: return
|
||||
val currentInviterLevel = referralRepo.getReferralLevelForUser(inviterId)
|
||||
.let { referralLevelProvider.getReferralLevelById(it) }
|
||||
val reward = transferAmount * currentInviterLevel.share / 100
|
||||
|
||||
referralRepo.increaseIncome(inviterId, reward)
|
||||
|
||||
if (!wasActivated) return
|
||||
|
||||
val currentCount = referralRepo.getActiveInviteeForUser(inviterId)
|
||||
val nextLevel = currentInviterLevel.next
|
||||
|
||||
if (currentCount + 1 > currentInviterLevel.maxInvitee && nextLevel != null) {
|
||||
referralRepo.upgradeReferralLevelForUser(inviterId, nextLevel)
|
||||
}
|
||||
}
|
||||
|
||||
fun getReferralLevels(): List<ReferralLevel> =
|
||||
referralLevelProvider.getAvailableReferralLevels()
|
||||
|
||||
|
||||
fun getReferralLevelForUser(userId: Long): ReferralLevel =
|
||||
referralRepo.getReferralLevelForUser(userId)
|
||||
.let { referralLevelProvider.getReferralLevelById(it) }
|
||||
|
||||
fun getReferralStatForUser(userId: Long): ReferralStat {
|
||||
var referral = referralRepo.getReferralByUserId(userId)
|
||||
return ReferralStat(
|
||||
totalInvitee = referralRepo.getTotalInviteeForUser(userId),
|
||||
activeInvitee = referralRepo.getActiveInviteeForUser(userId),
|
||||
totalIncome = referral.totalIncome,
|
||||
availableIncome = referral.availableIncome,
|
||||
holdBalance = referral.holdBalance,
|
||||
referralLink = referral.referralLink
|
||||
)
|
||||
}
|
||||
|
||||
fun getInviteeForUser(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee> =
|
||||
referralRepo.getReferralInvitees(userId, pageSize, pageNumber)
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package ru.soune
|
||||
|
||||
data class ReferralStat(
|
||||
val totalInvitee: Int,
|
||||
val activeInvitee: Int,
|
||||
val totalIncome: Int,
|
||||
val availableIncome: Int,
|
||||
val holdBalance: Int,
|
||||
val referralLink: String,
|
||||
)
|
||||
@@ -1 +1,7 @@
|
||||
plugins {
|
||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
|
||||
}
|
||||
rootProject.name = 'no-copy'
|
||||
include 'referral'
|
||||
include 'finance'
|
||||
|
||||
|
||||
@@ -1,17 +1,49 @@
|
||||
package ru.soune.nocopy.configuration;
|
||||
|
||||
import com.vrt.AudioFilePathProvider;
|
||||
import com.vrt.fileprotection.FileProtector;
|
||||
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
||||
import com.vrt.fileprotection.image.ImageLocalSearch;
|
||||
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
||||
import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
@Configuration
|
||||
@EnableAutoConfiguration
|
||||
@AllArgsConstructor
|
||||
public class ApplicationConfig {
|
||||
|
||||
@Bean
|
||||
PasswordEncoder passwordEncoder() {
|
||||
return new BCryptPasswordEncoder();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public com.vrt.
|
||||
NoCopyFileService noCopyFileService(
|
||||
FileProtector.FileProvider fileProvider,
|
||||
FileProtector.ProcessingListener processingListener,
|
||||
ImageUniqueCheck imageUniqueCheck,
|
||||
ImageLocalSearch imageLocalSearch,
|
||||
AudioLocalSearch audioLocalSearch,
|
||||
AudioFilePathProvider audioFilePathProvider) {
|
||||
|
||||
return new com.vrt.NoCopyFileService(
|
||||
Collections.emptyList(),
|
||||
fileProvider,
|
||||
processingListener,
|
||||
imageUniqueCheck,
|
||||
imageLocalSearch,
|
||||
audioLocalSearch,
|
||||
audioFilePathProvider
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,10 @@ public class HandlerConfig {
|
||||
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||
VerifyRegisterUserHandler verifyRegisterUser,
|
||||
AuthRequestHandler authRequestHandler,
|
||||
ResetPasswordHandler resetPasswordHandler
|
||||
CompanyHandler companyHandler,
|
||||
TariffHandler tariffHandler,
|
||||
TariffInfoHandler tariffInfoHandler,
|
||||
ReferralHandler referralHandler
|
||||
) {
|
||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||
map.put(20001, login);
|
||||
@@ -31,7 +34,10 @@ public class HandlerConfig {
|
||||
map.put(20007, imageFoundRequestHandler);
|
||||
map.put(20008, authRequestHandler);
|
||||
map.put(20009, verifyRegisterUser);
|
||||
map.put(20010, resetPasswordHandler);
|
||||
map.put(30000, companyHandler);
|
||||
map.put(30001, tariffHandler);
|
||||
map.put(30002, tariffInfoHandler);
|
||||
map.put(30003, referralHandler);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.configuration;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import ru.soune.ReferralLevelProvider;
|
||||
import ru.soune.ReferralRepo;
|
||||
import ru.soune.ReferralService;
|
||||
|
||||
@Configuration
|
||||
public class ReferralConfig {
|
||||
|
||||
@Bean
|
||||
public ReferralService referralService(ReferralLevelProvider referralLevelProvider, ReferralRepo referralRepo) {
|
||||
return new ReferralService(referralLevelProvider, referralRepo);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package ru.soune.nocopy.configuration;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.http.client.SimpleClientHttpRequestFactory;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
@Configuration
|
||||
public class RestTemplateConfig {
|
||||
|
||||
@Bean
|
||||
public RestTemplate restTemplate() {
|
||||
RestTemplate restTemplate = new RestTemplate();
|
||||
|
||||
SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
|
||||
requestFactory.setConnectTimeout(30000);
|
||||
requestFactory.setReadTimeout(60000);
|
||||
restTemplate.setRequestFactory(requestFactory);
|
||||
|
||||
return restTemplate;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package ru.soune.nocopy.configuration.file;
|
||||
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
@Configuration
|
||||
@ConfigurationProperties(prefix = "file.storage")
|
||||
@Data
|
||||
public class FileStorageConfig {
|
||||
private String basePath;
|
||||
private long maxFileSize;
|
||||
private int chunkSize;
|
||||
private int authTokenLifeHours;
|
||||
|
||||
@PostConstruct
|
||||
public void init() throws IOException {
|
||||
Files.createDirectories(Paths.get(basePath));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package ru.soune.nocopy.configuration.file;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.soune.nocopy.service.file.FileProcessingOrchestrator;
|
||||
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class NoCopyInitializer {
|
||||
|
||||
private final FileProcessingOrchestrator orchestrator;
|
||||
|
||||
@EventListener(ApplicationReadyEvent.class)
|
||||
public void initializeOnStartup() {
|
||||
orchestrator.initializeProcessingQueue();
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,14 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import com.vrt.NoCopyFileService;
|
||||
import com.vrt.fileprotection.FileProtector;
|
||||
import com.vrt.fileprotection.NoCopyCheckResult;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
import org.springframework.core.io.FileSystemResource;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.web.PageableDefault;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -14,19 +19,25 @@ 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.file.*;
|
||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
||||
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||
import ru.soune.nocopy.dto.file.UploadProgress;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.exception.*;
|
||||
import ru.soune.nocopy.handler.*;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.service.FileSimilarityService;
|
||||
import ru.soune.nocopy.service.file.ProtectionsLimitService;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
import ru.soune.nocopy.service.file.FileEntityService;
|
||||
import ru.soune.nocopy.service.file.FileUploadService;
|
||||
import ru.soune.nocopy.util.FileUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
@@ -34,6 +45,7 @@ import java.nio.file.Paths;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Slf4j
|
||||
@@ -49,6 +61,18 @@ public class ApiController {
|
||||
|
||||
private final AuthService authService;
|
||||
|
||||
private final FileSimilarityService fileSimilarityService;
|
||||
|
||||
private final FileEntityRepository fileEntityRepository;
|
||||
|
||||
private final NoCopyFileService noCopyFileService;
|
||||
|
||||
private final FileUtil fileUtil;
|
||||
|
||||
private final ProtectionsLimitService protectionsLimitService;
|
||||
|
||||
private final AuthTokenRepository authTokenRepository;
|
||||
|
||||
@PostMapping("/v{version}/data")
|
||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||
@PathVariable("version") int version) {
|
||||
@@ -95,57 +119,82 @@ public class ApiController {
|
||||
@PathVariable("version") int version,
|
||||
@RequestParam(value = "upload_id", required = false) String uploadId,
|
||||
@RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
|
||||
@RequestParam(value = "chunk", required = false) MultipartFile chunk) {
|
||||
@RequestParam(value = "chunk", required = false) MultipartFile chunk,
|
||||
@RequestParam(value = "findSimilar", required = false, defaultValue = "0") Integer findSimilar) {
|
||||
try {
|
||||
if (chunk == null || chunk.isEmpty()) {
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||
"Chunk file null or empty", ChunkUploadResponse.builder()
|
||||
.uploadId(uploadId)
|
||||
.chunkNumber(chunkNumber)
|
||||
.build()));
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
|
||||
}
|
||||
|
||||
if (uploadId == null || uploadId.isBlank()) {
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||
"Upload ID is required", ChunkUploadResponse.builder()
|
||||
.uploadId(uploadId)
|
||||
.chunkNumber(chunkNumber)
|
||||
.build()));
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Upload ID is required");
|
||||
}
|
||||
|
||||
if (chunkNumber == null || chunkNumber < 0) {
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||
"Valid chunk number is required", ChunkUploadResponse.builder()
|
||||
.uploadId(uploadId)
|
||||
.chunkNumber(chunkNumber)
|
||||
.build()));
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
||||
}
|
||||
|
||||
fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
||||
UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber,
|
||||
chunk, findSimilar);
|
||||
|
||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||
.uploadId(uploadId)
|
||||
.chunkNumber(chunkNumber)
|
||||
.chunkSize(chunk.getSize())
|
||||
.message("Chunk uploaded successfully")
|
||||
.build();
|
||||
return buildSuccessResponse(uploadId, chunkNumber, chunk,
|
||||
fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
|
||||
} catch (DuplicateImageException e) {
|
||||
Map<String, Object> duplicateData = new HashMap<>();
|
||||
duplicateData.put("duplicateFileId", e.duplicateFileId());
|
||||
duplicateData.put("userId", e.userId());
|
||||
duplicateData.put("message", e.getMessage());
|
||||
|
||||
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();
|
||||
if (uploadId != null) {
|
||||
duplicateData.put("uploadId", uploadId);
|
||||
}
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(
|
||||
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||
"Failed to upload chunk: " + e.getMessage(), responseBody));
|
||||
20004,
|
||||
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
||||
duplicateData
|
||||
));
|
||||
} catch (Exception e) {
|
||||
log.error("Error uploading chunk", e);
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/v{version}/files/{fileId}/similar")
|
||||
public ResponseEntity<BaseResponse> findSimilarFiles(
|
||||
@PathVariable("version") int version,
|
||||
@PathVariable String fileId,
|
||||
@RequestParam(value = "auth_token",required = false) String authToken,
|
||||
@RequestParam(required = false) List<String> similarityLevels,
|
||||
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
||||
SimilarityFilter filter = SimilarityFilter.builder()
|
||||
.similarityLevels(similarityLevels)
|
||||
.build();
|
||||
Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable, authToken);
|
||||
|
||||
String messageDesc;
|
||||
MessageCode success;
|
||||
|
||||
if (similarFiles.isEmpty()) {
|
||||
messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
|
||||
success = MessageCode.SUCCESS;
|
||||
} else {
|
||||
messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
|
||||
success = MessageCode.SUCCESS;
|
||||
}
|
||||
|
||||
Map<String, Object> responseData = new HashMap<>();
|
||||
responseData.put("content", similarFiles.getContent());
|
||||
responseData.put("page", similarFiles.getNumber());
|
||||
responseData.put("size", similarFiles.getSize());
|
||||
responseData.put("totalElements", similarFiles.getTotalElements());
|
||||
responseData.put("totalPages", similarFiles.getTotalPages());
|
||||
responseData.put("hasNext", similarFiles.hasNext());
|
||||
responseData.put("hasPrevious", similarFiles.hasPrevious());
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
|
||||
}
|
||||
|
||||
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||
public ResponseEntity<BaseResponse> getUploadProgress(
|
||||
@PathVariable("version") int version,
|
||||
@@ -169,7 +218,6 @@ public class ApiController {
|
||||
|
||||
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);
|
||||
|
||||
@@ -243,7 +291,6 @@ public class ApiController {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/v{version}/files/download/{fileId}")
|
||||
public ResponseEntity<?> downloadFile(
|
||||
@PathVariable(required = false) String fileId,
|
||||
@@ -295,8 +342,11 @@ public class ApiController {
|
||||
errorData));
|
||||
}
|
||||
|
||||
Path filePath = Paths.get(entityResponse.getFilePath());
|
||||
Resource resource = new UrlResource(filePath.toUri());
|
||||
|
||||
Path filePath = Paths.get(entityResponse.getProtectedFilePath());
|
||||
// Resource resource = new UrlResource(filePath.toUri());
|
||||
FileSystemResource resource = new FileSystemResource(filePath);
|
||||
long fileSize = Files.size(filePath);
|
||||
|
||||
if (!resource.exists()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
@@ -311,10 +361,10 @@ public class ApiController {
|
||||
String contentType = determineContentType(filePath);
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentLength(fileSize)
|
||||
.contentType(MediaType.parseMediaType(contentType))
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
|
||||
.header(HttpHeaders.CONTENT_LENGTH, String.valueOf(entityResponse.getFileSize()))
|
||||
.body(resource);
|
||||
} catch (FileEntityNotFoundException e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
@@ -337,6 +387,115 @@ public class ApiController {
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/protect/{fileId}")
|
||||
public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
|
||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
||||
|
||||
if (!optionalFileEntity.isPresent()) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
FileEntity fileEntity = optionalFileEntity.get();
|
||||
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
|
||||
|
||||
noCopyFileService.addFile(fileInfo);
|
||||
|
||||
fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
|
||||
fileEntityRepository.save(fileEntity);
|
||||
|
||||
return ResponseEntity.ok().build();
|
||||
}
|
||||
|
||||
@GetMapping("/check/{fileId}/{type}")
|
||||
public ResponseEntity<?> check(@PathVariable(required = false) String fileId,
|
||||
@PathVariable(required = false) String type) {
|
||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
||||
|
||||
if (!optionalFileEntity.isPresent()) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
FileEntity fileEntity = optionalFileEntity.get();
|
||||
|
||||
Path path = Paths.get(fileEntity.getProtectedFilePath());
|
||||
|
||||
File file = path.toFile();
|
||||
|
||||
NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
|
||||
FileProtector.Type.valueOf(type.toUpperCase()));
|
||||
|
||||
return ResponseEntity.ok().body(noCopyCheckResult);
|
||||
}
|
||||
|
||||
@GetMapping("/check/file_stats")
|
||||
public ResponseEntity<?> checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
Map<String, Object> fileTypeStats = protectionsLimitService.getFileTypeStats(authToken.getUser().getId());
|
||||
|
||||
return ResponseEntity.ok().body(fileTypeStats);
|
||||
}
|
||||
|
||||
private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
|
||||
return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
|
||||
}
|
||||
|
||||
private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
|
||||
throws IOException {
|
||||
fileEntityService.deleteFromDisk(fileEntity);
|
||||
|
||||
fileEntityService.softDeleteFileWithHash(fileEntity);
|
||||
|
||||
Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
|
||||
|
||||
if (originalFile.isPresent()) {
|
||||
Map<String, String> duplicateInfo = Map.of(
|
||||
"duplicate_file_id", originalFile.get().getId(),
|
||||
"owner_user_id", String.valueOf(originalFile.get().getUserId()));
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(
|
||||
20004,
|
||||
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||
"Failed to upload chunk, duplicate",
|
||||
duplicateInfo));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
|
||||
String fileId) {
|
||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||
.uploadId(uploadId)
|
||||
.chunkNumber(chunkNumber)
|
||||
.chunkSize(chunk.getSize())
|
||||
.fileId(fileId)
|
||||
.message("Chunk uploaded successfully")
|
||||
.build();
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(
|
||||
20000,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Chunk uploaded successfully",
|
||||
responseBody));
|
||||
}
|
||||
|
||||
private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
|
||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||
.uploadId(uploadId)
|
||||
.chunkNumber(chunkNumber)
|
||||
.build();
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(
|
||||
20004,
|
||||
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||
errorMessage,
|
||||
responseBody));
|
||||
}
|
||||
|
||||
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
||||
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||
.stream()
|
||||
@@ -372,16 +531,4 @@ public class ApiController {
|
||||
}
|
||||
return contentType;
|
||||
}
|
||||
|
||||
private boolean isPreviewSupported(String mimeType) {
|
||||
if (mimeType == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return mimeType.startsWith("image") ||
|
||||
mimeType.startsWith("text") ||
|
||||
mimeType.equals("pdf") ||
|
||||
mimeType.startsWith("video") ||
|
||||
mimeType.startsWith("audio");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.file.CheckStatus;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||
import ru.soune.nocopy.entity.user.ProtectedFileCheck;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||
import ru.soune.nocopy.service.file.FileStorageService;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/files")
|
||||
@Slf4j
|
||||
public class FileController {
|
||||
|
||||
@Autowired
|
||||
private FileStorageService fileStorageService;
|
||||
|
||||
@Autowired
|
||||
private FileEntityRepository fileRepository;
|
||||
|
||||
@Autowired
|
||||
private CheckCounterService checkCounterService;
|
||||
|
||||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@GetMapping("/public/{fileId}")
|
||||
public ResponseEntity<Resource> getPublicFile(
|
||||
@PathVariable String fileId) throws IOException {
|
||||
|
||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
||||
|
||||
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getFilePath());
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"inline; filename=\"" + fileEntity.getOriginalFileName() + "\"")
|
||||
.body(resource);
|
||||
}
|
||||
|
||||
@GetMapping("/protected/{fileId}")
|
||||
public ResponseEntity<Resource> getProtectedFile(
|
||||
@PathVariable String fileId) throws IOException {
|
||||
|
||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
||||
|
||||
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getProtectedFilePath());
|
||||
|
||||
if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
|
||||
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
|
||||
throw new RuntimeException("File is not protected");
|
||||
}
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"inline; filename=\"" + fileEntity.getOriginalFileName() + "\"")
|
||||
.body(resource);
|
||||
}
|
||||
|
||||
@GetMapping("check-file/status/{userId}")
|
||||
public ResponseEntity<CheckStatus> getStatus(@PathVariable Long userId) {
|
||||
CheckStatus status = checkCounterService.getCurrentStatus(userId);
|
||||
|
||||
return ResponseEntity.ok(status);
|
||||
}
|
||||
|
||||
@PostMapping("check-file/update-limit/{userId}/{limit}")
|
||||
public ResponseEntity<ProtectedFileCheck> getStatus(@PathVariable Long userId, @PathVariable Integer limit) {
|
||||
User user = userRepository.findById(userId).orElseThrow();
|
||||
ProtectedFileCheck protectedFileCheck = checkCounterService.updateLimit(user, limit);
|
||||
|
||||
return ResponseEntity
|
||||
.ok()
|
||||
.body(protectedFileCheck);
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,9 @@ package ru.soune.nocopy.controller;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("check/api")
|
||||
public class HealtCheckController {
|
||||
@@ -11,4 +14,22 @@ public class HealtCheckController {
|
||||
public HttpStatus healtCheck() {
|
||||
return HttpStatus.OK;
|
||||
}
|
||||
|
||||
@GetMapping("/api/debug/memory")
|
||||
public Map<String, String> getMemoryInfo() {
|
||||
Runtime runtime = Runtime.getRuntime();
|
||||
long mb = 1024 * 1024;
|
||||
|
||||
Map<String, String> info = new HashMap<>();
|
||||
info.put("maxMemory (MB)", String.valueOf(runtime.maxMemory() / mb));
|
||||
info.put("totalMemory (MB)", String.valueOf(runtime.totalMemory() / mb));
|
||||
info.put("freeMemory (MB)", String.valueOf(runtime.freeMemory() / mb));
|
||||
info.put("usedMemory (MB)", String.valueOf((runtime.totalMemory() - runtime.freeMemory()) / mb));
|
||||
info.put("availableProcessors", String.valueOf(runtime.availableProcessors()));
|
||||
|
||||
info.put("JAVA_TOOL_OPTIONS", System.getenv("JAVA_TOOL_OPTIONS"));
|
||||
info.put("JAVA_OPTS", System.getenv("JAVA_OPTS"));
|
||||
|
||||
return info;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("v1/api/content")
|
||||
@AllArgsConstructor
|
||||
public class UserContentController {
|
||||
}
|
||||
@@ -2,20 +2,34 @@ package ru.soune.nocopy.controller;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.register.ChangePasswordRequest;
|
||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||
import ru.soune.nocopy.dto.register.RegRequest;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||
import ru.soune.nocopy.dto.user.UserDTO;
|
||||
import ru.soune.nocopy.dto.user.UserRequest;
|
||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||
import ru.soune.nocopy.mapper.UserMapper;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.file.FileStatsService;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
import ru.soune.nocopy.service.tariff.TariffService;
|
||||
import ru.soune.nocopy.service.user.UserService;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
@@ -31,12 +45,21 @@ public class UserController {
|
||||
|
||||
private final UserMapper userMapper;
|
||||
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
|
||||
private final AuthService authService;
|
||||
|
||||
private final TariffService tariffService;
|
||||
|
||||
private final FileStatsService fileStatsService;
|
||||
|
||||
@GetMapping("/all")
|
||||
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
||||
List<UserDTO> allUsers = userRepository.findAll().stream()
|
||||
.map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.isActive(),
|
||||
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
|
||||
u.getPhone(), u.getGenderType(),
|
||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
|
||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
||||
null, null))
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(allUsers);
|
||||
@@ -49,26 +72,68 @@ public class UserController {
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
if (authToken != null) {
|
||||
if (tokenOptional.isPresent()) {
|
||||
User user = userRepository.findByEmail(email);
|
||||
//TODO add mapper
|
||||
|
||||
if (user != null) {
|
||||
UserDTO userDTO = userMapper.toDTO(user);
|
||||
userDTO.setEmail(email);
|
||||
userDTO.setFullName(user.getFullName());
|
||||
userDTO.setCompany(user.getCompany());
|
||||
|
||||
if (user.getCompany() != null) {
|
||||
userDTO.setCompany(user.getCompany().getCompanyName());
|
||||
}
|
||||
|
||||
if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
|
||||
userDTO.setTariffs(tariffService.getAllTariffs());
|
||||
|
||||
Long fileOnDisk = user.canManageCompanySettings() ?
|
||||
fileStatsService.calculateCompanyFileSize(user.getId()):
|
||||
fileStatsService.calculateUserFileSize(user.getId());
|
||||
|
||||
Integer filesCount = user.canManageCompanySettings() ?
|
||||
fileStatsService.filesCompanyCount(user.getId()):
|
||||
fileStatsService.filesUserCount(user.getId());
|
||||
|
||||
TariffInfo personalTariffInfo;
|
||||
|
||||
if (user.getCompany() == null) {
|
||||
personalTariffInfo = user.getPersonalTariffInfo();
|
||||
} else {
|
||||
personalTariffInfo = user.getCompany().getTariffInfo();
|
||||
}
|
||||
|
||||
Tariff tariff = personalTariffInfo.getTariff();
|
||||
|
||||
TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
|
||||
.id(personalTariffInfo.getId())
|
||||
.tariffName(tariff.getName())
|
||||
.status(personalTariffInfo.getStatus().name())
|
||||
.tariffId(tariff.getId())
|
||||
.currentFileCounts(filesCount)
|
||||
.maxFileCounts(tariff.getMaxFilesCount())
|
||||
.currentFileOnDisk(fileOnDisk)
|
||||
.maxFileOnDisk(tariff.getDiskSize())
|
||||
.startTariff(personalTariffInfo.getStartTariff())
|
||||
.endTariff(personalTariffInfo.getEndTariff())
|
||||
.build();
|
||||
|
||||
userDTO.setTariffInfo(infoDTO);
|
||||
|
||||
}
|
||||
|
||||
userDTO.setPhone(user.getPhone());
|
||||
userDTO.setGenderType(user.getGenderType());
|
||||
userDTO.setBirthday(user.getBirthday());
|
||||
userDTO.setCreatedAt(user.getCreatedAt());
|
||||
userDTO.setSubscriptionType(user.getSubscriptionType());
|
||||
userDTO.setActive(user.isActive());
|
||||
userDTO.setPermission(user.getUserPermissions());
|
||||
|
||||
return ResponseEntity.ok(userDTO);
|
||||
}
|
||||
|
||||
} else {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
return ResponseEntity.notFound().build();
|
||||
@@ -108,4 +173,46 @@ public class UserController {
|
||||
|
||||
return ResponseEntity.ok(userService.updateUser(userRequest, user));
|
||||
}
|
||||
|
||||
@PostMapping("/create-user")
|
||||
public ResponseEntity<User> addUser(@RequestBody RegRequest registerRequest) {
|
||||
|
||||
if (userRepository.existsByEmail(registerRequest.getEmail()) ||
|
||||
userRepository.existsByPhone(registerRequest.getPhone())) {
|
||||
RegAnswer regAnswer = new RegAnswer();
|
||||
regAnswer.setFieldErrors(Arrays.asList(Map.of("email", registerRequest.getEmail())));
|
||||
regAnswer.setFieldErrors(Arrays.asList(Map.of("phone", registerRequest.getPhone())));
|
||||
|
||||
throw new NotValidFieldException("User already exists with email:" + registerRequest.getEmail() + " or phone: " +
|
||||
registerRequest.getPhone(), new BaseResponse(2,
|
||||
MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getCode(),
|
||||
MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer));
|
||||
}
|
||||
|
||||
User user = new User();
|
||||
user.setFullName(registerRequest.getFullName());
|
||||
user.setEmail(registerRequest.getEmail());
|
||||
user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
|
||||
user.setActive(true);
|
||||
user.setEmailVerified(true);
|
||||
|
||||
if (registerRequest.getPhone() != null) {
|
||||
user.setPhone(registerRequest.getPhone());
|
||||
}
|
||||
|
||||
User savedUser = userRepository.save(user);
|
||||
|
||||
AuthToken authToken = authService.generateAuthToken(savedUser);
|
||||
|
||||
authTokenRepository.save(authToken);
|
||||
|
||||
return ResponseEntity.ok().body(savedUser);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-user/{userId}")
|
||||
public ResponseEntity<?> addUser(@PathVariable Long userId) {
|
||||
userRepository.deleteById(userId);
|
||||
return ResponseEntity.ok().body(Map.of("userId", userId, "deleted", "true"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -9,8 +9,10 @@ public enum MessageCode {
|
||||
TOKEN_IS_ALIVE(2, "Token is alive"),
|
||||
INVALID_ACTION(2, "Invalid action"),
|
||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||
USER_NOT_VERIFIED(2, "User not verified"),
|
||||
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
||||
USER_NOT_FOUND(2, "User not found"),
|
||||
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
||||
IMAGE_FOUND_ERROR(2, "Image found error"),
|
||||
@@ -25,7 +27,20 @@ public enum MessageCode {
|
||||
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
|
||||
FILE_NOT_FOUND(4, "File not found"),
|
||||
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
|
||||
USER_NOT_ACTIVE(2, "User not active");
|
||||
SEND_EMAIL_EXCEPTION(2, "Send email exception"),
|
||||
SIMILAR_FILES_FOUND(0, "Similar files found"),
|
||||
FILE_IS_PROTECTED(0, "File is protected"),
|
||||
FILE_IS_NOT_PROTECTED(0, "File is not protected"),
|
||||
TARIFF_IS_ADD(0, "Tariff is added"),
|
||||
TARIFF_IS_DELETED(0, "Tariff is deleted"),
|
||||
TARIFF_IS_UPDATED(0, "Tariff is updated"),
|
||||
TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
|
||||
VALIDATION_ERROR(2, "Validation error"),
|
||||
RESOURCE_NOT_FOUND(4, "Resource not found"),
|
||||
INTERNAL_ERROR(4, "Internal server error"),
|
||||
COMPANY_NOT_FOUND(4, "Company not found"),
|
||||
COMPANY_ALREADY_EXISTS(2, "Company already exists"),
|
||||
ERROR_TARIFF_INFO(2, "Erorr with tariff info");
|
||||
|
||||
private final Integer code;
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package ru.soune.nocopy.dto.company;
|
||||
|
||||
import lombok.Data;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
public class CompanyActionRequestDto {
|
||||
private String action;
|
||||
private String companyId;
|
||||
private String companyName;
|
||||
private Map<String, Object> companyData;
|
||||
private Long userId;
|
||||
private Map<String, Object> searchParams;
|
||||
private PageableParams pageable;
|
||||
|
||||
@Data
|
||||
public static class PageableParams {
|
||||
private int page;
|
||||
private int size;
|
||||
private String sort;
|
||||
private String direction;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.dto.company;
|
||||
|
||||
import lombok.Data;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class CompanyResponseDto {
|
||||
private String id;
|
||||
private String companyName;
|
||||
private String phone;
|
||||
private String address;
|
||||
private String email;
|
||||
private LocalDateTime registerDate;
|
||||
private LocalDateTime updateDate;
|
||||
private long userCount;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CheckIncrementResult {
|
||||
private boolean success;
|
||||
private Integer countChecked;
|
||||
private Integer remainingLimit;
|
||||
private String message;
|
||||
|
||||
public static CheckIncrementResult success(Integer countChecked) {
|
||||
return CheckIncrementResult.builder()
|
||||
.success(true)
|
||||
.countChecked(countChecked)
|
||||
.message("Check count incremented successfully")
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class CheckStatus {
|
||||
private Long userId;
|
||||
private Integer countChecked;
|
||||
private Integer remainingLimit;
|
||||
private LocalDateTime lastCheckAt;
|
||||
}
|
||||
@@ -20,6 +20,9 @@ public class ChunkUploadResponse {
|
||||
@JsonProperty("chunk_size")
|
||||
private Long chunkSize;
|
||||
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("message")
|
||||
private String message;
|
||||
}
|
||||
|
||||
@@ -17,6 +17,9 @@ public class FileEntityRequest {
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("full_delete")
|
||||
private Integer fullDelete;
|
||||
|
||||
@JsonProperty("upload_session_id")
|
||||
private String uploadSessionId;
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ public class FileEntityResponse {
|
||||
private String originalFileName;
|
||||
private String storedFileName;
|
||||
private String filePath;
|
||||
private String protectedFilePath;
|
||||
private Long fileSize;
|
||||
private String mimeType;
|
||||
private String fileExtension;
|
||||
@@ -31,4 +32,12 @@ public class FileEntityResponse {
|
||||
private String downloadUrl;
|
||||
private boolean existsOnDisk;
|
||||
private Integer supportId;
|
||||
private String protectStatus;
|
||||
private String ownerName;
|
||||
private String ownerEmail;
|
||||
private String ownerCompany;
|
||||
private String fileName;
|
||||
private String fileFormat;
|
||||
private Integer checksCount;
|
||||
private LocalDateTime fileUploadDate;
|
||||
}
|
||||
|
||||
@@ -58,4 +58,16 @@ public class FileInfoUserResponse {
|
||||
|
||||
@JsonProperty("audios_violations")
|
||||
private Integer audiosViolations;
|
||||
|
||||
@JsonProperty("protected_files_count")
|
||||
private Long protectedFilesCount;
|
||||
|
||||
@JsonProperty("protected_audio_files_count")
|
||||
private Long protectedAudioFilesCount;
|
||||
|
||||
@JsonProperty("protected_video_files_count")
|
||||
private Long protectedVideoFilesCount;
|
||||
|
||||
@JsonProperty("protected_image_files_count")
|
||||
private Long protectedImageFilesCount;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FileTypeStatsDto {
|
||||
private String fileType;
|
||||
private Integer count;
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class GoogleVisionSearchResponse {
|
||||
|
||||
@JsonProperty("bestGuessLabels")
|
||||
private List<BestGuessLabel> bestGuessLabels;
|
||||
|
||||
@JsonProperty("fullMatchingImages")
|
||||
private List<ImageResult> fullMatchingImages;
|
||||
|
||||
@JsonProperty("visuallySimilarImages")
|
||||
private List<ImageResult> visuallySimilarImages;
|
||||
|
||||
@JsonProperty("pagesWithMatchingImages")
|
||||
private List<PageResult> pagesWithMatchingImages;
|
||||
|
||||
@JsonProperty("partialMatchingImages")
|
||||
private List<ImageResult> partialMatchingImages;
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public static class BestGuessLabel {
|
||||
@JsonProperty("label")
|
||||
private String label;
|
||||
|
||||
@JsonProperty("languageCode")
|
||||
private String languageCode;
|
||||
}
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public static class ImageResult {
|
||||
@JsonProperty("url")
|
||||
private String url;
|
||||
|
||||
@JsonProperty("score")
|
||||
private Float score;
|
||||
|
||||
@JsonProperty("height")
|
||||
private Integer height;
|
||||
|
||||
@JsonProperty("width")
|
||||
private Integer width;
|
||||
}
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public static class PageResult {
|
||||
@JsonProperty("url")
|
||||
private String url;
|
||||
|
||||
@JsonProperty("pageTitle")
|
||||
private String pageTitle;
|
||||
|
||||
@JsonProperty("fullMatchingImages")
|
||||
private List<ImageResult> fullMatchingImages;
|
||||
|
||||
@JsonProperty("partialMatchingImages")
|
||||
private List<ImageResult> partialMatchingImages;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
class PeriodHistoryDto {
|
||||
private LocalDate periodStart;
|
||||
private LocalDate periodEnd;
|
||||
private Integer totalChecks;
|
||||
private Map<String, Integer> checksByType;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ProtectionLimitsDto {
|
||||
private Long userId;
|
||||
private String userName;
|
||||
private String userEmail;
|
||||
private LocalDate lastResetDate;
|
||||
private Integer totalChecksAllTime;
|
||||
private Integer periodChecksCount;
|
||||
private Map<String, Integer> checksByFileType;
|
||||
private LocalDate periodStartDate;
|
||||
private LocalDate periodEndDate;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime lastCheckAt;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Value;
|
||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Value
|
||||
@Builder
|
||||
public class SimilarFileDTO {
|
||||
String fileId;
|
||||
String originalFileName;
|
||||
Long fileSize;
|
||||
Integer hammingDistance;
|
||||
String similarityLevel;
|
||||
Long ownerId;
|
||||
Long supportId;
|
||||
ProtectionStatus status;
|
||||
LocalDateTime uploadDate;
|
||||
String url;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SimilarityFilter {
|
||||
private List<String> similarityLevels;
|
||||
private Integer page;
|
||||
private Integer size;
|
||||
}
|
||||
@@ -12,6 +12,15 @@ public class YandexSearchResponse {
|
||||
@JsonProperty("images")
|
||||
private List<ImageResult> images;
|
||||
|
||||
@JsonProperty("images")
|
||||
public void setImages(List<ImageResult> images) {
|
||||
if (images != null && images.size() > 5) {
|
||||
this.images = images.subList(0, 5);
|
||||
} else {
|
||||
this.images = images;
|
||||
}
|
||||
}
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public static class ImageResult {
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
package ru.soune.nocopy.dto.referral;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
public class ReferralRequest {
|
||||
private String token;
|
||||
private Integer amount;
|
||||
private Integer pageSize;
|
||||
private Integer pageNumber;
|
||||
private String action;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune.nocopy.dto.register;
|
||||
|
||||
public enum AccountType {
|
||||
B2B, B2C
|
||||
}
|
||||
@@ -17,5 +17,9 @@ public class RegAnswer {
|
||||
|
||||
private boolean isVerified;
|
||||
|
||||
private Long userId;
|
||||
|
||||
private String email;
|
||||
|
||||
private List<Map<String, String>> fieldErrors;
|
||||
}
|
||||
@@ -13,6 +13,9 @@ public class RegRequest {
|
||||
|
||||
private String companyName;
|
||||
|
||||
@NotEmpty(message = "Need account type")
|
||||
private String accountType;
|
||||
|
||||
@Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
|
||||
private String phone;
|
||||
|
||||
@@ -24,4 +27,8 @@ public class RegRequest {
|
||||
@NotBlank(message = "Password is required")
|
||||
@Size(min = 8, message = "Password must be at least 8 characters")
|
||||
private String password;
|
||||
|
||||
private String authToken;
|
||||
|
||||
private String referralLink;
|
||||
}
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
package ru.soune.nocopy.dto.register;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ResetPasswordRequest {
|
||||
|
||||
@JsonProperty("email")
|
||||
private String email;
|
||||
|
||||
@JsonProperty("verifyToken")
|
||||
private String verifyToken;
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("password")
|
||||
private String password;
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package ru.soune.nocopy.dto.register;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ResetPasswordResponse {
|
||||
@JsonProperty("user_id")
|
||||
private Long userId;
|
||||
|
||||
@JsonProperty("authToken")
|
||||
private String authToken;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TariffDTO {
|
||||
private Long id;
|
||||
private String type;
|
||||
private String name;
|
||||
private double price;
|
||||
private int tokens;
|
||||
private int maxFilesCount;
|
||||
private Long diskSize;
|
||||
private Long maxUsers;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
public class TariffInfoDTO {
|
||||
private String id;
|
||||
private String status;
|
||||
private LocalDateTime startTariff;
|
||||
private LocalDateTime endTariff;
|
||||
private Long tariffId;
|
||||
private String tariffName;
|
||||
private Integer tokens;
|
||||
private Long maxFileOnDisk;
|
||||
private Long currentFileOnDisk;
|
||||
private Integer currentFileCounts;
|
||||
private Integer maxFileCounts;
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TariffInfoRequest {
|
||||
private String id;
|
||||
|
||||
@NotNull(message = "Action is required")
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
@JsonProperty("start_tariff")
|
||||
private LocalDateTime startTariff;
|
||||
|
||||
@JsonProperty("end_tariff")
|
||||
private LocalDateTime endTariff;
|
||||
|
||||
@JsonProperty("tariff_id")
|
||||
private Long tariffId;
|
||||
|
||||
@JsonProperty("tariff_type")
|
||||
private String tariffType;
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TariffInfoResponse {
|
||||
@JsonProperty("id")
|
||||
private String id;
|
||||
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
@JsonProperty("start_tariff")
|
||||
private LocalDateTime startTariff;
|
||||
|
||||
@JsonProperty("end_tariff")
|
||||
private LocalDateTime endTariff;
|
||||
|
||||
@JsonProperty("tariff_id")
|
||||
private Long tariffId;
|
||||
|
||||
@JsonProperty("tariff_name")
|
||||
private String tariffName;
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TariffRequest {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
@NotBlank
|
||||
@JsonProperty("type")
|
||||
private String type;
|
||||
|
||||
@NotNull
|
||||
@NotBlank
|
||||
@JsonProperty("tariff_name")
|
||||
private String name;
|
||||
|
||||
@Min(value = 0, message = "Price cannot be negative")
|
||||
@JsonProperty("tariff_price")
|
||||
private double price;
|
||||
|
||||
@Min(value = 0, message = "Tokens must be at least 0")
|
||||
@JsonProperty("tariff_tokens")
|
||||
private int tokens;
|
||||
|
||||
@Min(value = 0, message = "Max files count must be at least 0")
|
||||
@JsonProperty("max_files")
|
||||
private int maxFilesCount;
|
||||
|
||||
@Min(value = 0, message = "Disk size must be at least 0")
|
||||
@JsonProperty("disk_size")
|
||||
private int diskSize;
|
||||
|
||||
@Min(value = 0, message = "Max users must be at least 0")
|
||||
@JsonProperty("max_users")
|
||||
private int maxUsers;
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class TariffResponse {
|
||||
private String tariffName;
|
||||
private String tariffType;
|
||||
}
|
||||
@@ -4,11 +4,14 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffDTO;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||
import ru.soune.nocopy.entity.user.GenderType;
|
||||
import ru.soune.nocopy.entity.user.SubscriptionType;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@@ -24,4 +27,7 @@ public class UserDTO {
|
||||
private LocalDate birthday;
|
||||
private LocalDateTime createdAt;
|
||||
private SubscriptionType subscriptionType;
|
||||
private List<TariffDTO> tariffs;
|
||||
private TariffInfoDTO tariffInfo;
|
||||
private Long permission;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
package ru.soune.nocopy.entity.company;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.*;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Entity
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Getter @Setter
|
||||
@Table(name = "company")
|
||||
public class Company {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.UUID)
|
||||
private String id;
|
||||
|
||||
@Column(name = "company_name")
|
||||
private String companyName;
|
||||
|
||||
@Column(name = "address")
|
||||
private String address;
|
||||
|
||||
@Column(name = "phone")
|
||||
private String phone;
|
||||
|
||||
@CreatedDate
|
||||
@Column(name = "register_date", updatable = false, nullable = false)
|
||||
private LocalDateTime registerDate = LocalDateTime.now();
|
||||
|
||||
@Column(name = "update_date")
|
||||
private LocalDateTime updateDate;
|
||||
|
||||
@Size(max = 1024)
|
||||
@Column(name = "email", length = 1024)
|
||||
private String email;
|
||||
|
||||
@OneToMany(mappedBy = "company")
|
||||
@JsonIgnore
|
||||
@ToString.Exclude
|
||||
private List<User> users = new ArrayList<>();
|
||||
|
||||
@OneToOne(cascade = CascadeType.ALL)
|
||||
@JoinColumn(name = "tariff_info_id")
|
||||
private TariffInfo tariffInfo;
|
||||
}
|
||||
@@ -1,14 +1,12 @@
|
||||
package ru.soune.nocopy.entity.file;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.hibernate.annotations.GenerationTime;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.annotation.LastModifiedDate;
|
||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||
|
||||
import java.sql.DriverManager;
|
||||
import java.sql.SQLException;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@@ -65,14 +63,42 @@ public class FileEntity {
|
||||
@Column(name = "updated_at")
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
@Column(name = "protected_file_path")
|
||||
private String protectedFilePath;
|
||||
|
||||
@Column(name = "protection_status")
|
||||
@Enumerated(EnumType.STRING)
|
||||
private ProtectionStatus protectionStatus;
|
||||
|
||||
@Column(name = "protected_at")
|
||||
private LocalDateTime protectedAt;
|
||||
|
||||
@Column(name = "signature")
|
||||
@JsonIgnore
|
||||
private String signature;
|
||||
|
||||
@OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
@JsonIgnore
|
||||
private ImageHashEntity imageHash;
|
||||
|
||||
@PrePersist
|
||||
public void prePersist() {
|
||||
if (this.status == null) {
|
||||
this.status = FileStatus.ACTIVE;
|
||||
}
|
||||
|
||||
if (this.protectionStatus == null) {
|
||||
this.protectionStatus = ProtectionStatus.NOT_PROTECTED;
|
||||
}
|
||||
|
||||
if (this.createdAt == null) {
|
||||
this.createdAt = LocalDateTime.now();
|
||||
}
|
||||
this.updatedAt = LocalDateTime.now();
|
||||
}
|
||||
|
||||
@PreUpdate
|
||||
public void preUpdate() {
|
||||
this.updatedAt = LocalDateTime.now();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,5 +6,6 @@ public enum FileStatus {
|
||||
PROCESSING,
|
||||
VIOLATION,
|
||||
CHECKED,
|
||||
ERROR
|
||||
ERROR,
|
||||
TEMP
|
||||
}
|
||||
|
||||
@@ -7,10 +7,11 @@ import java.util.List;
|
||||
|
||||
@Getter
|
||||
public enum FileType {
|
||||
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
|
||||
// IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
|
||||
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp")),
|
||||
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
||||
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
||||
AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
|
||||
AUDIO("audio", List.of("wav"));
|
||||
|
||||
private final String displayName;
|
||||
private final List<String> allowedExtensions;
|
||||
|
||||
@@ -69,6 +69,7 @@ public class FileUploadSession {
|
||||
private String extension;
|
||||
|
||||
@Column(name = "retry_count")
|
||||
@Builder.Default
|
||||
private Integer retryCount = 0;
|
||||
|
||||
@Column(name = "completed_at")
|
||||
@@ -81,6 +82,7 @@ public class FileUploadSession {
|
||||
)
|
||||
@MapKeyColumn(name = "chunk_number")
|
||||
@Column(name = "chunk_path")
|
||||
@Builder.Default
|
||||
private Map<Integer, String> chunkPaths = new HashMap<>();
|
||||
|
||||
@PrePersist
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
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", indexes = {
|
||||
@Index(name = "idx_image_hashes_hash64", columnList = "hash64_hi, hash64_lo"),
|
||||
@Index(name = "idx_image_hashes_hash64_hi", columnList = "hash64_hi"),
|
||||
@Index(name = "idx_image_hashes_hash64_lo", columnList = "hash64_lo")
|
||||
})
|
||||
@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 Long hash64Hi;
|
||||
|
||||
@Column(name = "hash64_lo")
|
||||
private Long hash64Lo;
|
||||
|
||||
@Column(name = "hash_algorithm", nullable = false)
|
||||
private String hashAlgorithm;
|
||||
|
||||
@Column(name = "created_at")
|
||||
private LocalDateTime createdAt;
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
package ru.soune.nocopy.entity.file;
|
||||
|
||||
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.User;
|
||||
import ru.soune.nocopy.entity.user.UserContent;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@Table(name = "image_protection")
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
@EntityListeners(AuditingEntityListener.class)
|
||||
public class ImageProtection {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long protectionId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "user_id", nullable = false)
|
||||
@ToString.Exclude
|
||||
private User user;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "content_id", nullable = false)
|
||||
@ToString.Exclude
|
||||
private UserContent content;
|
||||
|
||||
@Column(name = "protection_method", nullable = false, length = 50)
|
||||
private String protectionMethod;
|
||||
|
||||
@Column(name = "protection_level", nullable = false)
|
||||
private Integer protectionLevel;
|
||||
|
||||
@Column(name = "is_active", nullable = false)
|
||||
private Boolean isActive = true;
|
||||
|
||||
@CreatedDate
|
||||
@Column(name = "applied_at", nullable = false, updatable = false)
|
||||
private LocalDateTime appliedAt;
|
||||
|
||||
@Column(name = "metadata", columnDefinition = "JSON")
|
||||
private String metadata;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package ru.soune.nocopy.entity.file;
|
||||
|
||||
public enum ProtectionStatus {
|
||||
NOT_PROTECTED,
|
||||
PROCESSING,
|
||||
PROTECTED,
|
||||
FAILED,
|
||||
FAILED_SAVE
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package ru.soune.nocopy.entity.referral;
|
||||
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.Data;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@Table(name = "referrals")
|
||||
@Data
|
||||
public class Referral {
|
||||
@Id
|
||||
private Long userId;
|
||||
|
||||
@Column(name = "referral_link", unique = true, nullable = false)
|
||||
private String referralLink;
|
||||
|
||||
@Column(name = "inviter_id")
|
||||
private Long inviterId;
|
||||
|
||||
@Column(name = "level_id")
|
||||
private String levelId = "bronze";
|
||||
|
||||
@Column(name = "total_income")
|
||||
private int totalIncome = 0;
|
||||
|
||||
@Column(name = "is_active")
|
||||
private boolean isActive = false;
|
||||
|
||||
@CreatedDate
|
||||
@Column(name = "created_at", updatable = false, nullable = false)
|
||||
private LocalDateTime createdAt = LocalDateTime.now();
|
||||
|
||||
@Column(name = "hold_balance")
|
||||
private int holdBalance = 0;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package ru.soune.nocopy.entity.referral;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.Data;
|
||||
|
||||
@Entity
|
||||
@Table(name = "referral_levels")
|
||||
@Data
|
||||
public class ReferralLevelEntity {
|
||||
@Id
|
||||
private String id;
|
||||
|
||||
@Column(nullable = false)
|
||||
private String name;
|
||||
|
||||
@Column(name = "min_invitees")
|
||||
private int minInvitees;
|
||||
|
||||
@Column(name = "reward_percentage")
|
||||
private int rewardPercentage;
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package ru.soune.nocopy.entity.tarif;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Entity
|
||||
@Table(name = "tariff")
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Getter
|
||||
@Setter
|
||||
public class Tariff {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "type", unique = true, nullable = false)
|
||||
private String type;
|
||||
|
||||
@Column(name = "tariff_name")
|
||||
private String name;
|
||||
|
||||
@Column(name = "price")
|
||||
private double price;
|
||||
|
||||
@Column(name = "tokens")
|
||||
private int tokens;
|
||||
|
||||
@Column(name = "max_files_count")
|
||||
private int maxFilesCount;
|
||||
|
||||
@Column(name = "disk_size")
|
||||
private Long diskSize;
|
||||
|
||||
@Column(name = "max_users")
|
||||
private Long maxUsers;
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package ru.soune.nocopy.entity.tarif;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@Table(name = "tariff_info")
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Getter @Setter
|
||||
public class TariffInfo {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.UUID)
|
||||
private String id;
|
||||
|
||||
@Column(name = "status", nullable = false)
|
||||
private TariffStatus status;
|
||||
|
||||
@Column(name = "start_tariff")
|
||||
private LocalDateTime startTariff;
|
||||
|
||||
@Column(name = "end_tariff")
|
||||
private LocalDateTime endTariff;
|
||||
|
||||
@Column(name = "tokens")
|
||||
private Integer tokens;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "tariff_id")
|
||||
private Tariff tariff;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune.nocopy.entity.tarif;
|
||||
|
||||
public enum TariffStatus {
|
||||
ACTIVE, EXPIRED, INACTIVE
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package ru.soune.nocopy.entity.tarif;
|
||||
|
||||
|
||||
public enum TariffType {
|
||||
START, BASIC, PRO, ENTERPRISE, DEMO;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package ru.soune.nocopy.entity.user;
|
||||
|
||||
public class Permission {
|
||||
public static final long LOGIN_BIT = 1L;
|
||||
public static final long COMPANY_SETTINGS_BIT = 1L << 1;
|
||||
public static final long DEFAULT_USER_PERMISSIONS = LOGIN_BIT;
|
||||
public static final long COMPANY_ADMIN_PERMISSIONS =
|
||||
LOGIN_BIT | COMPANY_SETTINGS_BIT;
|
||||
public static final long SUPER_ADMIN_PERMISSIONS = -1L;
|
||||
|
||||
public static boolean hasPermission(long userPermissions, long permissionBit) {
|
||||
return (userPermissions & permissionBit) != 0;
|
||||
}
|
||||
|
||||
public static long addPermission(long userPermissions, long permissionBit) {
|
||||
return userPermissions | permissionBit;
|
||||
}
|
||||
|
||||
public static long removePermission(long userPermissions, long permissionBit) {
|
||||
return userPermissions & ~permissionBit;
|
||||
}
|
||||
|
||||
public static boolean canLogin(long userPermissions) {
|
||||
return hasPermission(userPermissions, LOGIN_BIT);
|
||||
}
|
||||
|
||||
public static boolean canManageCompanySettings(long userPermissions) {
|
||||
return hasPermission(userPermissions, COMPANY_SETTINGS_BIT);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
package ru.soune.nocopy.entity.user;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Entity
|
||||
@Table(name = "protect_check")
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
@EntityListeners(AuditingEntityListener.class)
|
||||
public class ProtectedFileCheck {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@OneToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "user_id", unique = true, nullable = false)
|
||||
private User user;
|
||||
|
||||
@Column(nullable = false)
|
||||
@Builder.Default
|
||||
private Integer countChecked = 0;
|
||||
|
||||
@Column(name = "last_check_at")
|
||||
private LocalDateTime lastCheckAt;
|
||||
|
||||
@Version
|
||||
private Long version;
|
||||
|
||||
@ElementCollection
|
||||
@CollectionTable(
|
||||
name = "protection_usage_by_type",
|
||||
joinColumns = @JoinColumn(name = "protection_usage_id"))
|
||||
@MapKeyColumn(name = "file_type")
|
||||
@Column(name = "count")
|
||||
@Builder.Default
|
||||
private Map<String, Integer> usageByType = new HashMap<>();
|
||||
|
||||
@Column(name = "period_start_date")
|
||||
@Builder.Default
|
||||
private LocalDate periodStartDate = LocalDate.now();
|
||||
|
||||
@Column(name = "period_count")
|
||||
@Builder.Default
|
||||
private Integer periodCount = 0;
|
||||
|
||||
public synchronized boolean writeCheck(String fileType) {
|
||||
resetPeriodIfNeeded();
|
||||
|
||||
countChecked++;
|
||||
periodCount++;
|
||||
|
||||
usageByType.merge(fileType, 1, Integer::sum);
|
||||
|
||||
lastCheckAt = LocalDateTime.now();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private void resetPeriodIfNeeded() {
|
||||
LocalDate today = LocalDate.now();
|
||||
|
||||
if (periodStartDate == null ||
|
||||
ChronoUnit.DAYS.between(periodStartDate, today) >= 30) {
|
||||
|
||||
cleanupOldData();
|
||||
|
||||
periodStartDate = today;
|
||||
periodCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
public void cleanupOldData() {
|
||||
if (usageByType != null && !usageByType.isEmpty()) {
|
||||
usageByType.clear();
|
||||
periodCount = 0;
|
||||
}
|
||||
|
||||
lastCheckAt = LocalDateTime.now();
|
||||
}
|
||||
|
||||
|
||||
public int getPeriodCount() {
|
||||
resetPeriodIfNeeded();
|
||||
return periodCount;
|
||||
}
|
||||
|
||||
public LocalDate getPeriodStartDate() {
|
||||
resetPeriodIfNeeded();
|
||||
return periodStartDate;
|
||||
}
|
||||
}
|
||||
@@ -4,11 +4,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||
import ru.soune.nocopy.entity.file.ImageProtection;
|
||||
import ru.soune.nocopy.entity.company.Company;
|
||||
import ru.soune.nocopy.entity.file.Violation;
|
||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||
import ru.soune.nocopy.entity.tarif.TariffStatus;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -39,9 +40,6 @@ public class User {
|
||||
@Column(name = "email_verified")
|
||||
private boolean emailVerified = false;
|
||||
|
||||
@Column(name = "company")
|
||||
private String company;
|
||||
|
||||
@Column(nullable = false)
|
||||
@Size(min = 6)
|
||||
@JsonIgnore
|
||||
@@ -77,11 +75,6 @@ public class User {
|
||||
@ToString.Exclude
|
||||
private List<AuthToken> tokens = new ArrayList<>();
|
||||
|
||||
@OneToOne(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
@JsonIgnore
|
||||
@ToString.Exclude
|
||||
private UserNotActive userNotActive;
|
||||
|
||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
@JsonIgnore
|
||||
@ToString.Exclude
|
||||
@@ -92,12 +85,65 @@ public class User {
|
||||
@ToString.Exclude
|
||||
private List<Violation> violations = new ArrayList<>();
|
||||
|
||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
@OneToOne(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
@JsonIgnore
|
||||
@ToString.Exclude
|
||||
private List<ImageProtection> imageProtections = new ArrayList<>();
|
||||
private ProtectedFileCheck protectedFileCheck;
|
||||
|
||||
@Column(name = "failed_login_attempts")
|
||||
@ColumnDefault("0")
|
||||
private Integer failedLoginAttempts = 0;
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "company_id")
|
||||
@ToString.Exclude
|
||||
private Company company;
|
||||
|
||||
@Column(name = "permissions")
|
||||
private Long userPermissions = Permission.DEFAULT_USER_PERMISSIONS;
|
||||
|
||||
@OneToOne(cascade = CascadeType.ALL)
|
||||
@JoinColumn(name = "personal_tariff_info_id")
|
||||
@ToString.Exclude
|
||||
private TariffInfo personalTariffInfo;
|
||||
|
||||
public TariffInfo getActiveTariffInfo() {
|
||||
if (company != null && company.getTariffInfo() != null) {
|
||||
return company.getTariffInfo();
|
||||
}
|
||||
return personalTariffInfo;
|
||||
}
|
||||
|
||||
public boolean hasTariffAccess() {
|
||||
TariffInfo activeTariff = getActiveTariffInfo();
|
||||
if (activeTariff == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return activeTariff.getStatus() == TariffStatus.ACTIVE &&
|
||||
LocalDateTime.now().isBefore(activeTariff.getEndTariff());
|
||||
}
|
||||
|
||||
public boolean canLogin() {
|
||||
return Permission.canLogin(this.userPermissions);
|
||||
}
|
||||
|
||||
public boolean canManageCompanySettings() {
|
||||
return Permission.canManageCompanySettings(this.userPermissions);
|
||||
}
|
||||
|
||||
public void grantPermission(long permissionBit) {
|
||||
this.userPermissions = Permission.addPermission(this.userPermissions, permissionBit);
|
||||
}
|
||||
|
||||
public void removePermission(long permissionBit) {
|
||||
this.userPermissions = Permission.removePermission(this.userPermissions, permissionBit);
|
||||
}
|
||||
|
||||
public boolean hasPermission(long permissionBit) {
|
||||
return Permission.hasPermission(this.userPermissions, permissionBit);
|
||||
}
|
||||
|
||||
public String getCompanyName() {
|
||||
if (company != null) {
|
||||
return company.getCompanyName();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
package ru.soune.nocopy.entity.user;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@Table(name = "user_not_active")
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
@Builder
|
||||
public class UserNotActive {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@OneToOne(fetch = FetchType.LAZY)
|
||||
private User user;
|
||||
|
||||
@CreatedDate
|
||||
@Column(name = "created_at", updatable = false)
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
@Column(name = "blocked_until")
|
||||
private LocalDateTime blockedUntil;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package ru.soune.nocopy.exception;
|
||||
|
||||
public class DuplicateImageException extends RuntimeException {
|
||||
private final String duplicateFileId;
|
||||
private final Long userId;
|
||||
|
||||
public DuplicateImageException(String message, String duplicateFileId, Long userId) {
|
||||
super(message);
|
||||
this.duplicateFileId = duplicateFileId;
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public String duplicateFileId() {
|
||||
return duplicateFileId;
|
||||
}
|
||||
|
||||
public Long userId() {
|
||||
return userId;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune.nocopy.exception;
|
||||
|
||||
public class ResourceNotFoundException extends RuntimeException {
|
||||
public ResourceNotFoundException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune.nocopy.exception;
|
||||
|
||||
public class RetryableException extends RuntimeException {
|
||||
public RetryableException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
public RetryableException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune.nocopy.exception;
|
||||
|
||||
public class TariffNotFoundException extends RuntimeException {
|
||||
public TariffNotFoundException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,411 @@
|
||||
package ru.soune.nocopy.handler;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.domain.Sort;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.validation.BeanPropertyBindingResult;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import ru.soune.nocopy.dto.BaseRequest;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.company.CompanyActionRequestDto;
|
||||
import ru.soune.nocopy.dto.company.CompanyResponseDto;
|
||||
import ru.soune.nocopy.entity.company.Company;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.ResourceNotFoundException;
|
||||
import ru.soune.nocopy.exception.ValidationException;
|
||||
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
||||
import ru.soune.nocopy.service.CompanyService;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class CompanyHandler implements RequestHandler {
|
||||
|
||||
private final CompanyService companyService;
|
||||
|
||||
private final RegRequestValidator regRequestValidator;
|
||||
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) {
|
||||
try {
|
||||
CompanyActionRequestDto actionRequest = objectMapper.convertValue(
|
||||
request.getMessageBody(),
|
||||
CompanyActionRequestDto.class
|
||||
);
|
||||
|
||||
String action = actionRequest.getAction();
|
||||
|
||||
return switch (action) {
|
||||
case "create" -> handleCreate(actionRequest, request.getMsgId());
|
||||
case "update" -> handleUpdate(actionRequest, request.getMsgId());
|
||||
case "delete" -> handleDelete(actionRequest, request.getMsgId());
|
||||
case "getCompany" -> handleGet(actionRequest, request.getMsgId());
|
||||
case "getAll" -> handleGetAll(actionRequest, request.getMsgId());
|
||||
case "addUser" -> handleAddUser(actionRequest, request.getMsgId());
|
||||
case "removeUser" -> handleRemoveUser(actionRequest, request.getMsgId());
|
||||
case "getUsers" -> handleGetUsers(actionRequest, request.getMsgId());
|
||||
case "search" -> handleSearch(actionRequest, request.getMsgId());
|
||||
case "countUser" -> handleCountUsers(actionRequest, request.getMsgId());
|
||||
default -> new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.INVALID_ACTION.getCode(),
|
||||
"Invalid action: " + action,
|
||||
null
|
||||
);
|
||||
};
|
||||
|
||||
} catch (ValidationException e) {
|
||||
Map<String, String> errors = e.getBindingResult().getFieldErrors().stream()
|
||||
.collect(Collectors.toMap(
|
||||
error -> error.getField(),
|
||||
error -> error.getDefaultMessage() != null ? error.getDefaultMessage() : "Validation error"
|
||||
));
|
||||
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.VALIDATION_ERROR.getCode(),
|
||||
"Validation failed",
|
||||
Map.of("errors", errors)
|
||||
);
|
||||
|
||||
} catch (ResourceNotFoundException e) {
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.COMPANY_NOT_FOUND.getCode(),
|
||||
e.getMessage(),
|
||||
null
|
||||
);
|
||||
|
||||
} catch (IllegalArgumentException e) {
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.VALIDATION_ERROR.getCode(),
|
||||
e.getMessage(),
|
||||
null
|
||||
);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("Error handling company action", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.INTERNAL_ERROR.getCode(),
|
||||
"Error processing request: " + e.getMessage(),
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleCreate(CompanyActionRequestDto request, Integer msgId) {
|
||||
if (companyService.companyExistsByName(request.getCompanyName())) {
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.COMPANY_ALREADY_EXISTS.getCode(),
|
||||
"Company with this name already exists",
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
validateCompanyCreateData(request);
|
||||
|
||||
Company company = companyService.addCompany(
|
||||
request.getCompanyName(),
|
||||
getStringParam(request, "phone"),
|
||||
getStringParam(request, "address"),
|
||||
getStringParam(request, "email")
|
||||
);
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Company created successfully",
|
||||
mapToResponseDto(company)
|
||||
);
|
||||
}
|
||||
|
||||
private BaseResponse handleUpdate(CompanyActionRequestDto request, Integer msgId) {
|
||||
if (request.getCompanyId() == null) {
|
||||
throw new IllegalArgumentException("Company ID is required for update");
|
||||
}
|
||||
|
||||
Map<String, Object> companyData = request.getCompanyData();
|
||||
if (companyData == null) {
|
||||
companyData = new HashMap<>();
|
||||
}
|
||||
|
||||
Company company = companyService.updateCompany(
|
||||
request.getCompanyId(),
|
||||
(String) companyData.get("companyName"),
|
||||
(String) companyData.get("phone"),
|
||||
(String) companyData.get("address"),
|
||||
(String) companyData.get("email")
|
||||
);
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Company updated successfully",
|
||||
mapToResponseDto(company)
|
||||
);
|
||||
}
|
||||
|
||||
private BaseResponse handleDelete(CompanyActionRequestDto request, Integer msgId) {
|
||||
if (request.getCompanyId() == null) {
|
||||
throw new IllegalArgumentException("Company ID is required for deletion");
|
||||
}
|
||||
|
||||
companyService.deleteCompany(request.getCompanyId());
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Company deleted successfully",
|
||||
Map.of("deletedCompanyId", request.getCompanyId())
|
||||
);
|
||||
}
|
||||
|
||||
private BaseResponse handleGet(CompanyActionRequestDto request, Integer msgId) {
|
||||
Company company;
|
||||
|
||||
if (request.getCompanyId() != null) {
|
||||
company = companyService.getCompanyById(request.getCompanyId());
|
||||
} else if (request.getCompanyName() != null) {
|
||||
company = companyService.getCompanyByName(request.getCompanyName());
|
||||
} else {
|
||||
throw new IllegalArgumentException("Either companyId or companyName is required");
|
||||
}
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Company retrieved successfully",
|
||||
mapToResponseDto(company)
|
||||
);
|
||||
}
|
||||
|
||||
private BaseResponse handleGetAll(CompanyActionRequestDto request, Integer msgId) {
|
||||
List<Company> companies;
|
||||
|
||||
if (request.getPageable() != null) {
|
||||
Pageable pageable = createPageable(request.getPageable());
|
||||
Page<Company> companyPage = companyService.getAllCompanies(pageable);
|
||||
|
||||
List<CompanyResponseDto> companyDtos = companyPage.getContent().stream()
|
||||
.map(this::mapToResponseDto)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Companies retrieved successfully",
|
||||
Map.of(
|
||||
"companies", companyDtos,
|
||||
"totalElements", companyPage.getTotalElements(),
|
||||
"totalPages", companyPage.getTotalPages(),
|
||||
"currentPage", companyPage.getNumber(),
|
||||
"pageSize", companyPage.getSize()
|
||||
)
|
||||
);
|
||||
} else {
|
||||
companies = companyService.getAllCompanies();
|
||||
List<CompanyResponseDto> companyDtos = companies.stream()
|
||||
.map(this::mapToResponseDto)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Companies retrieved successfully",
|
||||
Map.of("companies", companyDtos)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleAddUser(CompanyActionRequestDto request, Integer msgId) {
|
||||
if (request.getCompanyId() == null || request.getUserId() == null) {
|
||||
throw new IllegalArgumentException("Company ID and User ID are required");
|
||||
}
|
||||
|
||||
companyService.addUserToCompany(request.getCompanyId(), request.getUserId());
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"User added to company successfully",
|
||||
Map.of(
|
||||
"companyId", request.getCompanyId(),
|
||||
"userId", request.getUserId()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private BaseResponse handleRemoveUser(CompanyActionRequestDto request, Integer msgId) {
|
||||
if (request.getUserId() == null) {
|
||||
throw new IllegalArgumentException("User ID is required");
|
||||
}
|
||||
|
||||
companyService.deleteUserFromCompany(request.getUserId());
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"User removed from company successfully",
|
||||
Map.of("userId", request.getUserId())
|
||||
);
|
||||
}
|
||||
|
||||
private BaseResponse handleGetUsers(CompanyActionRequestDto request, Integer msgId) {
|
||||
if (request.getCompanyId() == null) {
|
||||
throw new IllegalArgumentException("Company ID is required");
|
||||
}
|
||||
|
||||
List<User> users = companyService.getCompanyUsers(request.getCompanyId());
|
||||
|
||||
List<Map<String, Object>> userDtos = users.stream()
|
||||
.map(user -> {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("id", user.getId());
|
||||
map.put("email", user.getEmail());
|
||||
map.put("phone", user.getPhone());
|
||||
map.put("fullName", user.getFullName());
|
||||
return map;
|
||||
}).toList();
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Company users retrieved successfully",
|
||||
Map.of(
|
||||
"companyId", request.getCompanyId(),
|
||||
"users", userDtos,
|
||||
"count", userDtos.size()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private BaseResponse handleSearch(CompanyActionRequestDto request, Integer msgId) {
|
||||
String searchTerm = getStringParam(request, "name");
|
||||
if (searchTerm == null) {
|
||||
throw new IllegalArgumentException("Search term is required");
|
||||
}
|
||||
|
||||
List<Company> companies = companyService.searchCompaniesByName(searchTerm);
|
||||
List<CompanyResponseDto> companyDtos = companies.stream()
|
||||
.map(this::mapToResponseDto)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Companies search completed",
|
||||
Map.of(
|
||||
"searchTerm", searchTerm,
|
||||
"companies", companyDtos,
|
||||
"count", companyDtos.size()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private BaseResponse handleCountUsers(CompanyActionRequestDto request, Integer msgId) {
|
||||
if (request.getCompanyId() == null) {
|
||||
throw new IllegalArgumentException("Company ID is required");
|
||||
}
|
||||
|
||||
long count = companyService.countCompanyUsers(request.getCompanyId());
|
||||
|
||||
return new BaseResponse(
|
||||
msgId,
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"User count retrieved",
|
||||
Map.of(
|
||||
"companyId", request.getCompanyId(),
|
||||
"userCount", count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private void validateCompanyCreateData(CompanyActionRequestDto request) throws ValidationException {
|
||||
BindingResult bindingResult = new BeanPropertyBindingResult(request, "companyRequest");
|
||||
|
||||
if (request.getCompanyName() != null) {
|
||||
regRequestValidator.validateCompanyName(request.getCompanyName(), bindingResult);
|
||||
}
|
||||
|
||||
String email = getStringParam(request, "email");
|
||||
if (email != null) {
|
||||
regRequestValidator.validateEmail(email, bindingResult);
|
||||
}
|
||||
|
||||
String phone = getStringParam(request, "phone");
|
||||
if (phone != null) {
|
||||
regRequestValidator.validatePhone(phone, bindingResult);
|
||||
}
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
throw new ValidationException(bindingResult, null);
|
||||
}
|
||||
}
|
||||
|
||||
private String getStringParam(CompanyActionRequestDto request, String paramName) {
|
||||
if (request.getCompanyData() != null) {
|
||||
Object value = request.getCompanyData().get(paramName);
|
||||
return value != null ? value.toString() : null;
|
||||
}
|
||||
|
||||
Map<String, Object> searchParams = request.getSearchParams();
|
||||
if (searchParams != null) {
|
||||
Object value = searchParams.get(paramName);
|
||||
return value != null ? value.toString() : null;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private CompanyResponseDto mapToResponseDto(Company company) {
|
||||
CompanyResponseDto dto = new CompanyResponseDto();
|
||||
dto.setId(company.getId());
|
||||
dto.setCompanyName(company.getCompanyName());
|
||||
dto.setPhone(company.getPhone());
|
||||
dto.setAddress(company.getAddress());
|
||||
dto.setEmail(company.getEmail());
|
||||
dto.setRegisterDate(company.getRegisterDate());
|
||||
dto.setUpdateDate(company.getUpdateDate());
|
||||
|
||||
try {
|
||||
dto.setUserCount(companyService.countCompanyUsers(company.getId()));
|
||||
} catch (Exception e) {
|
||||
dto.setUserCount(0);
|
||||
}
|
||||
|
||||
return dto;
|
||||
}
|
||||
|
||||
private Pageable createPageable(CompanyActionRequestDto.PageableParams params) {
|
||||
Sort sort = Sort.unsorted();
|
||||
|
||||
if (params.getSort() != null) {
|
||||
Sort.Direction direction = params.getDirection() != null &&
|
||||
"desc".equalsIgnoreCase(params.getDirection()) ?
|
||||
Sort.Direction.DESC : Sort.Direction.ASC;
|
||||
sort = Sort.by(direction, params.getSort());
|
||||
}
|
||||
|
||||
return PageRequest.of(
|
||||
params.getPage(),
|
||||
params.getSize(),
|
||||
sort
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -6,9 +6,9 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.soune.nocopy.dto.*;
|
||||
import ru.soune.nocopy.dto.file.*;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
@@ -18,6 +18,7 @@ import ru.soune.nocopy.service.file.FileStatsService;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@@ -55,6 +56,8 @@ public class FileEntityHandler implements RequestHandler {
|
||||
return handleSearchFiles(request, fileRequest);
|
||||
case "storage_usage":
|
||||
return handleGetStorageUsage(request, fileRequest);
|
||||
case "check_protected":
|
||||
return handleProtectFile(request, fileRequest);
|
||||
case "delete_file":
|
||||
return handleDeleteFile(request, fileRequest);
|
||||
default:
|
||||
@@ -257,6 +260,29 @@ public class FileEntityHandler implements RequestHandler {
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleProtectFile(BaseRequest request, FileEntityRequest fileRequest) {
|
||||
String fileId = fileRequest.getFileId();
|
||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
||||
|
||||
if (optionalFileEntity.isEmpty()) {
|
||||
return new BaseResponse(request.getMsgId(),
|
||||
MessageCode.FILE_NOT_FOUND.getCode(),
|
||||
"File not found exception: " + fileRequest.getFileId(),
|
||||
null);
|
||||
}
|
||||
|
||||
FileEntity fileEntity = optionalFileEntity.get();
|
||||
ProtectionStatus protectionStatus = fileEntity.getProtectionStatus();
|
||||
|
||||
Integer code = protectionStatus == ProtectionStatus.PROTECTED ? MessageCode.FILE_IS_PROTECTED.getCode():
|
||||
MessageCode.FILE_IS_NOT_PROTECTED.getCode();
|
||||
String message = protectionStatus == ProtectionStatus.PROTECTED ? MessageCode.FILE_IS_PROTECTED.getDescription():
|
||||
MessageCode.FILE_IS_NOT_PROTECTED.getDescription();
|
||||
|
||||
return new BaseResponse(request.getMsgId(), code, message, fileEntityService.getById(fileId,
|
||||
request.getVersion()));
|
||||
}
|
||||
|
||||
private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
|
||||
try {
|
||||
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||
@@ -273,15 +299,17 @@ public class FileEntityHandler implements RequestHandler {
|
||||
|
||||
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||
.orElseThrow(() -> new FileEntityNotFoundException(fileId));
|
||||
int fullDelete = fileRequest.getFullDelete() == null ? 0 : fileRequest.getFullDelete();
|
||||
|
||||
if (fileEntity.getStatus().equals(FileStatus.DELETED)) {
|
||||
if (fileEntity.getStatus().equals(FileStatus.DELETED) || fullDelete == 1) {
|
||||
fileEntityService.deleteFromDisk(fileEntity);
|
||||
response = DeleteFileResponse.builder()
|
||||
.fileId(fileRequest.getFileId())
|
||||
.message("File deleted from disk")
|
||||
.build();
|
||||
} else {
|
||||
fileEntityService.markAsDeleted(fileEntity);
|
||||
fileEntityService.softDeleteFileWithHash(fileEntity);
|
||||
|
||||
response = DeleteFileResponse.builder()
|
||||
.fileId(fileRequest.getFileId())
|
||||
.message("File marked as deleted")
|
||||
|
||||
@@ -177,40 +177,13 @@ public class FileUploadHandler implements RequestHandler {
|
||||
}
|
||||
}
|
||||
|
||||
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));
|
||||
}
|
||||
@@ -225,7 +198,6 @@ public class FileUploadHandler implements RequestHandler {
|
||||
|
||||
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);
|
||||
|
||||
@@ -5,15 +5,16 @@ import org.springframework.context.support.DefaultMessageSourceResolvable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.MethodArgumentNotValidException;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.bind.annotation.ResponseStatus;
|
||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.exception.*;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@RestControllerAdvice
|
||||
@AllArgsConstructor
|
||||
@ControllerAdvice
|
||||
public class GlobalExceptionHandler {
|
||||
|
||||
@ExceptionHandler(MethodArgumentNotValidException.class)
|
||||
@@ -81,4 +82,12 @@ public class GlobalExceptionHandler {
|
||||
"message" ,ex.getMessage()
|
||||
));
|
||||
}
|
||||
|
||||
@ExceptionHandler(DuplicateImageException.class)
|
||||
@ResponseBody
|
||||
public ResponseEntity<BaseResponse> handleDuplicateImage(DuplicateImageException e) {
|
||||
return ResponseEntity.ok().body(new BaseResponse(
|
||||
20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||
"Duplicate image detected", e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,17 @@ 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.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||
import ru.soune.nocopy.service.search.SearchApiToYandexResponseMapper;
|
||||
import ru.soune.nocopy.service.search.YandexSearchService;
|
||||
import ru.soune.nocopy.service.search.GoogleVisionSearchService;
|
||||
import ru.soune.nocopy.service.tariff.TariffConstants;
|
||||
import ru.soune.nocopy.service.tariff.TariffInfoService;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@@ -20,6 +29,16 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
||||
|
||||
private final YandexSearchService yandexSearchService;
|
||||
|
||||
private final GoogleVisionSearchService googleVisionSearchService;
|
||||
|
||||
private final CheckCounterService checkCounterService;
|
||||
|
||||
private final FileEntityRepository fileEntityRepository;
|
||||
|
||||
private final TariffInfoService tariffInfoService;
|
||||
|
||||
private final SearchApiToYandexResponseMapper mapper = new SearchApiToYandexResponseMapper();
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||
ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||
@@ -27,9 +46,25 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
||||
|
||||
String fileId = imageSearchRequest.getFileId();
|
||||
|
||||
YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
|
||||
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)));
|
||||
});
|
||||
|
||||
// YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileEntity);
|
||||
|
||||
//TODO uncommited when add billing
|
||||
// GoogleVisionSearchResponse googleVisionSearchResponse = googleVisionSearchService.searchByFileEntity(fileId);
|
||||
|
||||
String yandexReverseSearchResponse = yandexSearchService.searchReverseByPublicUrl(fileEntity);
|
||||
|
||||
tariffInfoService.writeOffTokens(fileEntity.getUserId(), TariffConstants.TOKEN_VALUE_FOR_SEARCH);
|
||||
|
||||
checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), response);
|
||||
MessageCode.SUCCESS.getDescription(),mapper.mapToYandexResponse(yandexReverseSearchResponse));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,6 +50,16 @@ public class LoginRequestHandler implements RequestHandler {
|
||||
MessageCode.USER_NOT_VERIFIED.getDescription(), loginAnswer);
|
||||
}
|
||||
|
||||
if (!user.canLogin()) {
|
||||
LoginAnswer loginAnswer = new LoginAnswer();
|
||||
|
||||
loginAnswer.setFieldErrors(Arrays.asList(Map.of(
|
||||
"login_permission", "not found")));
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.PERMISSION_NOT_FOUND.getCode(),
|
||||
MessageCode.PERMISSION_NOT_FOUND.getDescription(), loginAnswer);
|
||||
}
|
||||
|
||||
AuthToken authToken = authService.login(loginRequest);
|
||||
String token = authToken.getToken();
|
||||
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
package ru.soune.nocopy.handler;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.soune.ReferralInvitee;
|
||||
import ru.soune.ReferralLevel;
|
||||
import ru.soune.ReferralService;
|
||||
import ru.soune.ReferralStat;
|
||||
import ru.soune.nocopy.dto.BaseRequest;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.referral.ReferralRequest;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class ReferralHandler implements RequestHandler {
|
||||
|
||||
private final ReferralService referralService;
|
||||
|
||||
private final AuthTokenRepository authTokenRepository;
|
||||
|
||||
private final ObjectMapper mapper = new ObjectMapper();
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||
ReferralRequest referralRequest = mapper.convertValue(request.getMessageBody(), ReferralRequest.class);
|
||||
String action = referralRequest.getAction();
|
||||
String token = referralRequest.getToken();
|
||||
AuthToken authToken = authTokenRepository.findByToken(token).orElseThrow();
|
||||
|
||||
switch (action) {
|
||||
case "refill":
|
||||
return handleRefill(request, authToken.getUser().getId(), referralRequest.getAmount());
|
||||
case "levels":
|
||||
return handleReferralLevels(request);
|
||||
case "level":
|
||||
return handleUserLevel(request, authToken.getUser().getId());
|
||||
case "userStats" :
|
||||
return handleUserStats(request, authToken.getUser().getId());
|
||||
case "invitees":
|
||||
return handleInvitees(referralRequest, request, authToken.getUser().getId());
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private BaseResponse handleRefill(BaseRequest request, Long userId, Integer amount) {
|
||||
referralService.onUserAccountRefill(userId, amount);
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), Map.of("account", "refill"));
|
||||
}
|
||||
|
||||
private BaseResponse handleReferralLevels(BaseRequest request) {
|
||||
List<ReferralLevel> referralLevels = referralService.getReferralLevels();
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), referralLevels);
|
||||
|
||||
}
|
||||
|
||||
private BaseResponse handleUserLevel(BaseRequest request, Long userId) {
|
||||
ReferralLevel referralLevelForUser = referralService.getReferralLevelForUser(userId);
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), referralLevelForUser);
|
||||
}
|
||||
|
||||
private BaseResponse handleUserStats(BaseRequest request, Long userId) {
|
||||
ReferralStat referralStatForUser = referralService.getReferralStatForUser(userId);
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), referralStatForUser);
|
||||
}
|
||||
|
||||
private BaseResponse handleInvitees(ReferralRequest referralRequest, BaseRequest request, Long userId) {
|
||||
List<ReferralInvitee> inviteeForUser = referralService.getInviteeForUser(userId, referralRequest.getPageSize(),
|
||||
referralRequest.getPageNumber());
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), inviteeForUser);
|
||||
}
|
||||
}
|
||||
@@ -6,11 +6,11 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.validation.BeanPropertyBindingResult;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import ru.soune.ReferralService;
|
||||
import ru.soune.nocopy.dto.*;
|
||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||
import ru.soune.nocopy.dto.register.RegRequest;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.user.EmailVerificationToken;
|
||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||
import ru.soune.nocopy.exception.ValidationException;
|
||||
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
||||
@@ -35,6 +35,8 @@ public class RegRequestHandler implements RequestHandler {
|
||||
|
||||
private final EmailService emailService;
|
||||
|
||||
private final ReferralService referralService;
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) throws ValidationException {
|
||||
RegRequest regRequest = objectMapper.convertValue(request.getMessageBody(), RegRequest.class);
|
||||
@@ -59,16 +61,31 @@ public class RegRequestHandler implements RequestHandler {
|
||||
}
|
||||
|
||||
AuthToken authToken = authService.register(regRequest);
|
||||
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
||||
// EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
||||
|
||||
// try {
|
||||
// emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
|
||||
// } catch (Exception e) {
|
||||
// return new BaseResponse(request.getMsgId(), MessageCode.SEND_EMAIL_EXCEPTION.getCode(),
|
||||
// MessageCode.SEND_EMAIL_EXCEPTION.getDescription(), Map.of(
|
||||
// "message", "not send",
|
||||
// "email", regRequest.getEmail()
|
||||
// ));
|
||||
// }
|
||||
|
||||
|
||||
emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
|
||||
String token = authToken.getToken();
|
||||
authService.useUserAuthToken(token);
|
||||
|
||||
RegAnswer regAnswer = new RegAnswer();
|
||||
|
||||
|
||||
regAnswer.setUserId(authToken.getUser().getId());
|
||||
regAnswer.setToken(token);
|
||||
regAnswer.setVerified(false);
|
||||
regAnswer.setActive(false);
|
||||
regAnswer.setVerified(true);
|
||||
regAnswer.setActive(true);
|
||||
|
||||
referralService.onRegister(authToken.getUser().getId(), regRequest.getReferralLink());
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), regAnswer);
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
package ru.soune.nocopy.handler;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
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.ActionResponse;
|
||||
import ru.soune.nocopy.dto.register.ResetPasswordRequest;
|
||||
import ru.soune.nocopy.dto.register.ResetPasswordResponse;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.user.EmailVerificationToken;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||
import ru.soune.nocopy.exception.UserNotFoundException;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.repository.EmailVerificationTokenRepository;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.mail.EmailService;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class ResetPasswordHandler implements RequestHandler{
|
||||
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
private final EmailService emailService;
|
||||
|
||||
private final AuthService authService;
|
||||
|
||||
private final UserRepository userRepository;
|
||||
|
||||
private final EmailVerificationTokenRepository emailVerificationTokenRepository;
|
||||
|
||||
private final AuthTokenRepository authTokenRepository;
|
||||
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||
ResetPasswordRequest resetPasswordRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||
ResetPasswordRequest.class);
|
||||
String action = resetPasswordRequest.getAction();
|
||||
User user = userRepository.findByEmail(resetPasswordRequest.getEmail());
|
||||
AuthToken authToken;
|
||||
|
||||
if (user == null) {
|
||||
throw new UserNotFoundException("User not found with email: " + resetPasswordRequest.getEmail());
|
||||
}
|
||||
|
||||
switch (action) {
|
||||
case "resetPassword":
|
||||
authToken = authService.generateAuthToken(user);
|
||||
|
||||
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
||||
|
||||
emailService.sendResetPasswordEmail(authToken.getUser(), emailToken.getToken());
|
||||
|
||||
return successResponse(request, authToken, user, MessageCode.SUCCESS.getDescription());
|
||||
case "confirmVerification":
|
||||
String verifyToken = resetPasswordRequest.getVerifyToken();
|
||||
|
||||
EmailVerificationToken verificationToken =
|
||||
emailVerificationTokenRepository.findByUserIdAndToken(user.getId(), verifyToken);
|
||||
|
||||
if (verificationToken == null) {
|
||||
throw new NotValidFieldException("Verification token not found",
|
||||
new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
|
||||
MessageCode.INVALID_TOKEN.getDescription(), Map.of("verifyToken", verifyToken)));
|
||||
}
|
||||
List<AuthToken> authTokens = authTokenRepository.findByUserId(user.getId());
|
||||
|
||||
authToken = authTokens.isEmpty() ? authService.generateAuthToken(user): authTokens.getFirst();
|
||||
|
||||
user.setPassword(passwordEncoder.encode(resetPasswordRequest.getPassword()));
|
||||
user.setActive(true);
|
||||
|
||||
emailVerificationTokenRepository.delete(verificationToken);
|
||||
|
||||
User saveUser = userRepository.save(user);
|
||||
|
||||
return successResponse(request, authToken, saveUser, MessageCode.SUCCESS.getDescription());
|
||||
default:
|
||||
ActionResponse response = ActionResponse.builder()
|
||||
.action(action)
|
||||
.availableActions(Arrays.asList("confirmVerification", "resetPassword"))
|
||||
.build();
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.INVALID_ACTION.getCode(),
|
||||
"Invalid action: " + action, response);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse successResponse(BaseRequest request, AuthToken authToken, User user, String message) {
|
||||
ResetPasswordResponse resetPasswordResponse = new ResetPasswordResponse();
|
||||
resetPasswordResponse.setAuthToken(authToken.getToken());
|
||||
resetPasswordResponse.setUserId(user.getId());
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), message, resetPasswordResponse);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
package ru.soune.nocopy.handler;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.soune.nocopy.dto.BaseRequest;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffDTO;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffRequest;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffResponse;
|
||||
import ru.soune.nocopy.service.tariff.TariffService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class TariffHandler implements RequestHandler {
|
||||
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
private final TariffService tariffService;
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||
try {
|
||||
TariffRequest tariffRequest = objectMapper.convertValue(request.getMessageBody(), TariffRequest.class);
|
||||
String action = tariffRequest.getAction();
|
||||
|
||||
switch (action) {
|
||||
case "add":
|
||||
return handleAddTariff(request, tariffRequest);
|
||||
case "remove":
|
||||
return handleRemoveTariff(request, tariffRequest);
|
||||
case "update":
|
||||
return handleUpdateTariff(request, tariffRequest);
|
||||
case "get" :
|
||||
return handleGetTariffs(request, tariffRequest);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("Error add tariff", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Error processing request: " + e.getMessage(),
|
||||
null);
|
||||
}
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), null);
|
||||
}
|
||||
|
||||
private BaseResponse handleAddTariff(BaseRequest request, TariffRequest tariffRequest) {
|
||||
tariffService.addTariff(tariffRequest.getName(), tariffRequest.getPrice(), tariffRequest.getType(),
|
||||
tariffRequest.getTokens(), tariffRequest.getDiskSize(), tariffRequest.getMaxUsers(),
|
||||
tariffRequest.getMaxFilesCount());
|
||||
|
||||
TariffResponse tariffResponse = TariffResponse.builder()
|
||||
.tariffName(tariffRequest.getName())
|
||||
.tariffType(tariffRequest.getType())
|
||||
.build();
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_ADD.getCode(),
|
||||
MessageCode.TARIFF_IS_ADD.getDescription(),
|
||||
tariffResponse);
|
||||
}
|
||||
|
||||
private BaseResponse handleRemoveTariff(BaseRequest request, TariffRequest tariffRequest) {
|
||||
TariffDTO tariff = tariffService.getTariffById(tariffRequest.getId());
|
||||
|
||||
if (tariff == null) {
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_NOT_FOUND.getCode(),
|
||||
MessageCode.TARIFF_IS_NOT_FOUND.getDescription(),
|
||||
Map.of("id", tariffRequest.getId()));
|
||||
}
|
||||
|
||||
TariffResponse tariffResponse = TariffResponse.builder()
|
||||
.tariffName(tariff.getName())
|
||||
.tariffType(tariff.getType())
|
||||
.build();
|
||||
|
||||
tariffService.deleteTariff(tariffRequest.getId());
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_DELETED.getCode(),
|
||||
MessageCode.TARIFF_IS_DELETED.getDescription(),
|
||||
tariffResponse);
|
||||
}
|
||||
|
||||
private BaseResponse handleUpdateTariff(BaseRequest request, TariffRequest tariffRequest) {
|
||||
TariffDTO tariff = tariffService.getTariffById(tariffRequest.getId());
|
||||
|
||||
if (tariff == null) {
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_NOT_FOUND.getCode(),
|
||||
MessageCode.TARIFF_IS_NOT_FOUND.getDescription(),
|
||||
Map.of("id", tariffRequest.getId()));
|
||||
}
|
||||
|
||||
TariffDTO tariffDTO = tariffService.updateTariff(tariffRequest.getId(), tariff);
|
||||
|
||||
TariffResponse tariffResponse = TariffResponse.builder()
|
||||
.tariffName(tariffDTO.getName())
|
||||
.tariffType(tariffDTO.getType())
|
||||
.build();
|
||||
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_UPDATED.getCode(),
|
||||
MessageCode.TARIFF_IS_UPDATED.getDescription(),
|
||||
tariffResponse);
|
||||
}
|
||||
|
||||
private BaseResponse handleGetTariffs(BaseRequest request, TariffRequest tariffRequest) {
|
||||
List<TariffDTO> allTariffs = tariffService.getAllTariffs();
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(),
|
||||
Map.of("tariffs", allTariffs));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,317 @@
|
||||
package ru.soune.nocopy.handler;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.soune.nocopy.dto.BaseRequest;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoRequest;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoResponse;
|
||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||
import ru.soune.nocopy.entity.tarif.TariffStatus;
|
||||
import ru.soune.nocopy.entity.tarif.TariffType;
|
||||
import ru.soune.nocopy.repository.TariffRepository;
|
||||
import ru.soune.nocopy.service.tariff.TariffInfoService;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class TariffInfoHandler implements RequestHandler {
|
||||
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
private final TariffInfoService tariffInfoService;
|
||||
|
||||
private final TariffRepository tariffRepository;
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||
try {
|
||||
TariffInfoRequest tariffInfoRequest = objectMapper.convertValue(request.getMessageBody(), TariffInfoRequest.class);
|
||||
String action = tariffInfoRequest.getAction();
|
||||
|
||||
switch (action) {
|
||||
case "create":
|
||||
return handleCreateTariffInfo(request, tariffInfoRequest);
|
||||
case "create_by_type":
|
||||
return handleCreateTariffInfoByType(request, tariffInfoRequest);
|
||||
case "update":
|
||||
return handleUpdateTariffInfo(request, tariffInfoRequest);
|
||||
case "delete":
|
||||
return handleDeleteTariffInfo(request, tariffInfoRequest);
|
||||
case "get_by_id":
|
||||
return handleGetTariffInfoById(request, tariffInfoRequest);
|
||||
case "get_all":
|
||||
return handleGetAllTariffInfos(request, tariffInfoRequest);
|
||||
default:
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Unknown action: " + action,
|
||||
null
|
||||
);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("Error processing tariff info request", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Error processing request: " + e.getMessage(),
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleCreateTariffInfo(BaseRequest request, TariffInfoRequest tariffInfoRequest) {
|
||||
try {
|
||||
Long tariffId = tariffInfoRequest.getTariffId();
|
||||
Tariff tariff= tariffRepository.findById(tariffId).orElseThrow();
|
||||
|
||||
TariffInfoDTO tariffInfoDTO = new TariffInfoDTO(null,
|
||||
tariffInfoRequest.getStatus() != null ? tariffInfoRequest.getStatus() : TariffStatus.ACTIVE.name(),
|
||||
tariffInfoRequest.getStartTariff() != null ? tariffInfoRequest.getStartTariff() : LocalDateTime.now(),
|
||||
tariffInfoRequest.getEndTariff() != null ? tariffInfoRequest.getEndTariff() : LocalDateTime.now().plusDays(30),
|
||||
tariffInfoRequest.getTariffId(), tariff.getName(), tariff.getTokens(), tariff.getDiskSize(), 0L,
|
||||
0, tariff.getMaxFilesCount());
|
||||
|
||||
TariffInfoDTO createdTariffInfo = tariffInfoService.createTariffInfo(tariffInfoDTO);
|
||||
|
||||
TariffInfoResponse response = TariffInfoResponse.builder()
|
||||
.id(createdTariffInfo.getId())
|
||||
.status(createdTariffInfo.getStatus())
|
||||
.startTariff(createdTariffInfo.getStartTariff())
|
||||
.endTariff(createdTariffInfo.getEndTariff())
|
||||
.tariffId(createdTariffInfo.getTariffId())
|
||||
.tariffName(createdTariffInfo.getTariffName())
|
||||
.build();
|
||||
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Tariff info created successfully",
|
||||
response
|
||||
);
|
||||
} catch (Exception e) {
|
||||
log.error("Error creating tariff info", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Failed to create tariff info: " + e.getMessage(),
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleCreateTariffInfoByType(BaseRequest request, TariffInfoRequest tariffInfoRequest) {
|
||||
try {
|
||||
if (tariffInfoRequest.getTariffType() == null) {
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Tariff type is required for create_by_type action",
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
tariffInfoService.createTariffInfo(
|
||||
TariffType.valueOf(tariffInfoRequest.getTariffType().toUpperCase())
|
||||
);
|
||||
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Tariff info created successfully by type: " + tariffInfoRequest.getTariffType(),
|
||||
null
|
||||
);
|
||||
} catch (IllegalArgumentException e) {
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Invalid tariff type: " + tariffInfoRequest.getTariffType(),
|
||||
null
|
||||
);
|
||||
} catch (Exception e) {
|
||||
log.error("Error creating tariff info by type", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Failed to create tariff info by type: " + e.getMessage(),
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleUpdateTariffInfo(BaseRequest request, TariffInfoRequest tariffInfoRequest) {
|
||||
try {
|
||||
if (tariffInfoRequest.getId() == null) {
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Tariff info ID is required for update",
|
||||
null
|
||||
);
|
||||
}
|
||||
Long tariffId = tariffInfoRequest.getTariffId();
|
||||
Tariff tariff = tariffRepository.findById(tariffId).orElseThrow();
|
||||
|
||||
TariffInfoDTO tariffInfoDTO = new TariffInfoDTO(
|
||||
tariffInfoRequest.getId(),
|
||||
tariffInfoRequest.getStatus(),
|
||||
tariffInfoRequest.getStartTariff(),
|
||||
tariffInfoRequest.getEndTariff(),
|
||||
tariffInfoRequest.getTariffId(),
|
||||
tariff.getName(), null, tariff.getDiskSize(), null, null, tariff.getMaxFilesCount()
|
||||
);
|
||||
|
||||
TariffInfoDTO updatedTariffInfo = tariffInfoService.updateTariffInfo(
|
||||
tariffInfoRequest.getId(),
|
||||
tariffInfoDTO
|
||||
);
|
||||
|
||||
TariffInfoResponse response = TariffInfoResponse.builder()
|
||||
.id(updatedTariffInfo.getId())
|
||||
.status(updatedTariffInfo.getStatus())
|
||||
.startTariff(updatedTariffInfo.getStartTariff())
|
||||
.endTariff(updatedTariffInfo.getEndTariff())
|
||||
.tariffId(updatedTariffInfo.getTariffId())
|
||||
.tariffName(updatedTariffInfo.getTariffName())
|
||||
.build();
|
||||
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Tariff info updated successfully",
|
||||
response
|
||||
);
|
||||
} catch (Exception e) {
|
||||
log.error("Error updating tariff info", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Failed to update tariff info: " + e.getMessage(),
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleDeleteTariffInfo(BaseRequest request, TariffInfoRequest tariffInfoRequest) {
|
||||
try {
|
||||
if (tariffInfoRequest.getId() == null) {
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Tariff info ID is required for delete",
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
TariffInfoDTO tariffInfo = tariffInfoService.getTariffInfoById(tariffInfoRequest.getId());
|
||||
|
||||
tariffInfoService.deleteTariffInfo(tariffInfoRequest.getId());
|
||||
|
||||
TariffInfoResponse response = TariffInfoResponse.builder()
|
||||
.id(tariffInfo.getId())
|
||||
.status(tariffInfo.getStatus())
|
||||
.startTariff(tariffInfo.getStartTariff())
|
||||
.endTariff(tariffInfo.getEndTariff())
|
||||
.tariffId(tariffInfo.getTariffId())
|
||||
.tariffName(tariffInfo.getTariffName())
|
||||
.build();
|
||||
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Tariff info deleted successfully",
|
||||
response
|
||||
);
|
||||
} catch (Exception e) {
|
||||
log.error("Error deleting tariff info", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Failed to delete tariff info: " + e.getMessage(),
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleGetTariffInfoById(BaseRequest request, TariffInfoRequest tariffInfoRequest) {
|
||||
try {
|
||||
if (tariffInfoRequest.getId() == null) {
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Tariff info ID is required",
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
TariffInfoDTO tariffInfo = tariffInfoService.getTariffInfoById(tariffInfoRequest.getId());
|
||||
|
||||
TariffInfoResponse response = TariffInfoResponse.builder()
|
||||
.id(tariffInfo.getId())
|
||||
.status(tariffInfo.getStatus())
|
||||
.startTariff(tariffInfo.getStartTariff())
|
||||
.endTariff(tariffInfo.getEndTariff())
|
||||
.tariffId(tariffInfo.getTariffId())
|
||||
.tariffName(tariffInfo.getTariffName())
|
||||
.build();
|
||||
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Tariff info retrieved successfully",
|
||||
response
|
||||
);
|
||||
} catch (Exception e) {
|
||||
log.error("Error getting tariff info by ID", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Failed to get tariff info: " + e.getMessage(),
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private BaseResponse handleGetAllTariffInfos(BaseRequest request, TariffInfoRequest tariffInfoRequest) {
|
||||
try {
|
||||
List<TariffInfoDTO> allTariffInfos = tariffInfoService.getAllTariffInfos();
|
||||
|
||||
List<TariffInfoResponse> responses = allTariffInfos.stream()
|
||||
.map(info -> TariffInfoResponse.builder()
|
||||
.id(info.getId())
|
||||
.status(info.getStatus())
|
||||
.startTariff(info.getStartTariff())
|
||||
.endTariff(info.getEndTariff())
|
||||
.tariffId(info.getTariffId())
|
||||
.tariffName(info.getTariffName())
|
||||
.build())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
"Tariff infos retrieved successfully",
|
||||
Map.of("tariff_infos", responses, "count", responses.size())
|
||||
);
|
||||
} catch (Exception e) {
|
||||
log.error("Error getting all tariff infos", e);
|
||||
return new BaseResponse(
|
||||
request.getMsgId(),
|
||||
MessageCode.ERROR_TARIFF_INFO.getCode(),
|
||||
"Failed to get tariff infos: " + e.getMessage(),
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package ru.soune.nocopy.handler;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import jakarta.mail.MessagingException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
@@ -21,7 +22,7 @@ import ru.soune.nocopy.service.mail.EmailService;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
import ru.soune.nocopy.service.user.UserService;
|
||||
|
||||
import java.util.List;
|
||||
import java.io.IOException;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -44,7 +45,7 @@ public class VerifyRegisterUserHandler implements RequestHandler {
|
||||
private final AuthService authService;
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) {
|
||||
public BaseResponse handle(BaseRequest request) throws MessagingException, IOException {
|
||||
VerifyUserRequest verifyUserRequest = objectMapper.convertValue(request.getMessageBody(), VerifyUserRequest.class);
|
||||
|
||||
Long userId = verifyUserRequest.getUserId();
|
||||
@@ -52,9 +53,9 @@ public class VerifyRegisterUserHandler implements RequestHandler {
|
||||
User user = userRepository.findById(userId)
|
||||
.orElseThrow(() -> new UserNotFoundException("User not found with id: " + userId));
|
||||
|
||||
List<AuthToken> authTokens = authTokenRepository.findByUserId(user.getId());
|
||||
Optional<AuthToken> userAuthTokens = authTokenRepository.findByUserId(userId);
|
||||
|
||||
AuthToken authToken = authTokens.isEmpty() ? authService.generateAuthToken(user): authTokens.getFirst();
|
||||
AuthToken authToken = userAuthTokens.isEmpty() ? authService.generateAuthToken(user): userAuthTokens.get();
|
||||
|
||||
if (verifyUserRequest.getResend() != null && verifyUserRequest.getResend() == 1) {
|
||||
return handleResend(request, user, authToken);
|
||||
@@ -63,7 +64,7 @@ public class VerifyRegisterUserHandler implements RequestHandler {
|
||||
return handleVerify(request, user, authToken, verifyUserRequest.getVerifyToken());
|
||||
}
|
||||
|
||||
private BaseResponse handleResend(BaseRequest request, User user, AuthToken authToken) {
|
||||
private BaseResponse handleResend(BaseRequest request, User user, AuthToken authToken) throws MessagingException, IOException {
|
||||
|
||||
EmailVerificationToken token = emailVerificationTokenRepository.findByUserId(user.getId());
|
||||
|
||||
@@ -71,7 +72,8 @@ public class VerifyRegisterUserHandler implements RequestHandler {
|
||||
emailService.sendVerificationEmail(user, token.getToken());
|
||||
|
||||
log.info("Verification token resent for user {}", user.getEmail());
|
||||
return successResponse(request, authToken, "Verification code has been resent", false, false);
|
||||
return successResponse(request, authToken, "Verification code has been resent", false,
|
||||
false, user.getEmail());
|
||||
}
|
||||
|
||||
if (token != null) {
|
||||
@@ -85,7 +87,7 @@ public class VerifyRegisterUserHandler implements RequestHandler {
|
||||
log.info("New verification token generated for user {}", user.getEmail());
|
||||
|
||||
return successResponse(request, authToken, "New verification code has been sent",
|
||||
false, false);
|
||||
false, false, user.getEmail());
|
||||
}
|
||||
|
||||
|
||||
@@ -100,19 +102,20 @@ public class VerifyRegisterUserHandler implements RequestHandler {
|
||||
}
|
||||
|
||||
User updateUser = userService.activateAndVerifyUser(user.getId());
|
||||
|
||||
emailVerificationTokenRepository.delete(token);
|
||||
|
||||
return successResponse(request, authToken, MessageCode.SUCCESS.getDescription(), updateUser.isActive(),
|
||||
updateUser.isEmailVerified());
|
||||
updateUser.isEmailVerified(), updateUser.getEmail());
|
||||
}
|
||||
|
||||
private BaseResponse successResponse(BaseRequest request, AuthToken authToken, String message, boolean isActive,
|
||||
boolean isVerified) {
|
||||
|
||||
boolean isVerified, String email) {
|
||||
RegAnswer regAnswer = new RegAnswer();
|
||||
regAnswer.setToken(authToken.getToken());
|
||||
regAnswer.setVerified(isVerified);
|
||||
regAnswer.setActive(isActive);
|
||||
regAnswer.setEmail(email);
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), message, regAnswer);
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user