Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 vladp
|
a982eef9c6 |
@@ -14,9 +14,6 @@ COPY --from=build /app/build/libs/*.jar app.jar
|
|||||||
|
|
||||||
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
||||||
|
|
||||||
ENV BUILD_TIME_BACK="unknown"\
|
|
||||||
BUILD_TIME_FRONT="unknown"
|
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
CMD ["java", "-jar", "app.jar"]
|
CMD ["java", "-jar", "app.jar"]
|
||||||
@@ -76,417 +76,3 @@ 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
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
------
|
|
||||||
Скрипты рефералки
|
|
||||||
|
|
||||||
INSERT INTO referrals (user_id, referral_link, inviter_id, level_id, total_income, is_active, created_at, hold_balance)
|
|
||||||
SELECT
|
|
||||||
u.id as user_id,
|
|
||||||
CONCAT('ref-', u.id, '-', LOWER(SUBSTRING(MD5(RANDOM()::text) FROM 1 FOR 8))) as referral_link,
|
|
||||||
NULL as inviter_id,
|
|
||||||
'bronze' as level_id,
|
|
||||||
0 as total_income,
|
|
||||||
false as is_active,
|
|
||||||
NOW() as created_at,
|
|
||||||
0 as hold_balance
|
|
||||||
FROM users u
|
|
||||||
LEFT JOIN referrals r ON u.id = r.user_id
|
|
||||||
WHERE
|
|
||||||
u.company_id IS NULL
|
|
||||||
AND r.user_id IS NULL
|
|
||||||
ORDER BY u.id;
|
|
||||||
|
|
||||||
-------
|
|
||||||
|
|
||||||
INSERT INTO referral_levels (id, name, min_invitees, reward_percentage) VALUES
|
|
||||||
('bronze', 'BRONZE', 0, 15),
|
|
||||||
('silver', 'SILVER', 6, 18),
|
|
||||||
('gold', 'GOLD', 16, 22),
|
|
||||||
('platinum', 'PLATINUM', 50, 25);
|
|
||||||
|
|
||||||
-----------------
|
|
||||||
Скрипт,для нумерации для уже сохданных файлов
|
|
||||||
WITH max_id AS (
|
|
||||||
SELECT COALESCE(MAX(support_id), 0) as max_val FROM file_entities
|
|
||||||
),
|
|
||||||
-- Нумеруем только NULL записи, начиная с max_val + 1
|
|
||||||
numbered AS (
|
|
||||||
SELECT
|
|
||||||
f.id,
|
|
||||||
(SELECT max_val FROM max_id) + ROW_NUMBER() OVER (ORDER BY f.created_at, f.id) as new_support_id
|
|
||||||
FROM file_entities f
|
|
||||||
WHERE f.support_id IS NULL
|
|
||||||
)
|
|
||||||
UPDATE file_entities
|
|
||||||
SET support_id = numbered.new_support_id
|
|
||||||
FROM numbered
|
|
||||||
WHERE file_entities.id = numbered.id;
|
|
||||||
|
|
||||||
---------------------------------
|
|
||||||
НАСТРОЙКА NGINX
|
|
||||||
--------------------------------
|
|
||||||
|
|
||||||
# admin.not-copy.com
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name admin.not-copy.com;
|
|
||||||
return 301 https://$server_name$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 443 ssl;
|
|
||||||
listen [::]:443 ssl;
|
|
||||||
server_name admin.not-copy.com;
|
|
||||||
|
|
||||||
ssl_certificate /etc/letsencrypt/live/admin.not-copy.com/fullchain.pem;
|
|
||||||
ssl_certificate_key /etc/letsencrypt/live/admin.not-copy.com/privkey.pem;
|
|
||||||
|
|
||||||
location /api/ {
|
|
||||||
proxy_pass http://localhost:3003;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://localhost:2995;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# workspace.not-copy.com
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name workspace.not-copy.com;
|
|
||||||
return 301 https://$server_name$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 443 ssl;
|
|
||||||
listen [::]:443 ssl;
|
|
||||||
server_name workspace.not-copy.com;
|
|
||||||
|
|
||||||
ssl_certificate /etc/letsencrypt/live/workspace.not-copy.com/fullchain.pem;
|
|
||||||
ssl_certificate_key /etc/letsencrypt/live/workspace.not-copy.com/privkey.pem;
|
|
||||||
|
|
||||||
location /api/ {
|
|
||||||
proxy_pass http://localhost:3003;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://localhost:2998;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# lp.not-copy.com
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name lp.not-copy.com;
|
|
||||||
return 301 https://$server_name$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 443 ssl;
|
|
||||||
listen [::]:443 ssl;
|
|
||||||
server_name lp.not-copy.com;
|
|
||||||
|
|
||||||
ssl_certificate /etc/letsencrypt/live/lp.not-copy.com/fullchain.pem;
|
|
||||||
ssl_certificate_key /etc/letsencrypt/live/lp.not-copy.com/privkey.pem;
|
|
||||||
|
|
||||||
location /api/ {
|
|
||||||
proxy_pass http://localhost:3003;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://localhost:2993;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# dev-admin.not-copy.com
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name dev-admin.not-copy.com;
|
|
||||||
return 301 https://$server_name$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 443 ssl;
|
|
||||||
listen [::]:443 ssl;
|
|
||||||
server_name dev-admin.not-copy.com;
|
|
||||||
|
|
||||||
ssl_certificate /etc/letsencrypt/live/dev-admin.not-copy.com/fullchain.pem;
|
|
||||||
ssl_certificate_key /etc/letsencrypt/live/dev-admin.not-copy.com/privkey.pem;
|
|
||||||
|
|
||||||
location /api/ {
|
|
||||||
proxy_pass http://localhost:3001;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://localhost:2996;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# dev-workspace.not-copy.com
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name dev-workspace.not-copy.com;
|
|
||||||
return 301 https://$server_name$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 443 ssl;
|
|
||||||
listen [::]:443 ssl;
|
|
||||||
server_name dev-workspace.not-copy.com;
|
|
||||||
|
|
||||||
ssl_certificate /etc/letsencrypt/live/dev-workspace.not-copy.com/fullchain.pem;
|
|
||||||
ssl_certificate_key /etc/letsencrypt/live/dev-workspace.not-copy.com/privkey.pem;
|
|
||||||
|
|
||||||
location /api/ {
|
|
||||||
proxy_pass http://localhost:3001;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://localhost:3002;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# dev-lp.not-copy.com
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name dev-lp.not-copy.com;
|
|
||||||
return 301 https://$server_name$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 443 ssl;
|
|
||||||
listen [::]:443 ssl;
|
|
||||||
server_name dev-lp.not-copy.com;
|
|
||||||
|
|
||||||
ssl_certificate /etc/letsencrypt/live/dev-lp.not-copy.com/fullchain.pem;
|
|
||||||
ssl_certificate_key /etc/letsencrypt/live/dev-lp.not-copy.com/privkey.pem;
|
|
||||||
|
|
||||||
location /api/ {
|
|
||||||
proxy_pass http://localhost:3001;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://localhost:2994;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# Проверяем конфиг
|
|
||||||
ls -la /etc/nginx/sites-available/
|
|
||||||
ls -la /etc/nginx/sites-enabled/
|
|
||||||
|
|
||||||
# Создание конфига
|
|
||||||
|
|
||||||
sudo nano /etc/nginx/sites-available/not-copy
|
|
||||||
|
|
||||||
# Создание симлинк
|
|
||||||
sudo ln -s /etc/nginx/sites-available/not-copy /etc/nginx/sites-enabled/
|
|
||||||
|
|
||||||
# Чек
|
|
||||||
sudo nginx -t
|
|
||||||
|
|
||||||
# Рестарт
|
|
||||||
sudo systemctl reload nginx
|
|
||||||
|
|
||||||
|
|
||||||
---------------------------------------------
|
|
||||||
|
|
||||||
# ПОЛНАЯ ИНСТРУКЦИЯ: НАСТРОЙКА ПРОКСИ ДЛЯ ОБХОДА БЛОКИРОВОК SEARCHAPI.IO
|
|
||||||
|
|
||||||
## Данные для подключения к прокси-серверу
|
|
||||||
IP: 193.46.217.94
|
|
||||||
Порт HTTP: 3128
|
|
||||||
Порт SOCKS: 1080
|
|
||||||
Логин SSH: root
|
|
||||||
Пароль SSH: u7nRtsD6
|
|
||||||
|
|
||||||
## 1. Настройка прокси-сервера
|
|
||||||
```bash
|
|
||||||
# Подключаемся к серверу
|
|
||||||
ssh root@193.46.217.94
|
|
||||||
# Вводим пароль: u7nRtsD6
|
|
||||||
|
|
||||||
# Обновляем систему и устанавливаем пакеты
|
|
||||||
yum update -y
|
|
||||||
yum install -y epel-release net-tools nano
|
|
||||||
yum install -y 3proxy
|
|
||||||
|
|
||||||
# Создаем конфигурацию
|
|
||||||
mkdir -p /etc/3proxy
|
|
||||||
cat > /etc/3proxy/3proxy.cfg << 'EOF'
|
|
||||||
nserver 8.8.8.8
|
|
||||||
nserver 8.8.4.4
|
|
||||||
timeouts 1 5 30 60 180 1800 15 60
|
|
||||||
daemon
|
|
||||||
log /var/log/3proxy/3proxy.log
|
|
||||||
logformat "- +_L%t.%. %N.%p %E %U %C:%c %R:%r %O %I %h %T"
|
|
||||||
rotate 30
|
|
||||||
auth none
|
|
||||||
allow * * * * *
|
|
||||||
proxy -p3128
|
|
||||||
socks -p1080
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Создаем папку для логов и запускаем прокси
|
|
||||||
mkdir -p /var/log/3proxy
|
|
||||||
/usr/bin/3proxy /etc/3proxy/3proxy.cfg
|
|
||||||
|
|
||||||
# Проверяем, что запустилось
|
|
||||||
ps aux | grep 3proxy
|
|
||||||
netstat -tulpn | grep -E '3128|1080'
|
|
||||||
|
|
||||||
# Настраиваем файрвол
|
|
||||||
firewall-cmd --permanent --add-port=3128/tcp
|
|
||||||
firewall-cmd --permanent --add-port=1080/tcp
|
|
||||||
firewall-cmd --reload
|
|
||||||
firewall-cmd --list-ports
|
|
||||||
|
|
||||||
# Проверяем локальную работу прокси
|
|
||||||
curl -x http://127.0.0.1:3128 https://api.ipify.org
|
|
||||||
# Должен вернуть: 193.46.217.94
|
|
||||||
|
|
||||||
# Настраиваем автозапуск
|
|
||||||
echo "/usr/bin/3proxy /etc/3proxy/3proxy.cfg" >> /etc/rc.local
|
|
||||||
chmod +x /etc/rc.local
|
|
||||||
|
|
||||||
|
|
||||||
# Проверяем доступность прокси
|
|
||||||
ping -c 4 193.46.217.94
|
|
||||||
curl -x http://193.46.217.94:3128 https://api.ipify.org
|
|
||||||
# Должен вернуть: 193.46.217.94
|
|
||||||
|
|
||||||
# Проверяем работу с SearchAPI через прокси
|
|
||||||
curl -x http://193.46.217.94:3128 "https://www.searchapi.io/api/v1/search?engine=google_lens&api_key=5jyYZC8jSaxhZTwjMUhwtAXi&url=https://dev-workspace.not-copy.com/api/files/public/76d06557-6df1-4fcd-a273-050ec6a35faf&search_type=exact_matches" -o test.json
|
|
||||||
ls -la test.json
|
|
||||||
tail -20 test.json
|
|
||||||
# Файл должен быть полным (заканчиваться на '}')
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ps aux | grep 3proxy # Проверка статуса
|
|
||||||
netstat -tulpn | grep -E '3128|1080' # Проверка портов
|
|
||||||
tail -f /var/log/3proxy/3proxy.log # Просмотр логов
|
|
||||||
killall 3proxy # Остановка прокси
|
|
||||||
/usr/bin/3proxy /etc/3proxy/3proxy.cfg # Запуск прокси
|
|
||||||
|
|
||||||
|
|
||||||
firewall-cmd --permanent --remove-port=3128/tcp
|
|
||||||
firewall-cmd --permanent --add-rich-rule='rule family="ipv4" source address="IP_ТВОЕГО_СЕРВЕРА" port port="3128" protocol="tcp" accept'
|
|
||||||
firewall-cmd --permanent --add-rich-rule='rule family="ipv4" source address="IP_ТВОЕГО_СЕРВЕРА" port port="1080" protocol="tcp" accept'
|
|
||||||
firewall-cmd --reload
|
|
||||||
|
|
||||||
|
|
||||||
На прокси-сервере:
|
|
||||||
bash
|
|
||||||
ps aux | grep 3proxy # Проверка статуса
|
|
||||||
netstat -tulpn | grep -E '3128|1080' # Проверка портов
|
|
||||||
tail -f /var/log/3proxy/3proxy.log # Просмотр логов
|
|
||||||
killall 3proxy # Остановка прокси
|
|
||||||
/usr/bin/3proxy /etc/3proxy/3proxy.cfg # Запуск прокси
|
|
||||||
|
|
||||||
На основном сервере:
|
|
||||||
bash
|
|
||||||
curl -x http://193.46.217.94:3128 https://api.ipify.org # Проверка прокси
|
|
||||||
telnet 193.46.217.94 3128 # Проверка порта
|
|
||||||
@@ -21,9 +21,6 @@ configurations {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
flatDir {
|
|
||||||
dirs 'libs'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -34,11 +31,6 @@ dependencies {
|
|||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
implementation 'commons-validator:commons-validator:1.7'
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
|
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
|
||||||
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.17.2'
|
|
||||||
implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
|
|
||||||
implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
|
|
||||||
|
|
||||||
implementation 'org.flywaydb:flyway-core:9.22.0'
|
|
||||||
|
|
||||||
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
||||||
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
||||||
@@ -58,13 +50,6 @@ 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.3.1-all'
|
|
||||||
|
|
||||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
|
|
||||||
|
|
||||||
implementation project(':referral')
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('test') {
|
tasks.named('test') {
|
||||||
|
|||||||
+6
-8
@@ -77,29 +77,27 @@ services:
|
|||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '1.5'
|
cpus: '1.5'
|
||||||
memory: 3G
|
memory: 1G
|
||||||
reservations:
|
reservations:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
memory: 2G
|
memory: 512M
|
||||||
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: 1048576
|
||||||
FILE_CHUNK_SIZE: 1000000
|
FILE_CHUNK_SIZE: 1000000
|
||||||
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_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: prod
|
SPRING_PROFILES_ACTIVE: docker
|
||||||
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_HOST: postfix
|
||||||
# MAIL_PORT: 25
|
# MAIL_PORT: 25
|
||||||
# MAIL_USERNAME: noreply@no-copy.ru
|
# MAIL_USERNAME: noreply@no-copy.ru
|
||||||
@@ -181,7 +179,7 @@ services:
|
|||||||
command:
|
command:
|
||||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||||
- '--storage.tsdb.path=/prometheus'
|
- '--storage.tsdb.path=/prometheus'
|
||||||
- '--storage.tsdb.retention.time=15d'
|
- '--storage.tsdb.retention.time=15d' # Удерживать 15 дней
|
||||||
- '--web.enable-lifecycle'
|
- '--web.enable-lifecycle'
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
fun main() {
|
|
||||||
println("Hello World!")
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
package ru.soune.actions
|
|
||||||
|
|
||||||
abstract class NoCopyAction
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package ru.soune.actions.free
|
|
||||||
|
|
||||||
import ru.soune.actions.NoCopyAction
|
|
||||||
|
|
||||||
sealed class NoCopyFreeAction : NoCopyAction()
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package ru.soune.actions.paid
|
|
||||||
|
|
||||||
import ru.soune.actions.NoCopyAction
|
|
||||||
|
|
||||||
sealed class NoCopyPaidAction : NoCopyAction() {
|
|
||||||
|
|
||||||
abstract val cost: Double
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
## Команды для помещения в сеть
|
|
||||||
|
|
||||||
Сеть для работы бэка и фронта : Наименование == 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}
|
|
||||||
|
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,223 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent any
|
|
||||||
|
|
||||||
parameters {
|
|
||||||
string(
|
|
||||||
name: 'BRANCH',
|
|
||||||
defaultValue: 'dev',
|
|
||||||
description: 'Ветка для деплоя'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'PORT',
|
|
||||||
defaultValue: '3001',
|
|
||||||
description: 'Порт для запуска экземпляра'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'PORT_DB',
|
|
||||||
defaultValue: '',
|
|
||||||
description: 'Порт для запуска БД'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'SERVER',
|
|
||||||
defaultValue: '92.242.61.23',
|
|
||||||
description: 'Сервер для деплоя'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'NETWORK',
|
|
||||||
defaultValue: 'app-network-dev',
|
|
||||||
description: 'Имя сети (будет создана если не существует)'
|
|
||||||
)
|
|
||||||
choice(
|
|
||||||
name: 'SPRING_PROFILE',
|
|
||||||
choices: ['dev', 'prod'],
|
|
||||||
description: 'Профиль Spring для запуска'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
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('Copy to server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
|
||||||
rm -rf /opt/deployments/${params.BRANCH}-${params.PORT}/*
|
|
||||||
mkdir -p /opt/deployments/${params.BRANCH}-${params.PORT}
|
|
||||||
"
|
|
||||||
|
|
||||||
sshpass -p '${SSH_PASS}' scp -r ./* ${SSH_USER}@${params.SERVER}:/opt/deployments/${params.BRANCH}-${params.PORT}/
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Deploy with docker-compose') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
|
||||||
def springProfile = params.SPRING_PROFILE
|
|
||||||
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} "
|
|
||||||
mkdir -p /opt/deployments/${params.BRANCH}-${params.PORT}
|
|
||||||
cd /opt/deployments/${params.BRANCH}-${params.PORT}
|
|
||||||
|
|
||||||
echo '1. Проверяем/создаем сеть ${params.NETWORK}...'
|
|
||||||
if ! docker network ls --format '{{.Name}}' | grep -q '^${params.NETWORK}\$'; then
|
|
||||||
docker network create ${params.NETWORK}
|
|
||||||
echo 'Сеть ${params.NETWORK} создана'
|
|
||||||
else
|
|
||||||
echo 'Сеть ${params.NETWORK} уже существует'
|
|
||||||
fi
|
|
||||||
|
|
||||||
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 ${params.NETWORK} \\
|
|
||||||
--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_DB} \\
|
|
||||||
-e POSTGRES_USER=${DB_USER} \\
|
|
||||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
|
||||||
-v pgdata_${params.PORT}:/var/lib/postgresql/data \\
|
|
||||||
-e BUILD_TIME_BACK='${buildTime}' \\
|
|
||||||
postgres:17.7
|
|
||||||
|
|
||||||
echo '4. Запускаем storage...'
|
|
||||||
docker run -d \\
|
|
||||||
--name file-storage-${params.PORT} \\
|
|
||||||
--network ${params.NETWORK} \\
|
|
||||||
-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 ${params.NETWORK} \\
|
|
||||||
--network-alias app \\
|
|
||||||
--network-alias app-${params.PORT} \\
|
|
||||||
-p ${params.PORT}:8080 \\
|
|
||||||
-v uploads_data_${params.PORT}:/data/uploads:rw \\
|
|
||||||
-e POSTGRES_DB=no_copy${params.PORT_DB} \\
|
|
||||||
-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 \\
|
|
||||||
-e SPRING_PROFILES_ACTIVE=${springProfile} \\
|
|
||||||
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
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Verify network') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
|
||||||
echo 'Проверяем подключение к сети ${params.NETWORK}'
|
|
||||||
docker network inspect ${params.NETWORK} --format='{{.Name}}: {{range .Containers}}{{.Name}} {{end}}'
|
|
||||||
|
|
||||||
echo 'Проверяем алиас app для контейнера app-backend-${params.PORT}'
|
|
||||||
docker inspect app-backend-${params.PORT} | grep -A 5 'Aliases'
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
success {
|
|
||||||
script {
|
|
||||||
def appUrl = params.SPRING_PROFILE == 'prod' ? 'https://workspace.not-copy.com' : 'https://dev-workspace.not-copy.com'
|
|
||||||
echo "Deployment successful"
|
|
||||||
echo "Application URL: ${appUrl}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
failure {
|
|
||||||
echo "Deployment failed for branch ${params.BRANCH} on port ${params.PORT}"
|
|
||||||
}
|
|
||||||
always {
|
|
||||||
echo "Deployment process finished"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,16 +7,6 @@ pipeline {
|
|||||||
defaultValue: 'main',
|
defaultValue: 'main',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
string(
|
|
||||||
name: 'PORT',
|
|
||||||
defaultValue: '2998',
|
|
||||||
description: 'Порт для запуска экземпляра'
|
|
||||||
)
|
|
||||||
string(
|
|
||||||
name: 'NETWORK',
|
|
||||||
defaultValue: 'app-network-dev',
|
|
||||||
description: 'Docker сеть для подключения'
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
@@ -46,19 +36,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-${params.PORT} 2>/dev/null || true
|
docker stop no-copy-frontend 2>/dev/null || true
|
||||||
docker rm no-copy-frontend-${params.PORT} 2>/dev/null || true
|
docker rm no-copy-frontend 2>/dev/null || true
|
||||||
|
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
docker-compose -f docker-compose.yaml -p frontend-${params.PORT} down 2>/dev/null || true
|
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} down 2>/dev/null || true
|
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -75,13 +65,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}-${params.PORT}/*
|
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
||||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
"
|
"
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}-${params.PORT}/
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -90,8 +80,6 @@ pipeline {
|
|||||||
stage('Build on server') {
|
stage('Build on server') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def BUILD_TIME_FRONT = sh(script: "date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
|
||||||
|
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(
|
usernamePassword(
|
||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
@@ -100,21 +88,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 "
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
# 1. СОЗДАЕМ JSON ФАЙЛ (ЭТО РАБОТАЕТ 100%)
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
mkdir -p public
|
docker-compose -f docker-compose.yaml build
|
||||||
echo '{\\"buildTime\\": \\"${BUILD_TIME_FRONT}\\"}' > public/build-info.json
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml build
|
||||||
# 2. Меняем имя контейнера и порт
|
else
|
||||||
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
echo 'Exception: docker-compose file not found'
|
||||||
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
exit 1
|
||||||
|
fi
|
||||||
# 3. Собираем образ
|
"
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
|
"""
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -131,26 +117,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}-${params.PORT}
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
echo '=== Запускаем контейнер ==='
|
# Проверяем и подключаем к сети app-network если нужно
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} up -d
|
docker network inspect app-network 2>/dev/null || echo 'Warning: app-network not found'
|
||||||
|
|
||||||
sleep 10
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml up -d
|
||||||
echo '=== Проверяем запуск ==='
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
docker-compose -f docker-compose.yml up -d
|
||||||
echo '✓ Контейнер запущен: no-copy-frontend-${params.PORT}'
|
fi
|
||||||
echo '✓ Порт: ${params.PORT}:2999'
|
|
||||||
else
|
sleep 10
|
||||||
echo '✗ Контейнер не запустился'
|
|
||||||
echo 'Логи:'
|
echo 'Status container:'
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} logs
|
docker ps --filter name=no-copy-frontend
|
||||||
exit 1
|
"
|
||||||
fi
|
"""
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -167,93 +151,23 @@ pipeline {
|
|||||||
)
|
)
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
# Ищем контейнер с правильным именем (с портом)
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
echo 'Container started'
|
||||||
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')
|
||||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} || echo '000')
|
echo 'HTTP code: \$HTTP_CODE'
|
||||||
echo 'HTTP code: \$HTTP_CODE'
|
|
||||||
|
echo 'Frontend available on http://92.242.61.23:2998'
|
||||||
echo 'Frontend available on http://92.242.61.23:${params.PORT}'
|
else
|
||||||
|
echo 'Exception: container did not start'
|
||||||
# Показываем все фронтенды
|
docker ps -a | grep frontend
|
||||||
echo ''
|
exit 1
|
||||||
echo 'All frontend containers:'
|
fi
|
||||||
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
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// stage('Connect to network') {
|
|
||||||
// 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 "
|
|
||||||
// echo 'Отключаем от всех сетей и подключаем к ${params.NETWORK}'
|
|
||||||
//
|
|
||||||
// # Отключаем от всех сетей (кроме bridge, host, none)
|
|
||||||
// current_networks=\$(docker inspect no-copy-frontend-${params.PORT} --format='{{range \$net, \$v := .NetworkSettings.Networks}}{{\$net}}{{\"\\n\"}}{{end}}' | grep -v -E '^(bridge|host|none)\$' || true)
|
|
||||||
//
|
|
||||||
// for net in \$current_networks; do
|
|
||||||
// echo \"Отключаем от сети: \$net\"
|
|
||||||
// docker network disconnect \$net no-copy-frontend-${params.PORT} 2>/dev/null || true
|
|
||||||
// done
|
|
||||||
//
|
|
||||||
// # Подключаем к нужной сети
|
|
||||||
// docker network connect ${params.NETWORK} no-copy-frontend-${params.PORT}
|
|
||||||
//
|
|
||||||
// echo 'Готово! Контейнер теперь в сети:'
|
|
||||||
// docker inspect no-copy-frontend-${params.PORT} --format='{{range \$net, \$v := .NetworkSettings.Networks}}{{\$net}}{{\"\\n\"}}{{end}}'
|
|
||||||
// "
|
|
||||||
// """
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
stage('Connect to network') {
|
|
||||||
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 "
|
|
||||||
echo 'Подключаем контейнер к сети ${params.NETWORK}'
|
|
||||||
|
|
||||||
if ! docker network ls --format '{{.Name}}' | grep -q '^${params.NETWORK}\$'; then
|
|
||||||
docker network create ${params.NETWORK}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if docker ps -a --format '{{.Names}}' | grep -q '^no-copy-frontend-${params.PORT}\$'; then
|
|
||||||
docker network disconnect ${params.NETWORK} no-copy-frontend-${params.PORT} 2>/dev/null || true
|
|
||||||
docker network connect ${params.NETWORK} no-copy-frontend-${params.PORT}
|
|
||||||
echo 'Контейнер подключен к ${params.NETWORK}'
|
|
||||||
fi
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -263,8 +177,7 @@ 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:${params.PORT}"
|
echo "Frontend available on http://92.242.61.23:2998"
|
||||||
echo "Container: no-copy-frontend-${params.PORT}"
|
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Deployment failed"
|
echo "Deployment failed"
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ pipeline {
|
|||||||
stages {
|
stages {
|
||||||
stage('Git pull') {
|
stage('Git pull') {
|
||||||
steps {
|
steps {
|
||||||
cleanWs()
|
|
||||||
script {
|
script {
|
||||||
checkout([
|
checkout([
|
||||||
$class: 'GitSCM',
|
$class: 'GitSCM',
|
||||||
@@ -31,10 +30,10 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
stage('Deploy with docker-compose') {
|
stage('Deploy with docker-compose') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(
|
usernamePassword(
|
||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
@@ -45,77 +44,68 @@ 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 \\
|
|
||||||
--exclude=.git \\
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||||
--exclude=.gradle \\
|
cd /opt/deployments/${params.BRANCH}
|
||||||
--exclude=build \\
|
|
||||||
--exclude=**/build \\
|
echo '1. Остановка старого приложения...'
|
||||||
--exclude=.idea \\
|
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
--exclude=out \\
|
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
. $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
|
||||||
|
echo '2. Удаление старых образов...'
|
||||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||||
cd /opt/deployments/${params.BRANCH}
|
|
||||||
|
echo '3. Создание сети если нужно...'
|
||||||
echo '1. Остановка старого приложения...'
|
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||||
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
|
||||||
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
echo '4. Запуск инфраструктуры...'
|
||||||
|
docker-compose up -d db storage
|
||||||
echo '2. Удаление старых образов...'
|
|
||||||
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
echo '5. Ожидание PostgreSQL...'
|
||||||
|
sleep 10
|
||||||
echo '3. Создание сети если нужно...'
|
|
||||||
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
echo '6. Сборка нового образа приложения...'
|
||||||
|
docker build --no-cache -t app-backend:latest .
|
||||||
echo '4. Запуск инфраструктуры...'
|
|
||||||
docker-compose up -d db storage
|
echo '7. Запуск приложения...'
|
||||||
|
docker run -d \\
|
||||||
echo '5. Ожидание PostgreSQL...'
|
--name app-backend \\
|
||||||
sleep 10
|
--network app-network \\
|
||||||
|
--network-alias app \\
|
||||||
echo '6. Сборка нового образа приложения...'
|
-p 80:8080 \\
|
||||||
docker build --no-cache -t app-backend:latest .
|
-v uploads_data:/data/uploads:rw \\
|
||||||
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
echo '7. Запуск приложения...'
|
-e POSTGRES_USER=$DB_USER \\
|
||||||
docker run -d \\
|
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||||
--name app-backend \\
|
-e POSTGRES_PORT=5432 \\
|
||||||
--network app-network \\
|
-e POSTGRES_HOST=db \\
|
||||||
--network-alias app \\
|
--restart unless-stopped \\
|
||||||
-p 80:8080 \\
|
app-backend:latest
|
||||||
-v uploads_data:/data/uploads:rw \\
|
|
||||||
-e POSTGRES_DB=no_copy_ \\
|
echo '8. Запуск мониторинга...'
|
||||||
-e POSTGRES_USER=$DB_USER \\
|
docker-compose up -d grafana prometheus loki tempo alloy
|
||||||
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
|
||||||
-e POSTGRES_PORT=5432 \\
|
echo '9. Проверка...'
|
||||||
-e POSTGRES_HOST=db \\
|
sleep 5
|
||||||
-e BUILD_TIME_BACK='${buildTime}' \\
|
|
||||||
--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
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -134,4 +124,4 @@ pipeline {
|
|||||||
echo "Deployment process finished"
|
echo "Deployment process finished"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,183 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
parameters {
|
||||||
|
string(
|
||||||
|
name: 'BRANCH',
|
||||||
|
defaultValue: 'main',
|
||||||
|
description: 'Ветка для деплоя'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Git pull') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
checkout([
|
||||||
|
$class: 'GitSCM',
|
||||||
|
branches: [[name: params.BRANCH]],
|
||||||
|
userRemoteConfigs: [[
|
||||||
|
url: 'https://code.3err0.ru/frontdev/no-copy-frontend.git',
|
||||||
|
credentialsId: 'nx-jen'
|
||||||
|
]]
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Stop old') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
docker stop no-copy-frontend 2>/dev/null || true
|
||||||
|
docker rm no-copy-frontend 2>/dev/null || true
|
||||||
|
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Copy to server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
||||||
|
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
"
|
||||||
|
|
||||||
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml build
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml build
|
||||||
|
else
|
||||||
|
echo 'Exception:don't found docker-compose'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Start on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
cd /opt/deployments/frontend/${params.BRANCH}
|
||||||
|
|
||||||
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
|
docker-compose -f docker-compose.yaml up -d
|
||||||
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
|
docker-compose -f docker-compose.yml up -d
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 10
|
||||||
|
|
||||||
|
echo 'Status container:'
|
||||||
|
docker ps --filter name=no-copy-frontend
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Check status') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||||
|
echo 'Container start'
|
||||||
|
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||||
|
echo 'HTTP код: ' \$HTTP_CODE
|
||||||
|
|
||||||
|
echo 'Frong start on http://92.242.61.23:2998'
|
||||||
|
else
|
||||||
|
echo 'Exception: container don't start'
|
||||||
|
docker ps -a | grep frontend
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
echo "Front branch ${params.BRANCH} completed"
|
||||||
|
echo "Use on http://92.242.61.23:2998"
|
||||||
|
}
|
||||||
|
failure {
|
||||||
|
echo "Failed"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
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.
@@ -1,26 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
fun main() {
|
|
||||||
println("Hello World!")
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
data class ReferralInvitee(
|
|
||||||
val email: String,
|
|
||||||
val isActive: Boolean,
|
|
||||||
val regDate: String,
|
|
||||||
)
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
interface ReferralLevel {
|
|
||||||
val id: String
|
|
||||||
val name: String
|
|
||||||
val share: Int
|
|
||||||
val minInvitee: Int
|
|
||||||
val maxInvitee: Int
|
|
||||||
val next: String?
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
interface ReferralLevelProvider {
|
|
||||||
|
|
||||||
fun getAvailableReferralLevels(): List<ReferralLevel>
|
|
||||||
|
|
||||||
fun getInitialReferralLevelId(): String
|
|
||||||
|
|
||||||
fun getReferralLevelById(levelId: String): ReferralLevel
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune
|
|
||||||
|
|
||||||
data class ReferralStat(
|
|
||||||
val totalInvitee: Int,
|
|
||||||
val activeInvitee: Int,
|
|
||||||
val totalIncome: Int,
|
|
||||||
val availableIncome: Int,
|
|
||||||
val holdBalance: Int,
|
|
||||||
val referralLink: String,
|
|
||||||
)
|
|
||||||
@@ -1,7 +1 @@
|
|||||||
plugins {
|
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
|
|
||||||
}
|
|
||||||
rootProject.name = 'no-copy'
|
rootProject.name = 'no-copy'
|
||||||
include 'referral'
|
|
||||||
include 'finance'
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
package ru.soune.nocopy.client;
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import java.net.URI;
|
|
||||||
import java.net.http.HttpClient;
|
|
||||||
import java.net.http.HttpRequest;
|
|
||||||
import java.net.http.HttpResponse;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.Base64;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
@Slf4j
|
|
||||||
public class YooKassaClient {
|
|
||||||
|
|
||||||
@Value("${yookassa.shop-id}")
|
|
||||||
private String shopId;
|
|
||||||
|
|
||||||
@Value("${yookassa.secret-key}")
|
|
||||||
private String secretKey;
|
|
||||||
|
|
||||||
private final HttpClient httpClient = HttpClient.newHttpClient();
|
|
||||||
|
|
||||||
private final ObjectMapper mapper = new ObjectMapper();
|
|
||||||
|
|
||||||
public boolean createAutoPayment(String paymentMethodId, double amount, String description, String userId) {
|
|
||||||
try {
|
|
||||||
String url = "https://api.yookassa.ru/v3/payments";
|
|
||||||
String auth = shopId + ":" + secretKey;
|
|
||||||
String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes(StandardCharsets.UTF_8));
|
|
||||||
|
|
||||||
Map<String, Object> body = new HashMap<>();
|
|
||||||
body.put("amount", Map.of("value", String.format("%.2f", amount),
|
|
||||||
"currency", "RUB"));
|
|
||||||
body.put("payment_method_id", paymentMethodId);
|
|
||||||
body.put("description", description);
|
|
||||||
body.put("capture", true);
|
|
||||||
body.put("metadata", Map.of("user_id", userId, "auto_payment", "true"));
|
|
||||||
|
|
||||||
String requestBody = mapper.writeValueAsString(body);
|
|
||||||
|
|
||||||
HttpRequest request = HttpRequest.newBuilder()
|
|
||||||
.uri(URI.create(url))
|
|
||||||
.header("Content-Type", "application/json")
|
|
||||||
.header("Authorization", "Basic " + encodedAuth)
|
|
||||||
.header("Idempotence-Key", UUID.randomUUID().toString())
|
|
||||||
.POST(HttpRequest.BodyPublishers.ofString(requestBody))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
|
|
||||||
|
|
||||||
if (response.statusCode() == 200 || response.statusCode() == 201) {
|
|
||||||
log.info("Auto payment created: {}", response.body());
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
log.error("Auto payment failed: {} - {}", response.statusCode(), response.body());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error creating auto payment", e);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,51 +1,17 @@
|
|||||||
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.documents.DocumentLocalSearch;
|
|
||||||
import com.vrt.fileprotection.image.ImageLocalSearch;
|
|
||||||
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
|
||||||
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,
|
|
||||||
DocumentLocalSearch documentLocalSearch) {
|
|
||||||
|
|
||||||
return new com.vrt.NoCopyFileService(
|
|
||||||
Collections.emptyList(),
|
|
||||||
fileProvider,
|
|
||||||
processingListener,
|
|
||||||
imageUniqueCheck,
|
|
||||||
imageLocalSearch,
|
|
||||||
audioLocalSearch,
|
|
||||||
audioFilePathProvider,
|
|
||||||
documentLocalSearch
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
|
||||||
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.web.cors.CorsConfiguration;
|
|
||||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
|
||||||
import org.springframework.web.filter.CorsFilter;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class CorsConfig {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public CorsFilter corsFilter() {
|
|
||||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
|
||||||
CorsConfiguration config = new CorsConfiguration();
|
|
||||||
config.addAllowedOrigin("*");
|
|
||||||
config.addAllowedMethod("*");
|
|
||||||
config.addAllowedHeader("*");
|
|
||||||
source.registerCorsConfiguration("/**", config);
|
|
||||||
|
|
||||||
return new CorsFilter(source);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -20,19 +20,7 @@ public class HandlerConfig {
|
|||||||
ImageFoundRequestHandler imageFoundRequestHandler,
|
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||||
VerifyRegisterUserHandler verifyRegisterUser,
|
VerifyRegisterUserHandler verifyRegisterUser,
|
||||||
AuthRequestHandler authRequestHandler,
|
AuthRequestHandler authRequestHandler,
|
||||||
CompanyHandler companyHandler,
|
ResetPasswordHandler resetPasswordHandler
|
||||||
TariffHandler tariffHandler,
|
|
||||||
TariffInfoHandler tariffInfoHandler,
|
|
||||||
ReferralHandler referralHandler,
|
|
||||||
ResetPasswordHandler resetPasswordHandler,
|
|
||||||
DaDataHandler daDataHandler,
|
|
||||||
PaymentHandler paymentHandler,
|
|
||||||
CostHandler costHandler,
|
|
||||||
MonitoringHandler monitoringHandler,
|
|
||||||
ViolationHandler violationHandler,
|
|
||||||
ViolationStatisticsHandler violationStatisticsHandler,
|
|
||||||
GlobalSearchHandler globalSearchHandler,
|
|
||||||
ViolationNotionHandler violationNotionHandler
|
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
map.put(20001, login);
|
map.put(20001, login);
|
||||||
@@ -44,18 +32,6 @@ public class HandlerConfig {
|
|||||||
map.put(20008, authRequestHandler);
|
map.put(20008, authRequestHandler);
|
||||||
map.put(20009, verifyRegisterUser);
|
map.put(20009, verifyRegisterUser);
|
||||||
map.put(20010, resetPasswordHandler);
|
map.put(20010, resetPasswordHandler);
|
||||||
map.put(30000, companyHandler);
|
|
||||||
map.put(30001, tariffHandler);
|
|
||||||
map.put(30002, tariffInfoHandler);
|
|
||||||
map.put(30003, referralHandler);
|
|
||||||
map.put(30004, daDataHandler);
|
|
||||||
map.put(30005, paymentHandler);
|
|
||||||
map.put(30007, monitoringHandler);
|
|
||||||
map.put(30008, costHandler);
|
|
||||||
map.put(30009, violationHandler);
|
|
||||||
map.put(30010, violationStatisticsHandler);
|
|
||||||
map.put(30011, globalSearchHandler);
|
|
||||||
map.put(30012, violationNotionHandler);
|
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
|
||||||
import org.springframework.context.event.EventListener;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
|
||||||
import ru.soune.nocopy.service.file.ImageResizeService;
|
|
||||||
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
@Slf4j
|
|
||||||
public class ImageMigration {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private FileEntityRepository fileRepository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ImageResizeService imageResizeService;
|
|
||||||
|
|
||||||
@EventListener(ApplicationReadyEvent.class)
|
|
||||||
public void migrate() {
|
|
||||||
List<FileEntity> images = fileRepository.findByThumbnailPathIsNull();
|
|
||||||
|
|
||||||
for (FileEntity file : images) {
|
|
||||||
try {
|
|
||||||
Path path = Paths.get(file.getProtectedFilePath());
|
|
||||||
if (Files.exists(path)) {
|
|
||||||
byte[] data = Files.readAllBytes(path);
|
|
||||||
imageResizeService.generateSizes(file, data);
|
|
||||||
fileRepository.save(file);
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error migrating {}: {}", file.getId(), e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -9,7 +9,6 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
|||||||
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.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -21,13 +20,7 @@ public class JacksonConfig {
|
|||||||
@Bean
|
@Bean
|
||||||
@Primary
|
@Primary
|
||||||
public ObjectMapper objectMapper() {
|
public ObjectMapper objectMapper() {
|
||||||
ObjectMapper mapper = Jackson2ObjectMapperBuilder.json()
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
.defaultViewInclusion(true)
|
|
||||||
.autoDetectFields(true)
|
|
||||||
.failOnUnknownProperties(false)
|
|
||||||
.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
|
||||||
.featuresToEnable(SerializationFeature.INDENT_OUTPUT)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
JavaTimeModule javaTimeModule = new JavaTimeModule();
|
JavaTimeModule javaTimeModule = new JavaTimeModule();
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -21,15 +21,4 @@ public class AsyncConfig {
|
|||||||
executor.initialize();
|
executor.initialize();
|
||||||
return executor;
|
return executor;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean(name = "taskExecutor")
|
|
||||||
public Executor taskExecutor() {
|
|
||||||
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
|
||||||
executor.setCorePoolSize(3);
|
|
||||||
executor.setMaxPoolSize(5);
|
|
||||||
executor.setQueueCapacity(50);
|
|
||||||
executor.setThreadNamePrefix("global-search-");
|
|
||||||
executor.initialize();
|
|
||||||
return executor;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
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;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class NoCopyInitializer {
|
|
||||||
|
|
||||||
@EventListener(ApplicationReadyEvent.class)
|
|
||||||
public void initializeOnStartup() {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package ru.soune.nocopy.configuration.search;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Component
|
|
||||||
@ConfigurationProperties(prefix = "search")
|
|
||||||
public class SearchProperties {
|
|
||||||
private Map<String, EngineConfig> engines;
|
|
||||||
private ProxyConfig proxy;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public static class EngineConfig {
|
|
||||||
private boolean enabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public static class ProxyConfig {
|
|
||||||
private boolean enabled;
|
|
||||||
private String host;
|
|
||||||
private int port;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +1,9 @@
|
|||||||
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 com.vrt.fileprotection.audio.AudioCheckResult;
|
|
||||||
import com.vrt.fileprotection.documents.DocumentCheckResult;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.core.io.FileSystemResource;
|
import org.springframework.core.io.Resource;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.core.io.UrlResource;
|
||||||
import org.springframework.data.domain.Pageable;
|
|
||||||
import org.springframework.data.web.PageableDefault;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
@@ -21,33 +14,26 @@ 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.file.*;
|
|
||||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||||
import ru.soune.nocopy.entity.company.Company;
|
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
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.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.entity.user.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.user.User;
|
|
||||||
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.UserRepository;
|
|
||||||
import ru.soune.nocopy.service.FileSimilarityService;
|
|
||||||
import ru.soune.nocopy.service.file.CheckCounterService;
|
|
||||||
import ru.soune.nocopy.service.file.ProtectionsLimitService;
|
|
||||||
import ru.soune.nocopy.service.register.AuthService;
|
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;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.*;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -63,20 +49,6 @@ public class ApiController {
|
|||||||
|
|
||||||
private final AuthService authService;
|
private final AuthService authService;
|
||||||
|
|
||||||
private final FileSimilarityService fileSimilarityService;
|
|
||||||
|
|
||||||
private final FileEntityRepository fileEntityRepository;
|
|
||||||
|
|
||||||
private final FileUtil fileUtil;
|
|
||||||
|
|
||||||
private final ProtectionsLimitService protectionsLimitService;
|
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
private final UserRepository userRepository;
|
|
||||||
|
|
||||||
private final CheckCounterService checkCounterService;
|
|
||||||
|
|
||||||
@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) {
|
||||||
@@ -123,160 +95,57 @@ 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 ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Chunk file null or empty", ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (uploadId == null || uploadId.isBlank()) {
|
if (uploadId == null || uploadId.isBlank()) {
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Upload ID is required");
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Upload ID is required", ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chunkNumber == null || chunkNumber < 0) {
|
if (chunkNumber == null || chunkNumber < 0) {
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Valid chunk number is required", ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build()));
|
||||||
}
|
}
|
||||||
|
|
||||||
UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber,
|
fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
||||||
chunk, findSimilar);
|
|
||||||
|
|
||||||
return buildSuccessResponse(uploadId, chunkNumber, chunk,
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
|
.uploadId(uploadId)
|
||||||
} catch (DuplicateImageException e) {
|
.chunkNumber(chunkNumber)
|
||||||
Map<String, Object> duplicateData = new HashMap<>();
|
.chunkSize(chunk.getSize())
|
||||||
duplicateData.put("duplicateFileId", e.duplicateFileId());
|
.message("Chunk uploaded successfully")
|
||||||
duplicateData.put("userId", e.userId());
|
.build();
|
||||||
duplicateData.put("message", e.getMessage());
|
|
||||||
|
|
||||||
if (uploadId != null) {
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
duplicateData.put("uploadId", uploadId);
|
"Chunk uploaded successfully", responseBody));
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
|
||||||
20004,
|
|
||||||
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
|
||||||
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
|
||||||
duplicateData
|
|
||||||
));
|
|
||||||
}catch (FileFormatException e){
|
|
||||||
return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
|
|
||||||
} 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());
|
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to upload chunk: " + e.getMessage(), responseBody));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final NoCopyFileService noCopyFileService;
|
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/{fileId}/similar")
|
|
||||||
public ResponseEntity<BaseResponse> findSimilarFiles(
|
|
||||||
@PathVariable("version") int version,
|
|
||||||
@PathVariable String fileId,
|
|
||||||
@RequestParam(value = "auth_token", required = false) String authToken,
|
|
||||||
@RequestParam(required = false) List<String> similarityLevels,
|
|
||||||
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
|
|
||||||
|
|
||||||
if (fileEntity == null) {
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(0, MessageCode.INVALID_FIELD.getCode(),
|
|
||||||
MessageCode.INVALID_FIELD.getDescription(), null));
|
|
||||||
}
|
|
||||||
|
|
||||||
BaseResponse response;
|
|
||||||
if ("image".equals(fileEntity.getMimeType())) {
|
|
||||||
Page<SimilarFileDTO> similarFilesPage = fileSimilarityService.findSimilarFiles(
|
|
||||||
fileId, similarityLevels, pageable, authToken);
|
|
||||||
response = buildSuccessResponse(similarFilesPage, MessageCode.SIMILAR_FILES_FOUND);
|
|
||||||
} else {
|
|
||||||
List<SimilarFileDTO> results = processNonImageFile(fileEntity, authToken);
|
|
||||||
log.info("results: {}", results);
|
|
||||||
response = buildSuccessResponse(results, MessageCode.SIMILAR_FILES_FOUND);
|
|
||||||
checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(response);
|
|
||||||
|
|
||||||
} catch(IllegalArgumentException e) {
|
|
||||||
log.error("Error with file extensions : {}", e.getMessage(), e);
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(MessageCode.FILE_FOR_SEARCH_NOT_VALID.getCode(),
|
|
||||||
MessageCode.FILE_FOR_SEARCH_NOT_VALID.getCode(),
|
|
||||||
MessageCode.FILE_FOR_SEARCH_NOT_VALID.getDescription(), null));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error finding similar files: {}", e.getMessage(), e);
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(MessageCode.INVALID_FIELD.getCode(),
|
|
||||||
MessageCode.INVALID_FIELD.getCode(),
|
|
||||||
MessageCode.INVALID_FIELD.getDescription(), null));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, String authToken) throws Exception {
|
|
||||||
List<SimilarFileDTO> results = new ArrayList<>();
|
|
||||||
|
|
||||||
FileEntity duplicateByHash = fileSimilarityService.findDuplicateByHash(fileEntity.getFilePath(),
|
|
||||||
fileEntity.getMimeType(), fileEntity.getUserId());
|
|
||||||
log.info("duplicateByHash: {}", duplicateByHash);
|
|
||||||
if (duplicateByHash != null) {
|
|
||||||
results.add(fileSimilarityService.buildDTO(duplicateByHash));
|
|
||||||
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
|
|
||||||
File file = new File(fileEntity.getFilePath());
|
|
||||||
FileProtector.Type type = "document".equals(fileEntity.getMimeType()) ?
|
|
||||||
FileProtector.Type.DOC : FileProtector.Type.AUDIO;
|
|
||||||
|
|
||||||
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
|
|
||||||
log.info("checkResult: {}", checkResult);
|
|
||||||
|
|
||||||
switch (checkResult) {
|
|
||||||
case DocumentCheckResult.Success success -> {
|
|
||||||
FileProtector.FileInfo info = success.getInfo();
|
|
||||||
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
|
|
||||||
if (entity != null) {
|
|
||||||
results.add(fileSimilarityService.buildDTO(entity));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case AudioCheckResult.Success success -> {
|
|
||||||
FileProtector.FileInfo info = success.getInfo();
|
|
||||||
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
|
|
||||||
if (entity != null) {
|
|
||||||
results.add(fileSimilarityService.buildDTO(entity));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case DocumentCheckResult.Failed failed ->
|
|
||||||
log.warn("Document check failed: {}", failed.getMessage());
|
|
||||||
case AudioCheckResult.Failed failed ->
|
|
||||||
log.warn("Audio check failed: {}", failed.getMessage());
|
|
||||||
default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
|
|
||||||
}
|
|
||||||
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
|
|
||||||
private BaseResponse buildSuccessResponse(Page<SimilarFileDTO> page, MessageCode messageCode) {
|
|
||||||
Map<String, Object> responseData = new HashMap<>();
|
|
||||||
responseData.put("content", page.getContent());
|
|
||||||
responseData.put("page", page.getNumber());
|
|
||||||
responseData.put("size", page.getSize());
|
|
||||||
responseData.put("totalElements", page.getTotalElements());
|
|
||||||
responseData.put("totalPages", page.getTotalPages());
|
|
||||||
responseData.put("hasNext", page.hasNext());
|
|
||||||
responseData.put("hasPrevious", page.hasPrevious());
|
|
||||||
|
|
||||||
return new BaseResponse(20004, messageCode.getCode(),
|
|
||||||
messageCode.getDescription(), responseData);
|
|
||||||
}
|
|
||||||
|
|
||||||
private BaseResponse buildSuccessResponse(List<SimilarFileDTO> list, MessageCode messageCode) {
|
|
||||||
Map<String, Object> responseData = new HashMap<>();
|
|
||||||
responseData.put("content", list);
|
|
||||||
responseData.put("totalElements", list.size());
|
|
||||||
|
|
||||||
return new BaseResponse(20004, messageCode.getCode(),
|
|
||||||
messageCode.getDescription(), responseData);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/progress/{uploadId}")
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
public ResponseEntity<BaseResponse> getUploadProgress(
|
public ResponseEntity<BaseResponse> getUploadProgress(
|
||||||
@PathVariable("version") int version,
|
@PathVariable("version") int version,
|
||||||
@@ -300,6 +169,7 @@ public class ApiController {
|
|||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
|
20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error getting progress for upload: {}", uploadId, e);
|
log.error("Error getting progress for upload: {}", uploadId, e);
|
||||||
|
|
||||||
@@ -373,46 +243,35 @@ 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,
|
||||||
@PathVariable(required = false) Integer version,
|
@PathVariable(required = false) Integer version,
|
||||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
try {
|
try {
|
||||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
if (tokenHeader == null) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("token", tokenHeader);
|
errorData.put("token", tokenHeader);
|
||||||
|
errorData.put("fileId", fileId);
|
||||||
|
errorData.put("version", version);
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.TOKEN_IS_NULL.getCode(),
|
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
|
||||||
MessageCode.TOKEN_IS_NULL.getDescription(),
|
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||||
|
|
||||||
User fileUser = userRepository.findById(entityResponse.getUserId()).orElseThrow();
|
if (!entityResponse.getUserId().equals(userId)) {
|
||||||
User user = userRepository.findById(userId).orElseThrow();
|
|
||||||
Company companyUser = user.getCompany();
|
|
||||||
|
|
||||||
if (companyUser != null && !fileUser.getCompany().getId().equals(companyUser.getId())) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("token", tokenHeader);
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
MessageCode.USER_NOT_HAD_PERMISSION.getDescription(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (companyUser == null && !entityResponse.getUserId().equals(userId)) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
|
||||||
MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
|
|
||||||
MessageCode.USER_NOT_HAD_PERMISSION.getDescription(),
|
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -421,8 +280,8 @@ public class ApiController {
|
|||||||
errorData.put("file_status", entityResponse.getStatus());
|
errorData.put("file_status", entityResponse.getStatus());
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_DELETE.getCode(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
MessageCode.FILE_DELETE.getDescription(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -431,15 +290,13 @@ public class ApiController {
|
|||||||
errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_NOT_EXIST.getCode(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
MessageCode.FILE_NOT_EXIST.getDescription(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Path filePath = Paths.get(entityResponse.getFilePath());
|
||||||
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<>();
|
||||||
@@ -450,13 +307,14 @@ public class ApiController {
|
|||||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
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.getFileName() + "\"")
|
"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<>();
|
||||||
@@ -466,15 +324,7 @@ public class ApiController {
|
|||||||
MessageCode.FILE_NOT_FOUND.getCode(),
|
MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
MessageCode.FILE_NOT_FOUND.getDescription(),
|
MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
} catch (NotFoundAuthToken e) {
|
} catch (NotFoundAuthToken | IOException e) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
|
||||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
|
||||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
|
|
||||||
errorData));
|
|
||||||
} catch (IOException e) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("token", tokenHeader);
|
errorData.put("token", tokenHeader);
|
||||||
errorData.put("fileId", fileId);
|
errorData.put("fileId", fileId);
|
||||||
@@ -487,76 +337,6 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/check/file_stats")
|
|
||||||
public ResponseEntity<?> checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
|
||||||
|
|
||||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
|
||||||
|
|
||||||
Map<String, Object> fileTypeStats = protectionsLimitService.getFileTypeStats(authToken.getUser().getId());
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(fileTypeStats);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
|
|
||||||
return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
|
|
||||||
throws IOException {
|
|
||||||
fileEntityService.deleteFromDisk(fileEntity);
|
|
||||||
|
|
||||||
fileEntityService.softDeleteFileWithHash(fileEntity);
|
|
||||||
|
|
||||||
Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
|
|
||||||
|
|
||||||
if (originalFile.isPresent()) {
|
|
||||||
Map<String, String> duplicateInfo = Map.of(
|
|
||||||
"duplicate_file_id", originalFile.get().getId(),
|
|
||||||
"owner_user_id", String.valueOf(originalFile.get().getUserId()));
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
|
||||||
20004,
|
|
||||||
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
|
||||||
"Failed to upload chunk, duplicate",
|
|
||||||
duplicateInfo));
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
|
|
||||||
String fileId) {
|
|
||||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
|
||||||
.uploadId(uploadId)
|
|
||||||
.chunkNumber(chunkNumber)
|
|
||||||
.chunkSize(chunk.getSize())
|
|
||||||
.fileId(fileId)
|
|
||||||
.message("Chunk uploaded successfully")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
|
||||||
20000,
|
|
||||||
MessageCode.SUCCESS.getCode(),
|
|
||||||
"Chunk uploaded successfully",
|
|
||||||
responseBody));
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
|
|
||||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
|
||||||
.uploadId(uploadId)
|
|
||||||
.chunkNumber(chunkNumber)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
|
||||||
20004,
|
|
||||||
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
|
||||||
errorMessage,
|
|
||||||
responseBody));
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
||||||
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||||
.stream()
|
.stream()
|
||||||
@@ -592,4 +372,16 @@ 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");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
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.*;
|
|
||||||
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 ru.soune.nocopy.service.file.ImageResizeService;
|
|
||||||
|
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.net.URLEncoder;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/files")
|
|
||||||
@Slf4j
|
|
||||||
public class FileController {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private FileStorageService fileStorageService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private FileEntityRepository fileRepository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private CheckCounterService checkCounterService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private UserRepository userRepository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ImageResizeService imageResizeService;
|
|
||||||
|
|
||||||
@GetMapping("/public/{fileId}")
|
|
||||||
public ResponseEntity<Resource> getPublicFile(@PathVariable String fileId) {
|
|
||||||
try {
|
|
||||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
|
||||||
.orElseThrow(() -> new FileNotFoundException("Not found: " + fileId));
|
|
||||||
|
|
||||||
Path filePath = Paths.get(fileEntity.getFilePath());
|
|
||||||
if (!Files.exists(filePath)) {
|
|
||||||
log.error("Not on disk: {}", fileEntity.getFilePath());
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
|
|
||||||
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getFilePath());
|
|
||||||
|
|
||||||
MediaType mediaType = getMediaType(fileEntity);
|
|
||||||
|
|
||||||
ContentDisposition contentDisposition = ContentDisposition.inline()
|
|
||||||
.filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
|
||||||
.contentType(mediaType)
|
|
||||||
.contentLength(Files.size(filePath))
|
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
|
|
||||||
.header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600")
|
|
||||||
.body(resource);
|
|
||||||
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
log.warn("Not on disk: {}", fileId);
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
} catch (IOException e) {
|
|
||||||
log.error("Read file exception: {}", fileId, e);
|
|
||||||
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private MediaType getMediaType(FileEntity fileEntity) {
|
|
||||||
try {
|
|
||||||
return MediaType.parseMediaType(fileEntity.getMimeType());
|
|
||||||
} catch (InvalidMediaTypeException e) {
|
|
||||||
String extension = fileEntity.getFileExtension().toLowerCase();
|
|
||||||
switch (extension) {
|
|
||||||
case "jpg":
|
|
||||||
case "jpeg":
|
|
||||||
return MediaType.IMAGE_JPEG;
|
|
||||||
case "png":
|
|
||||||
return MediaType.IMAGE_PNG;
|
|
||||||
case "pdf":
|
|
||||||
return MediaType.APPLICATION_PDF;
|
|
||||||
default:
|
|
||||||
return MediaType.APPLICATION_OCTET_STREAM;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/protected/{fileId}/{type}")
|
|
||||||
public ResponseEntity<Resource> getProtectedFile(
|
|
||||||
@PathVariable String fileId, @PathVariable String type) throws IOException {
|
|
||||||
|
|
||||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
|
||||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
|
||||||
|
|
||||||
String path = imageResizeService.getPath(fileEntity, type);
|
|
||||||
|
|
||||||
Resource resource = fileStorageService.loadFileAsResource(path);
|
|
||||||
|
|
||||||
if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
|
|
||||||
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
|
|
||||||
throw new RuntimeException("File is not protected");
|
|
||||||
}
|
|
||||||
|
|
||||||
String fileName = fileEntity.getOriginalFileName().replace("." +
|
|
||||||
fileEntity.getFileExtension(), "") + "_nocopy_protected" +
|
|
||||||
"." + fileEntity.getFileExtension();
|
|
||||||
String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8)
|
|
||||||
.replace("+", "%20");
|
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
|
||||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
|
||||||
"inline; filename*=UTF-8''" + encodedFileName)
|
|
||||||
.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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,173 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.dto.search.GlobalSearchStartRequest;
|
|
||||||
import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
|
|
||||||
import ru.soune.nocopy.dto.search.GlobalSearchStatusResponse;
|
|
||||||
import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO;
|
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
|
||||||
import ru.soune.nocopy.entity.search.GlobalSearchTask;
|
|
||||||
import ru.soune.nocopy.entity.search.SearchStatus;
|
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
|
||||||
import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
|
|
||||||
import ru.soune.nocopy.service.register.AuthService;
|
|
||||||
import ru.soune.nocopy.service.search.GlobalSearchService;
|
|
||||||
import ru.soune.nocopy.service.violation.ViolationService;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/v1/global-search")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class GlobalSearchController {
|
|
||||||
|
|
||||||
private final AuthService authService;
|
|
||||||
|
|
||||||
private final GlobalSearchService globalSearchService;
|
|
||||||
|
|
||||||
private final GlobalSearchTaskRepository globalSearchTaskRepository;
|
|
||||||
|
|
||||||
private final GlobalSearchTaskRepository searchTaskRepository;
|
|
||||||
|
|
||||||
private final ViolationService violationService;
|
|
||||||
|
|
||||||
@PostMapping("/start")
|
|
||||||
public ResponseEntity<?> startSearch(
|
|
||||||
@RequestBody GlobalSearchStartRequest request,
|
|
||||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
|
||||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
GlobalSearchStartResponse response = new GlobalSearchStartResponse();
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
|
||||||
|
|
||||||
List<FileEntity> filesToProcess = globalSearchService.getFilesToProcess(request, userId);
|
|
||||||
|
|
||||||
if (filesToProcess.isEmpty()) return ResponseEntity.ok().body("Files for search not found");
|
|
||||||
|
|
||||||
String taskId = globalSearchService.startSearch(request, userId, filesToProcess);
|
|
||||||
|
|
||||||
Optional<GlobalSearchTask> taskOptional = globalSearchTaskRepository.findById(taskId);
|
|
||||||
|
|
||||||
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
|
||||||
|
|
||||||
GlobalSearchTask task = taskOptional.orElseThrow();
|
|
||||||
|
|
||||||
response.setTaskId(taskId);
|
|
||||||
response.setStatus(SearchStatus.ACCEPTED.name());
|
|
||||||
response.setTotalFiles(task.getTotalFiles());
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/actual-task")
|
|
||||||
public ResponseEntity<?> getStatus(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
|
||||||
|
|
||||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
Optional<GlobalSearchTask> taskOptional;
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
|
||||||
|
|
||||||
taskOptional = searchTaskRepository.findByUserIdAndStatus(userId,
|
|
||||||
"PROCESSING");
|
|
||||||
|
|
||||||
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(taskOptional.get());
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/violation-summary")
|
|
||||||
public ResponseEntity<?> getSummary(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
|
||||||
|
|
||||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
List<FileViolationSummaryDTO> fileViolationsSummary;
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
|
||||||
|
|
||||||
fileViolationsSummary =
|
|
||||||
violationService.getFileViolationsSummary(userId);
|
|
||||||
|
|
||||||
if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found");
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(fileViolationsSummary);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/status/{taskId}")
|
|
||||||
public ResponseEntity<?> getStatus(@PathVariable String taskId,
|
|
||||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
|
||||||
|
|
||||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
GlobalSearchStatusResponse response;
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
|
||||||
|
|
||||||
Optional<GlobalSearchTask> taskOptional = searchTaskRepository.findByTaskIdAndUserId(taskId, userId);
|
|
||||||
|
|
||||||
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
|
||||||
|
|
||||||
GlobalSearchTask task = taskOptional.orElseThrow();
|
|
||||||
|
|
||||||
int progress = task.getTotalFiles() > 0 ? task.getProcessedFiles() * 100 / task.getTotalFiles() : 0;
|
|
||||||
|
|
||||||
response = new GlobalSearchStatusResponse();
|
|
||||||
response.setTaskId(taskId);
|
|
||||||
response.setStatus(task.getStatus());
|
|
||||||
response.setProgress(progress);
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(response);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +1,8 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
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 {
|
||||||
@@ -15,38 +11,4 @@ public class HealtCheckController {
|
|||||||
public HttpStatus healtCheck() {
|
public HttpStatus healtCheck() {
|
||||||
return HttpStatus.OK;
|
return HttpStatus.OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Value("${BUILD_TIME_BACK:unknown}")
|
|
||||||
private String buildTimeBack;
|
|
||||||
|
|
||||||
@GetMapping("/build")
|
|
||||||
public BuildInfo getBuildInfo() {
|
|
||||||
return new BuildInfo(buildTimeBack);
|
|
||||||
}
|
|
||||||
|
|
||||||
@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;
|
|
||||||
}
|
|
||||||
|
|
||||||
static class BuildInfo {
|
|
||||||
public String buildTimeBack;
|
|
||||||
|
|
||||||
public BuildInfo(String buildTimeBack) {
|
|
||||||
this.buildTimeBack = buildTimeBack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,119 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
|
|
||||||
import ru.soune.nocopy.entity.payment.Payment;
|
|
||||||
import ru.soune.nocopy.exception.PaymentNotFoundException;
|
|
||||||
import ru.soune.nocopy.exception.TariffNotFoundException;
|
|
||||||
import ru.soune.nocopy.exception.UserNotFoundException;
|
|
||||||
import ru.soune.nocopy.service.payment.PaymentService;
|
|
||||||
import ru.soune.nocopy.service.register.AuthService;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/payments")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@Slf4j
|
|
||||||
public class PaymentController {
|
|
||||||
|
|
||||||
private final PaymentService paymentService;
|
|
||||||
|
|
||||||
private final AuthService authService;
|
|
||||||
|
|
||||||
@PostMapping("/create")
|
|
||||||
public ResponseEntity<?> createPayment(@RequestParam String email, @RequestParam Long tariffId,
|
|
||||||
@RequestParam String operationType, @RequestParam String operationUuid) {
|
|
||||||
try {
|
|
||||||
Payment payment = paymentService.createPayment(email, tariffId, operationType, operationUuid);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(payment);
|
|
||||||
} catch (TariffNotFoundException e) {
|
|
||||||
return ResponseEntity
|
|
||||||
.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(Map.of("error", "Tariff not found", "message", e.getMessage()));
|
|
||||||
} catch (UserNotFoundException e) {
|
|
||||||
return ResponseEntity
|
|
||||||
.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(Map.of("error", "User not found", "message", e.getMessage()));
|
|
||||||
} catch (Exception e) {
|
|
||||||
return ResponseEntity
|
|
||||||
.status(HttpStatus.INTERNAL_SERVER_ERROR)
|
|
||||||
.body(Map.of("error", "Internal server error", "message", e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("webhook/yookassa")
|
|
||||||
public void handleYooKassaNotification(@RequestBody Map<String, Object> notification) {
|
|
||||||
try {
|
|
||||||
paymentService.handlePaymentNotification(notification);
|
|
||||||
log.info("Notification from yookassa: " + notification);
|
|
||||||
} catch (PaymentNotFoundException e) {
|
|
||||||
log.error("Error processing payment notification", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/auto-renewal")
|
|
||||||
public ResponseEntity<?> disableAutoRenewal(@RequestParam(value = "renewal") Boolean renewal,
|
|
||||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
|
||||||
try {
|
|
||||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
paymentService.changeAutoRenewal(authService.useUserAuthToken(tokenHeader), renewal);
|
|
||||||
return ResponseEntity.ok(Map.of("message", "Auto-renewal disabled"));
|
|
||||||
} catch (UserNotFoundException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(Map.of("error", e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/methods/{paymentMethodId}")
|
|
||||||
public ResponseEntity<?> deletePaymentMethod(@RequestHeader(value = "Authorization", required = false) String tokenHeader,
|
|
||||||
@PathVariable String paymentMethodId) {
|
|
||||||
try {
|
|
||||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
paymentService.deletePaymentMethod(authService.useUserAuthToken(tokenHeader), paymentMethodId);
|
|
||||||
return ResponseEntity.ok(Map.of("message", "Payment method deleted"));
|
|
||||||
} catch (UserNotFoundException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(Map.of("error", e.getMessage()));
|
|
||||||
} catch (RuntimeException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
|
|
||||||
.body(Map.of("error", e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/methods")
|
|
||||||
public ResponseEntity<?> getPaymentMethods(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
|
||||||
try {
|
|
||||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
errorData.put("token", tokenHeader);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(paymentService.getUserPaymentMethods(
|
|
||||||
authService.useUserAuthToken(tokenHeader)));
|
|
||||||
} catch (UserNotFoundException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(Map.of("error", e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,209 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
|
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.dto.payout.*;
|
|
||||||
import ru.soune.nocopy.entity.payout.BankTransferPayoutMethod;
|
|
||||||
import ru.soune.nocopy.entity.payout.CardPayoutMethod;
|
|
||||||
import ru.soune.nocopy.entity.payout.PayoutRequest;
|
|
||||||
import ru.soune.nocopy.entity.payout.PayoutType;
|
|
||||||
import ru.soune.nocopy.entity.user.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.user.User;
|
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.service.payout.PayoutMethodService;
|
|
||||||
import ru.soune.nocopy.service.payout.PayoutRequestService;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/payouts")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@Slf4j
|
|
||||||
public class PayoutController {
|
|
||||||
|
|
||||||
private final PayoutRequestService payoutRequestService;
|
|
||||||
|
|
||||||
private final PayoutMethodService payoutMethodService;
|
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
/*
|
|
||||||
Create payout
|
|
||||||
*/
|
|
||||||
@PostMapping("/create-request")
|
|
||||||
public ResponseEntity<PayoutRequest> createPayoutRequest(@RequestHeader("Authorization") String tokenHeader,
|
|
||||||
@Valid @RequestBody PayoutRequestDTO request) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
|
||||||
|
|
||||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
|
||||||
|
|
||||||
User user = authToken.getUser();
|
|
||||||
|
|
||||||
PayoutRequest payoutRequest = payoutRequestService.createPayoutRequest(user.getId(), request);
|
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(payoutRequest);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Completed payout
|
|
||||||
*/
|
|
||||||
@PostMapping("/requests/{requestId}/process")
|
|
||||||
public ResponseEntity<PayoutRequest> processPayoutRequest(@PathVariable Long requestId) {
|
|
||||||
PayoutRequest processed = payoutRequestService.processRequest(requestId);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(processed);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Cancel payout
|
|
||||||
*/
|
|
||||||
@PostMapping("/requests/{requestId}/cancel")
|
|
||||||
public ResponseEntity<PayoutRequest> cancelPayoutRequest(@PathVariable Long requestId,
|
|
||||||
@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"));
|
|
||||||
|
|
||||||
User user = authToken.getUser();
|
|
||||||
|
|
||||||
PayoutRequest cancelled = payoutRequestService.cancelPayoutRequest(user.getId(), requestId);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(cancelled);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Get user payouts
|
|
||||||
*/
|
|
||||||
@GetMapping("/requests")
|
|
||||||
public ResponseEntity<List<PayoutRequest>> getUserRequests(@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"));
|
|
||||||
|
|
||||||
User user = authToken.getUser();
|
|
||||||
|
|
||||||
return ResponseEntity.ok(payoutRequestService.getUserPayoutRequests(user.getId()));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Get payout by id
|
|
||||||
*/
|
|
||||||
@GetMapping("/requests/{requestId}")
|
|
||||||
public ResponseEntity<PayoutRequest> getPayoutRequest(@PathVariable Long requestId,
|
|
||||||
@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"));
|
|
||||||
|
|
||||||
User user = authToken.getUser();
|
|
||||||
|
|
||||||
return ResponseEntity.ok(payoutRequestService.getPayoutRequest(user.getId(), requestId));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Get payout by id
|
|
||||||
*/
|
|
||||||
@GetMapping("user/payout-methods")
|
|
||||||
public ResponseEntity<List<PayoutMethodDTO>> getUserMethods(@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"));
|
|
||||||
|
|
||||||
User user = authToken.getUser();
|
|
||||||
|
|
||||||
return ResponseEntity.ok(payoutMethodService.getUserMethods(user.getId()));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Get payout-methods
|
|
||||||
*/
|
|
||||||
@GetMapping("/payout-methods")
|
|
||||||
public ResponseEntity<List<PayoutMethodTypeDTO>> getAvailableMethodTypes() {
|
|
||||||
List<PayoutMethodTypeDTO> types = Arrays.stream(PayoutType.values())
|
|
||||||
.map(type -> PayoutMethodTypeDTO.builder()
|
|
||||||
.code(type.name())
|
|
||||||
.name(type.getDisplayName())
|
|
||||||
.build())
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
return ResponseEntity.ok(types);
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
add card method by userId
|
|
||||||
*/
|
|
||||||
@PostMapping("/payout-method/card")
|
|
||||||
public ResponseEntity<PayoutMethodDTO> addCardMethod(@Valid @RequestBody AddCardRequest request,
|
|
||||||
@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"));
|
|
||||||
|
|
||||||
User user = authToken.getUser();
|
|
||||||
|
|
||||||
CardPayoutMethod method = payoutMethodService.addCardMethod(user.getId(), request);
|
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.CREATED)
|
|
||||||
.body(payoutMethodService.convertToDto(method));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
add bank payout-method
|
|
||||||
*/
|
|
||||||
@PostMapping("/payout-method/bank-transfer")
|
|
||||||
public ResponseEntity<PayoutMethodDTO> addBankTransferMethod(@Valid @RequestBody AddBankTransferRequest request,
|
|
||||||
@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"));
|
|
||||||
|
|
||||||
User user = authToken.getUser();
|
|
||||||
|
|
||||||
BankTransferPayoutMethod method = payoutMethodService.addBankTransferMethod(user.getId(), request);
|
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.CREATED)
|
|
||||||
.body(payoutMethodService.convertToDto(method));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
set default bank payout-method
|
|
||||||
*/
|
|
||||||
@PutMapping("/payout-method/{methodId}/default")
|
|
||||||
public ResponseEntity<Void> setDefaultMethod(@PathVariable Long methodId,
|
|
||||||
@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"));
|
|
||||||
|
|
||||||
User user = authToken.getUser();
|
|
||||||
|
|
||||||
payoutMethodService.setDefaultMethod(user.getId(), methodId);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.configuration.search.SearchProperties;
|
|
||||||
import ru.soune.nocopy.dto.BaseResponse;
|
|
||||||
import ru.soune.nocopy.dto.search.config.SearchSettingsDto;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/search/settings")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class SearchSettingsController {
|
|
||||||
|
|
||||||
private final SearchProperties searchProperties;
|
|
||||||
|
|
||||||
@GetMapping
|
|
||||||
public ResponseEntity<?> getSettings() {
|
|
||||||
SearchSettingsDto dto = new SearchSettingsDto();
|
|
||||||
|
|
||||||
dto.setEngines(Map.of(
|
|
||||||
"yandex", searchProperties.getEngines().get("yandex").isEnabled(),
|
|
||||||
"google", searchProperties.getEngines().get("google").isEnabled()));
|
|
||||||
|
|
||||||
dto.setProxyEnabled(searchProperties.getProxy().isEnabled());
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(BaseResponse.builder()
|
|
||||||
.messageDesc("Success")
|
|
||||||
.messageBody(dto)
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping
|
|
||||||
public ResponseEntity<?> updateSettings(@RequestBody SearchSettingsDto settings) {
|
|
||||||
if (settings.getEngines() != null) {
|
|
||||||
settings.getEngines().forEach((key, value) -> {
|
|
||||||
if (searchProperties.getEngines().containsKey(key)) {
|
|
||||||
searchProperties.getEngines().get(key).setEnabled(value);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (settings.getProxyEnabled() != null) {
|
|
||||||
searchProperties.getProxy().setEnabled(settings.getProxyEnabled());
|
|
||||||
}
|
|
||||||
|
|
||||||
log.info("Settings updated: {}", settings);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(BaseResponse.builder()
|
|
||||||
.messageDesc("Settings updated")
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
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,34 +2,20 @@ 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.BaseResponse;
|
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
|
||||||
import ru.soune.nocopy.dto.register.ChangePasswordRequest;
|
import ru.soune.nocopy.dto.register.ChangePasswordRequest;
|
||||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
|
||||||
import ru.soune.nocopy.dto.register.RegRequest;
|
|
||||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
|
||||||
import ru.soune.nocopy.dto.user.UserDTO;
|
import ru.soune.nocopy.dto.user.UserDTO;
|
||||||
import ru.soune.nocopy.dto.user.UserRequest;
|
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.AuthToken;
|
||||||
import ru.soune.nocopy.entity.user.User;
|
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.file.FileStatsService;
|
|
||||||
import ru.soune.nocopy.service.register.AuthService;
|
|
||||||
import ru.soune.nocopy.service.tariff.TariffService;
|
|
||||||
import ru.soune.nocopy.service.user.UserService;
|
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
|
||||||
@@ -45,21 +31,12 @@ 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.getCompanyName(), u.getEmail(), u.isActive(),
|
.map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.isActive(),
|
||||||
u.getPhone(), u.getGenderType(),
|
u.getPhone(), u.getGenderType(),
|
||||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
|
||||||
null, null))
|
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
return ResponseEntity.ok(allUsers);
|
return ResponseEntity.ok(allUsers);
|
||||||
@@ -72,69 +49,26 @@ public class UserController {
|
|||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
if (tokenOptional.isPresent()) {
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
User user = userRepository.findByEmail(email);
|
|
||||||
|
|
||||||
|
if (authToken != null) {
|
||||||
|
User user = userRepository.findByEmail(email);
|
||||||
|
//TODO add mapper
|
||||||
if (user != null) {
|
if (user != null) {
|
||||||
UserDTO userDTO = userMapper.toDTO(user);
|
UserDTO userDTO = userMapper.toDTO(user);
|
||||||
userDTO.setEmail(email);
|
userDTO.setEmail(email);
|
||||||
userDTO.setFullName(user.getFullName());
|
userDTO.setFullName(user.getFullName());
|
||||||
|
userDTO.setCompany(user.getCompany());
|
||||||
if (user.getCompany() != null) {
|
|
||||||
userDTO.setCompany(user.getCompany().getCompanyName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
|
|
||||||
userDTO.setTariffs(tariffService.getTariffByAccountType(user));
|
|
||||||
|
|
||||||
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())
|
|
||||||
.tokens(personalTariffInfo.getTokens() + personalTariffInfo.getBoughtTokens())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
userDTO.setTariffInfo(infoDTO);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
userDTO.setPhone(user.getPhone());
|
userDTO.setPhone(user.getPhone());
|
||||||
userDTO.setGenderType(user.getGenderType());
|
userDTO.setGenderType(user.getGenderType());
|
||||||
userDTO.setBirthday(user.getBirthday());
|
userDTO.setBirthday(user.getBirthday());
|
||||||
userDTO.setCreatedAt(user.getCreatedAt());
|
userDTO.setCreatedAt(user.getCreatedAt());
|
||||||
userDTO.setSubscriptionType(user.getSubscriptionType());
|
userDTO.setSubscriptionType(user.getSubscriptionType());
|
||||||
userDTO.setActive(user.isActive());
|
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();
|
||||||
@@ -174,46 +108,4 @@ 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"));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,10 @@ package ru.soune.nocopy.dto;
|
|||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Builder
|
|
||||||
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class BaseResponse {
|
public class BaseResponse {
|
||||||
@JsonProperty("msg_id")
|
@JsonProperty("msg_id")
|
||||||
|
|||||||
@@ -4,23 +4,15 @@ public enum MessageCode {
|
|||||||
SUCCESS(0, "Operation successful"),
|
SUCCESS(0, "Operation successful"),
|
||||||
REG_EMAIL_EXISTS(1, "Email already registered"),
|
REG_EMAIL_EXISTS(1, "Email already registered"),
|
||||||
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||||
REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"),
|
|
||||||
INVALID_FIELD(2, "Invalid field"),
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
MAIL_VERIFIED_NULL(2, "Mail verified null"),
|
INVALID_TOKEN(2, "Invalid token"),
|
||||||
INVALID_TOKEN(2, "Token not found or time expired"),
|
|
||||||
TOKEN_IS_ALIVE(2, "Token is alive"),
|
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"),
|
|
||||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
FILE_NOT_EXIST(2, "File not exist on disk"),
|
|
||||||
FILE_DELETE(2, "File was deleted"),
|
|
||||||
USER_NOT_HAD_PERMISSION(2, "User not have permission for file"),
|
|
||||||
USER_NOT_VERIFIED(2, "User not verified"),
|
USER_NOT_VERIFIED(2, "User not verified"),
|
||||||
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
|
||||||
USER_NOT_FOUND(2, "User 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"),
|
||||||
TOKEN_IS_NULL(2, "Token field is null"),
|
|
||||||
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"),
|
||||||
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||||
@@ -33,29 +25,7 @@ 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"),
|
||||||
SEND_EMAIL_EXCEPTION(2, "Send email exception"),
|
USER_NOT_ACTIVE(2, "User not active");
|
||||||
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"),
|
|
||||||
PAYMENT_NOT_FOUND(4, "Payment not found"),
|
|
||||||
COMPANY_ALREADY_EXISTS(2, "Company already exists"),
|
|
||||||
USER_LIMIT_IS_OVER(2, "Over user limits"),
|
|
||||||
MONITORING_TYPE_NOT_FOUND(4, "Monitoring type not found"),
|
|
||||||
ERROR_TARIFF_INFO(2, "Erorr with tariff info"),
|
|
||||||
FILE_FOR_SEARCH_NOT_VALID(2, "File for search unsupported"),
|
|
||||||
NOT_VALID_FILE_TYPE_OR_COUNT_FILE(2, "Cost for file type not found, count is negative or files count" +
|
|
||||||
"more than max valid"),
|
|
||||||
USER_NOT_ACTIVE(2, "User not active"),
|
|
||||||
NOTION_NOT_FOUND(4, "Notion not found"),
|
|
||||||
MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion");
|
|
||||||
|
|
||||||
private final Integer code;
|
private final Integer code;
|
||||||
|
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.cost;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class CostRequest {
|
|
||||||
String action;
|
|
||||||
|
|
||||||
@JsonProperty("file_type")
|
|
||||||
String fileType;
|
|
||||||
|
|
||||||
@JsonProperty("count_files")
|
|
||||||
Integer countFilesForProtect;
|
|
||||||
|
|
||||||
@JsonProperty("auth_token")
|
|
||||||
String authToken;
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.cost;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
public class CostResponse {
|
|
||||||
private int cost;
|
|
||||||
|
|
||||||
private Boolean success;
|
|
||||||
|
|
||||||
@JsonProperty("max_files_for_check")
|
|
||||||
private Integer maxFilesForCheck;
|
|
||||||
|
|
||||||
@JsonProperty("count_file")
|
|
||||||
private Integer countFile;
|
|
||||||
|
|
||||||
@JsonProperty("tokens_count")
|
|
||||||
private int needTokensCount;
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class DaDataAddress {
|
|
||||||
private String value;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class DaDataData {
|
|
||||||
private String inn;
|
|
||||||
private DaDataAddress address;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class DaDataRequest {
|
|
||||||
|
|
||||||
@JsonProperty("inn")
|
|
||||||
private String inn;
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class DaDataResponse {
|
|
||||||
@JsonProperty("companyName")
|
|
||||||
private String companyName;
|
|
||||||
|
|
||||||
@JsonProperty("inn")
|
|
||||||
private String inn;
|
|
||||||
|
|
||||||
@JsonProperty("address")
|
|
||||||
private String address;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class DaDataSuggestion {
|
|
||||||
private String value;
|
|
||||||
private DaDataData data;
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.dadata;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
|
||||||
public class DaDataWrapper {
|
|
||||||
private List<DaDataSuggestion> suggestions;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
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,9 +20,6 @@ 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,9 +17,6 @@ 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;
|
||||||
|
|
||||||
@@ -34,16 +31,4 @@ public class FileEntityRequest {
|
|||||||
|
|
||||||
@JsonProperty("token")
|
@JsonProperty("token")
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
@JsonProperty("sort_by")
|
|
||||||
private String sortBy;
|
|
||||||
|
|
||||||
@JsonProperty("sort_order")
|
|
||||||
private String sortOrder;
|
|
||||||
|
|
||||||
@JsonProperty("type")
|
|
||||||
private String type;
|
|
||||||
|
|
||||||
@JsonProperty("date_filter")
|
|
||||||
private String dateFilter;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ 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 String thumbnailFileUrl;
|
|
||||||
private Long fileSize;
|
private Long fileSize;
|
||||||
private String mimeType;
|
private String mimeType;
|
||||||
private String fileExtension;
|
private String fileExtension;
|
||||||
@@ -33,13 +31,4 @@ 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;
|
|
||||||
private String monitoring;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,31 +58,4 @@ public class FileInfoUserResponse {
|
|||||||
|
|
||||||
@JsonProperty("audios_violations")
|
@JsonProperty("audios_violations")
|
||||||
private Integer audiosViolations;
|
private Integer audiosViolations;
|
||||||
|
|
||||||
@JsonProperty("document_size")
|
|
||||||
private Long documentSize;
|
|
||||||
|
|
||||||
@JsonProperty("document_quantity")
|
|
||||||
private Integer documentCount;
|
|
||||||
|
|
||||||
@JsonProperty("document_check")
|
|
||||||
private Integer documentCheck;
|
|
||||||
|
|
||||||
@JsonProperty("document_violations")
|
|
||||||
private Integer documentViolations;
|
|
||||||
|
|
||||||
@JsonProperty("protected_document_files_count")
|
|
||||||
private Long protectedDocumentFilesCount;
|
|
||||||
|
|
||||||
@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;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,10 +30,4 @@ public class FileListResponse {
|
|||||||
|
|
||||||
@JsonProperty("page_size")
|
@JsonProperty("page_size")
|
||||||
private Integer pageSize;
|
private Integer pageSize;
|
||||||
|
|
||||||
@JsonProperty("sort_by")
|
|
||||||
private String sortBy;
|
|
||||||
|
|
||||||
@JsonProperty("sort_order")
|
|
||||||
private String sortOrder;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -28,7 +28,4 @@ public class FileUploadRequest {
|
|||||||
|
|
||||||
@JsonProperty("token")
|
@JsonProperty("token")
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
@JsonProperty("convertTo")
|
|
||||||
private String convertTo;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,10 +7,4 @@ import lombok.Data;
|
|||||||
public class ImageSearchRequest {
|
public class ImageSearchRequest {
|
||||||
@JsonProperty("file_id")
|
@JsonProperty("file_id")
|
||||||
private String fileId;
|
private String fileId;
|
||||||
|
|
||||||
@JsonProperty("page")
|
|
||||||
private Integer page = 1;
|
|
||||||
|
|
||||||
@JsonProperty("page_size")
|
|
||||||
private Integer pageSize = 10;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
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;
|
|
||||||
Boolean owner;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class SimilarityFilter {
|
|
||||||
private List<String> similarityLevels;
|
|
||||||
private Integer page;
|
|
||||||
private Integer size;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
public enum SortOrder {
|
|
||||||
ASC("asc"),
|
|
||||||
DESC("desc");
|
|
||||||
|
|
||||||
private final String value;
|
|
||||||
|
|
||||||
SortOrder(String value) {
|
|
||||||
this.value = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static SortOrder fromString(String value) {
|
|
||||||
if (value == null) return ASC;
|
|
||||||
for (SortOrder order : SortOrder.values()) {
|
|
||||||
if (order.value.equalsIgnoreCase(value)) {
|
|
||||||
return order;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ASC;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -33,12 +33,4 @@ public class YandexSearchResponse {
|
|||||||
@JsonProperty("host")
|
@JsonProperty("host")
|
||||||
private String host;
|
private String host;
|
||||||
}
|
}
|
||||||
|
|
||||||
private int page;
|
|
||||||
|
|
||||||
private int pageSize;
|
|
||||||
|
|
||||||
private int totalResults;
|
|
||||||
|
|
||||||
private int totalPages;
|
|
||||||
}
|
}
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.monitoring;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class GetViolationsRequest {
|
|
||||||
|
|
||||||
@JsonProperty("file_id")
|
|
||||||
private String fileId;
|
|
||||||
|
|
||||||
@JsonProperty("page")
|
|
||||||
private Integer page;
|
|
||||||
|
|
||||||
@JsonProperty("page_size")
|
|
||||||
private Integer pageSize;
|
|
||||||
|
|
||||||
@JsonProperty("mark_as_read")
|
|
||||||
private boolean markAsRead;
|
|
||||||
|
|
||||||
@JsonProperty("auth_token")
|
|
||||||
private String authToken;
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.monitoring;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import ru.soune.nocopy.entity.monitoring.MonitoringType;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Response for status monitoring
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
public class MonitoringStatusResponse {
|
|
||||||
|
|
||||||
@JsonProperty("file_id")
|
|
||||||
private String fileId;
|
|
||||||
|
|
||||||
@JsonProperty("file_name")
|
|
||||||
private String fileName;
|
|
||||||
|
|
||||||
@JsonProperty("monitoring_type")
|
|
||||||
private MonitoringType monitoringType;
|
|
||||||
|
|
||||||
@JsonProperty("next_run")
|
|
||||||
private LocalDateTime nextRun;
|
|
||||||
|
|
||||||
@JsonProperty("last_run")
|
|
||||||
private LocalDateTime lastRun;
|
|
||||||
|
|
||||||
@JsonProperty("last_run_status")
|
|
||||||
private String lastRunStatus;
|
|
||||||
|
|
||||||
@JsonProperty("is_active")
|
|
||||||
private boolean isActive;
|
|
||||||
|
|
||||||
@JsonProperty("need_add_tokens")
|
|
||||||
private boolean needAddTokens;
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.monitoring;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import ru.soune.nocopy.entity.monitoring.MonitoringType;
|
|
||||||
/**
|
|
||||||
Set monitoring request
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class SetMonitoringRequest {
|
|
||||||
|
|
||||||
@JsonProperty("file_id")
|
|
||||||
private String fileId;
|
|
||||||
|
|
||||||
@JsonProperty("monitoring_type")
|
|
||||||
private String monitoringType;
|
|
||||||
|
|
||||||
@JsonProperty("auth_token")
|
|
||||||
private String authToken;
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payment;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class PaymentMethodDTO {
|
|
||||||
private String paymentMethodId;
|
|
||||||
private String lastFour;
|
|
||||||
private String cardType;
|
|
||||||
private String expiryMonth;
|
|
||||||
private String expiryYear;
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payment;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@Builder
|
|
||||||
public class PaymentRequest {
|
|
||||||
private String email;
|
|
||||||
private String paymentUuid;
|
|
||||||
private String action;
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payment;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import ru.soune.nocopy.entity.payment.Payment;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@Builder
|
|
||||||
public class PaymentResponse {
|
|
||||||
List<Payment> payments;
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payout;
|
|
||||||
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import jakarta.validation.constraints.Pattern;
|
|
||||||
import jakarta.validation.constraints.Size;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class AddBankTransferRequest {
|
|
||||||
|
|
||||||
@NotBlank(message = "Bank name is required")
|
|
||||||
@Size(min = 2, max = 200, message = "Bank name must be between 2 and 200 characters")
|
|
||||||
private String bankName;
|
|
||||||
|
|
||||||
@NotBlank(message = "BIC is required")
|
|
||||||
@Pattern(regexp = "^[0-9]{9}$", message = "BIC must contain 9 digits")
|
|
||||||
private String bic;
|
|
||||||
|
|
||||||
@Pattern(regexp = "^[0-9]{20}$", message = "Correspondent account must contain 20 digits")
|
|
||||||
private String correspondentAccount;
|
|
||||||
|
|
||||||
@NotBlank(message = "Account number is required")
|
|
||||||
@Pattern(regexp = "^[0-9]{20}$", message = "Account number must contain 20 digits")
|
|
||||||
private String accountNumber;
|
|
||||||
|
|
||||||
@NotBlank(message = "Account holder name is required")
|
|
||||||
@Size(min = 3, max = 200, message = "Account holder name must be between 3 and 200 characters")
|
|
||||||
private String accountHolder;
|
|
||||||
|
|
||||||
@Pattern(regexp = "^[0-9]{10}$|^[0-9]{12}$", message = "INN must contain 10 or 12 digits")
|
|
||||||
private String inn;
|
|
||||||
|
|
||||||
@Pattern(regexp = "^[0-9]{9}$", message = "KPP must contain 9 digits")
|
|
||||||
private String kpp;
|
|
||||||
|
|
||||||
@Builder.Default
|
|
||||||
private boolean saveAsDefault = false;
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payout;
|
|
||||||
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import jakarta.validation.constraints.Pattern;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class AddCardRequest {
|
|
||||||
|
|
||||||
@NotBlank(message = "Card number required")
|
|
||||||
@Pattern(regexp = "^[0-9]{16}$", message = "Card number 16 cipher")
|
|
||||||
private String cardNumber;
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payout;
|
|
||||||
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class PayoutMethodDTO {
|
|
||||||
private Long id;
|
|
||||||
private String type;
|
|
||||||
private String displayName;
|
|
||||||
private String maskedDetails;
|
|
||||||
private String cardNumber;
|
|
||||||
private boolean isDefault;
|
|
||||||
private boolean isVerified;
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payout;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class PayoutMethodResponse {
|
|
||||||
private Long id;
|
|
||||||
private String type;
|
|
||||||
private String displayName;
|
|
||||||
private String maskedDetails;
|
|
||||||
private boolean isDefault;
|
|
||||||
private boolean isVerified;
|
|
||||||
private LocalDateTime createdAt;
|
|
||||||
private String bankName;
|
|
||||||
private String cardBrand;
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payout;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class PayoutMethodTypeDTO {
|
|
||||||
private String code;
|
|
||||||
private String name;
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payout;
|
|
||||||
|
|
||||||
import jakarta.validation.constraints.DecimalMin;
|
|
||||||
import jakarta.validation.constraints.NotNull;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class PayoutRequestDTO {
|
|
||||||
|
|
||||||
@NotNull(message = "Sum of pay is required")
|
|
||||||
@DecimalMin(value = "1000.00", message = "Min sum for pay 1000")
|
|
||||||
private BigDecimal amount;
|
|
||||||
|
|
||||||
@NotNull(message = "Способ выплаты обязателен")
|
|
||||||
private Long payoutMethodId;
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.payout;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import ru.soune.nocopy.entity.payout.PayoutRequest;
|
|
||||||
import ru.soune.nocopy.entity.payout.PayoutRequestStatus;
|
|
||||||
import ru.soune.nocopy.entity.payout.PayoutType;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
|
|
||||||
public class PayoutResponse {
|
|
||||||
private Long id;
|
|
||||||
private BigDecimal amount;
|
|
||||||
private String formattedAmount;
|
|
||||||
private PayoutRequestStatus status;
|
|
||||||
private PayoutType payoutType;
|
|
||||||
private String payoutMethodDisplay;
|
|
||||||
private LocalDateTime createdAt;
|
|
||||||
private String formattedCreatedAt;
|
|
||||||
private LocalDateTime processedAt;
|
|
||||||
private LocalDateTime completedAt;
|
|
||||||
private String transactionId;
|
|
||||||
private String rejectionReason;
|
|
||||||
private boolean canCancel;
|
|
||||||
|
|
||||||
public static PayoutResponse fromEntity(PayoutRequest request) {
|
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm");
|
|
||||||
|
|
||||||
return PayoutResponse.builder()
|
|
||||||
.id(request.getId())
|
|
||||||
.amount(request.getAmount())
|
|
||||||
.formattedAmount(String.format("%.2f ₽", request.getAmount()))
|
|
||||||
.status(request.getStatus())
|
|
||||||
.payoutType(request.getPayoutType())
|
|
||||||
.payoutMethodDisplay(request.getPayoutMethod() != null ?
|
|
||||||
request.getPayoutMethod().getDisplayName() : null)
|
|
||||||
.createdAt(request.getCreatedAt())
|
|
||||||
.formattedCreatedAt(request.getCreatedAt() != null ?
|
|
||||||
request.getCreatedAt().format(formatter) : null)
|
|
||||||
.processedAt(request.getProcessAt())
|
|
||||||
.completedAt(request.getCompletedAt())
|
|
||||||
.rejectionReason(request.getRejectionReason())
|
|
||||||
.canCancel(request.getStatus() == PayoutRequestStatus.PENDING)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
|
||||||
|
|
||||||
public enum AccountType {
|
|
||||||
B2B, B2C
|
|
||||||
}
|
|
||||||
@@ -17,9 +17,5 @@ public class RegAnswer {
|
|||||||
|
|
||||||
private boolean isVerified;
|
private boolean isVerified;
|
||||||
|
|
||||||
private Long userId;
|
|
||||||
|
|
||||||
private String email;
|
|
||||||
|
|
||||||
private List<Map<String, String>> fieldErrors;
|
private List<Map<String, String>> fieldErrors;
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -14,11 +13,6 @@ public class RegRequest {
|
|||||||
|
|
||||||
private String companyName;
|
private String companyName;
|
||||||
|
|
||||||
private String inn;
|
|
||||||
|
|
||||||
@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;
|
||||||
|
|
||||||
@@ -30,11 +24,4 @@ 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;
|
|
||||||
|
|
||||||
@JsonProperty("mail_verified")
|
|
||||||
private String mailVerified;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,4 +21,4 @@ public class ResetPasswordRequest {
|
|||||||
|
|
||||||
@JsonProperty("password")
|
@JsonProperty("password")
|
||||||
private String password;
|
private String password;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.search;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class GlobalSearchFileResult {
|
|
||||||
private String fileId;
|
|
||||||
private String fileName;
|
|
||||||
private String thumbnail;
|
|
||||||
private String fileStatus;
|
|
||||||
private List<YandexSearchResponse.ImageResult> images;
|
|
||||||
private int page;
|
|
||||||
private int pageSize;
|
|
||||||
private int totalResults;
|
|
||||||
private int totalPages;
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.search;
|
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Builder
|
|
||||||
@Data
|
|
||||||
public class GlobalSearchStartRequest {
|
|
||||||
private String searchType;
|
|
||||||
|
|
||||||
private List<String> fileIds;
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.search;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class GlobalSearchStartResponse {
|
|
||||||
private String taskId;
|
|
||||||
|
|
||||||
private String status;
|
|
||||||
|
|
||||||
private Integer totalFiles;
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.search;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class GlobalSearchStatisticsRequest {
|
|
||||||
|
|
||||||
@JsonProperty("token")
|
|
||||||
private String token;
|
|
||||||
|
|
||||||
@JsonProperty("limit")
|
|
||||||
private Integer limit = 10;
|
|
||||||
|
|
||||||
@JsonProperty("days")
|
|
||||||
private Integer days;
|
|
||||||
}
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.search;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import ru.soune.nocopy.entity.search.GlobalSearchTask;
|
|
||||||
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
public class GlobalSearchStatisticsResponse {
|
|
||||||
|
|
||||||
@JsonProperty("total_searches")
|
|
||||||
private long totalSearches;
|
|
||||||
|
|
||||||
@JsonProperty("searches_by_status")
|
|
||||||
private StatusCountDto searchesByStatus;
|
|
||||||
|
|
||||||
@JsonProperty("recent_searches")
|
|
||||||
private List<SearchStatDto> recentSearches;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
public static class StatusCountDto {
|
|
||||||
@JsonProperty("processing")
|
|
||||||
private long processing;
|
|
||||||
|
|
||||||
@JsonProperty("completed")
|
|
||||||
private long completed;
|
|
||||||
|
|
||||||
@JsonProperty("failed")
|
|
||||||
private long failed;
|
|
||||||
|
|
||||||
@JsonProperty("total")
|
|
||||||
private long total;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
public static class SearchStatDto {
|
|
||||||
@JsonProperty("task_id")
|
|
||||||
private String taskId;
|
|
||||||
|
|
||||||
@JsonProperty("search_type")
|
|
||||||
private String searchType;
|
|
||||||
|
|
||||||
@JsonProperty("status")
|
|
||||||
private String status;
|
|
||||||
|
|
||||||
@JsonProperty("total_files")
|
|
||||||
private Integer totalFiles;
|
|
||||||
|
|
||||||
@JsonProperty("violations_found")
|
|
||||||
private long violationsFound;
|
|
||||||
|
|
||||||
@JsonProperty("created_at")
|
|
||||||
private String createdAt;
|
|
||||||
|
|
||||||
@JsonProperty("duration_seconds")
|
|
||||||
private Long durationSeconds;
|
|
||||||
|
|
||||||
@JsonProperty("file_ids")
|
|
||||||
private List<String> fileIds;
|
|
||||||
|
|
||||||
public static SearchStatDto fromEntity(GlobalSearchTask task, long violationsCount, List<String> fileIds ) {
|
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
||||||
|
|
||||||
Long duration = null;
|
|
||||||
if (task.getUpdatedAt() != null && task.getCreatedAt() != null) {
|
|
||||||
duration = java.time.Duration.between(task.getCreatedAt(), task.getUpdatedAt()).getSeconds();
|
|
||||||
}
|
|
||||||
|
|
||||||
return SearchStatDto.builder()
|
|
||||||
.taskId(task.getTaskId())
|
|
||||||
.searchType(task.getSearchType())
|
|
||||||
.status(task.getStatus())
|
|
||||||
.totalFiles(task.getTotalFiles())
|
|
||||||
.violationsFound(violationsCount)
|
|
||||||
.fileIds(fileIds)
|
|
||||||
.createdAt(task.getCreatedAt() != null ? task.getCreatedAt().format(formatter) : null)
|
|
||||||
.durationSeconds(duration)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.search;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class GlobalSearchStatusResponse {
|
|
||||||
private String taskId;
|
|
||||||
|
|
||||||
private String status;
|
|
||||||
|
|
||||||
private String searchType;
|
|
||||||
|
|
||||||
private Integer progress;
|
|
||||||
|
|
||||||
private List<GlobalSearchFileResult> results;
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user