Compare commits
105
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 | ||
|
|
8555002415 | ||
|
|
4560925183 | ||
|
|
d638819ee9 | ||
|
|
51654fd060 | ||
|
|
e37cc06cd0 | ||
|
|
5a3e26b6a3 | ||
|
|
409c677ba6 | ||
|
|
95deda12f3 | ||
|
|
d1b5b6eb5c | ||
|
|
251bb37105 | ||
|
|
1fc065a46b | ||
|
|
f9accd7af1 | ||
|
|
55fa8b84e2 | ||
|
|
4a8e561258 | ||
|
|
4704f780e5 | ||
|
|
20e1ab321d | ||
|
|
f136ac1f0a |
@@ -1,10 +1,19 @@
|
|||||||
|
# Postgres
|
||||||
POSTGRES_DB=no_copy_
|
POSTGRES_DB=no_copy_
|
||||||
POSTGRES_USER=ncp_db
|
POSTGRES_USER=ncp_db
|
||||||
POSTGRES_PASSWORD=ncpDbApp
|
POSTGRES_PASSWORD=ncpDbApp
|
||||||
POSTGRES_PORT=5432
|
POSTGRES_PORT=5432
|
||||||
POSTGRES_HOST=postgres
|
POSTGRES_HOST=postgres
|
||||||
|
|
||||||
|
# Redis
|
||||||
REDIS_HOST=redis
|
REDIS_HOST=redis
|
||||||
REDIS_PORT=6379
|
REDIS_PORT=6379
|
||||||
|
|
||||||
SERVER_PORT=8080
|
# Backend server
|
||||||
|
SERVER_PORT=8080
|
||||||
|
|
||||||
|
# Postfix
|
||||||
|
MAIL_HOST_PROD=postfix-production
|
||||||
|
MAIL_PORT_PROD=25
|
||||||
|
MAIL_USERNAME_PROD=noreply@nocopy.com
|
||||||
|
SMTP_PASSWORD_PROD=nocopy!nocopy!
|
||||||
@@ -76,3 +76,49 @@ ALTER TABLE file_entities
|
|||||||
ALTER COLUMN support_id
|
ALTER COLUMN support_id
|
||||||
SET DEFAULT nextval('file_support_id_seq');
|
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 {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
flatDir {
|
||||||
|
dirs 'libs'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -30,6 +33,10 @@ dependencies {
|
|||||||
implementation 'org.springframework.security:spring-security-crypto:6.5.3'
|
implementation 'org.springframework.security:spring-security-crypto:6.5.3'
|
||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
implementation 'commons-validator:commons-validator:1.7'
|
implementation '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 'org.flywaydb:flyway-core:9.22.0'
|
||||||
|
|
||||||
@@ -51,6 +58,13 @@ dependencies {
|
|||||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
|
|
||||||
|
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') {
|
tasks.named('test') {
|
||||||
|
|||||||
+41
-4
@@ -17,6 +17,29 @@ services:
|
|||||||
command: tail -f /dev/null
|
command: tail -f /dev/null
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# postfix:
|
||||||
|
# image: boky/postfix:latest
|
||||||
|
# container_name: postfix-production
|
||||||
|
# hostname: ${DOMAIN:-no-copy.ru}
|
||||||
|
# environment:
|
||||||
|
# - DOMAIN=${DOMAIN:-no-copy.ru}
|
||||||
|
# - ALLOWED_SENDER_DOMAINS=*
|
||||||
|
# - RELAYHOST=
|
||||||
|
# - DISABLE_SMTP_AUTH=
|
||||||
|
# - SMTP_USERNAME=${MAIL_USERNAME:-noreply@no-copy.ru}
|
||||||
|
# - SMTP_PASSWORD=${SMTP_PASSWORD:-nocopy!nocopy!}
|
||||||
|
# - RELAY_NETWORKS=172.16.0.0/12
|
||||||
|
# - POSTFIX_mynetworks=127.0.0.0/8 172.17.0.0/16 172.16.0.0/12
|
||||||
|
# - POSTFIX_smtpd_relay_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
|
||||||
|
# - POSTFIX_smtpd_recipient_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
|
||||||
|
# - DISABLE_SIGNING=true
|
||||||
|
# ports:
|
||||||
|
# - "25:25"
|
||||||
|
# - "587:587"
|
||||||
|
# networks:
|
||||||
|
# - app-network
|
||||||
|
# restart: unless-stopped
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:17.7
|
image: postgres:17.7
|
||||||
restart: always
|
restart: always
|
||||||
@@ -30,6 +53,8 @@ services:
|
|||||||
memory: 1G
|
memory: 1G
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
|
# POSTGRES_USER: postgres
|
||||||
|
# POSTGRES_PASSWORD: postgres
|
||||||
POSTGRES_USER: ${POSTGRES_USER}
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_SHARED_BUFFERS: 512MB
|
POSTGRES_SHARED_BUFFERS: 512MB
|
||||||
@@ -52,24 +77,36 @@ services:
|
|||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '1.5'
|
cpus: '1.5'
|
||||||
memory: 1G
|
memory: 3G
|
||||||
reservations:
|
reservations:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
memory: 512M
|
memory: 2G
|
||||||
environment:
|
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
|
FILE_STORAGE_PATH: /data/uploads
|
||||||
MAX_FILE_SIZE: 10737418240
|
MAX_FILE_SIZE: 10737418240
|
||||||
|
# FILE_CHUNK_SIZE: 1048576
|
||||||
FILE_CHUNK_SIZE: 1000000
|
FILE_CHUNK_SIZE: 1000000
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
|
|
||||||
POSTGRES_USER: ${POSTGRES_USER}
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
POSTGRES_HOST: db
|
POSTGRES_HOST: db
|
||||||
STORAGE_SERVICE_URL: http://storage:8081
|
STORAGE_SERVICE_URL: http://storage:8081
|
||||||
SPRING_PROFILES_ACTIVE: docker
|
SPRING_PROFILES_ACTIVE: prod
|
||||||
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
||||||
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
||||||
YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
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
|
||||||
|
# SMTP_PASSWORD: nocopy!nocopy!
|
||||||
|
# SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: "false"
|
||||||
|
# SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: "false"
|
||||||
|
# SPRING_MAIL_PROPERTIES_MAIL_DEBUG: "true"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
ports:
|
ports:
|
||||||
@@ -238,7 +275,7 @@ volumes:
|
|||||||
loki_rules:
|
loki_rules:
|
||||||
uploads_data:
|
uploads_data:
|
||||||
prometheus_data:
|
prometheus_data:
|
||||||
|
# postfix-data:
|
||||||
networks:
|
networks:
|
||||||
app-network:
|
app-network:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
@@ -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',
|
defaultValue: 'main',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
|
string(
|
||||||
|
name: 'PORT',
|
||||||
|
defaultValue: '2998',
|
||||||
|
description: 'Порт для запуска экземпляра'
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
@@ -36,19 +41,19 @@ pipeline {
|
|||||||
)
|
)
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
docker stop no-copy-frontend 2>/dev/null || true
|
docker stop no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||||
docker rm no-copy-frontend 2>/dev/null || true
|
docker rm no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||||
|
|
||||||
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
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
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
docker-compose -f docker-compose.yaml -p frontend-${params.PORT} down 2>/dev/null || true
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
docker-compose -f docker-compose.yml -p frontend-${params.PORT} down 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -65,13 +70,13 @@ pipeline {
|
|||||||
)
|
)
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
rm -rf /opt/deployments/frontend/${params.BRANCH}-${params.PORT}/*
|
||||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
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}/
|
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 """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}
|
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
echo '=== Редактируем docker-compose.yml ==='
|
||||||
docker-compose -f docker-compose.yaml build
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
# Меняем имя контейнера
|
||||||
docker-compose -f docker-compose.yml build
|
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
||||||
else
|
|
||||||
echo 'Exception: docker-compose file not found'
|
# Меняем порт (2998 на нужный порт)
|
||||||
exit 1
|
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
||||||
fi
|
|
||||||
"
|
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 """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}
|
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||||
|
|
||||||
# Проверяем и подключаем к сети app-network если нужно
|
echo '=== Запускаем контейнер ==='
|
||||||
docker network inspect app-network 2>/dev/null || echo 'Warning: app-network not found'
|
docker-compose -f docker-compose.yml -p frontend-${params.PORT} up -d
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
sleep 10
|
||||||
docker-compose -f docker-compose.yaml up -d
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
echo '=== Проверяем запуск ==='
|
||||||
docker-compose -f docker-compose.yml up -d
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
||||||
fi
|
echo '✓ Контейнер запущен: no-copy-frontend-${params.PORT}'
|
||||||
|
echo '✓ Порт: ${params.PORT}:2999'
|
||||||
sleep 10
|
else
|
||||||
|
echo '✗ Контейнер не запустился'
|
||||||
echo 'Status container:'
|
echo 'Логи:'
|
||||||
docker ps --filter name=no-copy-frontend
|
docker-compose -f docker-compose.yml -p frontend-${params.PORT} logs
|
||||||
"
|
exit 1
|
||||||
"""
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -151,23 +163,29 @@ pipeline {
|
|||||||
)
|
)
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
# Ищем контейнер с правильным именем (с портом)
|
||||||
echo 'Container started'
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
||||||
|
echo 'Container started: no-copy-frontend-${params.PORT}'
|
||||||
sleep 5
|
|
||||||
|
sleep 5
|
||||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
|
||||||
echo 'HTTP code: \$HTTP_CODE'
|
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:2998'
|
|
||||||
else
|
echo 'Frontend available on http://92.242.61.23:${params.PORT}'
|
||||||
echo 'Exception: container did not start'
|
|
||||||
docker ps -a | grep frontend
|
# Показываем все фронтенды
|
||||||
exit 1
|
echo ''
|
||||||
fi
|
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 {
|
post {
|
||||||
success {
|
success {
|
||||||
echo "Front branch ${params.BRANCH} deployment completed"
|
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 {
|
failure {
|
||||||
echo "Deployment failed"
|
echo "Deployment failed"
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ pipeline {
|
|||||||
stages {
|
stages {
|
||||||
stage('Git pull') {
|
stage('Git pull') {
|
||||||
steps {
|
steps {
|
||||||
|
cleanWs()
|
||||||
script {
|
script {
|
||||||
checkout([
|
checkout([
|
||||||
$class: 'GitSCM',
|
$class: 'GitSCM',
|
||||||
@@ -30,7 +31,6 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
stage('Deploy with docker-compose') {
|
stage('Deploy with docker-compose') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
@@ -44,68 +44,76 @@ pipeline {
|
|||||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
echo "Deploying branch: ${params.BRANCH}"
|
echo "Deploying branch: ${params.BRANCH}"
|
||||||
|
|
||||||
echo "Copying files to server..."
|
echo "Copying files to server..."
|
||||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||||
sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
|
||||||
|
sshpass -p '$SSH_PASS' rsync -av --delete \\
|
||||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
--exclude=.git \\
|
||||||
cd /opt/deployments/${params.BRANCH}
|
--exclude=.gradle \\
|
||||||
|
--exclude=build \\
|
||||||
echo '1. Остановка старого приложения...'
|
--exclude=**/build \\
|
||||||
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
--exclude=.idea \\
|
||||||
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
--exclude=out \\
|
||||||
|
. $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||||
echo '2. Удаление старых образов...'
|
|
||||||
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||||
|
cd /opt/deployments/${params.BRANCH}
|
||||||
echo '3. Создание сети если нужно...'
|
|
||||||
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
echo '1. Остановка старого приложения...'
|
||||||
|
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
echo '4. Запуск инфраструктуры...'
|
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
docker-compose up -d db storage
|
|
||||||
|
echo '2. Удаление старых образов...'
|
||||||
echo '5. Ожидание PostgreSQL...'
|
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||||
sleep 10
|
|
||||||
|
echo '3. Создание сети если нужно...'
|
||||||
echo '6. Сборка нового образа приложения...'
|
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||||
docker build --no-cache -t app-backend:latest .
|
|
||||||
|
echo '4. Запуск инфраструктуры...'
|
||||||
echo '7. Запуск приложения...'
|
docker-compose up -d db storage
|
||||||
docker run -d \\
|
|
||||||
--name app-backend \\
|
echo '5. Ожидание PostgreSQL...'
|
||||||
--network app-network \\
|
sleep 10
|
||||||
--network-alias app \\
|
|
||||||
-p 80:8080 \\
|
echo '6. Сборка нового образа приложения...'
|
||||||
-v uploads_data:/data/uploads:rw \\
|
docker build --no-cache -t app-backend:latest .
|
||||||
-e POSTGRES_DB=no_copy_ \\
|
|
||||||
-e POSTGRES_USER=$DB_USER \\
|
echo '7. Запуск приложения...'
|
||||||
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
docker run -d \\
|
||||||
-e POSTGRES_PORT=5432 \\
|
--name app-backend \\
|
||||||
-e POSTGRES_HOST=db \\
|
--network app-network \\
|
||||||
--restart unless-stopped \\
|
--network-alias app \\
|
||||||
app-backend:latest
|
-p 80:8080 \\
|
||||||
|
-v uploads_data:/data/uploads:rw \\
|
||||||
echo '8. Запуск мониторинга...'
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
docker-compose up -d grafana prometheus loki tempo alloy
|
-e POSTGRES_USER=$DB_USER \\
|
||||||
|
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||||
echo '9. Проверка...'
|
-e POSTGRES_PORT=5432 \\
|
||||||
sleep 5
|
-e POSTGRES_HOST=db \\
|
||||||
|
--restart unless-stopped \\
|
||||||
echo 'Статус контейнеров:'
|
app-backend:latest
|
||||||
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
|
||||||
|
echo '8. Запуск мониторинга...'
|
||||||
echo '10. Проверка health...'
|
docker-compose up -d grafana prometheus loki tempo alloy
|
||||||
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
|
||||||
echo 'Приложение работает'
|
echo '9. Проверка...'
|
||||||
echo 'URL: http://${params.SERVER}:80'
|
sleep 5
|
||||||
else
|
|
||||||
echo 'Проверка health не удалась'
|
echo 'Статус контейнеров:'
|
||||||
docker logs app-backend --tail=20
|
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||||
fi
|
|
||||||
"
|
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"
|
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.
@@ -16,8 +16,6 @@ dependencies {
|
|||||||
|
|
||||||
implementation("io.insert-koin:koin-core:4.1.1")
|
implementation("io.insert-koin:koin-core:4.1.1")
|
||||||
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
||||||
|
|
||||||
testImplementation(kotlin("test"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.test {
|
tasks.test {
|
||||||
|
|||||||
@@ -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,
|
||||||
|
)
|
||||||
@@ -3,4 +3,5 @@ plugins {
|
|||||||
}
|
}
|
||||||
rootProject.name = 'no-copy'
|
rootProject.name = 'no-copy'
|
||||||
include 'referral'
|
include 'referral'
|
||||||
|
include 'finance'
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +1,49 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
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.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableAutoConfiguration
|
@EnableAutoConfiguration
|
||||||
|
@AllArgsConstructor
|
||||||
public class ApplicationConfig {
|
public class ApplicationConfig {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
PasswordEncoder passwordEncoder() {
|
PasswordEncoder passwordEncoder() {
|
||||||
return new BCryptPasswordEncoder();
|
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
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,12 @@ public class HandlerConfig {
|
|||||||
FileEntityHandler file,
|
FileEntityHandler file,
|
||||||
LogoutRequestHandler logoutHandler,
|
LogoutRequestHandler logoutHandler,
|
||||||
ImageFoundRequestHandler imageFoundRequestHandler,
|
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||||
AuthRequestHandler authRequestHandler
|
VerifyRegisterUserHandler verifyRegisterUser,
|
||||||
|
AuthRequestHandler authRequestHandler,
|
||||||
|
CompanyHandler companyHandler,
|
||||||
|
TariffHandler tariffHandler,
|
||||||
|
TariffInfoHandler tariffInfoHandler,
|
||||||
|
ReferralHandler referralHandler
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
map.put(20001, login);
|
map.put(20001, login);
|
||||||
@@ -28,6 +33,11 @@ public class HandlerConfig {
|
|||||||
map.put(20006, logoutHandler);
|
map.put(20006, logoutHandler);
|
||||||
map.put(20007, imageFoundRequestHandler);
|
map.put(20007, imageFoundRequestHandler);
|
||||||
map.put(20008, authRequestHandler);
|
map.put(20008, authRequestHandler);
|
||||||
|
map.put(20009, verifyRegisterUser);
|
||||||
|
map.put(30000, companyHandler);
|
||||||
|
map.put(30001, tariffHandler);
|
||||||
|
map.put(30002, tariffInfoHandler);
|
||||||
|
map.put(30003, referralHandler);
|
||||||
|
|
||||||
return map;
|
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,11 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import com.vrt.NoCopyFileService;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.NoCopyCheckResult;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.FileSystemResource;
|
||||||
import org.springframework.core.io.UrlResource;
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.data.web.PageableDefault;
|
import org.springframework.data.web.PageableDefault;
|
||||||
@@ -17,23 +19,25 @@ import org.springframework.web.multipart.MultipartFile;
|
|||||||
import ru.soune.nocopy.dto.BaseRequest;
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
import ru.soune.nocopy.dto.BaseResponse;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.RegAnswer;
|
|
||||||
import ru.soune.nocopy.dto.file.*;
|
import ru.soune.nocopy.dto.file.*;
|
||||||
|
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
|
||||||
import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
|
||||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
|
||||||
import ru.soune.nocopy.dto.file.UploadProgress;
|
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
|
import ru.soune.nocopy.entity.user.AuthToken;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
import ru.soune.nocopy.handler.*;
|
import ru.soune.nocopy.handler.*;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
import ru.soune.nocopy.service.FileSimilarityService;
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
import ru.soune.nocopy.service.auth.AuthService;
|
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.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
@@ -61,6 +65,14 @@ public class ApiController {
|
|||||||
|
|
||||||
private final FileEntityRepository fileEntityRepository;
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final NoCopyFileService noCopyFileService;
|
||||||
|
|
||||||
|
private final FileUtil fileUtil;
|
||||||
|
|
||||||
|
private final ProtectionsLimitService protectionsLimitService;
|
||||||
|
|
||||||
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
@PostMapping("/v{version}/data")
|
@PostMapping("/v{version}/data")
|
||||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
@PathVariable("version") int version) {
|
@PathVariable("version") int version) {
|
||||||
@@ -82,6 +94,9 @@ public class ApiController {
|
|||||||
return ResponseEntity.ok().body(response);
|
return ResponseEntity.ok().body(response);
|
||||||
} catch (ValidationException e) {
|
} catch (ValidationException e) {
|
||||||
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
||||||
|
} catch (UserNotFoundException e) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.USER_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.USER_NOT_FOUND.getDescription(), new HashMap<>()));
|
||||||
} catch (NotFoundAuthToken e) {
|
} catch (NotFoundAuthToken e) {
|
||||||
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
|
||||||
@@ -104,7 +119,8 @@ public class ApiController {
|
|||||||
@PathVariable("version") int version,
|
@PathVariable("version") int version,
|
||||||
@RequestParam(value = "upload_id", required = false) String uploadId,
|
@RequestParam(value = "upload_id", required = false) String uploadId,
|
||||||
@RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
|
@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 {
|
try {
|
||||||
if (chunk == null || chunk.isEmpty()) {
|
if (chunk == null || chunk.isEmpty()) {
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
|
return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
|
||||||
@@ -116,13 +132,27 @@ public class ApiController {
|
|||||||
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
||||||
}
|
}
|
||||||
|
|
||||||
fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber,
|
||||||
|
chunk, findSimilar);
|
||||||
|
|
||||||
return buildSuccessResponse(uploadId, chunkNumber, chunk);
|
return buildSuccessResponse(uploadId, chunkNumber, chunk,
|
||||||
|
fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
|
||||||
} catch (DuplicateImageException e) {
|
} catch (DuplicateImageException e) {
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
Map<String, Object> duplicateData = new HashMap<>();
|
||||||
|
duplicateData.put("duplicateFileId", e.duplicateFileId());
|
||||||
|
duplicateData.put("userId", e.userId());
|
||||||
|
duplicateData.put("message", e.getMessage());
|
||||||
|
|
||||||
|
if (uploadId != null) {
|
||||||
|
duplicateData.put("uploadId", uploadId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004,
|
||||||
|
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
||||||
Map.of("duplicateOwnerId", e.userId(), "duplicateFileId", e.duplicateFileId())));
|
duplicateData
|
||||||
|
));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error uploading chunk", e);
|
log.error("Error uploading chunk", e);
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||||
@@ -133,22 +163,23 @@ public class ApiController {
|
|||||||
public ResponseEntity<BaseResponse> findSimilarFiles(
|
public ResponseEntity<BaseResponse> findSimilarFiles(
|
||||||
@PathVariable("version") int version,
|
@PathVariable("version") int version,
|
||||||
@PathVariable String fileId,
|
@PathVariable String fileId,
|
||||||
|
@RequestParam(value = "auth_token",required = false) String authToken,
|
||||||
@RequestParam(required = false) List<String> similarityLevels,
|
@RequestParam(required = false) List<String> similarityLevels,
|
||||||
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
||||||
SimilarityFilter filter = SimilarityFilter.builder()
|
SimilarityFilter filter = SimilarityFilter.builder()
|
||||||
.similarityLevels(similarityLevels)
|
.similarityLevels(similarityLevels)
|
||||||
.build();
|
.build();
|
||||||
Page<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
|
Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable, authToken);
|
||||||
|
|
||||||
String messageDesc;
|
String messageDesc;
|
||||||
MessageCode success;
|
MessageCode success;
|
||||||
|
|
||||||
if (similarFiles.isEmpty()) {
|
if (similarFiles.isEmpty()) {
|
||||||
messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
|
messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
|
||||||
success = MessageCode.FILE_NOT_FOUND;
|
success = MessageCode.SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
|
messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
|
||||||
success = MessageCode.SIMILAR_FILES_FOUND;
|
success = MessageCode.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, Object> responseData = new HashMap<>();
|
Map<String, Object> responseData = new HashMap<>();
|
||||||
@@ -194,7 +225,8 @@ public class ApiController {
|
|||||||
.uploadId(uploadId)
|
.uploadId(uploadId)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
"Failed to get upload progress: " + e.getMessage(), responseBody));
|
"Failed to get upload progress: " + e.getMessage(), responseBody));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -259,7 +291,6 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/download/{fileId}")
|
@GetMapping("/v{version}/files/download/{fileId}")
|
||||||
public ResponseEntity<?> downloadFile(
|
public ResponseEntity<?> downloadFile(
|
||||||
@PathVariable(required = false) String fileId,
|
@PathVariable(required = false) String fileId,
|
||||||
@@ -311,8 +342,11 @@ public class ApiController {
|
|||||||
errorData));
|
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()) {
|
if (!resource.exists()) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
@@ -327,10 +361,10 @@ public class ApiController {
|
|||||||
String contentType = determineContentType(filePath);
|
String contentType = determineContentType(filePath);
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
return ResponseEntity.ok()
|
||||||
|
.contentLength(fileSize)
|
||||||
.contentType(MediaType.parseMediaType(contentType))
|
.contentType(MediaType.parseMediaType(contentType))
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||||
"attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
|
"attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
|
||||||
.header(HttpHeaders.CONTENT_LENGTH, String.valueOf(entityResponse.getFileSize()))
|
|
||||||
.body(resource);
|
.body(resource);
|
||||||
} catch (FileEntityNotFoundException e) {
|
} catch (FileEntityNotFoundException e) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
@@ -353,32 +387,67 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> checkForDuplicates(String uploadId) throws IOException {
|
@GetMapping("/protect/{fileId}")
|
||||||
Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
|
public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
|
||||||
|
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
||||||
|
|
||||||
if (uploadedFile.isEmpty() || !uploadedFile.get().getMimeType().equals("image")) {
|
if (!optionalFileEntity.isPresent()) {
|
||||||
return null;
|
return ResponseEntity.notFound().build();
|
||||||
}
|
}
|
||||||
|
FileEntity fileEntity = optionalFileEntity.get();
|
||||||
|
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
|
||||||
|
|
||||||
FileEntity fileEntity = uploadedFile.get();
|
noCopyFileService.addFile(fileInfo);
|
||||||
List<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
|
|
||||||
|
|
||||||
if (hasDuplicate(similarFiles)) {
|
fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
|
||||||
return handleDuplicate(fileEntity, similarFiles);
|
fileEntityRepository.save(fileEntity);
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
return ResponseEntity.ok().build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean hasDuplicate(List<SimilarFileResponse> similarFiles) {
|
@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);
|
return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileResponse> similarFiles)
|
private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
fileEntityService.deleteFromDisk(fileEntity);
|
fileEntityService.deleteFromDisk(fileEntity);
|
||||||
|
|
||||||
fileEntityService.markAsDeleted(fileEntity);
|
fileEntityService.softDeleteFileWithHash(fileEntity);
|
||||||
|
|
||||||
Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
|
Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
|
||||||
|
|
||||||
@@ -397,11 +466,13 @@ public class ApiController {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk) {
|
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
|
||||||
|
String fileId) {
|
||||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
.uploadId(uploadId)
|
.uploadId(uploadId)
|
||||||
.chunkNumber(chunkNumber)
|
.chunkNumber(chunkNumber)
|
||||||
.chunkSize(chunk.getSize())
|
.chunkSize(chunk.getSize())
|
||||||
|
.fileId(fileId)
|
||||||
.message("Chunk uploaded successfully")
|
.message("Chunk uploaded successfully")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -460,16 +531,4 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
return contentType;
|
return contentType;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isPreviewSupported(String mimeType) {
|
|
||||||
if (mimeType == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return mimeType.startsWith("image") ||
|
|
||||||
mimeType.startsWith("text") ||
|
|
||||||
mimeType.equals("pdf") ||
|
|
||||||
mimeType.startsWith("video") ||
|
|
||||||
mimeType.startsWith("audio");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -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.http.HttpStatus;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("check/api")
|
@RequestMapping("check/api")
|
||||||
public class HealtCheckController {
|
public class HealtCheckController {
|
||||||
@@ -11,4 +14,22 @@ public class HealtCheckController {
|
|||||||
public HttpStatus healtCheck() {
|
public HttpStatus healtCheck() {
|
||||||
return HttpStatus.OK;
|
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 lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import ru.soune.nocopy.dto.ChangePasswordRequest;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import ru.soune.nocopy.dto.UserDTO;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.UserRequest;
|
import ru.soune.nocopy.dto.register.ChangePasswordRequest;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||||
import ru.soune.nocopy.entity.User;
|
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.InvalidUserEmail;
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.mapper.UserMapper;
|
import ru.soune.nocopy.mapper.UserMapper;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.UserService;
|
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.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@@ -31,12 +45,21 @@ public class UserController {
|
|||||||
|
|
||||||
private final UserMapper userMapper;
|
private final UserMapper userMapper;
|
||||||
|
|
||||||
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final TariffService tariffService;
|
||||||
|
|
||||||
|
private final FileStatsService fileStatsService;
|
||||||
|
|
||||||
@GetMapping("/all")
|
@GetMapping("/all")
|
||||||
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
||||||
List<UserDTO> allUsers = userRepository.findAll().stream()
|
List<UserDTO> allUsers = userRepository.findAll().stream()
|
||||||
.map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.getIsActive(),
|
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
|
||||||
u.getPhone(), u.getGenderType(),
|
u.getPhone(), u.getGenderType(),
|
||||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
|
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
||||||
|
null, null))
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
return ResponseEntity.ok(allUsers);
|
return ResponseEntity.ok(allUsers);
|
||||||
@@ -49,26 +72,68 @@ public class UserController {
|
|||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
if (tokenOptional.isPresent()) {
|
||||||
|
User user = userRepository.findByEmail(email);
|
||||||
|
|
||||||
if (authToken != null) {
|
if (user != null) {
|
||||||
Optional<User> user = userRepository.findByEmail(email);
|
UserDTO userDTO = userMapper.toDTO(user);
|
||||||
//TODO add mapper
|
|
||||||
if (user.isPresent()) {
|
|
||||||
UserDTO userDTO = userMapper.toDTO(user.get());
|
|
||||||
userDTO.setEmail(email);
|
userDTO.setEmail(email);
|
||||||
userDTO.setFullName(user.get().getFullName());
|
userDTO.setFullName(user.getFullName());
|
||||||
userDTO.setCompany(user.get().getCompany());
|
|
||||||
userDTO.setPhone(user.get().getPhone());
|
if (user.getCompany() != null) {
|
||||||
userDTO.setGenderType(user.get().getGenderType());
|
userDTO.setCompany(user.getCompany().getCompanyName());
|
||||||
userDTO.setBirthday(user.get().getBirthday());
|
}
|
||||||
userDTO.setCreatedAt(user.get().getCreatedAt());
|
|
||||||
userDTO.setSubscriptionType(user.get().getSubscriptionType());
|
if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
|
||||||
userDTO.setActive(user.get().getIsActive());
|
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);
|
return ResponseEntity.ok(userDTO);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
}
|
}
|
||||||
|
|
||||||
return ResponseEntity.notFound().build();
|
return ResponseEntity.notFound().build();
|
||||||
@@ -108,4 +173,46 @@ public class UserController {
|
|||||||
|
|
||||||
return ResponseEntity.ok(userService.updateUser(userRequest, user));
|
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"));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
public record AuthResponse (
|
|
||||||
boolean success,
|
|
||||||
String message,
|
|
||||||
String token,
|
|
||||||
LocalDateTime expiresAt
|
|
||||||
) {}
|
|
||||||
@@ -6,10 +6,14 @@ public enum MessageCode {
|
|||||||
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||||
INVALID_FIELD(2, "Invalid field"),
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
INVALID_TOKEN(2, "Invalid token"),
|
INVALID_TOKEN(2, "Invalid token"),
|
||||||
|
TOKEN_IS_ALIVE(2, "Token is alive"),
|
||||||
INVALID_ACTION(2, "Invalid action"),
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
||||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
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"),
|
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
||||||
IMAGE_FOUND_ERROR(2, "Image found error"),
|
IMAGE_FOUND_ERROR(2, "Image found error"),
|
||||||
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
||||||
@@ -23,7 +27,20 @@ public enum MessageCode {
|
|||||||
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
|
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
|
||||||
FILE_NOT_FOUND(4, "File not found"),
|
FILE_NOT_FOUND(4, "File not found"),
|
||||||
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
|
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
|
||||||
SIMILAR_FILES_FOUND(0, "Similar files found");
|
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;
|
private final Integer code;
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class UserContentDTO {
|
|
||||||
String fileName;
|
|
||||||
String originalFilename;
|
|
||||||
String fileType;
|
|
||||||
String fileExtension;
|
|
||||||
Long fileSize;
|
|
||||||
String filePath;
|
|
||||||
Integer protectionLevel;
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import ru.soune.nocopy.entity.ContentStatus;
|
|
||||||
import ru.soune.nocopy.entity.file.FileType;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
public record UserContentResponse(
|
|
||||||
Long id,
|
|
||||||
String filename,
|
|
||||||
String originalFilename,
|
|
||||||
FileType fileType,
|
|
||||||
long fileSize,
|
|
||||||
String filePath,
|
|
||||||
ContentStatus status,
|
|
||||||
LocalDateTime uploadDate
|
|
||||||
) {}
|
|
||||||
@@ -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")
|
@JsonProperty("chunk_size")
|
||||||
private Long chunkSize;
|
private Long chunkSize;
|
||||||
|
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
@JsonProperty("message")
|
@JsonProperty("message")
|
||||||
private String message;
|
private String message;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,9 @@ public class FileEntityRequest {
|
|||||||
@JsonProperty("file_id")
|
@JsonProperty("file_id")
|
||||||
private String fileId;
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("full_delete")
|
||||||
|
private Integer fullDelete;
|
||||||
|
|
||||||
@JsonProperty("upload_session_id")
|
@JsonProperty("upload_session_id")
|
||||||
private String uploadSessionId;
|
private String uploadSessionId;
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ public class FileEntityResponse {
|
|||||||
private String originalFileName;
|
private String originalFileName;
|
||||||
private String storedFileName;
|
private String storedFileName;
|
||||||
private String filePath;
|
private String filePath;
|
||||||
|
private String protectedFilePath;
|
||||||
private Long fileSize;
|
private Long fileSize;
|
||||||
private String mimeType;
|
private String mimeType;
|
||||||
private String fileExtension;
|
private String fileExtension;
|
||||||
@@ -31,4 +32,12 @@ public class FileEntityResponse {
|
|||||||
private String downloadUrl;
|
private String downloadUrl;
|
||||||
private boolean existsOnDisk;
|
private boolean existsOnDisk;
|
||||||
private Integer supportId;
|
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")
|
@JsonProperty("audios_violations")
|
||||||
private Integer audiosViolations;
|
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;
|
||||||
|
}
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Value;
|
|
||||||
|
|
||||||
@Value
|
|
||||||
@Builder
|
|
||||||
public class SimilarFileResponse {
|
|
||||||
String fileId;
|
|
||||||
String originalFileName;
|
|
||||||
Long fileSize;
|
|
||||||
Integer hammingDistance;
|
|
||||||
String similarityLevel;
|
|
||||||
}
|
|
||||||
@@ -12,6 +12,15 @@ public class YandexSearchResponse {
|
|||||||
@JsonProperty("images")
|
@JsonProperty("images")
|
||||||
private List<ImageResult> 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
|
@Data
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public static class ImageResult {
|
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
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+5
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -13,5 +13,9 @@ import java.util.Map;
|
|||||||
public class LoginAnswer {
|
public class LoginAnswer {
|
||||||
private String Token;
|
private String Token;
|
||||||
|
|
||||||
|
private boolean isActive;
|
||||||
|
|
||||||
|
private boolean isVerified;
|
||||||
|
|
||||||
private List<Map<String, String>> fieldErrors;
|
private List<Map<String, String>> fieldErrors;
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
+9
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -13,5 +13,13 @@ import java.util.Map;
|
|||||||
public class RegAnswer {
|
public class RegAnswer {
|
||||||
private String Token;
|
private String Token;
|
||||||
|
|
||||||
|
private boolean isActive;
|
||||||
|
|
||||||
|
private boolean isVerified;
|
||||||
|
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
private String email;
|
||||||
|
|
||||||
private List<Map<String, String>> fieldErrors;
|
private List<Map<String, String>> fieldErrors;
|
||||||
}
|
}
|
||||||
+8
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
@@ -13,6 +13,9 @@ public class RegRequest {
|
|||||||
|
|
||||||
private String companyName;
|
private String companyName;
|
||||||
|
|
||||||
|
@NotEmpty(message = "Need account type")
|
||||||
|
private String accountType;
|
||||||
|
|
||||||
@Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
|
@Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
|
||||||
private String phone;
|
private String phone;
|
||||||
|
|
||||||
@@ -24,4 +27,8 @@ public class RegRequest {
|
|||||||
@NotBlank(message = "Password is required")
|
@NotBlank(message = "Password is required")
|
||||||
@Size(min = 8, message = "Password must be at least 8 characters")
|
@Size(min = 8, message = "Password must be at least 8 characters")
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
private String authToken;
|
||||||
|
|
||||||
|
private String referralLink;
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
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 VerifyUserRequest {
|
||||||
|
@JsonProperty("verify_token")
|
||||||
|
private String verifyToken;
|
||||||
|
|
||||||
|
@JsonProperty("user_id")
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
@JsonProperty("resend")
|
||||||
|
private Integer resend;
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.user;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.user;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
+9
-3
@@ -1,14 +1,17 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.user;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import ru.soune.nocopy.entity.GenderType;
|
import ru.soune.nocopy.dto.tarriff.TariffDTO;
|
||||||
import ru.soune.nocopy.entity.SubscriptionType;
|
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.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@@ -24,4 +27,7 @@ public class UserDTO {
|
|||||||
private LocalDate birthday;
|
private LocalDate birthday;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private SubscriptionType subscriptionType;
|
private SubscriptionType subscriptionType;
|
||||||
|
private List<TariffDTO> tariffs;
|
||||||
|
private TariffInfoDTO tariffInfo;
|
||||||
|
private Long permission;
|
||||||
}
|
}
|
||||||
+2
-2
@@ -1,11 +1,11 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto.user;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.Past;
|
import jakarta.validation.constraints.Past;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import ru.soune.nocopy.entity.GenderType;
|
import ru.soune.nocopy.entity.user.GenderType;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
package ru.soune.nocopy.entity;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import lombok.*;
|
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
package ru.soune.nocopy.entity;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import lombok.*;
|
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "user_actions")
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ToString
|
|
||||||
@EntityListeners(AuditingEntityListener.class)
|
|
||||||
public class UserAction {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
||||||
private Long actionId;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "user_id", nullable = false)
|
|
||||||
@ToString.Exclude
|
|
||||||
private User user;
|
|
||||||
|
|
||||||
@Column(name = "action", nullable = false, length = 100)
|
|
||||||
private String action;
|
|
||||||
|
|
||||||
@Column(name = "details", columnDefinition = "TEXT")
|
|
||||||
private String details;
|
|
||||||
|
|
||||||
@Column(name = "ip_address", length = 45)
|
|
||||||
private String ipAddress;
|
|
||||||
|
|
||||||
@Column(name = "user_agent", columnDefinition = "TEXT")
|
|
||||||
private String userAgent;
|
|
||||||
|
|
||||||
@CreatedDate
|
|
||||||
@Column(name = "created_at", nullable = false, updatable = false)
|
|
||||||
private LocalDateTime createdAt;
|
|
||||||
}
|
|
||||||
@@ -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
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.entity;
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@@ -3,13 +3,10 @@ package ru.soune.nocopy.entity.file;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.hibernate.annotations.GenerationTime;
|
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.annotation.LastModifiedDate;
|
import org.springframework.data.annotation.LastModifiedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
|
||||||
import java.sql.DriverManager;
|
|
||||||
import java.sql.SQLException;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@@ -66,6 +63,20 @@ public class FileEntity {
|
|||||||
@Column(name = "updated_at")
|
@Column(name = "updated_at")
|
||||||
private LocalDateTime updatedAt;
|
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)
|
@OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
private ImageHashEntity imageHash;
|
private ImageHashEntity imageHash;
|
||||||
@@ -75,9 +86,19 @@ public class FileEntity {
|
|||||||
if (this.status == null) {
|
if (this.status == null) {
|
||||||
this.status = FileStatus.ACTIVE;
|
this.status = FileStatus.ACTIVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.protectionStatus == null) {
|
||||||
|
this.protectionStatus = ProtectionStatus.NOT_PROTECTED;
|
||||||
|
}
|
||||||
|
|
||||||
if (this.createdAt == null) {
|
if (this.createdAt == null) {
|
||||||
this.createdAt = LocalDateTime.now();
|
this.createdAt = LocalDateTime.now();
|
||||||
}
|
}
|
||||||
this.updatedAt = LocalDateTime.now();
|
this.updatedAt = LocalDateTime.now();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PreUpdate
|
||||||
|
public void preUpdate() {
|
||||||
|
this.updatedAt = LocalDateTime.now();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,5 +6,6 @@ public enum FileStatus {
|
|||||||
PROCESSING,
|
PROCESSING,
|
||||||
VIOLATION,
|
VIOLATION,
|
||||||
CHECKED,
|
CHECKED,
|
||||||
ERROR
|
ERROR,
|
||||||
|
TEMP
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,10 +7,11 @@ import java.util.List;
|
|||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public enum FileType {
|
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",
|
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
||||||
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
||||||
AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
|
AUDIO("audio", List.of("wav"));
|
||||||
|
|
||||||
private final String displayName;
|
private final String displayName;
|
||||||
private final List<String> allowedExtensions;
|
private final List<String> allowedExtensions;
|
||||||
|
|||||||
@@ -9,7 +9,11 @@ import lombok.NoArgsConstructor;
|
|||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "image_hashes")
|
@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
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@@ -26,10 +30,10 @@ public class ImageHashEntity {
|
|||||||
private FileEntity file;
|
private FileEntity file;
|
||||||
|
|
||||||
@Column(name = "hash64_hi")
|
@Column(name = "hash64_hi")
|
||||||
private Integer hash64Hi;
|
private Long hash64Hi;
|
||||||
|
|
||||||
@Column(name = "hash64_lo")
|
@Column(name = "hash64_lo")
|
||||||
private Integer hash64Lo;
|
private Long hash64Lo;
|
||||||
|
|
||||||
@Column(name = "hash_algorithm", nullable = false)
|
@Column(name = "hash_algorithm", nullable = false)
|
||||||
private String hashAlgorithm;
|
private String hashAlgorithm;
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
public enum ProtectionStatus {
|
||||||
|
NOT_PROTECTED,
|
||||||
|
PROCESSING,
|
||||||
|
PROTECTED,
|
||||||
|
FAILED,
|
||||||
|
FAILED_SAVE
|
||||||
|
}
|
||||||
+2
-1
@@ -1,9 +1,10 @@
|
|||||||
package ru.soune.nocopy.entity;
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
import ru.soune.nocopy.entity.user.User;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.entity;
|
package ru.soune.nocopy.entity.user;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package ru.soune.nocopy.entity.user;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.*;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "email_verification_tokens")
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class EmailVerificationToken {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "user_id", nullable = false)
|
||||||
|
private User user;
|
||||||
|
|
||||||
|
@Column(name = "token", nullable = false, length = 6)
|
||||||
|
private String token;
|
||||||
|
|
||||||
|
@Column(name = "expires_at", nullable = false)
|
||||||
|
private LocalDateTime expiresAt = LocalDateTime.now().plusMinutes(15);
|
||||||
|
|
||||||
|
@Column(name = "created_at", nullable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
|
public boolean isExpired() {
|
||||||
|
return LocalDateTime.now().isAfter(expiresAt);
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.entity;
|
package ru.soune.nocopy.entity.user;
|
||||||
|
|
||||||
public enum GenderType {
|
public enum GenderType {
|
||||||
MALE, FEMALE
|
MALE, FEMALE
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.entity;
|
package ru.soune.nocopy.entity.user;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
+67
-11
@@ -1,4 +1,4 @@
|
|||||||
package ru.soune.nocopy.entity;
|
package ru.soune.nocopy.entity.user;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
@@ -6,6 +6,10 @@ import jakarta.validation.constraints.Size;
|
|||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
import ru.soune.nocopy.entity.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.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -33,8 +37,8 @@ public class User {
|
|||||||
@Column(name = "email", nullable = false, length = 1024, unique = true)
|
@Column(name = "email", nullable = false, length = 1024, unique = true)
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
@Column(name = "company")
|
@Column(name = "email_verified")
|
||||||
private String company;
|
private boolean emailVerified = false;
|
||||||
|
|
||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
@Size(min = 6)
|
@Size(min = 6)
|
||||||
@@ -64,7 +68,7 @@ public class User {
|
|||||||
private LocalDateTime lastLoginAt;
|
private LocalDateTime lastLoginAt;
|
||||||
|
|
||||||
@Column(name = "is_active")
|
@Column(name = "is_active")
|
||||||
private Boolean isActive = true;
|
private boolean isActive = false;
|
||||||
|
|
||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
@@ -76,18 +80,70 @@ public class User {
|
|||||||
@ToString.Exclude
|
@ToString.Exclude
|
||||||
private List<UserContent> userContents = new ArrayList<>();
|
private List<UserContent> userContents = new ArrayList<>();
|
||||||
|
|
||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
|
||||||
@JsonIgnore
|
|
||||||
@ToString.Exclude
|
|
||||||
private List<UserAction> userActions = new ArrayList<>();
|
|
||||||
|
|
||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
@ToString.Exclude
|
@ToString.Exclude
|
||||||
private List<Violation> violations = new ArrayList<>();
|
private List<Violation> violations = new ArrayList<>();
|
||||||
|
|
||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
@OneToOne(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
|
private ProtectedFileCheck protectedFileCheck;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "company_id")
|
||||||
@ToString.Exclude
|
@ToString.Exclude
|
||||||
private List<ImageProtection> imageProtections = new ArrayList<>();
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+2
-1
@@ -1,9 +1,10 @@
|
|||||||
package ru.soune.nocopy.entity;
|
package ru.soune.nocopy.entity.user;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
import ru.soune.nocopy.entity.file.ContentStatus;
|
||||||
import ru.soune.nocopy.entity.file.FileType;
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user