Compare commits
406
Commits
NCB-101
...
22e9d6c9db
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22e9d6c9db | ||
|
|
8bad5a4619 | ||
|
|
3b04cc8907 | ||
|
|
ebbd69b452 | ||
|
|
47bed4149a | ||
|
|
e788b062b8 | ||
|
|
db606284cb | ||
|
|
de32f9b4d1 | ||
|
|
bc26b39d86 | ||
|
|
9423a44e17 | ||
|
|
1f49c49679 | ||
|
|
be779ec496 | ||
|
|
6f2d8320dc | ||
|
|
ea33e9cfe3 | ||
|
|
a2e94b744c | ||
|
|
de2a7f83fd | ||
|
|
1ac6d6f1b0 | ||
|
|
d82ee69d6f | ||
|
|
6555f4c0c2 | ||
|
|
c83dc10125 | ||
|
|
71cd0ebf10 | ||
|
|
ca9a7478f4 | ||
|
|
ea763edbec | ||
|
|
357ca3ec62 | ||
|
|
cb8a564afe | ||
|
|
398bfe74bb | ||
|
|
1e8e1f48db | ||
|
|
8a4f299941 | ||
|
|
9891b1d9b2 | ||
|
|
e26b5928a4 | ||
|
|
2dc9a760bc | ||
|
|
646d6fa11d | ||
|
|
16791d35de | ||
|
|
4a85e415a7 | ||
|
|
85f8528b0c | ||
|
|
31d257c9bb | ||
|
|
b87a4aff39 | ||
|
|
859a95fda7 | ||
|
|
7ec130e006 | ||
|
|
8ee60229f0 | ||
|
|
d55b1620d5 | ||
|
|
6929060661 | ||
|
|
670f14e955 | ||
|
|
1536dbc845 | ||
|
|
59c1b30669 | ||
|
|
992cc1747c | ||
|
|
b557b851e4 | ||
|
|
9713f383a6 | ||
|
|
34d5f159a4 | ||
|
|
71e410aef5 | ||
|
|
b143b29a78 | ||
|
|
9afe09ccc5 | ||
|
|
e20e4f6b48 | ||
|
|
246d55da55 | ||
|
|
81130fc238 | ||
|
|
942e4d4926 | ||
|
|
cf2aefe6c3 | ||
|
|
ab796932e6 | ||
|
|
55081d51a3 | ||
|
|
0c522e2faf | ||
|
|
5c0a0c146b | ||
|
|
42e8648f53 | ||
|
|
e03c9ff0ff | ||
|
|
3a1f4ea9d9 | ||
|
|
24bae18311 | ||
|
|
7845304f87 | ||
|
|
4dc479e31b | ||
|
|
e633d43a74 | ||
|
|
31713550ce | ||
|
|
2aac3bbdf4 | ||
|
|
6415053840 | ||
|
|
772cf9f40f | ||
|
|
20911982a6 | ||
|
|
82e84514e4 | ||
|
|
9dd1f8e6c8 | ||
|
|
73ef7a57a3 | ||
|
|
284bde0e27 | ||
|
|
218582958c | ||
|
|
16620213c7 | ||
|
|
0e0fac02a8 | ||
|
|
57a39d0cb0 | ||
|
|
df38da6d5f | ||
|
|
cbff850da6 | ||
|
|
afe78f74f2 | ||
|
|
c0818146bc | ||
|
|
a4928395b9 | ||
|
|
7c7ad61397 | ||
|
|
dfc24b77c4 | ||
|
|
8c8ae0eb3c | ||
|
|
ae81c42b89 | ||
|
|
cfe3520bad | ||
|
|
b0c66720b0 | ||
|
|
0c373acc7f | ||
|
|
59e9de2684 | ||
|
|
5dc3bb7157 | ||
|
|
48cdca56a2 | ||
|
|
59909c05c3 | ||
|
|
675c93c0c6 | ||
|
|
cc77f481dc | ||
|
|
51feca36d0 | ||
|
|
17850710b5 | ||
|
|
de8120c737 | ||
|
|
2319dd498f | ||
|
|
b77efcbce5 | ||
|
|
a6e73be032 | ||
|
|
cda829829c | ||
|
|
48c14d475d | ||
|
|
0546f6acd5 | ||
|
|
807a8e1d53 | ||
|
|
0314618db5 | ||
|
|
6bc6592f37 | ||
|
|
4d8d3d4df2 | ||
|
|
153a875b16 | ||
|
|
01ba4c3892 | ||
|
|
6565c18958 | ||
|
|
f433b4dc01 | ||
|
|
891a900a53 | ||
|
|
96a329cc48 | ||
|
|
d506b1cdaf | ||
|
|
ed8eb25ec1 | ||
|
|
ec8f3af710 | ||
|
|
394259c2c7 | ||
|
|
ff44763f88 | ||
|
|
9dd174eb60 | ||
|
|
957b10c5b9 | ||
|
|
89124a0a73 | ||
|
|
b864d7e9bd | ||
|
|
5c918d48ad | ||
|
|
0d943da120 | ||
|
|
af4e4717d1 | ||
|
|
d0df78730f | ||
|
|
ef22693691 | ||
|
|
b09e4e3bdb | ||
|
|
f88b6fd353 | ||
|
|
d23df37b45 | ||
|
|
8b8db46c29 | ||
|
|
3fd4cbeab5 | ||
|
|
367af98994 | ||
|
|
ba89406417 | ||
|
|
d2b94802de | ||
|
|
d98a5ce692 | ||
|
|
cdc45e400d | ||
|
|
c9e95edf1d | ||
|
|
352fe2c5cf | ||
|
|
6d80498402 | ||
|
|
bb43b6ef4f | ||
|
|
6793bbfc5c | ||
|
|
851528ead8 | ||
|
|
dad0c9db3b | ||
|
|
50577b43a2 | ||
|
|
25b4601bfb | ||
|
|
aacd485584 | ||
|
|
bc86854596 | ||
|
|
0aa30736d8 | ||
|
|
c82d67ab6f | ||
|
|
83a325a5ac | ||
|
|
b7ef3c86e8 | ||
|
|
d3ab48d40c | ||
|
|
b79f2a4969 | ||
|
|
b19abf32e9 | ||
|
|
bbc2508a9e | ||
|
|
377a71a28e | ||
|
|
e1894168b6 | ||
|
|
fa4cb2ed1b | ||
|
|
c46c3842aa | ||
|
|
d885f3fc4c | ||
|
|
fb48ce45a0 | ||
|
|
d9249c4ebc | ||
|
|
18383b1b62 | ||
|
|
9686eb453f | ||
|
|
93da73e90b | ||
|
|
67204d1c5c | ||
|
|
9a27b56f05 | ||
|
|
f032caf0a3 | ||
|
|
0f8017a5a9 | ||
|
|
c75ec6aa39 | ||
|
|
ef35c62a61 | ||
|
|
aa14f0dfbf | ||
|
|
ddaf729e18 | ||
|
|
2ca39eca3a | ||
|
|
136b2b2082 | ||
|
|
fb091496de | ||
|
|
5c8431195b | ||
|
|
e5d4ec2f07 | ||
|
|
a87567e45d | ||
|
|
63e065373f | ||
|
|
c44c251790 | ||
|
|
61e47975ff | ||
|
|
7adb52d86f | ||
|
|
e8bcca6ee0 | ||
|
|
99f4db1d76 | ||
|
|
097a31fd7b | ||
|
|
cca3a58f5a | ||
|
|
8a1035c6e1 | ||
|
|
284b402cdc | ||
|
|
610ab0977d | ||
|
|
66af0ea285 | ||
|
|
cb01e24d87 | ||
|
|
b67fb403e6 | ||
|
|
b3d99b0c02 | ||
|
|
d1b695a65b | ||
|
|
67e547e185 | ||
|
|
ced8768332 | ||
|
|
3e90609ae0 | ||
|
|
dc27e2ccf2 | ||
|
|
3f0a514660 | ||
|
|
0797ce20e5 | ||
|
|
ab4151b68b | ||
|
|
0047cfd4f6 | ||
|
|
cdaa6c7ce2 | ||
|
|
d2d78b5117 | ||
|
|
3002f4b04c | ||
|
|
a34fb9ffa7 | ||
|
|
d0b977291c | ||
|
|
71aa8ee01a | ||
|
|
04506f4b42 | ||
|
|
e0ecd91ed0 | ||
|
|
2f167a0150 | ||
|
|
33c0275a37 | ||
|
|
d1e36a8dd0 | ||
|
|
d5f7c73306 | ||
|
|
0529af6526 | ||
|
|
5de7e828c2 | ||
|
|
d29258855e | ||
|
|
cbcd16d376 | ||
|
|
4dd6c4a3c0 | ||
|
|
da84490198 | ||
|
|
b723247b9c | ||
|
|
eb223c2ecb | ||
|
|
bb96e3ac93 | ||
|
|
cc43b92f69 | ||
|
|
d92a9a7d86 | ||
|
|
6dec7838ce | ||
|
|
83ed7c5b01 | ||
|
|
e66ae81d18 | ||
|
|
6c3742913c | ||
|
|
dfc9a22bc5 | ||
|
|
d0be6580e4 | ||
|
|
1dd6a6b7e2 | ||
|
|
c33ffe516a | ||
|
|
ac7cc54b5e | ||
|
|
ea7dd5e5df | ||
|
|
c2a649a252 | ||
|
|
f680f766cd | ||
|
|
82827c9a2a | ||
|
|
e6e8461b9b | ||
|
|
1b2337ea2f | ||
|
|
5fc9563a4e | ||
|
|
fdc17b8325 | ||
|
|
3b68b3337c | ||
|
|
631066b217 | ||
|
|
61dcada973 | ||
|
|
7492b8aa7f | ||
|
|
9ad4830edb | ||
|
|
6366cbc96b | ||
|
|
4e0e953253 | ||
|
|
1476509b48 | ||
|
|
9cde6f3bb6 | ||
|
|
9cd5965b37 | ||
|
|
572255c066 | ||
|
|
d01ea6e2bd | ||
|
|
2ab91dee58 | ||
|
|
d1a91fec1a | ||
|
|
b0cc5720a6 | ||
|
|
ed89d315ae | ||
|
|
74f9be8bf7 | ||
|
|
bbf8e3ee3d | ||
|
|
db3dcb8166 | ||
|
|
42a5368003 | ||
|
|
be62dd458a | ||
|
|
2d80b40b27 | ||
|
|
1b921b525a | ||
|
|
b56fb63a37 | ||
|
|
bb41898abf | ||
|
|
9974e22abe | ||
|
|
064a888188 | ||
|
|
484475eadc | ||
|
|
c60aeec6f5 | ||
|
|
0bb952c4e6 | ||
|
|
11ee4e18ed | ||
|
|
684888aa2c | ||
|
|
eb43621b74 | ||
|
|
dd73227db1 | ||
|
|
a7939845c7 | ||
|
|
40cb53a3b0 | ||
|
|
bac45ec738 | ||
|
|
01cfc16583 | ||
|
|
f71252bb5e | ||
|
|
934f3459fb | ||
|
|
75643ae84c | ||
|
|
7df791f9b8 | ||
|
|
b518504e58 | ||
|
|
3558588da9 | ||
|
|
6e8ada2429 | ||
|
|
64dce8601a | ||
|
|
86fa3b555a | ||
|
|
e089d370cf | ||
|
|
28ddf49af1 | ||
|
|
93946cc2e3 | ||
|
|
671625e0cf | ||
|
|
40c9b2a796 | ||
|
|
b859b175f0 | ||
|
|
d827e2ca16 | ||
|
|
1ae2819245 | ||
|
|
dbefc21e6d | ||
|
|
e32e2d990b | ||
|
|
3896477783 | ||
|
|
b5d4509769 | ||
|
|
aa6c0c1b94 | ||
|
|
31140e810b | ||
|
|
aef2c1dfe0 | ||
|
|
c1360fce87 | ||
|
|
9e4035bf83 | ||
|
|
b5de6c04f7 | ||
|
|
a8a7a78ebf | ||
|
|
29ed74745f | ||
|
|
9e81b45922 | ||
|
|
c7c3bbe07a | ||
|
|
0f71f5d58b | ||
|
|
4ffd830f09 | ||
|
|
4fdd14f81d | ||
|
|
8f2127bed5 | ||
|
|
b71ba527d2 | ||
|
|
e71ce9bc10 | ||
|
|
d8f6a08a2f | ||
|
|
077902f4ab | ||
|
|
5f063354e6 | ||
|
|
48a83591da | ||
|
|
724e72c71a | ||
|
|
f4fc1f26a7 | ||
|
|
be1ad7f066 | ||
|
|
7cd2aa7d32 | ||
|
|
6bffd5b385 | ||
|
|
283f0b9e6f | ||
|
|
a9eda37aad | ||
|
|
ecd42ce263 | ||
|
|
9d33c7532a | ||
|
|
0f2908b037 | ||
|
|
37abdeca9a | ||
|
|
e87c14198b | ||
|
|
8bc95efa2b | ||
|
|
051f1ef5d4 | ||
|
|
549d248cb7 | ||
|
|
9a3a8bde05 | ||
|
|
69e758a710 | ||
|
|
d7874aa37a | ||
|
|
ad4850414a | ||
|
|
3d2c7ecb05 | ||
|
|
51170891ce | ||
|
|
d775802a99 | ||
|
|
dfb1fca8cd | ||
|
|
3f375d3b12 | ||
|
|
a7b9f22939 | ||
|
|
e78f882417 | ||
|
|
2445b70c7a | ||
|
|
41ac8933e9 | ||
|
|
7af909c4f2 | ||
|
|
976d1f751e | ||
|
|
dbef82d896 | ||
|
|
7e1877ffc3 | ||
|
|
8ce07c6b81 | ||
|
|
fa1892585a | ||
|
|
6d6721fb0a | ||
|
|
535be69840 | ||
|
|
fdea57d947 | ||
|
|
0aa7f5c865 | ||
|
|
067b967a17 | ||
|
|
9a8a4a72f4 | ||
|
|
964910ec69 | ||
|
|
547e70ecdd | ||
|
|
78b97b48c9 | ||
|
|
4e0579c952 | ||
|
|
57dcc12cf2 | ||
|
|
a01adfc848 | ||
|
|
8965ffdd1f | ||
|
|
a21eb899b3 | ||
|
|
95ebcf0241 | ||
|
|
a3e6e0091a | ||
|
|
2f38a7c455 | ||
|
|
17aa52d4ac | ||
|
|
8eb0772196 | ||
|
|
c1782cf59b | ||
|
|
46cf252699 | ||
|
|
ebcb68135b | ||
|
|
e68ad3d3d3 | ||
|
|
12e001211b | ||
|
|
40f8effb31 | ||
|
|
69c3d876ae | ||
|
|
610415951d | ||
|
|
9ca116856c | ||
|
|
86db70caf4 | ||
|
|
0b2ef108ca | ||
|
|
0fbe725eb9 | ||
|
|
29cdbb887f | ||
|
|
2bf5e99fbb | ||
|
|
655e8f0844 | ||
|
|
31aa1c0545 | ||
|
|
97d6c8317e | ||
|
|
a42f3e8ed8 | ||
|
|
46c75deacb | ||
|
|
4930a73762 | ||
|
|
726da25ddf | ||
|
|
a9b7b7ca6e | ||
|
|
daef30ec11 | ||
|
|
a25b33fe13 | ||
|
|
2985d84b04 |
@@ -290,7 +290,7 @@ server_name dev-admin.not-copy.com;
|
||||
ssl_certificate_key /etc/letsencrypt/live/dev-admin.not-copy.com/privkey.pem;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://localhost:3001;
|
||||
proxy_pass http://localhost:8082;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
@@ -323,6 +323,7 @@ server_name dev-workspace.not-copy.com;
|
||||
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;
|
||||
@@ -489,4 +490,14 @@ killall 3proxy # Остановка прокси
|
||||
На основном сервере:
|
||||
bash
|
||||
curl -x http://193.46.217.94:3128 https://api.ipify.org # Проверка прокси
|
||||
telnet 193.46.217.94 3128 # Проверка порта
|
||||
telnet 193.46.217.94 3128 # Проверка порта
|
||||
|
||||
------
|
||||
|
||||
Настройка Яндекс Клауд
|
||||
|
||||
1. YCAJEpWAtaVkVGX0sH6_EupEg - индетификатор ключа
|
||||
2. YCMmVykfXrZ_nfU13Vo4yoCVGa70DnTlBgF1pUzO - секретный ключ
|
||||
|
||||
private static final String KEY_ID = "YCAJEmHZcWxzf4oGWvETG3mms";
|
||||
private static final String SECRET_KEY = "YCPAPZ32XC-LWb8xE0b_xTcBD8NZUCHpSOfu8LUG";
|
||||
@@ -62,9 +62,25 @@ dependencies {
|
||||
implementation name: 'testlib-fat-0.3.1-all'
|
||||
|
||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
|
||||
implementation 'com.maxmind.geoip2:geoip2:4.2.0'
|
||||
implementation 'org.sejda.imageio:webp-imageio:0.1.6'
|
||||
|
||||
implementation project(':referral')
|
||||
|
||||
//cloud
|
||||
implementation("software.amazon.awssdk:aws-sdk-java:2.29.33")
|
||||
implementation("software.amazon.awssdk:apache-client:2.29.33")
|
||||
|
||||
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")
|
||||
implementation("org.springframework.boot:spring-boot-starter-web")
|
||||
|
||||
|
||||
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.1.0'
|
||||
implementation 'io.github.resilience4j:resilience4j-spring-boot3:2.2.0'
|
||||
|
||||
//cache
|
||||
implementation("org.springframework.boot:spring-boot-starter-cache:4.0.6")
|
||||
implementation 'com.github.ben-manes.caffeine:caffeine'
|
||||
}
|
||||
|
||||
tasks.named('test') {
|
||||
|
||||
@@ -216,6 +216,33 @@ services:
|
||||
networks:
|
||||
- app-network
|
||||
|
||||
nexus:
|
||||
image: sonatype/nexus3:latest
|
||||
container_name: nexus
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "9000:8081"
|
||||
volumes:
|
||||
- nexus-data:/nexus-data
|
||||
environment:
|
||||
- INSTALL4J_ADD_VM_PARAMS=-Xms512m -Xmx1024m -XX:MaxDirectMemorySize=512m
|
||||
networks:
|
||||
- app-network
|
||||
|
||||
mongodb:
|
||||
image: mongo:latest
|
||||
container_name: mongo_ncp
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "27017:27017"
|
||||
environment:
|
||||
MONGO_INITDB_ROOT_USERNAME: mongo_db
|
||||
MONGO_INITDB_ROOT_PASSWORD: mongo_ncp
|
||||
volumes:
|
||||
- mongodb_data:/data/db
|
||||
networks:
|
||||
- app-network
|
||||
|
||||
tempo:
|
||||
image: grafana/tempo:2.4.1
|
||||
container_name: tempo
|
||||
@@ -267,6 +294,8 @@ services:
|
||||
|
||||
volumes:
|
||||
pgdata:
|
||||
mongodb_data:
|
||||
name: mongodb_data
|
||||
artifacts:
|
||||
tempo_data:
|
||||
loki_data:
|
||||
@@ -275,6 +304,8 @@ volumes:
|
||||
loki_rules:
|
||||
uploads_data:
|
||||
prometheus_data:
|
||||
nexus-data:
|
||||
driver: local
|
||||
# postfix-data:
|
||||
networks:
|
||||
app-network:
|
||||
|
||||
@@ -86,10 +86,11 @@ pipeline {
|
||||
passwordVariable: 'SSH_PASS'
|
||||
),
|
||||
string(credentialsId: 'DB_USER', variable: 'DB_USER'),
|
||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD'),
|
||||
string(credentialsId: 'MONGO_USER', variable: 'MONGO_USER'),
|
||||
string(credentialsId: 'MONGO_PASSWORD', variable: 'MONGO_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"
|
||||
@@ -98,7 +99,6 @@ pipeline {
|
||||
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}
|
||||
@@ -118,6 +118,8 @@ pipeline {
|
||||
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 не найден'
|
||||
docker stop mongodb-${params.PORT} 2>/dev/null || echo 'Контейнер MongoDB не найден'
|
||||
docker rm mongodb-${params.PORT} 2>/dev/null || echo 'Контейнер MongoDB не найден'
|
||||
|
||||
echo '3. Запускаем БД...'
|
||||
docker run -d \\
|
||||
@@ -134,20 +136,31 @@ pipeline {
|
||||
-e BUILD_TIME_BACK='${buildTime}' \\
|
||||
postgres:17.7
|
||||
|
||||
echo '4. Запускаем storage...'
|
||||
echo '4. Запускаем MongoDB...'
|
||||
docker run -d \\
|
||||
--name mongodb-${params.PORT} \\
|
||||
--network ${params.NETWORK} \\
|
||||
--network-alias mongodb-${params.PORT} \\
|
||||
-p ${params.PORT}1:27017 \\
|
||||
-e MONGO_INITDB_ROOT_USERNAME=${MONGO_USER} \\
|
||||
-e MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD} \\
|
||||
-v mongodb_data_${params.PORT}:/data/db \\
|
||||
mongo:7.0
|
||||
|
||||
echo '5. Запускаем 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. Ждем БД...'
|
||||
echo '6. Ждем БД...'
|
||||
sleep 15
|
||||
|
||||
echo '6. Собираем приложение...'
|
||||
|
||||
echo '7. Собираем приложение...'
|
||||
docker build --no-cache -t app-backend-${params.PORT}:latest .
|
||||
|
||||
echo '7. Запускаем приложение...'
|
||||
echo '8. Запускаем приложение...'
|
||||
docker run -d \\
|
||||
--name app-backend-${params.PORT} \\
|
||||
--network ${params.NETWORK} \\
|
||||
@@ -162,9 +175,11 @@ pipeline {
|
||||
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
||||
-e FILE_STORAGE_PATH=/data/uploads \\
|
||||
-e SPRING_PROFILES_ACTIVE=${springProfile} \\
|
||||
-e MONGO_URI=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@mongodb-${params.PORT}:27017 \\
|
||||
-e MONGO_DATABASE=no_copy \\
|
||||
app-backend-${params.PORT}:latest
|
||||
|
||||
echo '8. Проверка...'
|
||||
echo '9. Проверка...'
|
||||
sleep 10
|
||||
|
||||
if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
|
||||
|
||||
@@ -9,5 +9,6 @@ interface Referral {
|
||||
val totalIncome: Int
|
||||
val availableIncome: Int
|
||||
val holdBalance: Int
|
||||
val spentBalance: Int
|
||||
val active: Boolean
|
||||
}
|
||||
@@ -18,6 +18,7 @@ class ReferralService(
|
||||
override val totalIncome = 0
|
||||
override val availableIncome = 0
|
||||
override val holdBalance: Int = 0
|
||||
override val spentBalance: Int = 0
|
||||
override val active: Boolean = false
|
||||
}
|
||||
|
||||
@@ -59,7 +60,8 @@ class ReferralService(
|
||||
totalIncome = referral.totalIncome,
|
||||
availableIncome = referral.availableIncome,
|
||||
holdBalance = referral.holdBalance,
|
||||
referralLink = referral.referralLink
|
||||
referralLink = referral.referralLink,
|
||||
spentBalance = referral.spentBalance,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -7,4 +7,5 @@ data class ReferralStat(
|
||||
val availableIncome: Int,
|
||||
val holdBalance: Int,
|
||||
val referralLink: String,
|
||||
val spentBalance: Int,
|
||||
)
|
||||
@@ -2,10 +2,12 @@ package ru.soune.nocopy;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cache.annotation.EnableCaching;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
|
||||
@SpringBootApplication
|
||||
@EnableScheduling
|
||||
@EnableCaching
|
||||
public class NoCopyApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package ru.soune.nocopy.configuration;
|
||||
|
||||
import com.github.benmanes.caffeine.cache.Caffeine;
|
||||
import com.vrt.AudioFilePathProvider;
|
||||
import com.vrt.fileprotection.FileProtector;
|
||||
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
||||
@@ -8,18 +9,27 @@ import com.vrt.fileprotection.image.ImageLocalSearch;
|
||||
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.cache.CacheManager;
|
||||
import org.springframework.cache.annotation.EnableCaching;
|
||||
import org.springframework.cache.caffeine.CaffeineCacheManager;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@Configuration
|
||||
@EnableAutoConfiguration
|
||||
@AllArgsConstructor
|
||||
@EnableCaching
|
||||
public class ApplicationConfig {
|
||||
|
||||
// private final FileEntityRepository fileEntityRepository;
|
||||
|
||||
// private final FileUtil fileUtil;
|
||||
|
||||
@Bean
|
||||
PasswordEncoder passwordEncoder() {
|
||||
return new BCryptPasswordEncoder();
|
||||
@@ -36,6 +46,9 @@ public class ApplicationConfig {
|
||||
AudioFilePathProvider audioFilePathProvider,
|
||||
DocumentLocalSearch documentLocalSearch) {
|
||||
|
||||
// List<FileProtector.FileInfo> initialFiles = loadProcessingFile();
|
||||
|
||||
//TODO инициализация файлов при создании
|
||||
return new com.vrt.NoCopyFileService(
|
||||
Collections.emptyList(),
|
||||
fileProvider,
|
||||
@@ -47,5 +60,28 @@ public class ApplicationConfig {
|
||||
documentLocalSearch
|
||||
);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public CacheManager cacheManager() {
|
||||
CaffeineCacheManager cacheManager = new CaffeineCacheManager(
|
||||
"reverseImageSearch", "parsedImages");
|
||||
|
||||
cacheManager.setCaffeine(Caffeine.newBuilder()
|
||||
.maximumSize(2_000)
|
||||
.expireAfterWrite(1, TimeUnit.HOURS)
|
||||
.expireAfterAccess(30, TimeUnit.MINUTES)
|
||||
.softValues()
|
||||
.recordStats()
|
||||
);
|
||||
|
||||
return cacheManager;
|
||||
}
|
||||
// private List<FileProtector.FileInfo> loadProcessingFile() {
|
||||
// List<FileEntity> byProtectionStatus =
|
||||
// fileEntityRepository.findByProtectionStatus(ProtectionStatus.PROCESSING);
|
||||
//
|
||||
// return byProtectionStatus.stream().map(fileEntity ->
|
||||
// fileUtil.createFileInfo(fileEntity, null)).toList();
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,14 @@ public class HandlerConfig {
|
||||
ViolationHandler violationHandler,
|
||||
ViolationStatisticsHandler violationStatisticsHandler,
|
||||
GlobalSearchHandler globalSearchHandler,
|
||||
ViolationNotionHandler violationNotionHandler
|
||||
ViolationNotionHandler violationNotionHandler,
|
||||
ComplaintEntityHandler complaintEntityHandler,
|
||||
UserInfoHandler userInfoHandler,
|
||||
NotificationHandler notificationHandler,
|
||||
UserVerificationHandler userVerificationHandler,
|
||||
LawCaseHandler lawCaseHandler,
|
||||
TokenOperationHandler tokenOperationHandler,
|
||||
DockViewFileHandler dockViewFileHandler
|
||||
) {
|
||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||
map.put(20001, login);
|
||||
@@ -56,6 +63,65 @@ public class HandlerConfig {
|
||||
map.put(30010, violationStatisticsHandler);
|
||||
map.put(30011, globalSearchHandler);
|
||||
map.put(30012, violationNotionHandler);
|
||||
map.put(30013, complaintEntityHandler);
|
||||
map.put(30014, userInfoHandler);
|
||||
map.put(30015, notificationHandler);
|
||||
map.put(30016, userVerificationHandler);
|
||||
map.put(30017, lawCaseHandler);
|
||||
map.put(30018, tokenOperationHandler);
|
||||
map.put(30028, dockViewFileHandler);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public Map<Integer, RequestHandler> internalInfoHandler(
|
||||
StatisticComplaintHandler statisticComplaintHandler,
|
||||
StatisticUserFilesHandler statisticUserHandler,
|
||||
StatisticTariffInfoFileHandler statisticTariffInfoFileHandler,
|
||||
StatisticUserDynamicHandler statisticUserDynamicHandler,
|
||||
StatisticProtectedFilesHandler statisticProtectedFilesHandler,
|
||||
StatisticViolationHandler statisticViolationHandler,
|
||||
StatisticSubscriberHandler statisticSubscriberHandler,
|
||||
StatisticTokenHandler statisticTokenHandler,
|
||||
StatisticIncomeHandler statisticIncomeHandler,
|
||||
MonitoringStatisticHandler monitoringStatisticHandler,
|
||||
FileInteranlInfoHandler fileInfo,
|
||||
TariffInformationHandler tariffInformationHandler,
|
||||
UserInfoHandler userInfoHandler
|
||||
)
|
||||
{
|
||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||
map.put(30014, userInfoHandler);
|
||||
map.put(30019, statisticUserHandler);
|
||||
map.put(30020, statisticTariffInfoFileHandler);
|
||||
map.put(30021, statisticUserDynamicHandler);
|
||||
map.put(30022, statisticProtectedFilesHandler);
|
||||
map.put(30023, statisticViolationHandler);
|
||||
map.put(30024, statisticSubscriberHandler);
|
||||
map.put(30025, statisticTokenHandler);
|
||||
map.put(30026, statisticIncomeHandler);
|
||||
map.put(30027, monitoringStatisticHandler);
|
||||
map.put(30029, statisticComplaintHandler);
|
||||
map.put(40001, fileInfo);
|
||||
map.put(40004, tariffInformationHandler);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public Map<Integer, RequestHandler> internalControlHandler(
|
||||
ControlComplaintHandler controlComplaintHandler,
|
||||
FileInternalControlHandler fileInternalControlHandler,
|
||||
TariffControlHandler tariffControlHandler,
|
||||
UserInfoHandler userInfoHandler
|
||||
)
|
||||
{
|
||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||
map.put(30014, userInfoHandler);
|
||||
map.put(30030, controlComplaintHandler);
|
||||
map.put(40002, fileInternalControlHandler);
|
||||
map.put(40003, tariffControlHandler);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@ import com.vrt.fileprotection.audio.AudioCheckResult;
|
||||
import com.vrt.fileprotection.documents.DocumentCheckResult;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.core.io.FileSystemResource;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.springframework.core.io.InputStreamResource;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.web.PageableDefault;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.validation.FieldError;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -21,12 +21,14 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
import ru.soune.nocopy.dto.BaseRequest;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.docviewer.DocViewerRequest;
|
||||
import ru.soune.nocopy.dto.file.*;
|
||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||
import ru.soune.nocopy.entity.company.Company;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||
import ru.soune.nocopy.entity.file.permission.PermissionType;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.*;
|
||||
@@ -35,18 +37,20 @@ 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.dockview.DockViewService;
|
||||
import ru.soune.nocopy.service.file.*;
|
||||
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||
import ru.soune.nocopy.service.file.ProtectionsLimitService;
|
||||
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
import ru.soune.nocopy.service.file.FileEntityService;
|
||||
import ru.soune.nocopy.service.file.FileUploadService;
|
||||
import ru.soune.nocopy.util.FileUtil;
|
||||
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -59,6 +63,10 @@ public class ApiController {
|
||||
|
||||
private final Map<Integer, RequestHandler> handlers;
|
||||
|
||||
private final Map<Integer, RequestHandler> internalInfoHandler;
|
||||
|
||||
private final Map<Integer, RequestHandler> internalControlHandler;
|
||||
|
||||
private final FileEntityService fileEntityService;
|
||||
|
||||
private final AuthService authService;
|
||||
@@ -67,6 +75,8 @@ public class ApiController {
|
||||
|
||||
private final FileEntityRepository fileEntityRepository;
|
||||
|
||||
private final NoCopyFileService noCopyFileService;
|
||||
|
||||
private final FileUtil fileUtil;
|
||||
|
||||
private final ProtectionsLimitService protectionsLimitService;
|
||||
@@ -77,6 +87,12 @@ public class ApiController {
|
||||
|
||||
private final CheckCounterService checkCounterService;
|
||||
|
||||
private final CloudStorageService cloudStorageService;
|
||||
|
||||
private final ZipService zipService;
|
||||
|
||||
private final DockViewService dockViewService;
|
||||
|
||||
@PostMapping("/v{version}/data")
|
||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||
@PathVariable("version") int version) {
|
||||
@@ -118,6 +134,96 @@ public class ApiController {
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/internal/data-info")
|
||||
public ResponseEntity<?> handleInternalInfoPostRequest(@RequestBody BaseRequest request) {
|
||||
Integer msgId = request.getMsgId();
|
||||
BaseResponse response;
|
||||
RequestHandler internalHandler = internalInfoHandler.get(msgId);
|
||||
|
||||
try {
|
||||
if (internalHandler == null) {
|
||||
response = new BaseResponse(msgId,
|
||||
MessageCode.MSG_ID_NOT_FOUND.getCode(),
|
||||
MessageCode.MSG_ID_NOT_FOUND.getDescription(),
|
||||
new HashMap<>());
|
||||
} else {
|
||||
response = internalHandler.handle(request);
|
||||
}
|
||||
|
||||
return ResponseEntity.ok().body(response);
|
||||
} catch (Exception e) {
|
||||
log.error("Handler execution failed for msgId: {}", msgId, e);
|
||||
|
||||
BaseResponse errorResponse = new BaseResponse(msgId,
|
||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||
MessageCode.INVALID_JSON_BODY.getDescription(),
|
||||
new HashMap<>());
|
||||
|
||||
return ResponseEntity.ok().body(errorResponse);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/internal/data-download/{fileId}")
|
||||
public ResponseEntity<byte[]> getPublicFile(@PathVariable String fileId) {
|
||||
try {
|
||||
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||
.orElseThrow(() -> new FileNotFoundException("Not found in DB: " + fileId));
|
||||
|
||||
MediaType mediaType = getMediaType(fileEntity);
|
||||
|
||||
ContentDisposition contentDisposition = ContentDisposition.inline()
|
||||
.filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
|
||||
.build();
|
||||
|
||||
byte[] fileBytes;
|
||||
try (InputStream inputStream = cloudStorageService.readFileFromStorage(fileEntity.getFilePath())) {
|
||||
fileBytes = IOUtils.toByteArray(inputStream);
|
||||
}
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(mediaType)
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
|
||||
.header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600")
|
||||
.body(fileBytes);
|
||||
|
||||
} catch (FileNotFoundException e) {
|
||||
return ResponseEntity.notFound().build();
|
||||
} catch (NoSuchKeyException e) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
|
||||
} catch (Exception e) {
|
||||
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/internal/data-control")
|
||||
public ResponseEntity<?> handleInternalControlPostRequest(@RequestBody BaseRequest request) {
|
||||
Integer msgId = request.getMsgId();
|
||||
BaseResponse response;
|
||||
RequestHandler internalHandler = internalControlHandler.get(msgId);
|
||||
|
||||
try {
|
||||
if (internalHandler == null) {
|
||||
response = new BaseResponse(msgId,
|
||||
MessageCode.MSG_ID_NOT_FOUND.getCode(),
|
||||
MessageCode.MSG_ID_NOT_FOUND.getDescription(),
|
||||
new HashMap<>());
|
||||
} else {
|
||||
response = internalHandler.handle(request);
|
||||
}
|
||||
|
||||
return ResponseEntity.ok().body(response);
|
||||
} catch (Exception e) {
|
||||
log.error("Handler execution failed for msgId: {}", msgId, e);
|
||||
|
||||
BaseResponse errorResponse = new BaseResponse(msgId,
|
||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||
MessageCode.INVALID_JSON_BODY.getDescription(),
|
||||
new HashMap<>());
|
||||
|
||||
return ResponseEntity.ok().body(errorResponse);
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/v{version}/files/chunk")
|
||||
public ResponseEntity<BaseResponse> uploadChunk(
|
||||
@PathVariable("version") int version,
|
||||
@@ -157,6 +263,44 @@ public class ApiController {
|
||||
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
||||
duplicateData
|
||||
));
|
||||
} catch (FileFormatException e){
|
||||
return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
|
||||
} catch (Exception e) {
|
||||
log.error("Error uploading chunk", e);
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/v{version}/private/files/chunk")
|
||||
public ResponseEntity<BaseResponse> uploadChunk(
|
||||
@RequestParam(value = "upload_id", required = false) String uploadId,
|
||||
@RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
|
||||
@RequestParam(value = "chunk", required = false) MultipartFile chunk,
|
||||
@RequestParam(value = "last_file", required = false) Boolean last_file,
|
||||
@RequestParam(value = "token") String token) {
|
||||
try {
|
||||
if (chunk == null || chunk.isEmpty()) {
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
|
||||
}
|
||||
if (uploadId == null || uploadId.isBlank()) {
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Upload Id is required");
|
||||
}
|
||||
if (chunkNumber == null || chunkNumber < 0) {
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
||||
}
|
||||
|
||||
Long userId = authService.useUserAuthToken(token);
|
||||
|
||||
UploadProgressResponse uploadProgressResponse = fileUploadService.uploadPassportChunk(uploadId, chunkNumber,
|
||||
chunk, userId);
|
||||
|
||||
if (last_file) {
|
||||
zipService.createAndSplitZip(userId,
|
||||
fileEntityService.getAllUserFiles(userId, List.of(FileStatus.PRIVATE)));
|
||||
}
|
||||
|
||||
return buildSuccessResponse(uploadId, chunkNumber, chunk,
|
||||
fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
|
||||
}catch (FileFormatException e){
|
||||
return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
|
||||
} catch (Exception e) {
|
||||
@@ -165,7 +309,17 @@ public class ApiController {
|
||||
}
|
||||
}
|
||||
|
||||
private final NoCopyFileService noCopyFileService;
|
||||
@GetMapping("/check/{fileId}")
|
||||
public ResponseEntity<BaseResponse> check(@PathVariable String fileId) {
|
||||
FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
|
||||
|
||||
File file = new File(fileEntity.getFilePath());
|
||||
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, FileProtector.Type.IMAGE);
|
||||
log.info("checkResult: {}", checkResult);
|
||||
|
||||
|
||||
return ResponseEntity.ok(new BaseResponse(1, 1, "1", checkResult));
|
||||
}
|
||||
|
||||
@GetMapping("/v{version}/files/{fileId}/similar")
|
||||
public ResponseEntity<BaseResponse> findSimilarFiles(
|
||||
@@ -189,14 +343,13 @@ public class ApiController {
|
||||
fileId, similarityLevels, pageable, authToken);
|
||||
response = buildSuccessResponse(similarFilesPage, MessageCode.SIMILAR_FILES_FOUND);
|
||||
} else {
|
||||
List<SimilarFileDTO> results = processNonImageFile(fileEntity, authToken);
|
||||
List<SimilarFileDTO> results = processNonImageFile(fileEntity, true);
|
||||
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(),
|
||||
@@ -210,45 +363,55 @@ public class ApiController {
|
||||
}
|
||||
}
|
||||
|
||||
private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, String authToken) throws Exception {
|
||||
private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, boolean cloud) throws Exception {
|
||||
List<SimilarFileDTO> results = new ArrayList<>();
|
||||
|
||||
File file = null;
|
||||
FileEntity duplicateByHash = fileSimilarityService.findDuplicateByHash(fileEntity.getFilePath(),
|
||||
fileEntity.getMimeType(), fileEntity.getUserId());
|
||||
fileEntity.getMimeType(), fileEntity.getUserId(), cloud);
|
||||
|
||||
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;
|
||||
try {
|
||||
file = cloudStorageService.readFileFromStorageByPath(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);
|
||||
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));
|
||||
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 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());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new Exception("Files for search not valid");
|
||||
} finally {
|
||||
if (file != null && file.exists()) {
|
||||
file.delete();
|
||||
}
|
||||
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;
|
||||
@@ -373,6 +536,42 @@ public class ApiController {
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/v{version}/files/public-download/{fileId}")
|
||||
public ResponseEntity<?> downloadFile(
|
||||
@PathVariable(required = false) String fileId, @PathVariable(required = false) Integer version) {
|
||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||
FileStatus status = entityResponse.getStatus();
|
||||
|
||||
if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
|
||||
status.equals(FileStatus.REMOVED)) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("fileId", entityResponse.getId());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_IS_BLOCKED.getCode(),
|
||||
MessageCode.FILE_IS_BLOCKED.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
if (!entityResponse.getPermissions().get(PermissionType.DOWNLOAD)) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("fileId", entityResponse.getId());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getCode(),
|
||||
MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"attachment; filename=\"" + entityResponse.getFileName() + "\"")
|
||||
.body(bytes);
|
||||
}
|
||||
|
||||
@GetMapping("/v{version}/files/download/{fileId}")
|
||||
public ResponseEntity<?> downloadFile(
|
||||
@PathVariable(required = false) String fileId,
|
||||
@@ -391,6 +590,28 @@ public class ApiController {
|
||||
|
||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||
FileStatus status = entityResponse.getStatus();
|
||||
|
||||
if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
|
||||
status.equals(FileStatus.REMOVED)) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("fileId", entityResponse.getId());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_IS_BLOCKED.getCode(),
|
||||
MessageCode.FILE_IS_BLOCKED.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
if (!entityResponse.getPermissions().get(PermissionType.DOWNLOAD)) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("fileId", entityResponse.getId());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getCode(),
|
||||
MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
User fileUser = userRepository.findById(entityResponse.getUserId()).orElseThrow();
|
||||
User user = userRepository.findById(userId).orElseThrow();
|
||||
@@ -426,38 +647,13 @@ public class ApiController {
|
||||
errorData));
|
||||
}
|
||||
|
||||
if (!entityResponse.isExistsOnDisk()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_NOT_EXIST.getCode(),
|
||||
MessageCode.FILE_NOT_EXIST.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
|
||||
Path filePath = Paths.get(entityResponse.getProtectedFilePath());
|
||||
FileSystemResource resource = new FileSystemResource(filePath);
|
||||
long fileSize = Files.size(filePath);
|
||||
|
||||
if (!resource.exists()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("resource", resource.exists());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
String contentType = determineContentType(filePath);
|
||||
byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentLength(fileSize)
|
||||
.contentType(MediaType.parseMediaType(contentType))
|
||||
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"attachment; filename=\"" + entityResponse.getFileName() + "\"")
|
||||
.body(resource);
|
||||
.body(bytes);
|
||||
} catch (FileEntityNotFoundException e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("fileId", fileId);
|
||||
@@ -474,15 +670,66 @@ public class ApiController {
|
||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
|
||||
errorData));
|
||||
} catch (IOException e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
errorData.put("fileId", fileId);
|
||||
errorData.put("version", version);
|
||||
}
|
||||
}
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
|
||||
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
|
||||
@PostMapping("/file/link")
|
||||
public ResponseEntity<?> downloadFile(@RequestBody DocViewerRequest viewerRequest) {
|
||||
try {
|
||||
String tokenHeader = viewerRequest.getToken();
|
||||
Long userId = tokenHeader == null ? 0L: authService.useUserAuthToken(tokenHeader);
|
||||
|
||||
if (viewerRequest.getFileId() == null) {
|
||||
return ResponseEntity.ok().body(new BaseResponse(0,
|
||||
MessageCode.NOT_VALID_FIELD.getCode(),
|
||||
MessageCode.NOT_VALID_FIELD.getDescription(),
|
||||
"file_id is required"));
|
||||
}
|
||||
|
||||
FileEntityResponse entityResponse = fileEntityService.getById(viewerRequest.getFileId(), 0);
|
||||
FileStatus status = entityResponse.getStatus();
|
||||
|
||||
if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
|
||||
status.equals(FileStatus.REMOVED)) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("fileId", entityResponse.getId());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(0,
|
||||
MessageCode.FILE_IS_BLOCKED.getCode(),
|
||||
MessageCode.FILE_IS_BLOCKED.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
|
||||
|
||||
dockViewService.createDockView(viewerRequest, userId);
|
||||
|
||||
String filename = entityResponse.getFileName();
|
||||
String encodedFilename = URLEncoder.encode(filename, StandardCharsets.UTF_8)
|
||||
.replace("+", "%20");
|
||||
|
||||
String safeFilename = filename.replaceAll("[^\\x00-\\x7F]", "_");
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"attachment; filename=\"" + safeFilename + "\"; filename*=UTF-8''" + encodedFilename)
|
||||
.body(bytes);
|
||||
} catch (FileEntityNotFoundException e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("fileId", viewerRequest.getFileId());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(0,
|
||||
MessageCode.FILE_NOT_FOUND.getCode(),
|
||||
MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||
errorData));
|
||||
} catch (NotFoundAuthToken e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", viewerRequest.getFileId());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(0,
|
||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
}
|
||||
@@ -500,33 +747,6 @@ public class ApiController {
|
||||
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()
|
||||
@@ -584,12 +804,22 @@ public class ApiController {
|
||||
return errorDetail;
|
||||
}
|
||||
|
||||
|
||||
private String determineContentType(Path filePath) throws IOException {
|
||||
String contentType = Files.probeContentType(filePath);
|
||||
if (contentType == null) {
|
||||
contentType = "application/octet-stream";
|
||||
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;
|
||||
}
|
||||
}
|
||||
return contentType;
|
||||
}
|
||||
}
|
||||
@@ -1,63 +1,62 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import com.google.common.io.ByteStreams;
|
||||
import com.vrt.NoCopyFileService;
|
||||
import com.vrt.fileprotection.FileProtector;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.io.InputStreamResource;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
|
||||
import ru.soune.nocopy.dto.file.CheckStatus;
|
||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||
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 ru.soune.nocopy.service.file.*;
|
||||
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
|
||||
import ru.soune.nocopy.util.FileUtil;
|
||||
import software.amazon.awssdk.services.mq.model.NotFoundException;
|
||||
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.*;
|
||||
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
|
||||
@AllArgsConstructor
|
||||
public class FileController {
|
||||
|
||||
@Autowired
|
||||
private FileStorageService fileStorageService;
|
||||
|
||||
@Autowired
|
||||
private FileEntityRepository fileRepository;
|
||||
|
||||
@Autowired
|
||||
private CheckCounterService checkCounterService;
|
||||
|
||||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@Autowired
|
||||
private ImageResizeService imageResizeService;
|
||||
private final FileEntityService fileEntityService;
|
||||
|
||||
private NoCopyFileService noCopyFileService;
|
||||
|
||||
private FileUtil fileUtil;
|
||||
|
||||
private ZipService zipService;
|
||||
|
||||
private CloudStorageService cloudStorageService;
|
||||
|
||||
@GetMapping("/public/{fileId}")
|
||||
public ResponseEntity<Resource> getPublicFile(@PathVariable String fileId) {
|
||||
public ResponseEntity<StreamingResponseBody> 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());
|
||||
.orElseThrow(() -> new FileNotFoundException("Not found in DB: " + fileId));
|
||||
|
||||
MediaType mediaType = getMediaType(fileEntity);
|
||||
|
||||
@@ -65,22 +64,50 @@ public class FileController {
|
||||
.filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
|
||||
.build();
|
||||
|
||||
StreamingResponseBody responseBody = outputStream -> {
|
||||
try (InputStream inputStream = cloudStorageService.readFileFromStorage(fileEntity.getFilePath())) {
|
||||
ByteStreams.copy(inputStream, outputStream);
|
||||
} catch (NoSuchKeyException e) {
|
||||
log.error("File disappeared from S3 during streaming: {}", fileId, e);
|
||||
throw new IOException("File not found in storage", e);
|
||||
}
|
||||
};
|
||||
|
||||
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);
|
||||
|
||||
.body(responseBody);
|
||||
} catch (FileNotFoundException e) {
|
||||
log.warn("Not on disk: {}", fileId);
|
||||
log.warn("File not found in DB: {}", fileId);
|
||||
return ResponseEntity.notFound().build();
|
||||
} catch (IOException e) {
|
||||
log.error("Read file exception: {}", fileId, e);
|
||||
} catch (NoSuchKeyException e) {
|
||||
log.warn("File not found in S3: {}", fileId);
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
|
||||
} catch (Exception e) {
|
||||
log.error("Error reading file: {}", fileId, e);
|
||||
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/public/file-info/{fileId}")
|
||||
public ResponseEntity<FileEntityResponse> getPublicFileInfo(@PathVariable String fileId) {
|
||||
return handleGetFileInfo(fileId);
|
||||
}
|
||||
|
||||
private ResponseEntity<FileEntityResponse> handleGetFileInfo(String fileId) {
|
||||
try {
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId, 1);
|
||||
|
||||
return ResponseEntity
|
||||
.ok()
|
||||
.body(fileInfo);
|
||||
} catch (NotFoundException e) {
|
||||
return ResponseEntity
|
||||
.notFound().build();
|
||||
}
|
||||
}
|
||||
|
||||
private MediaType getMediaType(FileEntity fileEntity) {
|
||||
try {
|
||||
return MediaType.parseMediaType(fileEntity.getMimeType());
|
||||
@@ -107,9 +134,7 @@ public class FileController {
|
||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
||||
|
||||
String path = imageResizeService.getPath(fileEntity, type);
|
||||
|
||||
Resource resource = fileStorageService.loadFileAsResource(path);
|
||||
String filePath = type.equals("thumbnail") ? fileEntity.getThumbnailPath(): fileEntity.getFilePath();
|
||||
|
||||
if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
|
||||
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
|
||||
@@ -122,6 +147,8 @@ public class FileController {
|
||||
String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8)
|
||||
.replace("+", "%20");
|
||||
|
||||
InputStreamResource resource = new InputStreamResource(cloudStorageService.readFileFromStorage(filePath));
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
@@ -145,4 +172,33 @@ public class FileController {
|
||||
.ok()
|
||||
.body(protectedFileCheck);
|
||||
}
|
||||
|
||||
@PostMapping("protect/{fileId}/{convertTo}")
|
||||
public ResponseEntity<FileProtector.FileInfo> convert(@PathVariable String fileId, @PathVariable String convertTo) {
|
||||
FileEntity file = fileRepository.findByFileId(fileId);
|
||||
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(file, convertTo);
|
||||
|
||||
noCopyFileService.addFile(fileInfo);
|
||||
|
||||
return ResponseEntity
|
||||
.ok()
|
||||
.body(fileInfo);
|
||||
}
|
||||
|
||||
@GetMapping("/download/user-passport/archive/{userId}")
|
||||
public ResponseEntity<byte[]> downloadPassportZip(@PathVariable Long userId) {
|
||||
try {
|
||||
byte[] zipBytes = zipService.assembleZipFromSplitFiles(userId);
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"attachment; filename=passport_" + userId + ".zip")
|
||||
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||
.contentLength(zipBytes.length)
|
||||
.body(zipBytes);
|
||||
} catch (IOException e) {
|
||||
log.error("Failed to assemble passport for user {}", userId, e);
|
||||
return ResponseEntity.internalServerError().build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,12 +2,14 @@ package ru.soune.nocopy.controller;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.data.domain.Page;
|
||||
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.dto.violation.ViolationRequest;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.search.GlobalSearchTask;
|
||||
import ru.soune.nocopy.entity.search.SearchStatus;
|
||||
@@ -57,15 +59,9 @@ public class GlobalSearchController {
|
||||
|
||||
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());
|
||||
response.setTotalFiles(filesToProcess.size());
|
||||
} catch (NotFoundAuthToken e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
@@ -120,8 +116,7 @@ public class GlobalSearchController {
|
||||
try {
|
||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||
|
||||
fileViolationsSummary =
|
||||
violationService.getFileViolationsSummary(userId);
|
||||
fileViolationsSummary = violationService.getFileViolationsSummary(userId);
|
||||
|
||||
if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found");
|
||||
} catch (NotFoundAuthToken e) {
|
||||
@@ -134,6 +129,31 @@ public class GlobalSearchController {
|
||||
return ResponseEntity.ok(fileViolationsSummary);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/violation-summary-with-files")
|
||||
public ResponseEntity<?> getViolations(@RequestBody ViolationRequest request) {
|
||||
if (request.getToken() == null || request.getToken().isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", request.getToken());
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
try {
|
||||
Long userId = authService.useUserAuthToken(request.getToken());
|
||||
|
||||
Page<FileViolationSummaryDTO> result = violationService.getFileViolationsSummary(
|
||||
userId, request.getFileName(), request.getSortDirection(),
|
||||
request.getPage(), request.getSize(), request.getStartDate(), request.getEndDate());
|
||||
|
||||
return ResponseEntity.ok(result);
|
||||
} catch (NotFoundAuthToken e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", request.getToken());
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/status/{taskId}")
|
||||
public ResponseEntity<?> getStatus(@PathVariable String taskId,
|
||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import ru.soune.nocopy.dto.docviewer.DockViewResponse;
|
||||
import ru.soune.nocopy.entity.docviewer.DockView;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.migration.S3MigrationTool;
|
||||
import ru.soune.nocopy.repository.DockViewRepository;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.geo.GeoCountryService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/migration")
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class MigrationController {
|
||||
|
||||
private final S3MigrationTool migrationTool;
|
||||
|
||||
private final DockViewRepository dockViewRepository;
|
||||
|
||||
private final GeoCountryService geoCountryService;
|
||||
|
||||
private final UserRepository userRepository;
|
||||
|
||||
private final FileEntityRepository fileEntityRepository;
|
||||
|
||||
@PostMapping("/start")
|
||||
public ResponseEntity<String> startMigration() {
|
||||
log.info("Migration triggered via API");
|
||||
|
||||
CompletableFuture.runAsync(() -> {
|
||||
try {
|
||||
migrationTool.migrationFilesToS3();
|
||||
} catch (Exception e) {
|
||||
log.error("Migration failed", e);
|
||||
}
|
||||
});
|
||||
|
||||
return ResponseEntity.ok("Migration started. Check logs for progress.");
|
||||
}
|
||||
|
||||
@PostMapping("/status")
|
||||
public ResponseEntity<String> getStatus() {
|
||||
return ResponseEntity.ok("Check application logs and migration_failed.txt for details");
|
||||
}
|
||||
|
||||
@PostMapping("/fill-dock-view")
|
||||
public ResponseEntity<String> fillDockView() {
|
||||
List<DockView> dockViews = dockViewRepository.findAll();
|
||||
|
||||
for (DockView dockView: dockViews) {
|
||||
String viewerIp = dockView.getViewerIp();
|
||||
Long viewerId = dockView.getViewerId();
|
||||
String geoEnName = geoCountryService.getCityByIp(viewerIp, "en") + "/" +
|
||||
geoCountryService.getCountryByIp(viewerIp, "en");
|
||||
String geoRuName = geoCountryService.getCityByIp(viewerIp, "ru") + "/" +
|
||||
geoCountryService.getCountryByIp(viewerIp, "ru");
|
||||
User user = userRepository.findById(viewerId).orElse(null);
|
||||
FileEntity file = fileEntityRepository.findByFileId(dockView.getFileId());
|
||||
|
||||
dockView.setGeoNameRu(geoRuName);
|
||||
dockView.setGeoNameEn(geoEnName);
|
||||
dockView.setViewerName(user == null ? "guest" : user.getFullName());
|
||||
dockView.setDocName(file.getOriginalFileName());
|
||||
|
||||
dockViewRepository.save(dockView);
|
||||
}
|
||||
|
||||
return ResponseEntity.ok("fill old dock view");
|
||||
}
|
||||
}
|
||||
@@ -70,7 +70,7 @@ public class PaymentController {
|
||||
}
|
||||
|
||||
paymentService.changeAutoRenewal(authService.useUserAuthToken(tokenHeader), renewal);
|
||||
return ResponseEntity.ok(Map.of("message", "Auto-renewal disabled"));
|
||||
return ResponseEntity.ok(Map.of("message", "Auto-renewal changed:" + renewal));
|
||||
} catch (UserNotFoundException e) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
||||
.body(Map.of("error", e.getMessage()));
|
||||
|
||||
@@ -14,13 +14,17 @@ 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.InsufficientFundsException;
|
||||
import ru.soune.nocopy.exception.InvalidPayoutMethodException;
|
||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||
import ru.soune.nocopy.exception.PendingPayoutExistsException;
|
||||
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.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -40,8 +44,8 @@ public class PayoutController {
|
||||
Create payout
|
||||
*/
|
||||
@PostMapping("/create-request")
|
||||
public ResponseEntity<PayoutRequest> createPayoutRequest(@RequestHeader("Authorization") String tokenHeader,
|
||||
@Valid @RequestBody PayoutRequestDTO request) {
|
||||
public ResponseEntity<?> createPayoutRequest(@RequestHeader("Authorization") String tokenHeader,
|
||||
@Valid @RequestBody PayoutRequestDTO request) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
@@ -50,9 +54,12 @@ public class PayoutController {
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
PayoutRequest payoutRequest = payoutRequestService.createPayoutRequest(user.getId(), request);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.CREATED).body(payoutRequest);
|
||||
try {
|
||||
PayoutRequest payoutRequest = payoutRequestService.createPayoutRequest(user.getId(), request);
|
||||
return ResponseEntity.status(HttpStatus.CREATED).body(payoutRequest);
|
||||
} catch (InsufficientFundsException | PendingPayoutExistsException | InvalidPayoutMethodException e) {
|
||||
return ResponseEntity.status(HttpStatus.CONFLICT).body(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -53,17 +53,6 @@ public class UserController {
|
||||
|
||||
private final FileStatsService fileStatsService;
|
||||
|
||||
@GetMapping("/all")
|
||||
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
||||
List<UserDTO> allUsers = userRepository.findAll().stream()
|
||||
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
|
||||
u.getPhone(), u.getGenderType(),
|
||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
||||
null, null))
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(allUsers);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<UserDTO> getUser(@RequestParam("email") String email,
|
||||
@@ -79,6 +68,7 @@ public class UserController {
|
||||
UserDTO userDTO = userMapper.toDTO(user);
|
||||
userDTO.setEmail(email);
|
||||
userDTO.setFullName(user.getFullName());
|
||||
userDTO.setVerifiedStatus(user.getVerificationStatus());
|
||||
|
||||
if (user.getCompany() != null) {
|
||||
userDTO.setCompany(user.getCompany().getCompanyName());
|
||||
@@ -120,14 +110,12 @@ public class UserController {
|
||||
.build();
|
||||
|
||||
userDTO.setTariffInfo(infoDTO);
|
||||
|
||||
}
|
||||
|
||||
userDTO.setPhone(user.getPhone());
|
||||
userDTO.setGenderType(user.getGenderType());
|
||||
userDTO.setBirthday(user.getBirthday());
|
||||
userDTO.setCreatedAt(user.getCreatedAt());
|
||||
userDTO.setSubscriptionType(user.getSubscriptionType());
|
||||
userDTO.setActive(user.isActive());
|
||||
userDTO.setPermission(user.getUserPermissions());
|
||||
|
||||
|
||||
@@ -15,4 +15,7 @@ public class BaseRequest {
|
||||
|
||||
@JsonProperty("message_body")
|
||||
Object messageBody;
|
||||
|
||||
@JsonProperty(value = "admin_id", required = false)
|
||||
Long adminId;
|
||||
}
|
||||
|
||||
@@ -2,9 +2,11 @@ package ru.soune.nocopy.dto;
|
||||
|
||||
public enum MessageCode {
|
||||
SUCCESS(0, "Operation successful"),
|
||||
SUCCESS_MODERATION(0, "File moderated successfully"),
|
||||
REG_EMAIL_EXISTS(1, "Email already registered"),
|
||||
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||
REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"),
|
||||
FILE_IS_BLOCKED(1, "File is blocked,deleted or removed"),
|
||||
INVALID_FIELD(2, "Invalid field"),
|
||||
MAIL_VERIFIED_NULL(2, "Mail verified null"),
|
||||
INVALID_TOKEN(2, "Token not found or time expired"),
|
||||
@@ -16,18 +18,25 @@ public enum MessageCode {
|
||||
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"),
|
||||
NOT_OWNER_FILE_STATUS_VIOLATION(2, "Violation in not owner file status"),
|
||||
USER_NOT_VERIFIED(2, "User not verified"),
|
||||
LAW_CASE_NOT_FOUND(4, "Law case not found"),
|
||||
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
||||
USER_NOT_FOUND(2, "User not found"),
|
||||
LAW_CASE_ALREADY_EXIST(2, "Law case already exists"),
|
||||
COMPLAINT_ALREADY_EXIST(2, "Complaint already exists"),
|
||||
COMPLAINT_NOT_FOUND(4, "Complaint not found"),
|
||||
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"),
|
||||
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
||||
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||
USER_NOT_HAVE_TOKEN(2, "Not have tokens"),
|
||||
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
||||
FILE_ENTITY_ERROR(2, "File entity error"),
|
||||
NOT_VALID_FIELD(2, "Not valid field"),
|
||||
ACCESS_DENIED(2, "Access denied"),
|
||||
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
||||
AUTH_EMAIL_NOT_FOUND(4, "Email not COMPLAINT_OR_LAW_CASE_IN_WORK"),
|
||||
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
||||
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
|
||||
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
|
||||
@@ -39,10 +48,12 @@ public enum MessageCode {
|
||||
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_NOT_DELETED(0, "Tariff is not deleted,use some users"),
|
||||
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"),
|
||||
OPERATION_NOT_FOUND(4, "Operation not found"),
|
||||
INTERNAL_ERROR(4, "Internal server error"),
|
||||
COMPANY_NOT_FOUND(4, "Company not found"),
|
||||
PAYMENT_NOT_FOUND(4, "Payment not found"),
|
||||
@@ -51,11 +62,20 @@ public enum MessageCode {
|
||||
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"),
|
||||
ILLEGAL_STATE(2, "File is not in moderation state"),
|
||||
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");
|
||||
NOT_FOUND(4, "Notion not found"),
|
||||
MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion"),
|
||||
USER_VERIFICATIONS_NOT_FOUND(4, "Verifications not found"),
|
||||
COMPLAINT_OR_LAW_CASE_IN_WORK(2, "Complaint or lawcase in work"),
|
||||
NOT_VALID_STATUS(2, "Not valid status"),
|
||||
PERMISSION_NOT_VALID(2, "Not valid permission"),
|
||||
NOT_HAVE_DOWNLOAD_PERMISSION(2, "Not haver permission for download"),
|
||||
ADMIN_USER_NOT_FOUND(4, "Verifications ,user or admin not found");
|
||||
|
||||
|
||||
private final Integer code;
|
||||
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
package ru.soune.nocopy.dto.complaint;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class BaseResponse {
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
@JsonProperty("message")
|
||||
private String message;
|
||||
|
||||
@JsonProperty("data")
|
||||
private Object data;
|
||||
|
||||
@JsonProperty("error_code")
|
||||
private String errorCode;
|
||||
|
||||
public static BaseResponse success(Object data) {
|
||||
return BaseResponse.builder()
|
||||
.status("SUCCESS")
|
||||
.data(data)
|
||||
.build();
|
||||
}
|
||||
|
||||
public static BaseResponse error(String message, String errorCode) {
|
||||
return BaseResponse.builder()
|
||||
.status("ERROR")
|
||||
.message(message)
|
||||
.errorCode(errorCode)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package ru.soune.nocopy.dto.complaint;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class ComplaintRequest {
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("id")
|
||||
private Long id;
|
||||
|
||||
@JsonProperty("violation_id")
|
||||
private Long violationId;
|
||||
|
||||
@JsonProperty("text")
|
||||
private String complaintText;
|
||||
|
||||
@JsonProperty("email")
|
||||
private String email;
|
||||
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page;
|
||||
|
||||
@JsonProperty("size")
|
||||
private Integer size;
|
||||
|
||||
@JsonProperty("sort_by")
|
||||
private String sortBy;
|
||||
|
||||
@JsonProperty("sort_direction")
|
||||
private String sortDirection;
|
||||
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package ru.soune.nocopy.dto.complaint;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ComplaintResponse {
|
||||
@JsonProperty("id")
|
||||
private Long id;
|
||||
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
@JsonProperty("complaint_text")
|
||||
private String complaintText;
|
||||
|
||||
@JsonProperty("violation_id")
|
||||
private Long violationId;
|
||||
|
||||
@JsonProperty("email")
|
||||
private String email;
|
||||
|
||||
@JsonProperty("created_at")
|
||||
private String createdAt;
|
||||
|
||||
@JsonProperty("updated_at")
|
||||
private String updatedAt;
|
||||
|
||||
@JsonProperty("not_moderated")
|
||||
private Boolean notModerated;
|
||||
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package ru.soune.nocopy.dto.complaint;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class LawCasePageResponse {
|
||||
private List<LawCaseResponse> content;
|
||||
private int pageNumber;
|
||||
private int pageSize;
|
||||
private long totalElements;
|
||||
private int totalPages;
|
||||
private boolean last;
|
||||
private boolean first;
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package ru.soune.nocopy.dto.complaint;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.complaint.LawCasePriority;
|
||||
import ru.soune.nocopy.entity.complaint.LawCaseType;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class LawCaseRequest {
|
||||
private Long id;
|
||||
//required
|
||||
private String name;
|
||||
//required
|
||||
private String description;
|
||||
private BigDecimal amount;
|
||||
private String priority = LawCasePriority.HIGH.toString();
|
||||
private String type;
|
||||
private String lawyer;
|
||||
private String token;
|
||||
private Integer pageSize = 5;
|
||||
private Integer pageNumber = 0;
|
||||
private String sortBy = "updatedAt";
|
||||
private String sortDir = "desc";
|
||||
private String action;
|
||||
private String filterType;
|
||||
private String filterLawyer;
|
||||
private String filterPriority;
|
||||
@JsonProperty("violation_id")
|
||||
private Long violationId;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package ru.soune.nocopy.dto.complaint;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.complaint.LawCase;
|
||||
import ru.soune.nocopy.entity.complaint.LawCasePriority;
|
||||
import ru.soune.nocopy.entity.complaint.LawCaseType;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class LawCaseResponse {
|
||||
private Long id;
|
||||
|
||||
private String name;
|
||||
|
||||
private String description;
|
||||
|
||||
private BigDecimal amount;
|
||||
|
||||
private LawCasePriority priority;
|
||||
|
||||
private LawCaseType type;
|
||||
|
||||
private String lawyer;
|
||||
|
||||
@JsonProperty("created_at")
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
@JsonProperty("updated_at")
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
@JsonProperty("page_number")
|
||||
private int pageNumber;
|
||||
|
||||
@JsonProperty("page_size")
|
||||
private int pageSize;
|
||||
|
||||
@JsonProperty("total_elements")
|
||||
private long totalElements;
|
||||
|
||||
@JsonProperty("total_pages")
|
||||
private int totalPages;
|
||||
|
||||
@JsonProperty("violation_id")
|
||||
private long violationId;
|
||||
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
private List<LawCaseResponse> content;
|
||||
|
||||
public static LawCaseResponse fromEntity(LawCase lawCase) {
|
||||
return LawCaseResponse.builder()
|
||||
.id(lawCase.getId())
|
||||
.name(lawCase.getName())
|
||||
.description(lawCase.getDescription())
|
||||
.amount(lawCase.getAmount())
|
||||
.priority(lawCase.getPriority())
|
||||
.type(lawCase.getType())
|
||||
.lawyer(lawCase.getLawyer())
|
||||
.createdAt(lawCase.getCreatedAt())
|
||||
.updatedAt(lawCase.getUpdatedAt())
|
||||
.violationId(lawCase.getViolationId())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package ru.soune.nocopy.dto.complaint;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class PaginatedResponse<T> {
|
||||
private List<T> content;
|
||||
private long totalElements;
|
||||
private int totalPages;
|
||||
private int pageNumber;
|
||||
private int pageSize;
|
||||
private boolean first;
|
||||
private boolean last;
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package ru.soune.nocopy.dto.docviewer;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class DocViewerRequest {
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
|
||||
@JsonProperty("ip")
|
||||
private String ip;
|
||||
|
||||
@JsonProperty("user_agent")
|
||||
private String userAgent;
|
||||
|
||||
@JsonProperty("page")
|
||||
private int page = 0;
|
||||
|
||||
@JsonProperty("size")
|
||||
private int size = 10;
|
||||
|
||||
@JsonProperty("sort_by")
|
||||
private String sortBy = "createdAt";
|
||||
|
||||
@JsonProperty("sort_direction")
|
||||
private String sortDirection = "desc";
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("locale")
|
||||
private String locale;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package ru.soune.nocopy.dto.docviewer;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class DockViewResponse {
|
||||
|
||||
@JsonProperty("city")
|
||||
private String city;
|
||||
|
||||
@JsonProperty("country")
|
||||
private String country;
|
||||
|
||||
@JsonProperty("viewer")
|
||||
private String viewer;
|
||||
|
||||
@JsonProperty("document")
|
||||
private String document;
|
||||
|
||||
@JsonProperty("view_date")
|
||||
private LocalDateTime viewDate;
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package ru.soune.nocopy.dto.docviewer;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public class DockViewStatsResponse {
|
||||
private String fileId;
|
||||
|
||||
private Long totalViews;
|
||||
|
||||
private Long uniqueIps;
|
||||
|
||||
private Long uniqueUsers;
|
||||
|
||||
private int documentsCount;
|
||||
|
||||
private int uniqueCountryCount;
|
||||
|
||||
private int uniqueCityCount;
|
||||
|
||||
private LocalDateTime firstViewDate;
|
||||
|
||||
private LocalDateTime lastViewDate;
|
||||
|
||||
private List<DockViewStatsResponse> content;
|
||||
|
||||
private List<DockViewResponse> history;
|
||||
|
||||
private Integer pageNumber;
|
||||
|
||||
private Integer pageSize;
|
||||
|
||||
private Long totalElements;
|
||||
|
||||
private Integer totalPages;
|
||||
|
||||
private Boolean isLast;
|
||||
|
||||
private Boolean isFirst;
|
||||
|
||||
private Boolean hasNext;
|
||||
|
||||
private Boolean hasPrevious;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class AppealInfo {
|
||||
private String appealId;
|
||||
private String status;
|
||||
private LocalDateTime createdAt;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class AppealRequest {
|
||||
private String fileId;
|
||||
private String appealReason;
|
||||
private String additionalInfo;
|
||||
private String token;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class AppealResponse {
|
||||
private String appealId;
|
||||
private String fileId;
|
||||
private String appealReason;
|
||||
private String additionalInfo;
|
||||
private String status;
|
||||
private String adminComment;
|
||||
private String fileName;
|
||||
private LocalDateTime createdAt;
|
||||
private LocalDateTime resolvedAt;
|
||||
}
|
||||
@@ -5,6 +5,11 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.entity.file.permission.PermissionType;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@@ -17,6 +22,9 @@ public class FileEntityRequest {
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("file_ids")
|
||||
private List<String> fileIds;
|
||||
|
||||
@JsonProperty("full_delete")
|
||||
private Integer fullDelete;
|
||||
|
||||
@@ -44,6 +52,39 @@ public class FileEntityRequest {
|
||||
@JsonProperty("type")
|
||||
private String type;
|
||||
|
||||
@JsonProperty("file_status")
|
||||
private FileStatus fileStatus;
|
||||
|
||||
@JsonProperty("date_filter")
|
||||
private String dateFilter;
|
||||
|
||||
@JsonProperty("comment")
|
||||
private String comment;
|
||||
|
||||
@JsonProperty("appeal_reason")
|
||||
private String appealReason;
|
||||
|
||||
@JsonProperty("additional_info")
|
||||
private String additionalInfo;
|
||||
|
||||
@JsonProperty("appeal_id")
|
||||
private String appealId;
|
||||
|
||||
@JsonProperty("approve")
|
||||
private Boolean approve;
|
||||
|
||||
@JsonProperty("reason_text")
|
||||
private String reasonText;
|
||||
|
||||
@JsonProperty("search_query")
|
||||
private String searchQuery;
|
||||
|
||||
@JsonProperty("permissions")
|
||||
private Map<String, Boolean> permissions;
|
||||
|
||||
@JsonProperty("is_appeal")
|
||||
private Boolean isAppeal;
|
||||
|
||||
@JsonProperty("statuses")
|
||||
private List<String> statuses;
|
||||
}
|
||||
|
||||
@@ -5,8 +5,11 @@ import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.entity.file.permission.PermissionType;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@@ -42,4 +45,6 @@ public class FileEntityResponse {
|
||||
private Integer checksCount;
|
||||
private LocalDateTime fileUploadDate;
|
||||
private String monitoring;
|
||||
private Map<PermissionType, Boolean> permissions;
|
||||
private List<Map<String, Object>> appealInfos;
|
||||
}
|
||||
|
||||
@@ -16,12 +16,6 @@ public class FileListResponse {
|
||||
@JsonProperty("files")
|
||||
private List<FileEntityResponse> files;
|
||||
|
||||
@JsonProperty("total_count")
|
||||
private Integer totalCount;
|
||||
|
||||
@JsonProperty("total_size")
|
||||
private Long totalSize;
|
||||
|
||||
@JsonProperty("formatted_total_size")
|
||||
private String formattedTotalSize;
|
||||
|
||||
@@ -36,4 +30,13 @@ public class FileListResponse {
|
||||
|
||||
@JsonProperty("sort_order")
|
||||
private String sortOrder;
|
||||
|
||||
@JsonProperty("total_count")
|
||||
private Integer totalCount;
|
||||
|
||||
@JsonProperty("total_size")
|
||||
private Long totalSize;
|
||||
|
||||
@JsonProperty("statuses")
|
||||
private List<String> statuses;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.file.FileAppeal;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class FileModerationInfo {
|
||||
private String fileId;
|
||||
private String fileName;
|
||||
private String ownerName;
|
||||
private String ownerEmail;
|
||||
private FileStatus currentStatus;
|
||||
private LocalDateTime uploadDate;
|
||||
private Boolean hasActiveAppeal;
|
||||
private FileAppeal activeAppeal;
|
||||
}
|
||||
@@ -8,6 +8,9 @@ public class ImageSearchRequest {
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("check_similar_first")
|
||||
private Boolean checkSimilarFirst;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page = 1;
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class ModerationActionRequest {
|
||||
private String fileId;
|
||||
private FileStatus newStatus;
|
||||
private String comment;
|
||||
private Long adminId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -20,4 +20,5 @@ public class SimilarFileDTO {
|
||||
LocalDateTime uploadDate;
|
||||
String url;
|
||||
Boolean owner;
|
||||
String fileStatus;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package ru.soune.nocopy.dto.notification;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ActivateNotificationRequest {
|
||||
private String authToken;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package ru.soune.nocopy.dto.notification;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class ActiveNotificationsResponse {
|
||||
private List<NotificationDto> notifications;
|
||||
private long unreadCount;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune.nocopy.dto.notification;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class MarkAsReadRequest {
|
||||
private List<Long> notificationIds;
|
||||
private String authToken;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune.nocopy.dto.notification;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class MarkAsReadResponse {
|
||||
private boolean success;
|
||||
private int updatedCount;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package ru.soune.nocopy.dto.notification;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.notification.NotificationStatus;
|
||||
import ru.soune.nocopy.entity.notification.NotificationType;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class NotificationDto {
|
||||
private Long id;
|
||||
private String message;
|
||||
private NotificationType type;
|
||||
private NotificationStatus status;
|
||||
private LocalDateTime createdAt;
|
||||
private Object context;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package ru.soune.nocopy.dto.notification;
|
||||
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.notification.NotificationStatus;
|
||||
import ru.soune.nocopy.entity.notification.NotificationType;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class NotificationListRequest {
|
||||
private int page = 0;
|
||||
private int size = 10;
|
||||
private String sortBy = "createdAt";
|
||||
private String sortDirection = "DESC";
|
||||
private List<NotificationType> types;
|
||||
private List<NotificationStatus> statuses;
|
||||
private String authToken;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package ru.soune.nocopy.dto.notification;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class NotificationListResponse {
|
||||
private List<NotificationDto> notifications;
|
||||
private int currentPage;
|
||||
private int totalPages;
|
||||
private long totalElements;
|
||||
}
|
||||
@@ -37,4 +37,10 @@ public class RegRequest {
|
||||
|
||||
@JsonProperty("mail_verified")
|
||||
private String mailVerified;
|
||||
|
||||
@JsonProperty("ip")
|
||||
private String ip;
|
||||
|
||||
@JsonProperty("user_agent")
|
||||
private String userAgent;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ComplaintStatisticRequest {
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ComplaintStatisticResponse {
|
||||
|
||||
@JsonProperty("total_complaint")
|
||||
private Long totalComplaints;
|
||||
|
||||
@JsonProperty("total_created")
|
||||
private Long totalCreated;
|
||||
|
||||
@JsonProperty("total_in_work")
|
||||
private Long totalInWork;
|
||||
|
||||
@JsonProperty("total_completed")
|
||||
private Long totalCompleted;
|
||||
|
||||
@JsonProperty("total_cancelled")
|
||||
private Long totalCancelled;
|
||||
|
||||
@JsonProperty("complaints")
|
||||
private Map<String, Object> complaints;
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class IncomeStatisticRequest {
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class IncomeStatisticResponse {
|
||||
|
||||
@JsonProperty("total_income")
|
||||
private Long totalIncome;
|
||||
|
||||
@JsonProperty("total_available")
|
||||
private Long totalAvailable;
|
||||
|
||||
@JsonProperty("total_hold")
|
||||
private Long totalHold;
|
||||
|
||||
@JsonProperty("income_per_user")
|
||||
private Percentiles incomePerUser;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public static class Percentiles {
|
||||
@JsonProperty("p5")
|
||||
private Long p5;
|
||||
|
||||
@JsonProperty("p50")
|
||||
private Long p50;
|
||||
|
||||
@JsonProperty("p95")
|
||||
private Long p95;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class MonitoringStatisticRequest {
|
||||
private String authToken;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class MonitoringStatisticResponse {
|
||||
|
||||
@JsonProperty("day")
|
||||
private Long everyDay;
|
||||
|
||||
@JsonProperty("month")
|
||||
private Long everyMonth;
|
||||
|
||||
@JsonProperty("weekly")
|
||||
private Long everyWeekly;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProtectedFilesStatisticRequest {
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ProtectedFilesStatisticResponse {
|
||||
|
||||
@JsonProperty("total_files")
|
||||
private Long totalFiles;
|
||||
|
||||
@JsonProperty("total_size_bytes")
|
||||
private Long totalSizeBytes;
|
||||
|
||||
@JsonProperty("total_size_gb")
|
||||
private Double totalSizeGb;
|
||||
|
||||
@JsonProperty("files_per_user_percentiles")
|
||||
private Percentiles filesPerUser;
|
||||
|
||||
@JsonProperty("size_per_user_percentiles")
|
||||
private SizePercentiles sizePerUser;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public static class Percentiles {
|
||||
@JsonProperty("p5")
|
||||
private Long p5;
|
||||
|
||||
@JsonProperty("p50")
|
||||
private Long p50;
|
||||
|
||||
@JsonProperty("p95")
|
||||
private Long p95;
|
||||
}
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public static class SizePercentiles {
|
||||
@JsonProperty("p5_bytes")
|
||||
private Long p5;
|
||||
|
||||
@JsonProperty("p50_bytes")
|
||||
private Long p50;
|
||||
|
||||
@JsonProperty("p95_bytes")
|
||||
private Long p95;
|
||||
|
||||
@JsonProperty("p5_mb")
|
||||
private Double p5Mb;
|
||||
|
||||
@JsonProperty("p50_mb")
|
||||
private Double p50Mb;
|
||||
|
||||
@JsonProperty("p95_mb")
|
||||
private Double p95Mb;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class SubscriberStatisticRequest {
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class SubscriberStatisticResponse {
|
||||
|
||||
@JsonProperty("monthly")
|
||||
private PeriodStatistics monthly;
|
||||
|
||||
@JsonProperty("yearly")
|
||||
private PeriodStatistics yearly;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public static class PeriodStatistics {
|
||||
|
||||
@JsonProperty("current_active_subscriptions")
|
||||
private Long currentActiveSubscriptions;
|
||||
|
||||
@JsonProperty("first_time_subscriptions")
|
||||
private Long firstTimeSubscriptions;
|
||||
|
||||
@JsonProperty("renewals")
|
||||
private Long renewals;
|
||||
|
||||
@JsonProperty("upgrades")
|
||||
private Long upgrades;
|
||||
|
||||
@JsonProperty("downgrades")
|
||||
private Long downgrades;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class TariffStatisticFullResponse {
|
||||
|
||||
@JsonProperty("tariffs")
|
||||
private List<TariffStatisticResponse> tariffs;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class TariffStatisticRequest {
|
||||
|
||||
@JsonProperty("company_only")
|
||||
private Boolean companyOnly = false;
|
||||
|
||||
@JsonProperty("active_only")
|
||||
private Boolean activeOnly = true;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class TariffStatisticResponse {
|
||||
|
||||
@JsonProperty("tariff_name")
|
||||
private String tariffName;
|
||||
|
||||
@JsonProperty("user_count")
|
||||
private Long userCount;
|
||||
|
||||
@JsonProperty("usage_percent")
|
||||
private Double usagePercent;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class TokenStatisticRequest {
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class TokenStatisticResponse {
|
||||
|
||||
@JsonProperty("total_bought")
|
||||
private Long totalBought;
|
||||
|
||||
@JsonProperty("total_spent")
|
||||
private Long totalSpent;
|
||||
|
||||
@JsonProperty("bought_per_user")
|
||||
private Percentiles boughtPerUser;
|
||||
|
||||
@JsonProperty("spent_per_user")
|
||||
private Percentiles spentPerUser;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public static class Percentiles {
|
||||
@JsonProperty("p5")
|
||||
private Long p5;
|
||||
|
||||
@JsonProperty("p50")
|
||||
private Long p50;
|
||||
|
||||
@JsonProperty("p95")
|
||||
private Long p95;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UserDynamicStatisticRequest {
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class UserDynamicStatisticResponse {
|
||||
|
||||
@JsonProperty("total_users")
|
||||
private Long totalUsers;
|
||||
|
||||
@JsonProperty("new_last_30_days")
|
||||
private Long newLast30Days;
|
||||
|
||||
@JsonProperty("new_previous_30_days")
|
||||
private Long newPrevious30Days;
|
||||
|
||||
@JsonProperty("growth_percent")
|
||||
private Double growthPercent;
|
||||
|
||||
@JsonProperty("new_current_month")
|
||||
private Long newCurrentMonth;
|
||||
|
||||
@JsonProperty("new_previous_month")
|
||||
private Long newPreviousMonth;
|
||||
|
||||
@JsonProperty("month_growth_percent")
|
||||
private Double monthGrowthPercent;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UserFilesStatisticRequest {
|
||||
@JsonProperty("top")
|
||||
int topUsers;
|
||||
|
||||
@JsonProperty("type")
|
||||
String fileMimeType;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UserFilesStatisticResponse {
|
||||
@JsonProperty("full_name")
|
||||
private final String userName;
|
||||
|
||||
@JsonProperty("user_id")
|
||||
private final long userId;
|
||||
|
||||
@JsonProperty("count")
|
||||
private final int countFiles;
|
||||
|
||||
@JsonProperty("files_size")
|
||||
private final long fileSize;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ViolationStatisticRequest {
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package ru.soune.nocopy.dto.statistic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ViolationStatisticResponse {
|
||||
|
||||
@JsonProperty("total_violations")
|
||||
private Long totalViolations;
|
||||
|
||||
@JsonProperty("total_complaints")
|
||||
private Long totalComplaints;
|
||||
|
||||
@JsonProperty("total_law_cases")
|
||||
private Long totalLawCases;
|
||||
|
||||
@JsonProperty("complaints_without_case")
|
||||
private Long complaintsWithoutCase;
|
||||
|
||||
@JsonProperty("violations_with_complaint")
|
||||
private Long violationsWithComplaint;
|
||||
|
||||
@JsonProperty("violations_without_complaint")
|
||||
private Long violationsWithoutComplaint;
|
||||
}
|
||||
@@ -16,4 +16,6 @@ public class TariffDTO {
|
||||
private int maxFilesCount;
|
||||
private Long diskSize;
|
||||
private Long maxUsers;
|
||||
private String tariffTerm;
|
||||
private String description;
|
||||
}
|
||||
|
||||
@@ -24,29 +24,45 @@ public class TariffRequest {
|
||||
@JsonProperty("tariff_name")
|
||||
private String name;
|
||||
|
||||
@Min(value = 0, message = "Price cannot be negative")
|
||||
@JsonProperty("tariff_price")
|
||||
private double price;
|
||||
private Double price;
|
||||
|
||||
@Min(value = 0, message = "Tokens must be at least 0")
|
||||
@JsonProperty("tariff_tokens")
|
||||
private int tokens;
|
||||
private Integer tokens;
|
||||
|
||||
@Min(value = 0, message = "Max files count must be at least 0")
|
||||
@JsonProperty("max_files")
|
||||
private int maxFilesCount;
|
||||
private Integer maxFilesCount;
|
||||
|
||||
@Min(value = 0, message = "Disk size must be at least 0")
|
||||
@JsonProperty("disk_size")
|
||||
private int diskSize;
|
||||
private Long diskSize;
|
||||
|
||||
@Min(value = 0, message = "Max users must be at least 0")
|
||||
@JsonProperty("max_users")
|
||||
private int maxUsers;
|
||||
private Long maxUsers;
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("user_token")
|
||||
private String userToken;
|
||||
|
||||
@JsonProperty("tariff_term")
|
||||
private String tariffTerm;
|
||||
|
||||
@JsonProperty("description")
|
||||
private String description;
|
||||
|
||||
@JsonProperty("account_type")
|
||||
private String accountType;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page;
|
||||
|
||||
@JsonProperty("page_size")
|
||||
private Integer size;
|
||||
|
||||
@JsonProperty("sort_by")
|
||||
private String sortBy;
|
||||
|
||||
@JsonProperty("sort_direction")
|
||||
private String sortDirection = "desc";
|
||||
}
|
||||
@@ -1,12 +1,41 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public class TariffResponse {
|
||||
@JsonProperty("tariff_name")
|
||||
private String tariffName;
|
||||
|
||||
@JsonProperty("type")
|
||||
private String tariffType;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page;
|
||||
|
||||
@JsonProperty("page_size")
|
||||
private Integer pageSize;
|
||||
|
||||
@JsonProperty("sort_by")
|
||||
private String sortBy;
|
||||
|
||||
@JsonProperty("sort_direction")
|
||||
private String sortDirection;
|
||||
|
||||
@JsonProperty("total_pages")
|
||||
private Integer totalPages;
|
||||
|
||||
@JsonProperty("total_elements")
|
||||
private Long totalElements;
|
||||
|
||||
@JsonProperty("tariffs")
|
||||
private List<TariffDTO> tariffs;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package ru.soune.nocopy.dto.tokenoperation;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.tokenoperation.TokenOperation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class TokenOperationPageDto {
|
||||
|
||||
@JsonProperty("content")
|
||||
private List<TokenOperation> content;
|
||||
|
||||
@JsonProperty("page_number")
|
||||
private int pageNumber;
|
||||
|
||||
@JsonProperty("page_size")
|
||||
private int pageSize;
|
||||
|
||||
@JsonProperty("total_elements")
|
||||
private long totalElements;
|
||||
|
||||
@JsonProperty("total_pages")
|
||||
private int totalPages;
|
||||
|
||||
@JsonProperty("is_last")
|
||||
private boolean last;
|
||||
|
||||
@JsonProperty("is_first")
|
||||
private boolean first;
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package ru.soune.nocopy.dto.tokenoperation;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.tokenoperation.OperationType;
|
||||
|
||||
@Data
|
||||
public class TokenOperationRequest {
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
|
||||
@JsonProperty("operation_id")
|
||||
private Long operationId;
|
||||
|
||||
@JsonProperty("operation_type")
|
||||
private OperationType operationType;
|
||||
|
||||
@JsonProperty("spent")
|
||||
private Long spent;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page = 0;
|
||||
|
||||
@JsonProperty("size")
|
||||
private Integer size = 20;
|
||||
|
||||
@JsonProperty("sort_by")
|
||||
private String sortBy = "createdAt";
|
||||
|
||||
@JsonProperty("sort_direction")
|
||||
private String sortDirection = "desc";
|
||||
|
||||
@JsonProperty("min_spent")
|
||||
private Long minSpent;
|
||||
|
||||
@JsonProperty("max_spent")
|
||||
private Long maxSpent;
|
||||
|
||||
@JsonProperty("updates")
|
||||
private Object updates;
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package ru.soune.nocopy.dto.tokenoperation;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public class TokenOperationResponse {
|
||||
|
||||
@JsonProperty("success")
|
||||
private Boolean success;
|
||||
|
||||
@JsonProperty("message")
|
||||
private String message;
|
||||
|
||||
@JsonProperty("data")
|
||||
private Object data;
|
||||
|
||||
@JsonProperty("total_elements")
|
||||
private Long totalElements;
|
||||
|
||||
@JsonProperty("total_pages")
|
||||
private Integer totalPages;
|
||||
|
||||
@JsonProperty("current_page")
|
||||
private Integer currentPage;
|
||||
|
||||
@JsonProperty("page_size")
|
||||
private Integer pageSize;
|
||||
|
||||
@JsonProperty("statistics")
|
||||
private Map<String, Object> statistics;
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package ru.soune.nocopy.dto.user;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.user.SubscriptionType;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@Data
|
||||
public class UserAdditionalInfoBody {
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("user_id")
|
||||
private Long userId;
|
||||
|
||||
@JsonProperty("ip_address")
|
||||
private String ipAddress;
|
||||
|
||||
@JsonProperty("user_agent")
|
||||
private String userAgent;
|
||||
|
||||
@JsonProperty("page")
|
||||
private int page = 0;
|
||||
|
||||
@JsonProperty("size")
|
||||
private int size = 5;
|
||||
|
||||
@JsonProperty("sort_by")
|
||||
private String sortBy;
|
||||
|
||||
@JsonProperty("sort_direction")
|
||||
private String sortDirection = "desc";
|
||||
|
||||
@JsonProperty("full_name")
|
||||
private String fullName;
|
||||
|
||||
@JsonProperty("email")
|
||||
private String email;
|
||||
|
||||
@JsonProperty("is_active")
|
||||
private Boolean isActive;
|
||||
|
||||
@JsonProperty("email_verified")
|
||||
private Boolean emailVerified;
|
||||
|
||||
@JsonProperty("sub_type")
|
||||
private SubscriptionType subscriptionType;
|
||||
|
||||
@JsonProperty("date_from")
|
||||
private LocalDate dateFrom;
|
||||
|
||||
@JsonProperty("date_to")
|
||||
private LocalDate dateTo;
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffDTO;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||
import ru.soune.nocopy.entity.user.GenderType;
|
||||
import ru.soune.nocopy.entity.user.ModerationStatus;
|
||||
import ru.soune.nocopy.entity.user.SubscriptionType;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -26,8 +27,9 @@ public class UserDTO {
|
||||
private GenderType genderType;
|
||||
private LocalDate birthday;
|
||||
private LocalDateTime createdAt;
|
||||
private SubscriptionType subscriptionType;
|
||||
private String subscriptionType;
|
||||
private List<TariffDTO> tariffs;
|
||||
private TariffInfoDTO tariffInfo;
|
||||
private Long permission;
|
||||
private ModerationStatus verifiedStatus;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package ru.soune.nocopy.dto.user.moderation;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UserVerificationRequest {
|
||||
@JsonProperty("message")
|
||||
private String message;
|
||||
|
||||
@JsonProperty("user_id")
|
||||
private Long userId;
|
||||
|
||||
@JsonProperty("verified")
|
||||
private Boolean verified;
|
||||
|
||||
@JsonProperty("admin_id")
|
||||
private Long adminId;
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package ru.soune.nocopy.dto.user.moderation;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class UserVerificationResponse {
|
||||
private Long userVerificationId;
|
||||
private Long userId;
|
||||
private LocalDateTime updateTime;
|
||||
private String moderationStatus;
|
||||
}
|
||||
@@ -18,5 +18,7 @@ public class FileViolationSummaryDTO {
|
||||
private FileStatus status;
|
||||
private LocalDateTime createdAt;
|
||||
private long violationCount;
|
||||
private long countLawCase;
|
||||
private long countComplaint;
|
||||
private LocalDateTime latestViolationDate;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,22 @@
|
||||
package ru.soune.nocopy.dto.violation;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ViolationNotionRequest {
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("violation_id")
|
||||
private Long violationId;
|
||||
|
||||
@JsonProperty("notion_id")
|
||||
private Long notionId;
|
||||
|
||||
@JsonProperty("message")
|
||||
private String message;
|
||||
}
|
||||
|
||||
@@ -10,14 +10,8 @@ public class ViolationRequest {
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page = 0;
|
||||
|
||||
@JsonProperty("size")
|
||||
private Integer size = 10;
|
||||
|
||||
@JsonProperty("sort_direction")
|
||||
private String sortDirection = "desc";
|
||||
@JsonProperty("violation_id")
|
||||
private Long violationId;
|
||||
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
@@ -28,12 +22,25 @@ public class ViolationRequest {
|
||||
@JsonProperty("end_date")
|
||||
private String endDate;
|
||||
|
||||
@JsonProperty("group_by")
|
||||
private String groupBy;
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
|
||||
@JsonProperty("file_name")
|
||||
private String fileName = null;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page = 0;
|
||||
|
||||
@JsonProperty("size")
|
||||
private Integer size = 10;
|
||||
|
||||
@JsonProperty("sort_direction")
|
||||
private String sortDirection = "desc";
|
||||
|
||||
@JsonProperty("group_by")
|
||||
private String groupBy;
|
||||
|
||||
}
|
||||
@@ -58,6 +58,12 @@ public class ViolationResponse {
|
||||
@JsonProperty("created_date")
|
||||
private LocalDateTime createdDate;
|
||||
|
||||
@JsonProperty("country")
|
||||
private String country;
|
||||
|
||||
@JsonProperty("country_code")
|
||||
private String countryCode;
|
||||
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
|
||||
@@ -14,6 +14,12 @@ public class ViolationStatisticsResponse {
|
||||
@JsonProperty("new_violations")
|
||||
private long newViolations;
|
||||
|
||||
@JsonProperty("total_complaints")
|
||||
private Long totalComplaints;
|
||||
|
||||
@JsonProperty("total_law_cases")
|
||||
private Long totalLawCases;
|
||||
|
||||
@JsonProperty("in_progress_violations")
|
||||
private long inProgressViolations;
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ public class Company {
|
||||
@ToString.Exclude
|
||||
private List<User> users = new ArrayList<>();
|
||||
|
||||
@OneToOne(cascade = CascadeType.ALL)
|
||||
@OneToOne(cascade = CascadeType.MERGE)
|
||||
@JoinColumn(name = "tariff_info_id")
|
||||
private TariffInfo tariffInfo;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
package ru.soune.nocopy.entity.complaint;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.annotation.LastModifiedDate;
|
||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||
import ru.soune.nocopy.entity.violation.Violation;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@Table(name = "complaint")
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Getter @Setter
|
||||
@EntityListeners(AuditingEntityListener.class)
|
||||
public class ComplaintEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "status")
|
||||
@Enumerated(EnumType.STRING)
|
||||
private ComplaintStatus status;
|
||||
|
||||
@Column(name = "complaint_text", columnDefinition = "TEXT")
|
||||
private String complaintText;
|
||||
|
||||
@Column(name = "email")
|
||||
private String email;
|
||||
|
||||
@OneToOne(cascade = CascadeType.ALL)
|
||||
@JoinColumn(name = "violation_id")
|
||||
@ToString.Exclude
|
||||
@JsonIgnore
|
||||
private Violation violation;
|
||||
|
||||
@Column(name = "created_at", updatable = false)
|
||||
@CreatedDate
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
@Column(name = "updated_at")
|
||||
@LastModifiedDate
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
@Column(name = "not_moderated_file")
|
||||
private Boolean not_moderated_file;
|
||||
|
||||
@PrePersist
|
||||
public void prePersist() {
|
||||
if (this.createdAt == null) {
|
||||
this.createdAt = LocalDateTime.now();
|
||||
}
|
||||
this.updatedAt = LocalDateTime.now();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune.nocopy.entity.complaint;
|
||||
|
||||
public enum ComplaintStatus {
|
||||
CREATED, SHOWED, IN_WORK, COMPLETED, CANCELLED
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package ru.soune.nocopy.entity.complaint;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.annotation.LastModifiedDate;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
@Getter @Setter
|
||||
@Table(name = "law_case")
|
||||
public class LawCase {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "user_id", nullable = false)
|
||||
@ToString.Exclude
|
||||
private User user;
|
||||
|
||||
@Column(name = "name")
|
||||
private String name;
|
||||
|
||||
@Column(length = 500, name = "description")
|
||||
private String description;
|
||||
|
||||
@Column(name = "amount")
|
||||
private BigDecimal amount;
|
||||
|
||||
@Column(name = "priority")
|
||||
@Enumerated(EnumType.STRING)
|
||||
private LawCasePriority priority;
|
||||
|
||||
@Column(name = "type")
|
||||
@Enumerated(EnumType.STRING)
|
||||
private LawCaseType type = LawCaseType.ACTIVE;
|
||||
|
||||
@CreatedDate
|
||||
@Column(name = "created_at", updatable = false)
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
@LastModifiedDate
|
||||
@Column(name = "updated_at")
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
@Column(name = "lawyer")
|
||||
private String lawyer;
|
||||
|
||||
@Column(name = "violation_id")
|
||||
private Long violationId;
|
||||
|
||||
@PrePersist
|
||||
public void prePersist() {
|
||||
if (this.createdAt == null) {
|
||||
this.createdAt = LocalDateTime.now();
|
||||
}
|
||||
this.updatedAt = LocalDateTime.now();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package ru.soune.nocopy.entity.complaint;
|
||||
|
||||
public enum LawCasePriority {
|
||||
CRITICAL("critical"), HIGH("high"),
|
||||
MIDDLE("middle"), LOW("low");
|
||||
|
||||
private String name;
|
||||
|
||||
private LawCasePriority(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package ru.soune.nocopy.entity.complaint;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public enum LawCaseType {
|
||||
ACTIVE("active"), CLOSED("closed"),
|
||||
COMPLETED("completed");
|
||||
|
||||
private String name;
|
||||
|
||||
private LawCaseType(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package ru.soune.nocopy.entity.docviewer;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table(name = "dock_view")
|
||||
@RequiredArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Entity
|
||||
@Setter @Getter
|
||||
public class DockView {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "viewer_id")
|
||||
private Long viewerId;
|
||||
|
||||
@Column(name = "viewer_ip")
|
||||
private String viewerIp;
|
||||
|
||||
@Column(name = "user_agent")
|
||||
private String userAgent;
|
||||
|
||||
@Column(name = "file_id")
|
||||
private String fileId;
|
||||
|
||||
@Column(name = "geo_name_ru")
|
||||
private String geoNameRu;
|
||||
|
||||
@Column(name = "geo_name_en")
|
||||
private String geoNameEn;
|
||||
|
||||
@Column(name = "viewer_name")
|
||||
private String viewerName;
|
||||
|
||||
@Column(name = "document_name")
|
||||
private String docName;
|
||||
|
||||
@Column(name = "created_at",updatable = false)
|
||||
private LocalDateTime createdAt = LocalDateTime.now();
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package ru.soune.nocopy.entity.file;
|
||||
|
||||
public enum AppealStatus {
|
||||
PENDING,
|
||||
IN_REVIEW,
|
||||
APPROVED,
|
||||
REJECTED,
|
||||
EXPIRED
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
package ru.soune.nocopy.entity.file;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.annotation.LastModifiedDate;
|
||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "file_appeals")
|
||||
@EntityListeners(AuditingEntityListener.class)
|
||||
public class FileAppeal {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.UUID)
|
||||
private String id;
|
||||
|
||||
@Column(name = "file_id", nullable = false)
|
||||
private String fileId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "file_id", insertable = false, updatable = false)
|
||||
@ToString.Exclude
|
||||
private FileEntity file;
|
||||
|
||||
@Column(name = "user_id", nullable = false)
|
||||
private Long userId;
|
||||
|
||||
@Column(name = "appeal_reason", nullable = false, columnDefinition = "TEXT")
|
||||
private String appealReason;
|
||||
|
||||
@Column(name = "additional_info", columnDefinition = "TEXT")
|
||||
private String additionalInfo;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "status", nullable = false)
|
||||
private AppealStatus status;
|
||||
|
||||
@Column(name = "admin_comment", columnDefinition = "TEXT")
|
||||
private String adminComment;
|
||||
|
||||
@Column(name = "moderator_id")
|
||||
private Long moderatorId;
|
||||
|
||||
@Column(name = "moderation_before_status")
|
||||
@Enumerated(EnumType.STRING)
|
||||
private FileStatus moderationBeforeStatus;
|
||||
|
||||
@Column(name = "resolved_at")
|
||||
private LocalDateTime resolvedAt;
|
||||
|
||||
@CreatedDate
|
||||
@Column(name = "created_at", updatable = false)
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
@LastModifiedDate
|
||||
@Column(name = "updated_at")
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
@PrePersist
|
||||
public void prePersist() {
|
||||
if (this.status == null) {
|
||||
this.status = AppealStatus.PENDING;
|
||||
}
|
||||
if (this.createdAt == null) {
|
||||
this.createdAt = LocalDateTime.now();
|
||||
}
|
||||
this.updatedAt = LocalDateTime.now();
|
||||
}
|
||||
|
||||
@PreUpdate
|
||||
public void preUpdate() {
|
||||
this.updatedAt = LocalDateTime.now();
|
||||
}
|
||||
}
|
||||
@@ -6,8 +6,13 @@ import lombok.*;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.annotation.LastModifiedDate;
|
||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||
import ru.soune.nocopy.entity.file.permission.PermissionType;
|
||||
import ru.soune.nocopy.entity.monitoring.FileMonitoringEntity;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
@Data
|
||||
@@ -87,6 +92,17 @@ public class FileEntity {
|
||||
@Column(name = "medium_path")
|
||||
private String mediumPath;
|
||||
|
||||
@Column
|
||||
private String newExtension;
|
||||
|
||||
@ElementCollection
|
||||
@CollectionTable(name = "file_permissions",
|
||||
joinColumns = @JoinColumn(name = "file_id"))
|
||||
@Column(name = "allowed")
|
||||
@MapKeyEnumerated(EnumType.STRING)
|
||||
@MapKeyColumn(name = "permission_type")
|
||||
private Map<PermissionType, Boolean> permissions = new HashMap<>();
|
||||
|
||||
@OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
@JsonIgnore
|
||||
private ImageHashEntity imageHash;
|
||||
@@ -98,7 +114,7 @@ public class FileEntity {
|
||||
}
|
||||
|
||||
if (this.status == null) {
|
||||
this.status = FileStatus.ACTIVE;
|
||||
this.status = FileStatus.MODERATION;
|
||||
}
|
||||
|
||||
if (this.protectionStatus == null) {
|
||||
@@ -108,6 +124,15 @@ public class FileEntity {
|
||||
if (this.createdAt == null) {
|
||||
this.createdAt = LocalDateTime.now();
|
||||
}
|
||||
|
||||
if (this.permissions == null) {
|
||||
this.permissions = new HashMap<>();
|
||||
this.permissions.put(PermissionType.DOWNLOAD, true);
|
||||
// this.permissions.put(PermissionType.VIEW, true);
|
||||
// this.permissions.put(PermissionType.EDIT, true);
|
||||
}
|
||||
|
||||
|
||||
this.updatedAt = LocalDateTime.now();
|
||||
}
|
||||
|
||||
@@ -119,4 +144,29 @@ public class FileEntity {
|
||||
public static void initializeCounter(int maxId) {
|
||||
supportIdCounter = new AtomicInteger(maxId);
|
||||
}
|
||||
|
||||
@Transient
|
||||
public boolean hasPermission(PermissionType type) {
|
||||
return permissions.getOrDefault(type, false);
|
||||
}
|
||||
|
||||
@Transient
|
||||
public void setPermission(PermissionType type, boolean allowed) {
|
||||
permissions.put(type, allowed);
|
||||
}
|
||||
|
||||
@Transient
|
||||
public boolean canDownload() {
|
||||
return hasPermission(PermissionType.DOWNLOAD);
|
||||
}
|
||||
|
||||
// @Transient
|
||||
// public boolean canView() {
|
||||
// return hasPermission(PermissionType.VIEW);
|
||||
// }
|
||||
//
|
||||
// @Transient
|
||||
// public boolean canEdit() {
|
||||
// return hasPermission(PermissionType.EDIT);
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -7,5 +7,9 @@ public enum FileStatus {
|
||||
VIOLATION,
|
||||
CHECKED,
|
||||
ERROR,
|
||||
TEMP
|
||||
TEMP,
|
||||
REMOVED,
|
||||
MODERATION,
|
||||
PRIVATE,
|
||||
BLOCKED
|
||||
}
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package ru.soune.nocopy.entity.file.moderation;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "moderation_logs")
|
||||
@EntityListeners(AuditingEntityListener.class)
|
||||
public class ModerationLog {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.UUID)
|
||||
private String id;
|
||||
|
||||
@Column(name = "file_id", nullable = false)
|
||||
private String fileId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "file_id", insertable = false, updatable = false)
|
||||
@ToString.Exclude
|
||||
private FileEntity file;
|
||||
|
||||
@Column(name = "moderator_id", nullable = false)
|
||||
private Long moderatorId;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "old_status", nullable = false)
|
||||
private FileStatus oldStatus;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "new_status", nullable = false)
|
||||
private FileStatus newStatus;
|
||||
|
||||
@Column(name = "reason", columnDefinition = "TEXT")
|
||||
private String reason;
|
||||
|
||||
@Column(name = "comment", columnDefinition = "TEXT")
|
||||
private String comment;
|
||||
|
||||
@CreatedDate
|
||||
@Column(name = "created_at", updatable = false)
|
||||
private LocalDateTime createdAt;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package ru.soune.nocopy.entity.file.moderation;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
|
||||
@Entity
|
||||
@Builder
|
||||
@Table(name = "moderation_file")
|
||||
@Getter @Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ModerationPassportFile {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "user_id", nullable = false)
|
||||
private Long userId;
|
||||
|
||||
@Column(name = "path", nullable = false)
|
||||
private String path;
|
||||
|
||||
@Column(name = "part")
|
||||
private Integer part;
|
||||
|
||||
private String status;
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package ru.soune.nocopy.entity.file.moderation;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public enum PassportModerationFileStatus {
|
||||
|
||||
DOWNLOAD("download"),
|
||||
ON_MODERATION("on_moderation"),
|
||||
MODERATED("moderated");
|
||||
|
||||
private final String name;
|
||||
|
||||
PassportModerationFileStatus(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package ru.soune.nocopy.entity.file.permission;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public enum PermissionType {
|
||||
DOWNLOAD;
|
||||
|
||||
public static Set<String> getValidPermissionNames() {
|
||||
return Arrays.stream(PermissionType.values())
|
||||
.map(Enum::name)
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
public static Set<String> getInvalidPermissions(Map<String, Boolean> permissions) {
|
||||
Set<String> validNames = getValidPermissionNames();
|
||||
return permissions.keySet().stream()
|
||||
.filter(key -> !validNames.contains(key))
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
public static boolean areAllValid(Map<String, Boolean> permissions) {
|
||||
return getInvalidPermissions(permissions).isEmpty();
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,14 @@
|
||||
package ru.soune.nocopy.entity.monitoring;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public enum MonitoringType {
|
||||
MONITORING_DAILY, MONITORING_WEEKLY, MONITORING_MONTHLY, NONE
|
||||
MONITORING_DAILY(1), MONITORING_WEEKLY(7), MONITORING_MONTHLY(30), NONE(0);
|
||||
|
||||
private final int days;
|
||||
|
||||
MonitoringType(int days) {
|
||||
this.days = days;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
package ru.soune.nocopy.entity.notification;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.annotation.LastModifiedDate;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Entity
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Getter @Setter
|
||||
@Builder
|
||||
@Table(name = "notifications", indexes = {
|
||||
@Index(name = "idx_user_status", columnList = "user_id, status"),
|
||||
@Index(name = "idx_user_created", columnList = "user_id, created_at DESC")
|
||||
})
|
||||
public class Notification {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "created_at", updatable = false)
|
||||
@CreatedDate
|
||||
private LocalDateTime createdAt = LocalDateTime.now();
|
||||
|
||||
@LastModifiedDate
|
||||
@Column(name = "updated_at")
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
@Column(name = "message")
|
||||
private String message;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "notification_type")
|
||||
private NotificationType notificationType;
|
||||
|
||||
@Column(name = "status")
|
||||
private NotificationStatus status = NotificationStatus.NEW;
|
||||
|
||||
@Column(name = "context", columnDefinition = "TEXT")
|
||||
private String context;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "user_id")
|
||||
@JsonIgnore
|
||||
private User user;
|
||||
|
||||
@PrePersist
|
||||
public void prePersist() {
|
||||
if (this.createdAt == null) {
|
||||
this.createdAt = LocalDateTime.now();
|
||||
}
|
||||
|
||||
this.updatedAt = LocalDateTime.now();
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user