Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6656961de | ||
|
|
4ff5c5ec13 | ||
|
|
037445dcd5 | ||
|
|
ff9c959600 | ||
|
|
795b255613 | ||
|
|
c5f060d269 | ||
|
|
1cdc6ee1c9 | ||
|
|
0dd8400229 | ||
|
|
741ca5d5a2 | ||
|
|
f7c2a186cf | ||
|
|
c7660c30de | ||
|
|
02b8d3ee6d | ||
|
|
9024d3aaca | ||
|
|
9e5ff7ce97 | ||
|
|
9f3430adf2 | ||
|
|
41bc26ee94 | ||
|
|
7b58e4979d | ||
|
|
921d439e0a | ||
|
|
2d8f904bfd | ||
|
|
f1e0f9594e | ||
|
|
15d1824757 | ||
|
|
e66225cdd1 | ||
|
|
95edcdf527 | ||
|
|
28bc24647a | ||
|
|
566c1634a2 | ||
|
|
59125b4d19 | ||
|
|
18c07b427c | ||
|
|
a1669826b5 | ||
|
|
7b3000152f | ||
|
|
0f7079d118 | ||
|
|
3a478f9195 | ||
|
|
73fd5e9456 | ||
|
|
c56b2ba4e9 | ||
|
|
9186a6d9b0 | ||
|
|
68e102b6ce | ||
|
|
168aa3812c | ||
|
|
f291287b4c | ||
|
|
aa665acbad | ||
|
|
b5b71ddfe6 | ||
|
|
f4675eb739 | ||
|
|
e2d4312e0f | ||
|
|
83f29e3382 | ||
|
|
bffdf17717 | ||
|
|
507947d6a6 | ||
|
|
7af4b6c781 | ||
|
|
835a9bf18d | ||
|
|
3a477bc2ae | ||
|
|
2ca73e4417 | ||
|
|
37b1f370e5 | ||
|
|
65bbb00abf | ||
|
|
869a25043a | ||
|
|
ffa977f06e | ||
|
|
88bfe51297 | ||
|
|
087b9f7b33 | ||
|
|
a39363a417 | ||
|
|
edbbeab9be | ||
|
|
5b0c6ce5bd | ||
|
|
b04a357cca | ||
|
|
7fb96d4b51 | ||
|
|
54db3d78b4 | ||
|
|
b5ca777722 | ||
|
|
832b13e088 | ||
|
|
9d61f8c88f | ||
|
|
1b54badd00 | ||
|
|
c591ab40df | ||
|
|
590d42690b | ||
|
|
b65a39b672 | ||
|
|
c87b5af628 | ||
|
|
2f57a54137 | ||
|
|
edec60bf19 | ||
|
|
5c8610397a | ||
|
|
94061381c7 | ||
|
|
60857d4077 | ||
|
|
8b7f580b0e | ||
|
|
a46dd54c66 | ||
|
|
cd469edb7f | ||
|
|
4e9a3e9008 | ||
|
|
2bf0468f61 | ||
|
|
1670026430 | ||
|
|
66fe68342a | ||
|
|
7f601fcfb3 | ||
|
|
cfaf8fcf32 | ||
|
|
31c5d9aaab | ||
|
|
52bc0e254c | ||
|
|
4c3558dcfa | ||
|
|
120408e488 | ||
|
|
3ed38dacd1 | ||
|
|
88e7121213 | ||
|
|
5c27fd52ba | ||
|
|
c9921c6fac | ||
|
|
89478c1c9a | ||
|
|
34256c072e | ||
|
|
a89c29f763 | ||
|
|
f5fee52cb4 | ||
|
|
b8a0e6cce7 | ||
|
|
c7ded41c16 | ||
|
|
38e7a382c7 | ||
|
|
404e1a6bee | ||
|
|
1124cddb5a | ||
|
|
b0804938bd | ||
|
|
597b46ccff | ||
|
|
2966d9f3a9 | ||
|
|
fa7f5a731e | ||
|
|
077fe0c254 | ||
|
|
ce7906d2a8 | ||
|
|
8bcbc44528 | ||
|
|
24228609bb | ||
|
|
c86290c2cb | ||
|
|
c09a3a3a18 | ||
|
|
76aa04e174 | ||
|
|
ff441a6ea4 | ||
|
|
f3a0ab8181 | ||
|
|
a2c680d10a | ||
|
|
b8003c11e2 | ||
|
|
4f2d97d205 | ||
|
|
2b5f17f170 | ||
|
|
983b5eddda | ||
|
|
45010bb79a | ||
|
|
3cf3037120 | ||
|
|
3bb6667c2f | ||
|
|
694681fccc | ||
|
|
cb46ac6c88 | ||
|
|
bfe2367715 | ||
|
|
0185e7cd54 | ||
|
|
87b97c39ea | ||
|
|
ba6464147a | ||
|
|
51d1d78f40 | ||
|
|
28ce99ec1c | ||
|
|
274861c300 | ||
|
|
c5edc9a5fc | ||
|
|
81342ae05e | ||
|
|
c81a8c8d65 | ||
|
|
5460d91a6f | ||
|
|
abe98fb609 | ||
|
|
69be949f22 | ||
|
|
b347958772 | ||
|
|
a5c8d09fc4 | ||
|
|
ab495eada7 | ||
|
|
47f3cda7b0 | ||
|
|
247e97cd7a | ||
|
|
7ae1c817ad | ||
|
|
5d02e2e0f2 | ||
|
|
f926de161d | ||
|
|
3e39a3bf47 | ||
|
|
76b07db964 | ||
|
|
c289032671 | ||
|
|
f103aca8da | ||
|
|
7631ea8c8c | ||
|
|
f932bb47f0 | ||
|
|
ca10d4d130 | ||
|
|
339a3f61cd | ||
|
|
a42e3c72fc | ||
|
|
5551d84bf7 | ||
|
|
86e0e0619f | ||
|
|
f34e9df0c8 | ||
|
|
fbe80ff6d7 | ||
|
|
0767088fc4 | ||
|
|
db4cf41800 | ||
|
|
34231d9f6f | ||
|
|
e5da30400a | ||
|
|
65bd103c74 | ||
|
|
d4f26db9ce | ||
|
|
e9cdc66f72 | ||
|
|
9112854fea | ||
|
|
4ccf39f811 | ||
|
|
27df74891b | ||
|
|
22a44d833e | ||
|
|
e2f22bb27b | ||
|
|
d7e3afb4dc | ||
|
|
3d5856d302 | ||
|
|
8811f3ce0e | ||
|
|
ac11de2abb | ||
|
|
9f67f0c06d | ||
|
|
c54dfc994b | ||
|
|
a4e3d62f14 | ||
|
|
ec93afa705 | ||
|
|
18de1ab91b | ||
|
|
67690db7c0 | ||
|
|
b982cb96c1 | ||
|
|
74ba9709a9 | ||
|
|
8de13b410b | ||
|
|
77bf7ea886 | ||
|
|
78698d2873 | ||
|
|
8147a6ce49 | ||
|
|
db02f23c67 | ||
|
|
633f76cd73 | ||
|
|
6abfb4aa37 | ||
|
|
a132ac97f2 | ||
|
|
31b41dc3d7 | ||
|
|
73d010b426 | ||
|
|
fba974f91b | ||
|
|
27b0aaaf70 | ||
|
|
60f78599fa | ||
|
|
e416835c51 | ||
|
|
01b0c12eca | ||
|
|
45267158d8 | ||
|
|
fe710c824d | ||
|
|
919baa418e | ||
|
|
5f588fcb30 | ||
|
|
a431784baa | ||
|
|
ba802ca53f | ||
|
|
d4f9397dff | ||
|
|
796f1de022 | ||
|
|
e05bf7ef3a | ||
|
|
3c00a5bd2c | ||
|
|
1d3bdc506d | ||
|
|
1801b7e8fd | ||
|
|
e53c17976f | ||
|
|
31544084ca | ||
|
|
d74571b7cb | ||
|
|
27705c5739 | ||
|
|
7a02b94bd0 | ||
|
|
f15a24acc2 | ||
|
|
e555436d54 | ||
|
|
814d137937 | ||
|
|
1e14fa3f23 | ||
|
|
12aecff5c9 | ||
|
|
03a330b570 | ||
|
|
b372180f83 | ||
|
|
920fc67962 | ||
|
|
fb2ac0cf03 | ||
|
|
8a2be0d310 | ||
|
|
0743000c10 | ||
|
|
640deef98d | ||
|
|
28b5a64a33 | ||
|
|
6818b74307 | ||
|
|
6b73d01aeb | ||
|
|
1cb9edd5bf | ||
|
|
081ca05f88 | ||
|
|
970e0fa615 | ||
|
|
52e1a7dd02 | ||
|
|
19330d853d | ||
|
|
1472c342f5 | ||
|
|
1ced86ff8c | ||
|
|
8149c450b2 | ||
|
|
fea2d5ad89 | ||
|
|
2ef1619ef9 | ||
|
|
266bcaefcd | ||
|
|
bf48725244 | ||
|
|
86f7fc593a | ||
|
|
90be1d9d2b | ||
|
|
9692fe48b7 | ||
|
|
d50c565405 | ||
|
|
98fc145f1b | ||
|
|
e7e870ee30 | ||
|
|
8103960b45 | ||
|
|
792e0048cc | ||
|
|
33883faa98 | ||
|
|
7cc744829b | ||
|
|
5a70c091f8 | ||
|
|
69aabe3619 | ||
|
|
27a8766171 | ||
|
|
2bba70e583 | ||
|
|
8e8193cda6 | ||
|
|
b96b50c01f | ||
|
|
e926934473 | ||
|
|
a5003958a8 | ||
|
|
5b73fd2c39 | ||
|
|
daadc82bbb | ||
|
|
682c21ba73 | ||
|
|
1c7a33be32 | ||
|
|
aceb70484f | ||
|
|
3fc83e5458 | ||
|
|
a7e94639d2 | ||
|
|
f52ce6db3c | ||
|
|
80c53515fb | ||
|
|
511da8321b | ||
|
|
df1fd89c29 | ||
|
|
90e3134e98 | ||
|
|
130fd184b9 | ||
|
|
f90b8a0bce | ||
|
|
adc978bea8 | ||
|
|
7bb48f3944 | ||
|
|
27b812b0da | ||
|
|
6643070999 | ||
|
|
4395d276ed | ||
|
|
e49a944b05 | ||
|
|
8e716f7d20 | ||
|
|
2e8080183c | ||
|
|
dc9215523b | ||
|
|
72691511fa | ||
|
|
135d94e0ef | ||
|
|
d1bacb4ac7 | ||
|
|
7a809e6b8c | ||
|
|
06a6196a26 | ||
|
|
13324d4628 | ||
|
|
c38b86e1b9 | ||
|
|
3ce8edd7e1 | ||
|
|
22b487da22 | ||
|
|
4395654b0d | ||
|
|
7dd057603d | ||
|
|
a4858cf6c5 | ||
|
|
7d52276b31 | ||
|
|
8fe8c566c0 | ||
|
|
36d40a0b8d | ||
|
|
32f0a07e32 | ||
|
|
51ef63e8cd | ||
|
|
b0237fd812 | ||
|
|
de8c53784b | ||
|
|
3cd6b5396c | ||
|
|
615924ea9e | ||
|
|
9a8aa498c0 | ||
|
|
66633d4964 | ||
|
|
ce8c63475f | ||
|
|
30c05b6b24 | ||
|
|
49dc19cd04 | ||
|
|
fb5642db9e | ||
|
|
c539b1fbc2 | ||
|
|
61b8ea902b | ||
|
|
6ee7ab4d04 | ||
|
|
96acf796b2 | ||
|
|
ff7836900b | ||
|
|
ec20d68261 | ||
|
|
31fac0ab93 | ||
|
|
a32f089989 | ||
|
|
c019f23777 | ||
|
|
02bf7868ee | ||
|
|
2215adc37f | ||
|
|
6fcec8d67e | ||
|
|
4a185e6f9a | ||
|
|
cf2f73955b | ||
|
|
f67e172365 | ||
|
|
d32e8dcd75 | ||
|
|
5700adafb2 | ||
|
|
816a984891 | ||
|
|
21e31c7d0f | ||
|
|
e7c6df12d6 | ||
|
|
aa87ae32bc | ||
|
|
9ba3d8b973 | ||
|
|
300383e523 | ||
|
|
329000d284 | ||
|
|
4c8c4bb5c1 | ||
|
|
82eedb02d1 | ||
|
|
b2993e00a1 | ||
|
|
6197b26a81 | ||
|
|
0e2ef1d2e6 | ||
|
|
3e5eef3b42 | ||
|
|
89f83054ef | ||
|
|
f8234291b1 | ||
|
|
4cf36d7b17 | ||
|
|
6dacbde522 | ||
|
|
0a4ab562a4 | ||
|
|
76103b9d96 | ||
|
|
69a79b7ac7 | ||
|
|
c97f205a17 | ||
|
|
ab3eef1668 | ||
|
|
85449d73fd | ||
|
|
859239e77a | ||
|
|
63c3794aa4 | ||
|
|
349edbeb91 | ||
|
|
e26e50454a | ||
|
|
8d026a485f | ||
|
|
204e13ca85 | ||
|
|
79b13731a6 | ||
|
|
8555002415 | ||
|
|
4560925183 | ||
|
|
4314032a3b | ||
|
|
d638819ee9 | ||
|
|
51654fd060 | ||
|
|
e37cc06cd0 | ||
|
|
5a3e26b6a3 | ||
|
|
409c677ba6 | ||
|
|
95deda12f3 | ||
|
|
c2a780db2d | ||
|
|
ad9cbd96f6 | ||
|
|
211b99b986 | ||
|
|
d1b5b6eb5c | ||
|
|
251bb37105 | ||
|
|
1fc065a46b | ||
|
|
60678ef889 | ||
|
|
f0a87648cf | ||
|
|
c2ffcdcd6e | ||
|
|
f9accd7af1 | ||
|
|
55fa8b84e2 | ||
|
|
4a8e561258 | ||
|
|
0c0fadf5ec | ||
|
|
e979712b7c | ||
|
|
5027920199 | ||
|
|
4704f780e5 | ||
|
|
3d679440f6 | ||
|
|
4a45f40e9f | ||
|
|
bbb0d7b17a | ||
|
|
0ed3f958ff | ||
|
|
de810e32b4 | ||
|
|
1a6823f7a9 | ||
|
|
82a57a2983 | ||
|
|
d3e50aa8d1 | ||
|
|
5c6309e228 | ||
|
|
8ac73ff045 | ||
|
|
20e1ab321d | ||
|
|
2b7a8b97e1 | ||
|
|
344ec075d4 | ||
|
|
7b8546fd4d | ||
|
|
eb12e219ec | ||
|
|
920cde3cdf | ||
|
|
5b4dca23fb | ||
|
|
7b1ed5fe67 | ||
|
|
8102d72982 | ||
|
|
b3a3d57ee3 | ||
|
|
d896f23872 | ||
|
|
3e06040123 | ||
|
|
18d35cb0fb | ||
|
|
edd508e5d8 | ||
|
|
63baaf7c80 | ||
|
|
f136ac1f0a | ||
|
|
3a9a5b48a2 | ||
|
|
6fff5884d2 | ||
|
|
f8673dd581 | ||
|
|
b9a401f113 | ||
|
|
918b4894fc | ||
|
|
bf4d1ca450 | ||
|
|
f1222ede57 | ||
|
|
0da0404488 | ||
|
|
bd9ecd4f84 | ||
|
|
0f73c8319e | ||
|
|
28b0356b03 | ||
|
|
72a4516b7d | ||
|
|
851676b895 | ||
|
|
254fdc0fbd | ||
|
|
a33c53fa6b | ||
|
|
86e7371ffe | ||
|
|
9541e89651 | ||
|
|
291586dbf4 | ||
|
|
91e9b0c785 | ||
|
|
4fa6b83a10 | ||
|
|
2c1a2aeb16 | ||
|
|
2a9f33068a | ||
|
|
1ebe8b852f | ||
|
|
84993dec00 | ||
|
|
a2c20ae645 | ||
|
|
18ec9b51f3 | ||
|
|
45b7acc774 | ||
|
|
b2cf06a512 | ||
|
|
d842af2c62 | ||
|
|
c5ef58ddd4 | ||
|
|
f6d4ebfe0e | ||
|
|
a77a51f519 | ||
|
|
1aef1dcd96 | ||
|
|
7dc32d055b | ||
|
|
19d8f61e1d | ||
|
|
8fe4d854a6 | ||
|
|
4c607f5bf9 | ||
|
|
ce879fea18 | ||
|
|
33479ea9af | ||
|
|
ffb147d716 | ||
|
|
647fd6e1a7 | ||
|
|
76e8f4ab1d | ||
|
|
c03ca2566d | ||
|
|
1932784264 | ||
|
|
bd78b88f33 | ||
|
|
22c2eed8a1 | ||
|
|
f3266ee0e5 | ||
|
|
280bd91257 | ||
|
|
31b90f942c | ||
|
|
d167e92d90 | ||
|
|
f3aa6324c2 | ||
|
|
e2747fc999 | ||
|
|
a030837d45 | ||
|
|
651b92cb59 | ||
|
|
11a7ab6a73 | ||
|
|
641e983b89 | ||
|
|
8b6f0f1072 | ||
|
|
6797a47df5 | ||
|
|
fade754c7c | ||
|
|
f164370989 | ||
|
|
015f2f516c | ||
|
|
d34a304763 | ||
|
|
0635b9b4ac | ||
|
|
a30b0488e8 | ||
|
|
76da2e94c9 | ||
|
|
420734ff87 | ||
|
|
9ef192ed32 | ||
|
|
8a33bd33a2 | ||
|
|
b5b8bebb69 | ||
|
|
c2ffe08e7d |
@@ -1,10 +1,19 @@
|
|||||||
|
# Postgres
|
||||||
POSTGRES_DB=no_copy_
|
POSTGRES_DB=no_copy_
|
||||||
POSTGRES_USER=postgres
|
POSTGRES_USER=ncp_db
|
||||||
POSTGRES_PASSWORD=postgres
|
POSTGRES_PASSWORD=ncpDbApp
|
||||||
POSTGRES_PORT=5432
|
POSTGRES_PORT=5432
|
||||||
POSTGRES_HOST=postgres
|
POSTGRES_HOST=postgres
|
||||||
|
|
||||||
|
# Redis
|
||||||
REDIS_HOST=redis
|
REDIS_HOST=redis
|
||||||
REDIS_PORT=6379
|
REDIS_PORT=6379
|
||||||
|
|
||||||
|
# Backend server
|
||||||
SERVER_PORT=8080
|
SERVER_PORT=8080
|
||||||
|
|
||||||
|
# Postfix
|
||||||
|
MAIL_HOST_PROD=postfix-production
|
||||||
|
MAIL_PORT_PROD=25
|
||||||
|
MAIL_USERNAME_PROD=noreply@nocopy.com
|
||||||
|
SMTP_PASSWORD_PROD=nocopy!nocopy!
|
||||||
@@ -12,6 +12,11 @@ WORKDIR /app
|
|||||||
|
|
||||||
COPY --from=build /app/build/libs/*.jar app.jar
|
COPY --from=build /app/build/libs/*.jar app.jar
|
||||||
|
|
||||||
|
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
||||||
|
|
||||||
|
ENV BUILD_TIME_BACK="unknown"\
|
||||||
|
BUILD_TIME_FRONT="unknown"
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
CMD ["java", "-jar", "app.jar"]
|
CMD ["java", "-jar", "app.jar"]
|
||||||
@@ -0,0 +1,492 @@
|
|||||||
|
Создаем сеть:
|
||||||
|
docker network create app-network
|
||||||
|
|
||||||
|
Войти в БД:
|
||||||
|
docker exec -it postgres psql -U ncp_db -d no_copy_
|
||||||
|
|
||||||
|
Выполнить команду:
|
||||||
|
\du
|
||||||
|
|
||||||
|
Должен быть один пользователь:
|
||||||
|
List of roles
|
||||||
|
Role name | Attributes
|
||||||
|
-----------+------------------------------------------------------------
|
||||||
|
ncp_db | Superuser, Create role, Create DB, Replication, Bypass RLS
|
||||||
|
|
||||||
|
суперпользователь БД:
|
||||||
|
postgres/postgres
|
||||||
|
пользователь бд для бэка
|
||||||
|
ncp_db / ncpDbApp
|
||||||
|
|
||||||
|
Подключение к БД для приложения,если volume не существует :
|
||||||
|
|
||||||
|
Создаться автоматически.
|
||||||
|
|
||||||
|
Если уже существует volume :
|
||||||
|
|
||||||
|
docker exec -it postgres psql -U postgres -d postgres
|
||||||
|
|
||||||
|
CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
|
||||||
|
|
||||||
|
\du
|
||||||
|
|
||||||
|
\q
|
||||||
|
|
||||||
|
-------
|
||||||
|
|
||||||
|
psql -U postgres -d no_copy_
|
||||||
|
|
||||||
|
-- база
|
||||||
|
|
||||||
|
GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
|
||||||
|
|
||||||
|
-- схема
|
||||||
|
|
||||||
|
GRANT USAGE ON SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- существующие таблицы
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- существующие sequence (очень важно для id)
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- будущие таблицы
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON TABLES TO ncp_db;
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON SEQUENCES TO ncp_db;
|
||||||
|
|
||||||
|
|
||||||
|
Зайти в контейнер:
|
||||||
|
docker exec -it {name} bash
|
||||||
|
|
||||||
|
------
|
||||||
|
|
||||||
|
Создать для сущности FileEntity sequence для икремента индетификатора
|
||||||
|
|
||||||
|
CREATE SEQUENCE IF NOT EXISTS file_support_id_seq START 1;
|
||||||
|
|
||||||
|
ALTER TABLE file_entities
|
||||||
|
ALTER COLUMN support_id
|
||||||
|
SET DEFAULT nextval('file_support_id_seq');
|
||||||
|
|
||||||
|
----------
|
||||||
|
Раздать всем лимиты,у кого их нет
|
||||||
|
|
||||||
|
INSERT INTO protect_check (user_id, check_limit, count_checked, last_check_at, version)
|
||||||
|
SELECT
|
||||||
|
id as user_id,
|
||||||
|
10 as check_limit,
|
||||||
|
0 as count_checked,
|
||||||
|
NULL as last_check_at,
|
||||||
|
0 as version
|
||||||
|
FROM users
|
||||||
|
WHERE id NOT IN (SELECT user_id FROM protect_check);
|
||||||
|
|
||||||
|
--------
|
||||||
|
Обновлять констрейнты для file_entities
|
||||||
|
|
||||||
|
ALTER TABLE file_entities DROP CONSTRAINT file_entities_status_check;
|
||||||
|
|
||||||
|
ALTER TABLE file_entities
|
||||||
|
ADD CONSTRAINT file_entities_status_check
|
||||||
|
CHECK (status IN (
|
||||||
|
'ACTIVE',
|
||||||
|
'DELETED',
|
||||||
|
'PROCESSING',
|
||||||
|
'VIOLATION',
|
||||||
|
'CHECKED',
|
||||||
|
'ERROR',
|
||||||
|
'TEMP'
|
||||||
|
));
|
||||||
|
|
||||||
|
-------
|
||||||
|
Записи для лимитов поиска
|
||||||
|
|
||||||
|
INSERT INTO protect_check (user_id, limit_check, count_checked, last_check_at, version)
|
||||||
|
SELECT
|
||||||
|
u.id,
|
||||||
|
100, -- limit_check = 100
|
||||||
|
0, -- count_checked = 0
|
||||||
|
NULL, -- last_check_at = NULL
|
||||||
|
0 -- version = 0
|
||||||
|
FROM users u
|
||||||
|
WHERE NOT EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM protect_check pc
|
||||||
|
WHERE pc.user_id = u.id
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
------
|
||||||
|
Скрипты рефералки
|
||||||
|
|
||||||
|
INSERT INTO referrals (user_id, referral_link, inviter_id, level_id, total_income, is_active, created_at, hold_balance)
|
||||||
|
SELECT
|
||||||
|
u.id as user_id,
|
||||||
|
CONCAT('ref-', u.id, '-', LOWER(SUBSTRING(MD5(RANDOM()::text) FROM 1 FOR 8))) as referral_link,
|
||||||
|
NULL as inviter_id,
|
||||||
|
'bronze' as level_id,
|
||||||
|
0 as total_income,
|
||||||
|
false as is_active,
|
||||||
|
NOW() as created_at,
|
||||||
|
0 as hold_balance
|
||||||
|
FROM users u
|
||||||
|
LEFT JOIN referrals r ON u.id = r.user_id
|
||||||
|
WHERE
|
||||||
|
u.company_id IS NULL
|
||||||
|
AND r.user_id IS NULL
|
||||||
|
ORDER BY u.id;
|
||||||
|
|
||||||
|
-------
|
||||||
|
|
||||||
|
INSERT INTO referral_levels (id, name, min_invitees, reward_percentage) VALUES
|
||||||
|
('bronze', 'BRONZE', 0, 15),
|
||||||
|
('silver', 'SILVER', 6, 18),
|
||||||
|
('gold', 'GOLD', 16, 22),
|
||||||
|
('platinum', 'PLATINUM', 50, 25);
|
||||||
|
|
||||||
|
-----------------
|
||||||
|
Скрипт,для нумерации для уже сохданных файлов
|
||||||
|
WITH max_id AS (
|
||||||
|
SELECT COALESCE(MAX(support_id), 0) as max_val FROM file_entities
|
||||||
|
),
|
||||||
|
-- Нумеруем только NULL записи, начиная с max_val + 1
|
||||||
|
numbered AS (
|
||||||
|
SELECT
|
||||||
|
f.id,
|
||||||
|
(SELECT max_val FROM max_id) + ROW_NUMBER() OVER (ORDER BY f.created_at, f.id) as new_support_id
|
||||||
|
FROM file_entities f
|
||||||
|
WHERE f.support_id IS NULL
|
||||||
|
)
|
||||||
|
UPDATE file_entities
|
||||||
|
SET support_id = numbered.new_support_id
|
||||||
|
FROM numbered
|
||||||
|
WHERE file_entities.id = numbered.id;
|
||||||
|
|
||||||
|
---------------------------------
|
||||||
|
НАСТРОЙКА NGINX
|
||||||
|
--------------------------------
|
||||||
|
|
||||||
|
# admin.not-copy.com
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name admin.not-copy.com;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
listen [::]:443 ssl;
|
||||||
|
server_name admin.not-copy.com;
|
||||||
|
|
||||||
|
ssl_certificate /etc/letsencrypt/live/admin.not-copy.com/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/admin.not-copy.com/privkey.pem;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://localhost:3003;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://localhost:2995;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# workspace.not-copy.com
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name workspace.not-copy.com;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
listen [::]:443 ssl;
|
||||||
|
server_name workspace.not-copy.com;
|
||||||
|
|
||||||
|
ssl_certificate /etc/letsencrypt/live/workspace.not-copy.com/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/workspace.not-copy.com/privkey.pem;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://localhost:3003;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://localhost:2998;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# lp.not-copy.com
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name lp.not-copy.com;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
listen [::]:443 ssl;
|
||||||
|
server_name lp.not-copy.com;
|
||||||
|
|
||||||
|
ssl_certificate /etc/letsencrypt/live/lp.not-copy.com/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/lp.not-copy.com/privkey.pem;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://localhost:3003;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://localhost:2993;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# dev-admin.not-copy.com
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name dev-admin.not-copy.com;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
listen [::]:443 ssl;
|
||||||
|
server_name dev-admin.not-copy.com;
|
||||||
|
|
||||||
|
ssl_certificate /etc/letsencrypt/live/dev-admin.not-copy.com/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/dev-admin.not-copy.com/privkey.pem;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://localhost:3001;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://localhost:2996;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# dev-workspace.not-copy.com
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name dev-workspace.not-copy.com;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
listen [::]:443 ssl;
|
||||||
|
server_name dev-workspace.not-copy.com;
|
||||||
|
|
||||||
|
ssl_certificate /etc/letsencrypt/live/dev-workspace.not-copy.com/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/dev-workspace.not-copy.com/privkey.pem;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://localhost:3001;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://localhost:3002;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# dev-lp.not-copy.com
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name dev-lp.not-copy.com;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
listen [::]:443 ssl;
|
||||||
|
server_name dev-lp.not-copy.com;
|
||||||
|
|
||||||
|
ssl_certificate /etc/letsencrypt/live/dev-lp.not-copy.com/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/dev-lp.not-copy.com/privkey.pem;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://localhost:3001;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://localhost:2994;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Проверяем конфиг
|
||||||
|
ls -la /etc/nginx/sites-available/
|
||||||
|
ls -la /etc/nginx/sites-enabled/
|
||||||
|
|
||||||
|
# Создание конфига
|
||||||
|
|
||||||
|
sudo nano /etc/nginx/sites-available/not-copy
|
||||||
|
|
||||||
|
# Создание симлинк
|
||||||
|
sudo ln -s /etc/nginx/sites-available/not-copy /etc/nginx/sites-enabled/
|
||||||
|
|
||||||
|
# Чек
|
||||||
|
sudo nginx -t
|
||||||
|
|
||||||
|
# Рестарт
|
||||||
|
sudo systemctl reload nginx
|
||||||
|
|
||||||
|
|
||||||
|
---------------------------------------------
|
||||||
|
|
||||||
|
# ПОЛНАЯ ИНСТРУКЦИЯ: НАСТРОЙКА ПРОКСИ ДЛЯ ОБХОДА БЛОКИРОВОК SEARCHAPI.IO
|
||||||
|
|
||||||
|
## Данные для подключения к прокси-серверу
|
||||||
|
IP: 193.46.217.94
|
||||||
|
Порт HTTP: 3128
|
||||||
|
Порт SOCKS: 1080
|
||||||
|
Логин SSH: root
|
||||||
|
Пароль SSH: u7nRtsD6
|
||||||
|
|
||||||
|
## 1. Настройка прокси-сервера
|
||||||
|
```bash
|
||||||
|
# Подключаемся к серверу
|
||||||
|
ssh root@193.46.217.94
|
||||||
|
# Вводим пароль: u7nRtsD6
|
||||||
|
|
||||||
|
# Обновляем систему и устанавливаем пакеты
|
||||||
|
yum update -y
|
||||||
|
yum install -y epel-release net-tools nano
|
||||||
|
yum install -y 3proxy
|
||||||
|
|
||||||
|
# Создаем конфигурацию
|
||||||
|
mkdir -p /etc/3proxy
|
||||||
|
cat > /etc/3proxy/3proxy.cfg << 'EOF'
|
||||||
|
nserver 8.8.8.8
|
||||||
|
nserver 8.8.4.4
|
||||||
|
timeouts 1 5 30 60 180 1800 15 60
|
||||||
|
daemon
|
||||||
|
log /var/log/3proxy/3proxy.log
|
||||||
|
logformat "- +_L%t.%. %N.%p %E %U %C:%c %R:%r %O %I %h %T"
|
||||||
|
rotate 30
|
||||||
|
auth none
|
||||||
|
allow * * * * *
|
||||||
|
proxy -p3128
|
||||||
|
socks -p1080
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# Создаем папку для логов и запускаем прокси
|
||||||
|
mkdir -p /var/log/3proxy
|
||||||
|
/usr/bin/3proxy /etc/3proxy/3proxy.cfg
|
||||||
|
|
||||||
|
# Проверяем, что запустилось
|
||||||
|
ps aux | grep 3proxy
|
||||||
|
netstat -tulpn | grep -E '3128|1080'
|
||||||
|
|
||||||
|
# Настраиваем файрвол
|
||||||
|
firewall-cmd --permanent --add-port=3128/tcp
|
||||||
|
firewall-cmd --permanent --add-port=1080/tcp
|
||||||
|
firewall-cmd --reload
|
||||||
|
firewall-cmd --list-ports
|
||||||
|
|
||||||
|
# Проверяем локальную работу прокси
|
||||||
|
curl -x http://127.0.0.1:3128 https://api.ipify.org
|
||||||
|
# Должен вернуть: 193.46.217.94
|
||||||
|
|
||||||
|
# Настраиваем автозапуск
|
||||||
|
echo "/usr/bin/3proxy /etc/3proxy/3proxy.cfg" >> /etc/rc.local
|
||||||
|
chmod +x /etc/rc.local
|
||||||
|
|
||||||
|
|
||||||
|
# Проверяем доступность прокси
|
||||||
|
ping -c 4 193.46.217.94
|
||||||
|
curl -x http://193.46.217.94:3128 https://api.ipify.org
|
||||||
|
# Должен вернуть: 193.46.217.94
|
||||||
|
|
||||||
|
# Проверяем работу с SearchAPI через прокси
|
||||||
|
curl -x http://193.46.217.94:3128 "https://www.searchapi.io/api/v1/search?engine=google_lens&api_key=5jyYZC8jSaxhZTwjMUhwtAXi&url=https://dev-workspace.not-copy.com/api/files/public/76d06557-6df1-4fcd-a273-050ec6a35faf&search_type=exact_matches" -o test.json
|
||||||
|
ls -la test.json
|
||||||
|
tail -20 test.json
|
||||||
|
# Файл должен быть полным (заканчиваться на '}')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ps aux | grep 3proxy # Проверка статуса
|
||||||
|
netstat -tulpn | grep -E '3128|1080' # Проверка портов
|
||||||
|
tail -f /var/log/3proxy/3proxy.log # Просмотр логов
|
||||||
|
killall 3proxy # Остановка прокси
|
||||||
|
/usr/bin/3proxy /etc/3proxy/3proxy.cfg # Запуск прокси
|
||||||
|
|
||||||
|
|
||||||
|
firewall-cmd --permanent --remove-port=3128/tcp
|
||||||
|
firewall-cmd --permanent --add-rich-rule='rule family="ipv4" source address="IP_ТВОЕГО_СЕРВЕРА" port port="3128" protocol="tcp" accept'
|
||||||
|
firewall-cmd --permanent --add-rich-rule='rule family="ipv4" source address="IP_ТВОЕГО_СЕРВЕРА" port port="1080" protocol="tcp" accept'
|
||||||
|
firewall-cmd --reload
|
||||||
|
|
||||||
|
|
||||||
|
На прокси-сервере:
|
||||||
|
bash
|
||||||
|
ps aux | grep 3proxy # Проверка статуса
|
||||||
|
netstat -tulpn | grep -E '3128|1080' # Проверка портов
|
||||||
|
tail -f /var/log/3proxy/3proxy.log # Просмотр логов
|
||||||
|
killall 3proxy # Остановка прокси
|
||||||
|
/usr/bin/3proxy /etc/3proxy/3proxy.cfg # Запуск прокси
|
||||||
|
|
||||||
|
На основном сервере:
|
||||||
|
bash
|
||||||
|
curl -x http://193.46.217.94:3128 https://api.ipify.org # Проверка прокси
|
||||||
|
telnet 193.46.217.94 3128 # Проверка порта
|
||||||
+27
-1
@@ -21,6 +21,9 @@ configurations {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
flatDir {
|
||||||
|
dirs 'libs'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -29,16 +32,39 @@ dependencies {
|
|||||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
implementation 'org.springframework.security:spring-security-crypto:6.5.3'
|
implementation 'org.springframework.security:spring-security-crypto:6.5.3'
|
||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
|
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
|
||||||
|
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.17.2'
|
||||||
|
implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
|
||||||
|
implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
|
||||||
|
|
||||||
|
implementation 'org.flywaydb:flyway-core:9.22.0'
|
||||||
|
|
||||||
|
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
||||||
|
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
||||||
|
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
|
||||||
|
|
||||||
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
||||||
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
|
|
||||||
compileOnly 'org.projectlombok:lombok'
|
compileOnly 'org.projectlombok:lombok'
|
||||||
|
|
||||||
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
||||||
|
|
||||||
runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
|
runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
|
||||||
runtimeOnly 'com.mysql:mysql-connector-j'
|
runtimeOnly 'com.mysql:mysql-connector-j'
|
||||||
runtimeOnly 'org.postgresql:postgresql'
|
runtimeOnly 'org.postgresql:postgresql'
|
||||||
annotationProcessor 'org.projectlombok:lombok'
|
|
||||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
|
|
||||||
|
implementation name: 'testlib-fat-0.3.1-all'
|
||||||
|
|
||||||
|
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
|
||||||
|
|
||||||
|
implementation project(':referral')
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('test') {
|
tasks.named('test') {
|
||||||
|
|||||||
+138
-10
@@ -1,17 +1,69 @@
|
|||||||
version: '3.9'
|
version: '3.9'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
storage:
|
||||||
|
image: alpine:latest
|
||||||
|
container_name: file-storage
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: 128M
|
||||||
|
reservations:
|
||||||
|
memory: 64M
|
||||||
|
networks:
|
||||||
|
- app-network
|
||||||
|
volumes:
|
||||||
|
- uploads_data:/storage:rw
|
||||||
|
command: tail -f /dev/null
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# postfix:
|
||||||
|
# image: boky/postfix:latest
|
||||||
|
# container_name: postfix-production
|
||||||
|
# hostname: ${DOMAIN:-no-copy.ru}
|
||||||
|
# environment:
|
||||||
|
# - DOMAIN=${DOMAIN:-no-copy.ru}
|
||||||
|
# - ALLOWED_SENDER_DOMAINS=*
|
||||||
|
# - RELAYHOST=
|
||||||
|
# - DISABLE_SMTP_AUTH=
|
||||||
|
# - SMTP_USERNAME=${MAIL_USERNAME:-noreply@no-copy.ru}
|
||||||
|
# - SMTP_PASSWORD=${SMTP_PASSWORD:-nocopy!nocopy!}
|
||||||
|
# - RELAY_NETWORKS=172.16.0.0/12
|
||||||
|
# - POSTFIX_mynetworks=127.0.0.0/8 172.17.0.0/16 172.16.0.0/12
|
||||||
|
# - POSTFIX_smtpd_relay_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
|
||||||
|
# - POSTFIX_smtpd_recipient_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
|
||||||
|
# - DISABLE_SIGNING=true
|
||||||
|
# ports:
|
||||||
|
# - "25:25"
|
||||||
|
# - "587:587"
|
||||||
|
# networks:
|
||||||
|
# - app-network
|
||||||
|
# restart: unless-stopped
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:17
|
image: postgres:17.7
|
||||||
restart: always
|
restart: always
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '2.0'
|
||||||
|
memory: 2G
|
||||||
|
reservations:
|
||||||
|
cpus: '1.0'
|
||||||
|
memory: 1G
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
POSTGRES_USER: postgres
|
# POSTGRES_USER: postgres
|
||||||
POSTGRES_PASSWORD: postgres
|
# POSTGRES_PASSWORD: postgres
|
||||||
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
|
POSTGRES_SHARED_BUFFERS: 512MB
|
||||||
|
POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
|
||||||
ports:
|
ports:
|
||||||
- "54320:5432"
|
- "54320:5432"
|
||||||
volumes:
|
volumes:
|
||||||
- pgdata:/var/lib/postgresql/data
|
- pgdata:/var/lib/postgresql/data
|
||||||
|
- ./init-scripts:/docker-entrypoint-initdb.d:ro
|
||||||
container_name: postgres
|
container_name: postgres
|
||||||
networks:
|
networks:
|
||||||
app-network:
|
app-network:
|
||||||
@@ -21,15 +73,40 @@ services:
|
|||||||
app:
|
app:
|
||||||
build: .
|
build: .
|
||||||
container_name: app-backend
|
container_name: app-backend
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '1.5'
|
||||||
|
memory: 3G
|
||||||
|
reservations:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 2G
|
||||||
environment:
|
environment:
|
||||||
|
JAVA_TOOL_OPTIONS: "-Xmx2g -Xms1g -XX:MaxMetaspaceSize=512m -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -XX:+UseContainerSupport -XX:InitialRAMPercentage=50 -XX:MaxRAMPercentage=75"
|
||||||
FILE_STORAGE_PATH: /data/uploads
|
FILE_STORAGE_PATH: /data/uploads
|
||||||
MAX_FILE_SIZE: 1073741824
|
MAX_FILE_SIZE: 10737418240
|
||||||
FILE_CHUNK_SIZE: 5242880
|
# FILE_CHUNK_SIZE: 1048576
|
||||||
|
FILE_CHUNK_SIZE: 1000000
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
POSTGRES_USER: postgres
|
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
POSTGRES_HOST: db
|
POSTGRES_HOST: db
|
||||||
|
STORAGE_SERVICE_URL: http://storage:8081
|
||||||
|
SPRING_PROFILES_ACTIVE: prod
|
||||||
|
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
||||||
|
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
||||||
|
YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
||||||
|
# POSTGRES_USER: postgres
|
||||||
|
# POSTGRES_PASSWORD: postgres
|
||||||
|
# MAIL_HOST: postfix
|
||||||
|
# MAIL_PORT: 25
|
||||||
|
# MAIL_USERNAME: noreply@no-copy.ru
|
||||||
|
# SMTP_PASSWORD: nocopy!nocopy!
|
||||||
|
# SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: "false"
|
||||||
|
# SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: "false"
|
||||||
|
# SPRING_MAIL_PROPERTIES_MAIL_DEBUG: "true"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
ports:
|
ports:
|
||||||
@@ -41,11 +118,22 @@ services:
|
|||||||
- backend
|
- backend
|
||||||
- api
|
- api
|
||||||
volumes:
|
volumes:
|
||||||
- ./uploads:/data/uploads:rw
|
- uploads_data:/data/uploads:rw
|
||||||
|
healthcheck:
|
||||||
|
test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
|
||||||
|
interval: 10s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
grafana:
|
grafana:
|
||||||
image: grafana/grafana:10.3.1
|
image: grafana/grafana:10.3.1
|
||||||
container_name: grafana
|
container_name: grafana
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 512M
|
||||||
|
reservations:
|
||||||
|
memory: 256M
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -62,6 +150,8 @@ services:
|
|||||||
GF_SECURITY_ADMIN_USER: admin
|
GF_SECURITY_ADMIN_USER: admin
|
||||||
GF_SECURITY_ADMIN_PASSWORD: admin
|
GF_SECURITY_ADMIN_PASSWORD: admin
|
||||||
GF_METRICS_ENABLED: "true"
|
GF_METRICS_ENABLED: "true"
|
||||||
|
GF_DATABASE_MAX_IDLE_CONN: "2"
|
||||||
|
GF_DATABASE_MAX_OPEN_CONN: "10"
|
||||||
volumes:
|
volumes:
|
||||||
- ./infrastructure/grafana/provisioning:/etc/grafana/provisioning
|
- ./infrastructure/grafana/provisioning:/etc/grafana/provisioning
|
||||||
- ./infrastructure/grafana/dashboards:/var/lib/grafana/dashboards
|
- ./infrastructure/grafana/dashboards:/var/lib/grafana/dashboards
|
||||||
@@ -76,10 +166,23 @@ services:
|
|||||||
prometheus:
|
prometheus:
|
||||||
image: prom/prometheus:latest
|
image: prom/prometheus:latest
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 1G
|
||||||
|
reservations:
|
||||||
|
memory: 512M
|
||||||
ports:
|
ports:
|
||||||
- "9090:9090"
|
- "9090:9090"
|
||||||
volumes:
|
volumes:
|
||||||
- ./infrastructure/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
|
- ./infrastructure/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
|
||||||
|
- prometheus_data:/prometheus
|
||||||
|
command:
|
||||||
|
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||||
|
- '--storage.tsdb.path=/prometheus'
|
||||||
|
- '--storage.tsdb.retention.time=15d'
|
||||||
|
- '--web.enable-lifecycle'
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
@@ -91,10 +194,20 @@ services:
|
|||||||
loki:
|
loki:
|
||||||
image: grafana/loki:2.9.2
|
image: grafana/loki:2.9.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '1.0'
|
||||||
|
memory: 2G
|
||||||
|
reservations:
|
||||||
|
memory: 1G
|
||||||
ports:
|
ports:
|
||||||
- "3100:3100"
|
- "3100:3100"
|
||||||
volumes:
|
volumes:
|
||||||
- ./infrastructure/loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro
|
- ./infrastructure/loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro
|
||||||
|
- loki_data:/loki
|
||||||
|
command:
|
||||||
|
- -config.file=/etc/loki/loki-config.yaml
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "--spider", "-q", "http://localhost:3100/ready" ]
|
test: [ "CMD", "wget", "--spider", "-q", "http://localhost:3100/ready" ]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
@@ -106,6 +219,13 @@ services:
|
|||||||
tempo:
|
tempo:
|
||||||
image: grafana/tempo:2.4.1
|
image: grafana/tempo:2.4.1
|
||||||
container_name: tempo
|
container_name: tempo
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 512M
|
||||||
|
reservations:
|
||||||
|
memory: 256M
|
||||||
command: [ "-config.file=/etc/tempo/tempo.yaml" ]
|
command: [ "-config.file=/etc/tempo/tempo.yaml" ]
|
||||||
volumes:
|
volumes:
|
||||||
- ./infrastructure/tempo/tempo.yaml:/etc/tempo/tempo.yaml
|
- ./infrastructure/tempo/tempo.yaml:/etc/tempo/tempo.yaml
|
||||||
@@ -118,6 +238,13 @@ services:
|
|||||||
alloy:
|
alloy:
|
||||||
image: grafana/alloy:latest
|
image: grafana/alloy:latest
|
||||||
container_name: alloy
|
container_name: alloy
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: '0.5'
|
||||||
|
memory: 256M
|
||||||
|
reservations:
|
||||||
|
memory: 128M
|
||||||
user: root
|
user: root
|
||||||
ports:
|
ports:
|
||||||
- "9080:9080"
|
- "9080:9080"
|
||||||
@@ -146,8 +273,9 @@ volumes:
|
|||||||
loki_chunks:
|
loki_chunks:
|
||||||
loki_index:
|
loki_index:
|
||||||
loki_rules:
|
loki_rules:
|
||||||
# uploads_volume:
|
uploads_data:
|
||||||
|
prometheus_data:
|
||||||
|
# postfix-data:
|
||||||
networks:
|
networks:
|
||||||
app-network:
|
app-network:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
plugins {
|
||||||
|
kotlin("jvm") version "2.1.10"
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "ru.soune"
|
||||||
|
version = "1.0.0"
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
|
||||||
|
implementation("io.insert-koin:koin-core:4.1.1")
|
||||||
|
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.test {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
||||||
|
kotlin {
|
||||||
|
jvmToolchain(21)
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
fun main() {
|
||||||
|
println("Hello World!")
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
package ru.soune.actions
|
||||||
|
|
||||||
|
abstract class NoCopyAction
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package ru.soune.actions.free
|
||||||
|
|
||||||
|
import ru.soune.actions.NoCopyAction
|
||||||
|
|
||||||
|
sealed class NoCopyFreeAction : NoCopyAction()
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package ru.soune.actions.paid
|
||||||
|
|
||||||
|
import ru.soune.actions.NoCopyAction
|
||||||
|
|
||||||
|
sealed class NoCopyPaidAction : NoCopyAction() {
|
||||||
|
|
||||||
|
abstract val cost: Double
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
## Команды для помещения в сеть
|
||||||
|
|
||||||
|
Сеть для работы бэка и фронта : Наименование == app-network-{port}
|
||||||
|
|
||||||
|
|
||||||
|
### Проверить состояние:
|
||||||
|
|
||||||
|
|
||||||
|
docker inspect {container-name} --format='{{range $net, $_ := .NetworkSettings.Networks}}{{$net}} {{end}}'
|
||||||
|
|
||||||
|
|
||||||
|
### Создать сеть ,если нет
|
||||||
|
|
||||||
|
docker network create {name-network} 2>/dev/null || echo "Сеть уже существует"
|
||||||
|
|
||||||
|
### Переместить контейнер:
|
||||||
|
|
||||||
|
# Отключить от старой сети
|
||||||
|
docker network disconnect {network-name-old} {container-name}
|
||||||
|
|
||||||
|
# Подключить к новой сети
|
||||||
|
docker network connect {network-name-new} {container-name}
|
||||||
|
|
||||||
|
# Добавить алиас (опционально)
|
||||||
|
docker network connect --alias {alias} {network-name-new} {container-name}
|
||||||
|
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
parameters {
|
||||||
|
string(
|
||||||
|
name: 'BRANCH',
|
||||||
|
defaultValue: 'main',
|
||||||
|
description: 'Ветка для деплоя админ-панели'
|
||||||
|
)
|
||||||
|
string(
|
||||||
|
name: 'PORT',
|
||||||
|
defaultValue: '2996',
|
||||||
|
description: 'Порт для запуска экземпляра'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Git pull') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
checkout([
|
||||||
|
$class: 'GitSCM',
|
||||||
|
branches: [[name: params.BRANCH]],
|
||||||
|
userRemoteConfigs: [[
|
||||||
|
url: 'https://code.3err0.ru/frontdev/no-copy-admin-panel-frontend.git',
|
||||||
|
credentialsId: 'nx-jen'
|
||||||
|
]]
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Stop old') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
docker stop no-copy-admin-panel-${params.PORT} 2>/dev/null || true
|
||||||
|
docker rm no-copy-admin-panel-${params.PORT} 2>/dev/null || true
|
||||||
|
mkdir -p /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
|
||||||
|
rm -rf /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/*
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Copy to server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
cd /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
|
||||||
|
docker build -t no-copy-admin-panel:${params.BRANCH}-${params.PORT} .
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Start on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
docker run -d \\
|
||||||
|
--name no-copy-admin-panel-${params.PORT} \\
|
||||||
|
--restart unless-stopped \\
|
||||||
|
--network app-network \\
|
||||||
|
-p ${params.PORT}:2996 \\
|
||||||
|
no-copy-admin-panel:${params.BRANCH}-${params.PORT}
|
||||||
|
sleep 5
|
||||||
|
docker ps --filter name=no-copy-admin-panel-${params.PORT}
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Check status') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-admin-panel-${params.PORT}'; then
|
||||||
|
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
|
||||||
|
echo 'Admin panel available on http://92.242.61.23:${params.PORT}'
|
||||||
|
else
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
echo "Admin panel ${params.BRANCH} deployed"
|
||||||
|
}
|
||||||
|
failure {
|
||||||
|
echo "Deployment failed"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,223 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
parameters {
|
||||||
|
string(
|
||||||
|
name: 'BRANCH',
|
||||||
|
defaultValue: 'dev',
|
||||||
|
description: 'Ветка для деплоя'
|
||||||
|
)
|
||||||
|
string(
|
||||||
|
name: 'PORT',
|
||||||
|
defaultValue: '3001',
|
||||||
|
description: 'Порт для запуска экземпляра'
|
||||||
|
)
|
||||||
|
string(
|
||||||
|
name: 'PORT_DB',
|
||||||
|
defaultValue: '',
|
||||||
|
description: 'Порт для запуска БД'
|
||||||
|
)
|
||||||
|
string(
|
||||||
|
name: 'SERVER',
|
||||||
|
defaultValue: '92.242.61.23',
|
||||||
|
description: 'Сервер для деплоя'
|
||||||
|
)
|
||||||
|
string(
|
||||||
|
name: 'NETWORK',
|
||||||
|
defaultValue: 'app-network-dev',
|
||||||
|
description: 'Имя сети (будет создана если не существует)'
|
||||||
|
)
|
||||||
|
choice(
|
||||||
|
name: 'SPRING_PROFILE',
|
||||||
|
choices: ['dev', 'prod'],
|
||||||
|
description: 'Профиль Spring для запуска'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Git pull') {
|
||||||
|
steps {
|
||||||
|
cleanWs()
|
||||||
|
script {
|
||||||
|
checkout([
|
||||||
|
$class: 'GitSCM',
|
||||||
|
branches: [[name: params.BRANCH]],
|
||||||
|
userRemoteConfigs: [[
|
||||||
|
url: 'https://code.3err0.ru/backdev/no-copy.git',
|
||||||
|
credentialsId: 'nx-jen'
|
||||||
|
]]
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Copy to server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
||||||
|
rm -rf /opt/deployments/${params.BRANCH}-${params.PORT}/*
|
||||||
|
mkdir -p /opt/deployments/${params.BRANCH}-${params.PORT}
|
||||||
|
"
|
||||||
|
|
||||||
|
sshpass -p '${SSH_PASS}' scp -r ./* ${SSH_USER}@${params.SERVER}:/opt/deployments/${params.BRANCH}-${params.PORT}/
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Deploy with docker-compose') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
||||||
|
def springProfile = params.SPRING_PROFILE
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
),
|
||||||
|
string(credentialsId: 'DB_USER', variable: 'DB_USER'),
|
||||||
|
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
# Тестируем подключение сначала
|
||||||
|
echo "Testing SSH connection..."
|
||||||
|
if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
|
||||||
|
echo "SSH connection OK"
|
||||||
|
else
|
||||||
|
echo "SSH connection failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Основная команда
|
||||||
|
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
||||||
|
mkdir -p /opt/deployments/${params.BRANCH}-${params.PORT}
|
||||||
|
cd /opt/deployments/${params.BRANCH}-${params.PORT}
|
||||||
|
|
||||||
|
echo '1. Проверяем/создаем сеть ${params.NETWORK}...'
|
||||||
|
if ! docker network ls --format '{{.Name}}' | grep -q '^${params.NETWORK}\$'; then
|
||||||
|
docker network create ${params.NETWORK}
|
||||||
|
echo 'Сеть ${params.NETWORK} создана'
|
||||||
|
else
|
||||||
|
echo 'Сеть ${params.NETWORK} уже существует'
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo '2. Останавливаем старые контейнеры порта ${params.PORT}...'
|
||||||
|
docker stop app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
docker rm app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
docker stop postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
|
||||||
|
docker rm postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
|
||||||
|
docker stop file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
||||||
|
docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
||||||
|
|
||||||
|
echo '3. Запускаем БД...'
|
||||||
|
docker run -d \\
|
||||||
|
--name postgres-${params.PORT} \\
|
||||||
|
--network ${params.NETWORK} \\
|
||||||
|
--network-alias no_copy_${params.PORT} \\
|
||||||
|
--network-alias database-${params.PORT} \\
|
||||||
|
--network-alias db-${params.PORT} \\
|
||||||
|
-p ${params.PORT}0:5432 \\
|
||||||
|
-e POSTGRES_DB=no_copy${params.PORT_DB} \\
|
||||||
|
-e POSTGRES_USER=${DB_USER} \\
|
||||||
|
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
||||||
|
-v pgdata_${params.PORT}:/var/lib/postgresql/data \\
|
||||||
|
-e BUILD_TIME_BACK='${buildTime}' \\
|
||||||
|
postgres:17.7
|
||||||
|
|
||||||
|
echo '4. Запускаем storage...'
|
||||||
|
docker run -d \\
|
||||||
|
--name file-storage-${params.PORT} \\
|
||||||
|
--network ${params.NETWORK} \\
|
||||||
|
-v uploads_data_${params.PORT}:/storage:rw \\
|
||||||
|
alpine:latest tail -f /dev/null
|
||||||
|
|
||||||
|
echo '5. Ждем БД...'
|
||||||
|
sleep 15
|
||||||
|
|
||||||
|
echo '6. Собираем приложение...'
|
||||||
|
docker build --no-cache -t app-backend-${params.PORT}:latest .
|
||||||
|
|
||||||
|
echo '7. Запускаем приложение...'
|
||||||
|
docker run -d \\
|
||||||
|
--name app-backend-${params.PORT} \\
|
||||||
|
--network ${params.NETWORK} \\
|
||||||
|
--network-alias app \\
|
||||||
|
--network-alias app-${params.PORT} \\
|
||||||
|
-p ${params.PORT}:8080 \\
|
||||||
|
-v uploads_data_${params.PORT}:/data/uploads:rw \\
|
||||||
|
-e POSTGRES_DB=no_copy${params.PORT_DB} \\
|
||||||
|
-e POSTGRES_USER=${DB_USER} \\
|
||||||
|
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
||||||
|
-e POSTGRES_PORT=5432 \\
|
||||||
|
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
||||||
|
-e FILE_STORAGE_PATH=/data/uploads \\
|
||||||
|
-e SPRING_PROFILES_ACTIVE=${springProfile} \\
|
||||||
|
app-backend-${params.PORT}:latest
|
||||||
|
|
||||||
|
echo '8. Проверка...'
|
||||||
|
sleep 10
|
||||||
|
|
||||||
|
if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
|
||||||
|
echo 'Приложение работает на порту ${params.PORT}'
|
||||||
|
else
|
||||||
|
echo 'Проверка health не удалась'
|
||||||
|
docker logs app-backend-${params.PORT} --tail=20
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Verify network') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
||||||
|
echo 'Проверяем подключение к сети ${params.NETWORK}'
|
||||||
|
docker network inspect ${params.NETWORK} --format='{{.Name}}: {{range .Containers}}{{.Name}} {{end}}'
|
||||||
|
|
||||||
|
echo 'Проверяем алиас app для контейнера app-backend-${params.PORT}'
|
||||||
|
docker inspect app-backend-${params.PORT} | grep -A 5 'Aliases'
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
script {
|
||||||
|
def appUrl = params.SPRING_PROFILE == 'prod' ? 'https://workspace.not-copy.com' : 'https://dev-workspace.not-copy.com'
|
||||||
|
echo "Deployment successful"
|
||||||
|
echo "Application URL: ${appUrl}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
failure {
|
||||||
|
echo "Deployment failed for branch ${params.BRANCH} on port ${params.PORT}"
|
||||||
|
}
|
||||||
|
always {
|
||||||
|
echo "Deployment process finished"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,16 @@ pipeline {
|
|||||||
defaultValue: 'main',
|
defaultValue: 'main',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
|
string(
|
||||||
|
name: 'PORT',
|
||||||
|
defaultValue: '2998',
|
||||||
|
description: 'Порт для запуска экземпляра'
|
||||||
|
)
|
||||||
|
string(
|
||||||
|
name: 'NETWORK',
|
||||||
|
defaultValue: 'app-network-dev',
|
||||||
|
description: 'Docker сеть для подключения'
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
@@ -37,15 +47,15 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
docker stop no-copy-frontend 2>/dev/null || true
|
docker stop no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||||
docker rm no-copy-frontend 2>/dev/null || true
|
docker rm no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||||
|
|
||||||
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
if [ -f 'docker-compose.yaml' ]; then
|
||||||
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
docker-compose -f docker-compose.yaml -p frontend-${params.PORT} down 2>/dev/null || true
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
elif [ -f 'docker-compose.yml' ]; then
|
||||||
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
docker-compose -f docker-compose.yml -p frontend-${params.PORT} down 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
@@ -66,11 +76,11 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
rm -rf /opt/deployments/frontend/${params.BRANCH}-${params.PORT}/*
|
||||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||||
"
|
"
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}-${params.PORT}/
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,6 +90,8 @@ pipeline {
|
|||||||
stage('Build on server') {
|
stage('Build on server') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
|
def BUILD_TIME_FRONT = sh(script: "date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
||||||
|
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(
|
usernamePassword(
|
||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
@@ -89,16 +101,18 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}
|
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
# 1. СОЗДАЕМ JSON ФАЙЛ (ЭТО РАБОТАЕТ 100%)
|
||||||
docker-compose -f docker-compose.yaml build
|
mkdir -p public
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
echo '{\\"buildTime\\": \\"${BUILD_TIME_FRONT}\\"}' > public/build-info.json
|
||||||
docker-compose -f docker-compose.yml build
|
|
||||||
else
|
# 2. Меняем имя контейнера и порт
|
||||||
echo 'Exception: docker-compose file not found'
|
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
||||||
exit 1
|
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
||||||
fi
|
|
||||||
|
# 3. Собираем образ
|
||||||
|
docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@@ -118,21 +132,23 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}
|
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||||
|
|
||||||
# Проверяем и подключаем к сети app-network если нужно
|
echo '=== Запускаем контейнер ==='
|
||||||
docker network inspect app-network 2>/dev/null || echo 'Warning: app-network not found'
|
docker-compose -f docker-compose.yml -p frontend-${params.PORT} up -d
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
docker-compose -f docker-compose.yaml up -d
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
|
||||||
docker-compose -f docker-compose.yml up -d
|
|
||||||
fi
|
|
||||||
|
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
||||||
echo 'Status container:'
|
echo '=== Проверяем запуск ==='
|
||||||
docker ps --filter name=no-copy-frontend
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
||||||
|
echo '✓ Контейнер запущен: no-copy-frontend-${params.PORT}'
|
||||||
|
echo '✓ Порт: ${params.PORT}:2999'
|
||||||
|
else
|
||||||
|
echo '✗ Контейнер не запустился'
|
||||||
|
echo 'Логи:'
|
||||||
|
docker-compose -f docker-compose.yml -p frontend-${params.PORT} logs
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@@ -152,15 +168,21 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
# Ищем контейнер с правильным именем (с портом)
|
||||||
echo 'Container started'
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
||||||
|
echo 'Container started: no-copy-frontend-${params.PORT}'
|
||||||
|
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
||||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} || echo '000')
|
||||||
echo 'HTTP code: \$HTTP_CODE'
|
echo 'HTTP code: \$HTTP_CODE'
|
||||||
|
|
||||||
echo 'Frontend available on http://92.242.61.23:2998'
|
echo 'Frontend available on http://92.242.61.23:${params.PORT}'
|
||||||
|
|
||||||
|
# Показываем все фронтенды
|
||||||
|
echo ''
|
||||||
|
echo 'All frontend containers:'
|
||||||
|
docker ps --filter name=no-copy-frontend --format 'table {{.Names}}\\t{{.Ports}}\\t{{.Status}}'
|
||||||
else
|
else
|
||||||
echo 'Exception: container did not start'
|
echo 'Exception: container did not start'
|
||||||
docker ps -a | grep frontend
|
docker ps -a | grep frontend
|
||||||
@@ -172,12 +194,77 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// stage('Connect to network') {
|
||||||
|
// steps {
|
||||||
|
// script {
|
||||||
|
// withCredentials([
|
||||||
|
// usernamePassword(
|
||||||
|
// credentialsId: 'server-root-password',
|
||||||
|
// usernameVariable: 'SSH_USER',
|
||||||
|
// passwordVariable: 'SSH_PASS'
|
||||||
|
// )
|
||||||
|
// ]) {
|
||||||
|
// sh """
|
||||||
|
// sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
// echo 'Отключаем от всех сетей и подключаем к ${params.NETWORK}'
|
||||||
|
//
|
||||||
|
// # Отключаем от всех сетей (кроме bridge, host, none)
|
||||||
|
// current_networks=\$(docker inspect no-copy-frontend-${params.PORT} --format='{{range \$net, \$v := .NetworkSettings.Networks}}{{\$net}}{{\"\\n\"}}{{end}}' | grep -v -E '^(bridge|host|none)\$' || true)
|
||||||
|
//
|
||||||
|
// for net in \$current_networks; do
|
||||||
|
// echo \"Отключаем от сети: \$net\"
|
||||||
|
// docker network disconnect \$net no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||||
|
// done
|
||||||
|
//
|
||||||
|
// # Подключаем к нужной сети
|
||||||
|
// docker network connect ${params.NETWORK} no-copy-frontend-${params.PORT}
|
||||||
|
//
|
||||||
|
// echo 'Готово! Контейнер теперь в сети:'
|
||||||
|
// docker inspect no-copy-frontend-${params.PORT} --format='{{range \$net, \$v := .NetworkSettings.Networks}}{{\$net}}{{\"\\n\"}}{{end}}'
|
||||||
|
// "
|
||||||
|
// """
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
stage('Connect to network') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
echo 'Подключаем контейнер к сети ${params.NETWORK}'
|
||||||
|
|
||||||
|
if ! docker network ls --format '{{.Name}}' | grep -q '^${params.NETWORK}\$'; then
|
||||||
|
docker network create ${params.NETWORK}
|
||||||
|
fi
|
||||||
|
|
||||||
|
if docker ps -a --format '{{.Names}}' | grep -q '^no-copy-frontend-${params.PORT}\$'; then
|
||||||
|
docker network disconnect ${params.NETWORK} no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||||
|
docker network connect ${params.NETWORK} no-copy-frontend-${params.PORT}
|
||||||
|
echo 'Контейнер подключен к ${params.NETWORK}'
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
post {
|
post {
|
||||||
success {
|
success {
|
||||||
echo "Front branch ${params.BRANCH} deployment completed"
|
echo "Front branch ${params.BRANCH} deployment completed"
|
||||||
echo "Frontend available on http://92.242.61.23:2998"
|
echo "Frontend available on http://92.242.61.23:${params.PORT}"
|
||||||
|
echo "Container: no-copy-frontend-${params.PORT}"
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Deployment failed"
|
echo "Deployment failed"
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ pipeline {
|
|||||||
defaultValue: 'dev',
|
defaultValue: 'dev',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
|
|
||||||
string(
|
string(
|
||||||
name: 'SERVER',
|
name: 'SERVER',
|
||||||
defaultValue: '92.242.61.23',
|
defaultValue: '92.242.61.23',
|
||||||
@@ -18,6 +17,7 @@ pipeline {
|
|||||||
stages {
|
stages {
|
||||||
stage('Git pull') {
|
stage('Git pull') {
|
||||||
steps {
|
steps {
|
||||||
|
cleanWs()
|
||||||
script {
|
script {
|
||||||
checkout([
|
checkout([
|
||||||
$class: 'GitSCM',
|
$class: 'GitSCM',
|
||||||
@@ -34,75 +34,85 @@ pipeline {
|
|||||||
stage('Deploy with docker-compose') {
|
stage('Deploy with docker-compose') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
|
def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(
|
usernamePassword(
|
||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
usernameVariable: 'SSH_USER',
|
usernameVariable: 'SSH_USER',
|
||||||
passwordVariable: 'SSH_PASS'
|
passwordVariable: 'SSH_PASS'
|
||||||
)
|
),
|
||||||
|
string(credentialsId: 'DB_USER', variable: 'DB_USER'),
|
||||||
|
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
echo "Deploying branch: ${params.BRANCH}"
|
echo "Deploying branch: ${params.BRANCH}"
|
||||||
|
|
||||||
echo "Copying files to server..."
|
echo "Copying files to server..."
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
|
sshpass -p '$SSH_PASS' rsync -av --delete \\
|
||||||
|
--exclude=.git \\
|
||||||
|
--exclude=.gradle \\
|
||||||
|
--exclude=build \\
|
||||||
|
--exclude=**/build \\
|
||||||
|
--exclude=.idea \\
|
||||||
|
--exclude=out \\
|
||||||
|
. $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||||
|
|
||||||
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||||
cd /opt/deployments/${params.BRANCH}
|
cd /opt/deployments/${params.BRANCH}
|
||||||
|
|
||||||
echo 'Step 1: Checking current state...'
|
echo '1. Остановка старого приложения...'
|
||||||
|
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
|
||||||
# Смотрим что запущено
|
echo '2. Удаление старых образов...'
|
||||||
docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
|
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||||
|
|
||||||
echo 'Step 2: Stopping only application (keeping DB)...'
|
echo '3. Создание сети если нужно...'
|
||||||
|
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||||
|
|
||||||
# Останавливаем только приложение, БД оставляем работать
|
echo '4. Запуск инфраструктуры...'
|
||||||
docker stop app-backend 2>/dev/null || echo 'App not running'
|
docker-compose up -d db storage
|
||||||
docker rm app-backend 2>/dev/null || echo 'App not found'
|
|
||||||
|
|
||||||
# Проверяем что БД работает, если нет - запускаем
|
echo '5. Ожидание PostgreSQL...'
|
||||||
if ! docker ps | grep -q postgres; then
|
|
||||||
echo 'Starting PostgreSQL...'
|
|
||||||
docker-compose up -d db
|
|
||||||
sleep 10
|
sleep 10
|
||||||
else
|
|
||||||
echo 'PostgreSQL already running'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'Step 3: Building new application image...'
|
echo '6. Сборка нового образа приложения...'
|
||||||
docker build --no-cache -t app-backend:latest .
|
docker build --no-cache -t app-backend:latest .
|
||||||
|
|
||||||
echo 'Step 4: Starting application...'
|
echo '7. Запуск приложения...'
|
||||||
docker run -d \\
|
docker run -d \\
|
||||||
--name app-backend \\
|
--name app-backend \\
|
||||||
--network app-network \\
|
--network app-network \\
|
||||||
|
--network-alias app \\
|
||||||
-p 80:8080 \\
|
-p 80:8080 \\
|
||||||
|
-v uploads_data:/data/uploads:rw \\
|
||||||
-e POSTGRES_DB=no_copy_ \\
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
-e POSTGRES_USER=postgres \\
|
-e POSTGRES_USER=$DB_USER \\
|
||||||
-e POSTGRES_PASSWORD=postgres \\
|
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||||
-e POSTGRES_PORT=5432 \\
|
-e POSTGRES_PORT=5432 \\
|
||||||
-e POSTGRES_HOST=db \\
|
-e POSTGRES_HOST=db \\
|
||||||
|
-e BUILD_TIME_BACK='${buildTime}' \\
|
||||||
--restart unless-stopped \\
|
--restart unless-stopped \\
|
||||||
app-backend:latest
|
app-backend:latest
|
||||||
|
|
||||||
echo 'Step 5: Checking deployment...'
|
echo '8. Запуск мониторинга...'
|
||||||
sleep 10
|
docker-compose up -d grafana prometheus loki tempo alloy
|
||||||
|
|
||||||
echo 'Containers status:'
|
echo '9. Проверка...'
|
||||||
docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
|
sleep 5
|
||||||
|
|
||||||
echo 'Application logs (last 5 lines):'
|
echo 'Статус контейнеров:'
|
||||||
docker logs --tail=5 app-backend 2>/dev/null || echo 'Logs not available yet'
|
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||||
|
|
||||||
if docker ps | grep -q app-backend; then
|
echo '10. Проверка health...'
|
||||||
echo 'Deployment successful'
|
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
||||||
echo 'Application URL: http://${params.SERVER}:80'
|
echo 'Приложение работает'
|
||||||
|
echo 'URL: http://${params.SERVER}:80'
|
||||||
else
|
else
|
||||||
echo 'Application failed to start'
|
echo 'Проверка health не удалась'
|
||||||
docker logs app-backend
|
docker logs app-backend --tail=20
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -1,183 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent any
|
|
||||||
|
|
||||||
parameters {
|
|
||||||
string(
|
|
||||||
name: 'BRANCH',
|
|
||||||
defaultValue: 'main',
|
|
||||||
description: 'Ветка для деплоя'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
stage('Git pull') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
checkout([
|
|
||||||
$class: 'GitSCM',
|
|
||||||
branches: [[name: params.BRANCH]],
|
|
||||||
userRemoteConfigs: [[
|
|
||||||
url: 'https://code.3err0.ru/frontdev/no-copy-frontend.git',
|
|
||||||
credentialsId: 'nx-jen'
|
|
||||||
]]
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Stop old') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
docker stop no-copy-frontend 2>/dev/null || true
|
|
||||||
docker rm no-copy-frontend 2>/dev/null || true
|
|
||||||
|
|
||||||
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
|
||||||
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Copy to server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
|
||||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
|
||||||
"
|
|
||||||
|
|
||||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Build on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}
|
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
docker-compose -f docker-compose.yaml build
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
|
||||||
docker-compose -f docker-compose.yml build
|
|
||||||
else
|
|
||||||
echo 'Exception:don't found docker-compose'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Start on server') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}
|
|
||||||
|
|
||||||
if [ -f 'docker-compose.yaml' ]; then
|
|
||||||
docker-compose -f docker-compose.yaml up -d
|
|
||||||
elif [ -f 'docker-compose.yml' ]; then
|
|
||||||
docker-compose -f docker-compose.yml up -d
|
|
||||||
fi
|
|
||||||
|
|
||||||
sleep 10
|
|
||||||
|
|
||||||
echo 'Status container:'
|
|
||||||
docker ps --filter name=no-copy-frontend
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Check status') {
|
|
||||||
steps {
|
|
||||||
script {
|
|
||||||
withCredentials([
|
|
||||||
usernamePassword(
|
|
||||||
credentialsId: 'server-root-password',
|
|
||||||
usernameVariable: 'SSH_USER',
|
|
||||||
passwordVariable: 'SSH_PASS'
|
|
||||||
)
|
|
||||||
]) {
|
|
||||||
sh """
|
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
|
||||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
|
||||||
echo 'Container start'
|
|
||||||
|
|
||||||
sleep 5
|
|
||||||
|
|
||||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
|
||||||
echo 'HTTP код: ' \$HTTP_CODE
|
|
||||||
|
|
||||||
echo 'Frong start on http://92.242.61.23:2998'
|
|
||||||
else
|
|
||||||
echo 'Exception: container don't start'
|
|
||||||
docker ps -a | grep frontend
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
"
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
success {
|
|
||||||
echo "Front branch ${params.BRANCH} completed"
|
|
||||||
echo "Use on http://92.242.61.23:2998"
|
|
||||||
}
|
|
||||||
failure {
|
|
||||||
echo "Failed"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
parameters {
|
||||||
|
string(
|
||||||
|
name: 'BRANCH',
|
||||||
|
defaultValue: 'main',
|
||||||
|
description: 'Ветка для деплоя легальной панели'
|
||||||
|
)
|
||||||
|
string(
|
||||||
|
name: 'PORT',
|
||||||
|
defaultValue: '2997',
|
||||||
|
description: 'Порт для запуска экземпляра'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Git pull') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
checkout([
|
||||||
|
$class: 'GitSCM',
|
||||||
|
branches: [[name: params.BRANCH]],
|
||||||
|
userRemoteConfigs: [[
|
||||||
|
url: 'https://code.3err0.ru/frontdev/no-copy-legal-panel-frontend.git',
|
||||||
|
credentialsId: 'nx-jen'
|
||||||
|
]]
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Stop old') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
docker stop no-copy-legal-panel-${params.PORT} 2>/dev/null || true
|
||||||
|
docker rm no-copy-legal-panel-${params.PORT} 2>/dev/null || true
|
||||||
|
mkdir -p /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
|
||||||
|
rm -rf /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/*
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Copy to server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
cd /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
|
||||||
|
docker build -t no-copy-legal-panel:${params.BRANCH}-${params.PORT} .
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Start on server') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
docker run -d \\
|
||||||
|
--name no-copy-legal-panel-${params.PORT} \\
|
||||||
|
--restart unless-stopped \\
|
||||||
|
--network app-network \\
|
||||||
|
-p ${params.PORT}:2997 \\
|
||||||
|
no-copy-legal-panel:${params.BRANCH}-${params.PORT}
|
||||||
|
sleep 5
|
||||||
|
docker ps --filter name=no-copy-legal-panel-${params.PORT}
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Check status') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword(
|
||||||
|
credentialsId: 'server-root-password',
|
||||||
|
usernameVariable: 'SSH_USER',
|
||||||
|
passwordVariable: 'SSH_PASS'
|
||||||
|
)
|
||||||
|
]) {
|
||||||
|
sh """
|
||||||
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
|
if docker ps --format '{{.Names}}' | grep -q 'no-copy-legal-panel-${params.PORT}'; then
|
||||||
|
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
|
||||||
|
echo 'Legal panel available on http://92.242.61.23:${params.PORT}'
|
||||||
|
else
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
echo "Legal panel ${params.BRANCH} deployed on port ${params.PORT}"
|
||||||
|
}
|
||||||
|
failure {
|
||||||
|
echo "Deployment failed"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'ncp_db') THEN
|
||||||
|
CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
|
||||||
|
END IF;
|
||||||
|
END
|
||||||
|
$$;
|
||||||
|
|
||||||
|
GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
|
||||||
|
GRANT USAGE ON SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
|
||||||
|
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON TABLES TO ncp_db;
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON SEQUENCES TO ncp_db;
|
||||||
Binary file not shown.
@@ -0,0 +1,26 @@
|
|||||||
|
plugins {
|
||||||
|
kotlin("jvm") version "2.1.10"
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "ru.soune"
|
||||||
|
version = "1.0.0"
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
|
||||||
|
|
||||||
|
implementation("io.insert-koin:koin-core:4.1.1")
|
||||||
|
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.test {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
||||||
|
kotlin {
|
||||||
|
jvmToolchain(21)
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
fun main() {
|
||||||
|
println("Hello World!")
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
interface Referral {
|
||||||
|
|
||||||
|
val userId: Long
|
||||||
|
val referralLink: String
|
||||||
|
val inviter: Long?
|
||||||
|
val currentLevel: String
|
||||||
|
val totalIncome: Int
|
||||||
|
val availableIncome: Int
|
||||||
|
val holdBalance: Int
|
||||||
|
val active: Boolean
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
data class ReferralInvitee(
|
||||||
|
val email: String,
|
||||||
|
val isActive: Boolean,
|
||||||
|
val regDate: String,
|
||||||
|
)
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
interface ReferralLevel {
|
||||||
|
val id: String
|
||||||
|
val name: String
|
||||||
|
val share: Int
|
||||||
|
val minInvitee: Int
|
||||||
|
val maxInvitee: Int
|
||||||
|
val next: String?
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
interface ReferralLevelProvider {
|
||||||
|
|
||||||
|
fun getAvailableReferralLevels(): List<ReferralLevel>
|
||||||
|
|
||||||
|
fun getInitialReferralLevelId(): String
|
||||||
|
|
||||||
|
fun getReferralLevelById(levelId: String): ReferralLevel
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
interface ReferralRepo {
|
||||||
|
|
||||||
|
fun getUserReferralLink(userId: Long): String
|
||||||
|
|
||||||
|
fun getUserIdByLink(link: String): Long?
|
||||||
|
|
||||||
|
fun getInviterIdForUser(userId: Long): Long?
|
||||||
|
|
||||||
|
fun getReferralLevelForUser(userId: Long): String
|
||||||
|
|
||||||
|
fun getReferralByUserId(userId: Long): Referral
|
||||||
|
|
||||||
|
fun getReferralInvitees(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee>
|
||||||
|
|
||||||
|
// создаем новую запись в БД
|
||||||
|
fun createReferralEntity(entity: Referral)
|
||||||
|
|
||||||
|
// прибавить к totalIncome и availableIncome значение transferAmount
|
||||||
|
fun increaseIncome(userId: Long, transferAmount: Int)
|
||||||
|
|
||||||
|
// установить active в true
|
||||||
|
fun activateUser(userId: Long): Boolean
|
||||||
|
|
||||||
|
// посчитать записи, у которых inviter == userId и active == true
|
||||||
|
fun getActiveInviteeForUser(userId: Long): Int
|
||||||
|
|
||||||
|
// посчитать записи, у которых inviter == userId
|
||||||
|
fun getTotalInviteeForUser(userId: Long): Int
|
||||||
|
|
||||||
|
fun upgradeReferralLevelForUser(userId: Long, newLevelId: String)
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
class ReferralService(
|
||||||
|
private val referralLevelProvider: ReferralLevelProvider,
|
||||||
|
private val referralRepo: ReferralRepo,
|
||||||
|
) {
|
||||||
|
|
||||||
|
fun onRegister(userId: Long, inviterReferralLink: String?) {
|
||||||
|
val initialReferralLevel = referralLevelProvider.getInitialReferralLevelId()
|
||||||
|
val referralLink = referralRepo.getUserReferralLink(userId)
|
||||||
|
val inviter = inviterReferralLink?.let(referralRepo::getUserIdByLink)
|
||||||
|
|
||||||
|
val referral = object : Referral {
|
||||||
|
override val userId = userId
|
||||||
|
override val referralLink = referralLink
|
||||||
|
override val inviter = inviter
|
||||||
|
override val currentLevel = initialReferralLevel
|
||||||
|
override val totalIncome = 0
|
||||||
|
override val availableIncome = 0
|
||||||
|
override val holdBalance: Int = 0
|
||||||
|
override val active: Boolean = false
|
||||||
|
}
|
||||||
|
|
||||||
|
referralRepo.createReferralEntity(referral)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun onUserAccountRefill(userId: Long, transferAmount: Int) {
|
||||||
|
val wasActivated = referralRepo.activateUser(userId)
|
||||||
|
val inviterId = referralRepo.getInviterIdForUser(userId) ?: return
|
||||||
|
val currentInviterLevel = referralRepo.getReferralLevelForUser(inviterId)
|
||||||
|
.let { referralLevelProvider.getReferralLevelById(it) }
|
||||||
|
val reward = transferAmount * currentInviterLevel.share / 100
|
||||||
|
|
||||||
|
referralRepo.increaseIncome(inviterId, reward)
|
||||||
|
|
||||||
|
if (!wasActivated) return
|
||||||
|
|
||||||
|
val currentCount = referralRepo.getActiveInviteeForUser(inviterId)
|
||||||
|
val nextLevel = currentInviterLevel.next
|
||||||
|
|
||||||
|
if (currentCount + 1 > currentInviterLevel.maxInvitee && nextLevel != null) {
|
||||||
|
referralRepo.upgradeReferralLevelForUser(inviterId, nextLevel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getReferralLevels(): List<ReferralLevel> =
|
||||||
|
referralLevelProvider.getAvailableReferralLevels()
|
||||||
|
|
||||||
|
|
||||||
|
fun getReferralLevelForUser(userId: Long): ReferralLevel =
|
||||||
|
referralRepo.getReferralLevelForUser(userId)
|
||||||
|
.let { referralLevelProvider.getReferralLevelById(it) }
|
||||||
|
|
||||||
|
fun getReferralStatForUser(userId: Long): ReferralStat {
|
||||||
|
var referral = referralRepo.getReferralByUserId(userId)
|
||||||
|
return ReferralStat(
|
||||||
|
totalInvitee = referralRepo.getTotalInviteeForUser(userId),
|
||||||
|
activeInvitee = referralRepo.getActiveInviteeForUser(userId),
|
||||||
|
totalIncome = referral.totalIncome,
|
||||||
|
availableIncome = referral.availableIncome,
|
||||||
|
holdBalance = referral.holdBalance,
|
||||||
|
referralLink = referral.referralLink
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getInviteeForUser(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee> =
|
||||||
|
referralRepo.getReferralInvitees(userId, pageSize, pageNumber)
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune
|
||||||
|
|
||||||
|
data class ReferralStat(
|
||||||
|
val totalInvitee: Int,
|
||||||
|
val activeInvitee: Int,
|
||||||
|
val totalIncome: Int,
|
||||||
|
val availableIncome: Int,
|
||||||
|
val holdBalance: Int,
|
||||||
|
val referralLink: String,
|
||||||
|
)
|
||||||
@@ -1 +1,7 @@
|
|||||||
|
plugins {
|
||||||
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
|
||||||
|
}
|
||||||
rootProject.name = 'no-copy'
|
rootProject.name = 'no-copy'
|
||||||
|
include 'referral'
|
||||||
|
include 'finance'
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,10 @@ package ru.soune.nocopy;
|
|||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
|
@EnableScheduling
|
||||||
public class NoCopyApplication {
|
public class NoCopyApplication {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
package ru.soune.nocopy.client;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import java.net.URI;
|
||||||
|
import java.net.http.HttpClient;
|
||||||
|
import java.net.http.HttpRequest;
|
||||||
|
import java.net.http.HttpResponse;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@Slf4j
|
||||||
|
public class YooKassaClient {
|
||||||
|
|
||||||
|
@Value("${yookassa.shop-id}")
|
||||||
|
private String shopId;
|
||||||
|
|
||||||
|
@Value("${yookassa.secret-key}")
|
||||||
|
private String secretKey;
|
||||||
|
|
||||||
|
private final HttpClient httpClient = HttpClient.newHttpClient();
|
||||||
|
|
||||||
|
private final ObjectMapper mapper = new ObjectMapper();
|
||||||
|
|
||||||
|
public boolean createAutoPayment(String paymentMethodId, double amount, String description, String userId) {
|
||||||
|
try {
|
||||||
|
String url = "https://api.yookassa.ru/v3/payments";
|
||||||
|
String auth = shopId + ":" + secretKey;
|
||||||
|
String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes(StandardCharsets.UTF_8));
|
||||||
|
|
||||||
|
Map<String, Object> body = new HashMap<>();
|
||||||
|
body.put("amount", Map.of("value", String.format("%.2f", amount),
|
||||||
|
"currency", "RUB"));
|
||||||
|
body.put("payment_method_id", paymentMethodId);
|
||||||
|
body.put("description", description);
|
||||||
|
body.put("capture", true);
|
||||||
|
body.put("metadata", Map.of("user_id", userId, "auto_payment", "true"));
|
||||||
|
|
||||||
|
String requestBody = mapper.writeValueAsString(body);
|
||||||
|
|
||||||
|
HttpRequest request = HttpRequest.newBuilder()
|
||||||
|
.uri(URI.create(url))
|
||||||
|
.header("Content-Type", "application/json")
|
||||||
|
.header("Authorization", "Basic " + encodedAuth)
|
||||||
|
.header("Idempotence-Key", UUID.randomUUID().toString())
|
||||||
|
.POST(HttpRequest.BodyPublishers.ofString(requestBody))
|
||||||
|
.build();
|
||||||
|
|
||||||
|
HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
|
||||||
|
|
||||||
|
if (response.statusCode() == 200 || response.statusCode() == 201) {
|
||||||
|
log.info("Auto payment created: {}", response.body());
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
log.error("Auto payment failed: {} - {}", response.statusCode(), response.body());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error creating auto payment", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,17 +1,51 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import com.vrt.AudioFilePathProvider;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
||||||
|
import com.vrt.fileprotection.documents.DocumentLocalSearch;
|
||||||
|
import com.vrt.fileprotection.image.ImageLocalSearch;
|
||||||
|
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableAutoConfiguration
|
@EnableAutoConfiguration
|
||||||
|
@AllArgsConstructor
|
||||||
public class ApplicationConfig {
|
public class ApplicationConfig {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
PasswordEncoder passwordEncoder() {
|
PasswordEncoder passwordEncoder() {
|
||||||
return new BCryptPasswordEncoder();
|
return new BCryptPasswordEncoder();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public com.vrt.
|
||||||
|
NoCopyFileService noCopyFileService(
|
||||||
|
FileProtector.FileProvider fileProvider,
|
||||||
|
FileProtector.ProcessingListener processingListener,
|
||||||
|
ImageUniqueCheck imageUniqueCheck,
|
||||||
|
ImageLocalSearch imageLocalSearch,
|
||||||
|
AudioLocalSearch audioLocalSearch,
|
||||||
|
AudioFilePathProvider audioFilePathProvider,
|
||||||
|
DocumentLocalSearch documentLocalSearch) {
|
||||||
|
|
||||||
|
return new com.vrt.NoCopyFileService(
|
||||||
|
Collections.emptyList(),
|
||||||
|
fileProvider,
|
||||||
|
processingListener,
|
||||||
|
imageUniqueCheck,
|
||||||
|
imageLocalSearch,
|
||||||
|
audioLocalSearch,
|
||||||
|
audioFilePathProvider,
|
||||||
|
documentLocalSearch
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.web.cors.CorsConfiguration;
|
||||||
|
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||||
|
import org.springframework.web.filter.CorsFilter;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class CorsConfig {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public CorsFilter corsFilter() {
|
||||||
|
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||||
|
CorsConfiguration config = new CorsConfiguration();
|
||||||
|
config.addAllowedOrigin("*");
|
||||||
|
config.addAllowedMethod("*");
|
||||||
|
config.addAllowedHeader("*");
|
||||||
|
source.registerCorsConfiguration("/**", config);
|
||||||
|
|
||||||
|
return new CorsFilter(source);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import ru.soune.nocopy.handler.*;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class HandlerConfig {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public Map<Integer, RequestHandler> handlers(
|
||||||
|
RegRequestHandler reg,
|
||||||
|
LoginRequestHandler login,
|
||||||
|
FileUploadHandler upload,
|
||||||
|
FileEntityHandler file,
|
||||||
|
LogoutRequestHandler logoutHandler,
|
||||||
|
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||||
|
VerifyRegisterUserHandler verifyRegisterUser,
|
||||||
|
AuthRequestHandler authRequestHandler,
|
||||||
|
CompanyHandler companyHandler,
|
||||||
|
TariffHandler tariffHandler,
|
||||||
|
TariffInfoHandler tariffInfoHandler,
|
||||||
|
ReferralHandler referralHandler,
|
||||||
|
ResetPasswordHandler resetPasswordHandler,
|
||||||
|
DaDataHandler daDataHandler,
|
||||||
|
PaymentHandler paymentHandler,
|
||||||
|
CostHandler costHandler,
|
||||||
|
MonitoringHandler monitoringHandler,
|
||||||
|
ViolationHandler violationHandler,
|
||||||
|
ViolationStatisticsHandler violationStatisticsHandler,
|
||||||
|
GlobalSearchHandler globalSearchHandler,
|
||||||
|
ViolationNotionHandler violationNotionHandler
|
||||||
|
) {
|
||||||
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
|
map.put(20001, login);
|
||||||
|
map.put(20002, reg);
|
||||||
|
map.put(20004, upload);
|
||||||
|
map.put(20005, file);
|
||||||
|
map.put(20006, logoutHandler);
|
||||||
|
map.put(20007, imageFoundRequestHandler);
|
||||||
|
map.put(20008, authRequestHandler);
|
||||||
|
map.put(20009, verifyRegisterUser);
|
||||||
|
map.put(20010, resetPasswordHandler);
|
||||||
|
map.put(30000, companyHandler);
|
||||||
|
map.put(30001, tariffHandler);
|
||||||
|
map.put(30002, tariffInfoHandler);
|
||||||
|
map.put(30003, referralHandler);
|
||||||
|
map.put(30004, daDataHandler);
|
||||||
|
map.put(30005, paymentHandler);
|
||||||
|
map.put(30007, monitoringHandler);
|
||||||
|
map.put(30008, costHandler);
|
||||||
|
map.put(30009, violationHandler);
|
||||||
|
map.put(30010, violationStatisticsHandler);
|
||||||
|
map.put(30011, globalSearchHandler);
|
||||||
|
map.put(30012, violationNotionHandler);
|
||||||
|
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.service.file.ImageResizeService;
|
||||||
|
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@Slf4j
|
||||||
|
public class ImageMigration {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileEntityRepository fileRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ImageResizeService imageResizeService;
|
||||||
|
|
||||||
|
@EventListener(ApplicationReadyEvent.class)
|
||||||
|
public void migrate() {
|
||||||
|
List<FileEntity> images = fileRepository.findByThumbnailPathIsNull();
|
||||||
|
|
||||||
|
for (FileEntity file : images) {
|
||||||
|
try {
|
||||||
|
Path path = Paths.get(file.getProtectedFilePath());
|
||||||
|
if (Files.exists(path)) {
|
||||||
|
byte[] data = Files.readAllBytes(path);
|
||||||
|
imageResizeService.generateSizes(file, data);
|
||||||
|
fileRepository.save(file);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error migrating {}: {}", file.getId(), e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
|||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
|
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -20,7 +21,13 @@ public class JacksonConfig {
|
|||||||
@Bean
|
@Bean
|
||||||
@Primary
|
@Primary
|
||||||
public ObjectMapper objectMapper() {
|
public ObjectMapper objectMapper() {
|
||||||
ObjectMapper mapper = new ObjectMapper();
|
ObjectMapper mapper = Jackson2ObjectMapperBuilder.json()
|
||||||
|
.defaultViewInclusion(true)
|
||||||
|
.autoDetectFields(true)
|
||||||
|
.failOnUnknownProperties(false)
|
||||||
|
.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||||
|
.featuresToEnable(SerializationFeature.INDENT_OUTPUT)
|
||||||
|
.build();
|
||||||
|
|
||||||
JavaTimeModule javaTimeModule = new JavaTimeModule();
|
JavaTimeModule javaTimeModule = new JavaTimeModule();
|
||||||
|
|
||||||
@@ -35,6 +42,8 @@ public class JacksonConfig {
|
|||||||
|
|
||||||
mapper.registerModule(javaTimeModule);
|
mapper.registerModule(javaTimeModule);
|
||||||
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
||||||
|
mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
mapper.enable(SerializationFeature.INDENT_OUTPUT);
|
||||||
|
|
||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import ru.soune.ReferralLevelProvider;
|
||||||
|
import ru.soune.ReferralRepo;
|
||||||
|
import ru.soune.ReferralService;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class ReferralConfig {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public ReferralService referralService(ReferralLevelProvider referralLevelProvider, ReferralRepo referralRepo) {
|
||||||
|
return new ReferralService(referralLevelProvider, referralRepo);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.http.client.SimpleClientHttpRequestFactory;
|
||||||
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class RestTemplateConfig {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public RestTemplate restTemplate() {
|
||||||
|
RestTemplate restTemplate = new RestTemplate();
|
||||||
|
|
||||||
|
SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
|
||||||
|
requestFactory.setConnectTimeout(30000);
|
||||||
|
requestFactory.setReadTimeout(60000);
|
||||||
|
restTemplate.setRequestFactory(requestFactory);
|
||||||
|
|
||||||
|
return restTemplate;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,4 +21,15 @@ public class AsyncConfig {
|
|||||||
executor.initialize();
|
executor.initialize();
|
||||||
return executor;
|
return executor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean(name = "taskExecutor")
|
||||||
|
public Executor taskExecutor() {
|
||||||
|
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
||||||
|
executor.setCorePoolSize(3);
|
||||||
|
executor.setMaxPoolSize(5);
|
||||||
|
executor.setQueueCapacity(50);
|
||||||
|
executor.setThreadNamePrefix("global-search-");
|
||||||
|
executor.initialize();
|
||||||
|
return executor;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package ru.soune.nocopy.configuration.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class NoCopyInitializer {
|
||||||
|
|
||||||
|
@EventListener(ApplicationReadyEvent.class)
|
||||||
|
public void initializeOnStartup() {
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package ru.soune.nocopy.configuration.search;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Component
|
||||||
|
@ConfigurationProperties(prefix = "search")
|
||||||
|
public class SearchProperties {
|
||||||
|
private Map<String, EngineConfig> engines;
|
||||||
|
private ProxyConfig proxy;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public static class EngineConfig {
|
||||||
|
private boolean enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public static class ProxyConfig {
|
||||||
|
private boolean enabled;
|
||||||
|
private String host;
|
||||||
|
private int port;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,595 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import com.vrt.NoCopyFileService;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.NoCopyCheckResult;
|
||||||
|
import com.vrt.fileprotection.audio.AudioCheckResult;
|
||||||
|
import com.vrt.fileprotection.documents.DocumentCheckResult;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.core.io.FileSystemResource;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.web.PageableDefault;
|
||||||
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.validation.FieldError;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.*;
|
||||||
|
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||||
|
import ru.soune.nocopy.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.user.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.user.User;
|
||||||
|
import ru.soune.nocopy.exception.*;
|
||||||
|
import ru.soune.nocopy.handler.*;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||||
|
import ru.soune.nocopy.service.file.ProtectionsLimitService;
|
||||||
|
import ru.soune.nocopy.service.register.AuthService;
|
||||||
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ApiController {
|
||||||
|
private final FileUploadService fileUploadService;
|
||||||
|
|
||||||
|
private final Map<Integer, RequestHandler> handlers;
|
||||||
|
|
||||||
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final FileUtil fileUtil;
|
||||||
|
|
||||||
|
private final ProtectionsLimitService protectionsLimitService;
|
||||||
|
|
||||||
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
|
private final CheckCounterService checkCounterService;
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/data")
|
||||||
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
|
@PathVariable("version") int version) {
|
||||||
|
Integer msgId = request.getMsgId();
|
||||||
|
BaseResponse response;
|
||||||
|
|
||||||
|
try {
|
||||||
|
RequestHandler handler = handlers.get(msgId);
|
||||||
|
|
||||||
|
if (handler == null) {
|
||||||
|
response = new BaseResponse(msgId,
|
||||||
|
MessageCode.MSG_ID_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.MSG_ID_NOT_FOUND.getDescription(),
|
||||||
|
new HashMap<>());
|
||||||
|
} else {
|
||||||
|
response = handler.handle(request);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(response);
|
||||||
|
} catch (ValidationException e) {
|
||||||
|
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
||||||
|
} catch (UserNotFoundException e) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.USER_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.USER_NOT_FOUND.getDescription(), new HashMap<>()));
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
|
||||||
|
} catch (NotValidFieldException e) {
|
||||||
|
throw e;
|
||||||
|
} 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,
|
||||||
|
@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 = "findSimilar", required = false, defaultValue = "0") Integer findSimilar) {
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
|
||||||
|
UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber,
|
||||||
|
chunk, findSimilar);
|
||||||
|
|
||||||
|
return buildSuccessResponse(uploadId, chunkNumber, chunk,
|
||||||
|
fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
Map<String, Object> duplicateData = new HashMap<>();
|
||||||
|
duplicateData.put("duplicateFileId", e.duplicateFileId());
|
||||||
|
duplicateData.put("userId", e.userId());
|
||||||
|
duplicateData.put("message", e.getMessage());
|
||||||
|
|
||||||
|
if (uploadId != null) {
|
||||||
|
duplicateData.put("uploadId", uploadId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004,
|
||||||
|
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
|
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
||||||
|
duplicateData
|
||||||
|
));
|
||||||
|
}catch (FileFormatException e){
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error uploading chunk", e);
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private final NoCopyFileService noCopyFileService;
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/files/{fileId}/similar")
|
||||||
|
public ResponseEntity<BaseResponse> findSimilarFiles(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String fileId,
|
||||||
|
@RequestParam(value = "auth_token", required = false) String authToken,
|
||||||
|
@RequestParam(required = false) List<String> similarityLevels,
|
||||||
|
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
|
||||||
|
|
||||||
|
if (fileEntity == null) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(0, MessageCode.INVALID_FIELD.getCode(),
|
||||||
|
MessageCode.INVALID_FIELD.getDescription(), null));
|
||||||
|
}
|
||||||
|
|
||||||
|
BaseResponse response;
|
||||||
|
if ("image".equals(fileEntity.getMimeType())) {
|
||||||
|
Page<SimilarFileDTO> similarFilesPage = fileSimilarityService.findSimilarFiles(
|
||||||
|
fileId, similarityLevels, pageable, authToken);
|
||||||
|
response = buildSuccessResponse(similarFilesPage, MessageCode.SIMILAR_FILES_FOUND);
|
||||||
|
} else {
|
||||||
|
List<SimilarFileDTO> results = processNonImageFile(fileEntity, authToken);
|
||||||
|
log.info("results: {}", results);
|
||||||
|
response = buildSuccessResponse(results, MessageCode.SIMILAR_FILES_FOUND);
|
||||||
|
checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok(response);
|
||||||
|
|
||||||
|
} catch(IllegalArgumentException e) {
|
||||||
|
log.error("Error with file extensions : {}", e.getMessage(), e);
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(MessageCode.FILE_FOR_SEARCH_NOT_VALID.getCode(),
|
||||||
|
MessageCode.FILE_FOR_SEARCH_NOT_VALID.getCode(),
|
||||||
|
MessageCode.FILE_FOR_SEARCH_NOT_VALID.getDescription(), null));
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error finding similar files: {}", e.getMessage(), e);
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(MessageCode.INVALID_FIELD.getCode(),
|
||||||
|
MessageCode.INVALID_FIELD.getCode(),
|
||||||
|
MessageCode.INVALID_FIELD.getDescription(), null));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, String authToken) throws Exception {
|
||||||
|
List<SimilarFileDTO> results = new ArrayList<>();
|
||||||
|
|
||||||
|
FileEntity duplicateByHash = fileSimilarityService.findDuplicateByHash(fileEntity.getFilePath(),
|
||||||
|
fileEntity.getMimeType(), fileEntity.getUserId());
|
||||||
|
log.info("duplicateByHash: {}", duplicateByHash);
|
||||||
|
if (duplicateByHash != null) {
|
||||||
|
results.add(fileSimilarityService.buildDTO(duplicateByHash));
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
File file = new File(fileEntity.getFilePath());
|
||||||
|
FileProtector.Type type = "document".equals(fileEntity.getMimeType()) ?
|
||||||
|
FileProtector.Type.DOC : FileProtector.Type.AUDIO;
|
||||||
|
|
||||||
|
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
|
||||||
|
log.info("checkResult: {}", checkResult);
|
||||||
|
|
||||||
|
switch (checkResult) {
|
||||||
|
case DocumentCheckResult.Success success -> {
|
||||||
|
FileProtector.FileInfo info = success.getInfo();
|
||||||
|
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
|
||||||
|
if (entity != null) {
|
||||||
|
results.add(fileSimilarityService.buildDTO(entity));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case AudioCheckResult.Success success -> {
|
||||||
|
FileProtector.FileInfo info = success.getInfo();
|
||||||
|
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
|
||||||
|
if (entity != null) {
|
||||||
|
results.add(fileSimilarityService.buildDTO(entity));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case DocumentCheckResult.Failed failed ->
|
||||||
|
log.warn("Document check failed: {}", failed.getMessage());
|
||||||
|
case AudioCheckResult.Failed failed ->
|
||||||
|
log.warn("Audio check failed: {}", failed.getMessage());
|
||||||
|
default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
|
||||||
|
}
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse buildSuccessResponse(Page<SimilarFileDTO> page, MessageCode messageCode) {
|
||||||
|
Map<String, Object> responseData = new HashMap<>();
|
||||||
|
responseData.put("content", page.getContent());
|
||||||
|
responseData.put("page", page.getNumber());
|
||||||
|
responseData.put("size", page.getSize());
|
||||||
|
responseData.put("totalElements", page.getTotalElements());
|
||||||
|
responseData.put("totalPages", page.getTotalPages());
|
||||||
|
responseData.put("hasNext", page.hasNext());
|
||||||
|
responseData.put("hasPrevious", page.hasPrevious());
|
||||||
|
|
||||||
|
return new BaseResponse(20004, messageCode.getCode(),
|
||||||
|
messageCode.getDescription(), responseData);
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse buildSuccessResponse(List<SimilarFileDTO> list, MessageCode messageCode) {
|
||||||
|
Map<String, Object> responseData = new HashMap<>();
|
||||||
|
responseData.put("content", list);
|
||||||
|
responseData.put("totalElements", list.size());
|
||||||
|
|
||||||
|
return new BaseResponse(20004, messageCode.getCode(),
|
||||||
|
messageCode.getDescription(), responseData);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
|
public ResponseEntity<BaseResponse> getUploadProgress(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String uploadId) {
|
||||||
|
|
||||||
|
log.info("Getting progress for upload session: {}, version: {}", uploadId, version);
|
||||||
|
|
||||||
|
try {
|
||||||
|
var progress = fileUploadService.getUploadProgress(uploadId);
|
||||||
|
|
||||||
|
UploadProgress responseBody = UploadProgress.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.fileName(progress.getFileName())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.progressPercentage(progress.getProgressPercentage())
|
||||||
|
.filePath(progress.getFilePath())
|
||||||
|
.remainingChunks(progress.getTotalChunks() - progress.getUploadedChunks())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting progress for upload: {}", uploadId, e);
|
||||||
|
|
||||||
|
UploadProgress responseBody = UploadProgress.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to get upload progress: " + e.getMessage(), responseBody));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/files/{uploadId}/complete")
|
||||||
|
public ResponseEntity<BaseResponse> completeUpload(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String uploadId) {
|
||||||
|
|
||||||
|
log.info("Completing upload session: {}, version: {}", uploadId, version);
|
||||||
|
|
||||||
|
try {
|
||||||
|
var progress = fileUploadService.getUploadProgress(uploadId);
|
||||||
|
|
||||||
|
if (progress.getStatus() == UploadStatus.COMPLETED) {
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("Upload already completed")
|
||||||
|
.filePath(progress.getFilePath())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
|
"Upload already completed", responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (progress.getUploadedChunks() < progress.getTotalChunks()) {
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("Not all chunks uploaded")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.INCOMPLETE_UPLOAD.getCode(),
|
||||||
|
"Not all chunks uploaded", responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(progress.getUploadId())
|
||||||
|
.status(progress.getStatus().toString())
|
||||||
|
.uploadedChunks(progress.getUploadedChunks())
|
||||||
|
.totalChunks(progress.getTotalChunks())
|
||||||
|
.message("File assembly in progress")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
|
||||||
|
"File assembly in progress", responseBody));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error completing upload: {}", uploadId, e);
|
||||||
|
|
||||||
|
CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
"Failed to complete upload: " + e.getMessage(), responseBody));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/v{version}/files/download/{fileId}")
|
||||||
|
public ResponseEntity<?> downloadFile(
|
||||||
|
@PathVariable(required = false) String fileId,
|
||||||
|
@PathVariable(required = false) Integer version,
|
||||||
|
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
|
try {
|
||||||
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.TOKEN_IS_NULL.getCode(),
|
||||||
|
MessageCode.TOKEN_IS_NULL.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
|
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||||
|
|
||||||
|
User fileUser = userRepository.findById(entityResponse.getUserId()).orElseThrow();
|
||||||
|
User user = userRepository.findById(userId).orElseThrow();
|
||||||
|
Company companyUser = user.getCompany();
|
||||||
|
|
||||||
|
if (companyUser != null && !fileUser.getCompany().getId().equals(companyUser.getId())) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
|
||||||
|
MessageCode.USER_NOT_HAD_PERMISSION.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (companyUser == null && !entityResponse.getUserId().equals(userId)) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
|
||||||
|
MessageCode.USER_NOT_HAD_PERMISSION.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (entityResponse.getStatus().equals(FileStatus.DELETED)) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("file_status", entityResponse.getStatus());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_DELETE.getCode(),
|
||||||
|
MessageCode.FILE_DELETE.getDescription(),
|
||||||
|
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);
|
||||||
|
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.contentLength(fileSize)
|
||||||
|
.contentType(MediaType.parseMediaType(contentType))
|
||||||
|
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||||
|
"attachment; filename=\"" + entityResponse.getFileName() + "\"")
|
||||||
|
.body(resource);
|
||||||
|
} catch (FileEntityNotFoundException e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("fileId", fileId);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
errorData));
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||||
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
|
||||||
|
errorData));
|
||||||
|
} catch (IOException e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
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(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/check/file_stats")
|
||||||
|
public ResponseEntity<?> checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
Map<String, Object> fileTypeStats = protectionsLimitService.getFileTypeStats(authToken.getUser().getId());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(fileTypeStats);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
|
||||||
|
return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
|
||||||
|
throws IOException {
|
||||||
|
fileEntityService.deleteFromDisk(fileEntity);
|
||||||
|
|
||||||
|
fileEntityService.softDeleteFileWithHash(fileEntity);
|
||||||
|
|
||||||
|
Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
|
||||||
|
|
||||||
|
if (originalFile.isPresent()) {
|
||||||
|
Map<String, String> duplicateInfo = Map.of(
|
||||||
|
"duplicate_file_id", originalFile.get().getId(),
|
||||||
|
"owner_user_id", String.valueOf(originalFile.get().getUserId()));
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004,
|
||||||
|
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
|
"Failed to upload chunk, duplicate",
|
||||||
|
duplicateInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
|
||||||
|
String fileId) {
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.chunkSize(chunk.getSize())
|
||||||
|
.fileId(fileId)
|
||||||
|
.message("Chunk uploaded successfully")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20000,
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
"Chunk uploaded successfully",
|
||||||
|
responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
|
||||||
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
|
.uploadId(uploadId)
|
||||||
|
.chunkNumber(chunkNumber)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004,
|
||||||
|
MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
|
errorMessage,
|
||||||
|
responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
||||||
|
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||||
|
.stream()
|
||||||
|
.map(this::createErrorDetail)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
|
regAnswer.setFieldErrors(fieldErrors);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.INVALID_FIELD.getCode(),
|
||||||
|
MessageCode.INVALID_FIELD.getDescription(), regAnswer));
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<String, String> createErrorDetail(FieldError fieldError) {
|
||||||
|
Map<String, String> errorDetail = new HashMap<>();
|
||||||
|
errorDetail.put("field", fieldError.getField());
|
||||||
|
errorDetail.put("code", fieldError.getCode() != null ? fieldError.getCode() : "VALIDATION_ERROR");
|
||||||
|
errorDetail.put("message", fieldError.getDefaultMessage());
|
||||||
|
|
||||||
|
if (fieldError.getRejectedValue() != null &&
|
||||||
|
!fieldError.getField().toLowerCase().contains("password")) {
|
||||||
|
errorDetail.put("rejected_value", fieldError.getRejectedValue().toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return errorDetail;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private String determineContentType(Path filePath) throws IOException {
|
||||||
|
String contentType = Files.probeContentType(filePath);
|
||||||
|
if (contentType == null) {
|
||||||
|
contentType = "application/octet-stream";
|
||||||
|
}
|
||||||
|
return contentType;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.dto.AuthResponse;
|
|
||||||
import ru.soune.nocopy.dto.LoginRequest;
|
|
||||||
import ru.soune.nocopy.dto.LoginResponse;
|
|
||||||
import ru.soune.nocopy.dto.RegisterRequest;
|
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
|
||||||
import ru.soune.nocopy.exception.TokenNotFoundException;
|
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.service.AuthService;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("v1/api/auth")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class AuthController {
|
|
||||||
|
|
||||||
private final AuthService authService;
|
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
@PostMapping("/register")
|
|
||||||
public ResponseEntity<AuthResponse> register(@Valid @RequestBody RegisterRequest registerRequest) {
|
|
||||||
AuthToken authToken = authService.register(registerRequest);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(new AuthResponse(true, "success.user.register", authToken.getToken(),
|
|
||||||
authToken.getExpiresAt()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/login")
|
|
||||||
public ResponseEntity<LoginResponse> login(@Valid @RequestBody LoginRequest request) {
|
|
||||||
AuthToken login = authService.login(request);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(new LoginResponse(true, login.getUser().getEmail(),
|
|
||||||
login.getToken(),login.getExpiresAt().toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/logout")
|
|
||||||
public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
|
|
||||||
Optional<AuthToken> opToken = authTokenRepository.findByToken(token);
|
|
||||||
|
|
||||||
if (opToken.isEmpty()) {
|
|
||||||
throw new TokenNotFoundException("Token not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
authService.logout(token);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(Map.of("success", true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.core.io.Resource;
|
||||||
|
import org.springframework.http.*;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import ru.soune.nocopy.dto.file.CheckStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
|
import ru.soune.nocopy.entity.user.ProtectedFileCheck;
|
||||||
|
import ru.soune.nocopy.entity.user.User;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
|
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||||
|
import ru.soune.nocopy.service.file.FileStorageService;
|
||||||
|
import ru.soune.nocopy.service.file.ImageResizeService;
|
||||||
|
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.net.URLEncoder;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/files")
|
||||||
|
@Slf4j
|
||||||
|
public class FileController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileStorageService fileStorageService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileEntityRepository fileRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private CheckCounterService checkCounterService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private UserRepository userRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ImageResizeService imageResizeService;
|
||||||
|
|
||||||
|
@GetMapping("/public/{fileId}")
|
||||||
|
public ResponseEntity<Resource> getPublicFile(@PathVariable String fileId) {
|
||||||
|
try {
|
||||||
|
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new FileNotFoundException("Not found: " + fileId));
|
||||||
|
|
||||||
|
Path filePath = Paths.get(fileEntity.getFilePath());
|
||||||
|
if (!Files.exists(filePath)) {
|
||||||
|
log.error("Not on disk: {}", fileEntity.getFilePath());
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
MediaType mediaType = getMediaType(fileEntity);
|
||||||
|
|
||||||
|
ContentDisposition contentDisposition = ContentDisposition.inline()
|
||||||
|
.filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.contentType(mediaType)
|
||||||
|
.contentLength(Files.size(filePath))
|
||||||
|
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
|
||||||
|
.header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600")
|
||||||
|
.body(resource);
|
||||||
|
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
log.warn("Not on disk: {}", fileId);
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error("Read file exception: {}", fileId, e);
|
||||||
|
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private MediaType getMediaType(FileEntity fileEntity) {
|
||||||
|
try {
|
||||||
|
return MediaType.parseMediaType(fileEntity.getMimeType());
|
||||||
|
} catch (InvalidMediaTypeException e) {
|
||||||
|
String extension = fileEntity.getFileExtension().toLowerCase();
|
||||||
|
switch (extension) {
|
||||||
|
case "jpg":
|
||||||
|
case "jpeg":
|
||||||
|
return MediaType.IMAGE_JPEG;
|
||||||
|
case "png":
|
||||||
|
return MediaType.IMAGE_PNG;
|
||||||
|
case "pdf":
|
||||||
|
return MediaType.APPLICATION_PDF;
|
||||||
|
default:
|
||||||
|
return MediaType.APPLICATION_OCTET_STREAM;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/protected/{fileId}/{type}")
|
||||||
|
public ResponseEntity<Resource> getProtectedFile(
|
||||||
|
@PathVariable String fileId, @PathVariable String type) throws IOException {
|
||||||
|
|
||||||
|
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new RuntimeException("File not found"));
|
||||||
|
|
||||||
|
String path = imageResizeService.getPath(fileEntity, type);
|
||||||
|
|
||||||
|
Resource resource = fileStorageService.loadFileAsResource(path);
|
||||||
|
|
||||||
|
if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
|
||||||
|
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
|
||||||
|
throw new RuntimeException("File is not protected");
|
||||||
|
}
|
||||||
|
|
||||||
|
String fileName = fileEntity.getOriginalFileName().replace("." +
|
||||||
|
fileEntity.getFileExtension(), "") + "_nocopy_protected" +
|
||||||
|
"." + fileEntity.getFileExtension();
|
||||||
|
String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8)
|
||||||
|
.replace("+", "%20");
|
||||||
|
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
||||||
|
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||||
|
"inline; filename*=UTF-8''" + encodedFileName)
|
||||||
|
.body(resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("check-file/status/{userId}")
|
||||||
|
public ResponseEntity<CheckStatus> getStatus(@PathVariable Long userId) {
|
||||||
|
CheckStatus status = checkCounterService.getCurrentStatus(userId);
|
||||||
|
|
||||||
|
return ResponseEntity.ok(status);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("check-file/update-limit/{userId}/{limit}")
|
||||||
|
public ResponseEntity<ProtectedFileCheck> getStatus(@PathVariable Long userId, @PathVariable Integer limit) {
|
||||||
|
User user = userRepository.findById(userId).orElseThrow();
|
||||||
|
ProtectedFileCheck protectedFileCheck = checkCounterService.updateLimit(user, limit);
|
||||||
|
|
||||||
|
return ResponseEntity
|
||||||
|
.ok()
|
||||||
|
.body(protectedFileCheck);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import ru.soune.nocopy.dto.search.GlobalSearchStartRequest;
|
||||||
|
import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
|
||||||
|
import ru.soune.nocopy.dto.search.GlobalSearchStatusResponse;
|
||||||
|
import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.search.GlobalSearchTask;
|
||||||
|
import ru.soune.nocopy.entity.search.SearchStatus;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
|
||||||
|
import ru.soune.nocopy.service.register.AuthService;
|
||||||
|
import ru.soune.nocopy.service.search.GlobalSearchService;
|
||||||
|
import ru.soune.nocopy.service.violation.ViolationService;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/v1/global-search")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class GlobalSearchController {
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final GlobalSearchService globalSearchService;
|
||||||
|
|
||||||
|
private final GlobalSearchTaskRepository globalSearchTaskRepository;
|
||||||
|
|
||||||
|
private final GlobalSearchTaskRepository searchTaskRepository;
|
||||||
|
|
||||||
|
private final ViolationService violationService;
|
||||||
|
|
||||||
|
@PostMapping("/start")
|
||||||
|
public ResponseEntity<?> startSearch(
|
||||||
|
@RequestBody GlobalSearchStartRequest request,
|
||||||
|
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
GlobalSearchStartResponse response = new GlobalSearchStartResponse();
|
||||||
|
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
|
|
||||||
|
List<FileEntity> filesToProcess = globalSearchService.getFilesToProcess(request, userId);
|
||||||
|
|
||||||
|
if (filesToProcess.isEmpty()) return ResponseEntity.ok().body("Files for search not found");
|
||||||
|
|
||||||
|
String taskId = globalSearchService.startSearch(request, userId, filesToProcess);
|
||||||
|
|
||||||
|
Optional<GlobalSearchTask> taskOptional = globalSearchTaskRepository.findById(taskId);
|
||||||
|
|
||||||
|
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
||||||
|
|
||||||
|
GlobalSearchTask task = taskOptional.orElseThrow();
|
||||||
|
|
||||||
|
response.setTaskId(taskId);
|
||||||
|
response.setStatus(SearchStatus.ACCEPTED.name());
|
||||||
|
response.setTotalFiles(task.getTotalFiles());
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/actual-task")
|
||||||
|
public ResponseEntity<?> getStatus(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
|
|
||||||
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
Optional<GlobalSearchTask> taskOptional;
|
||||||
|
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
|
|
||||||
|
taskOptional = searchTaskRepository.findByUserIdAndStatus(userId,
|
||||||
|
"PROCESSING");
|
||||||
|
|
||||||
|
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok(taskOptional.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/violation-summary")
|
||||||
|
public ResponseEntity<?> getSummary(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
|
|
||||||
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
List<FileViolationSummaryDTO> fileViolationsSummary;
|
||||||
|
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
|
|
||||||
|
fileViolationsSummary =
|
||||||
|
violationService.getFileViolationsSummary(userId);
|
||||||
|
|
||||||
|
if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found");
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok(fileViolationsSummary);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/status/{taskId}")
|
||||||
|
public ResponseEntity<?> getStatus(@PathVariable String taskId,
|
||||||
|
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
|
|
||||||
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
GlobalSearchStatusResponse response;
|
||||||
|
|
||||||
|
try {
|
||||||
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
|
|
||||||
|
Optional<GlobalSearchTask> taskOptional = searchTaskRepository.findByTaskIdAndUserId(taskId, userId);
|
||||||
|
|
||||||
|
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
||||||
|
|
||||||
|
GlobalSearchTask task = taskOptional.orElseThrow();
|
||||||
|
|
||||||
|
int progress = task.getTotalFiles() > 0 ? task.getProcessedFiles() * 100 / task.getTotalFiles() : 0;
|
||||||
|
|
||||||
|
response = new GlobalSearchStatusResponse();
|
||||||
|
response.setTaskId(taskId);
|
||||||
|
response.setStatus(task.getStatus());
|
||||||
|
response.setProgress(progress);
|
||||||
|
} catch (NotFoundAuthToken e) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok(response);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,14 +1,52 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api")
|
@RequestMapping("check/api")
|
||||||
public class HealtCheckController {
|
public class HealtCheckController {
|
||||||
|
|
||||||
@GetMapping("/healt")
|
@GetMapping("/healt")
|
||||||
public HttpStatus healtCheck() {
|
public HttpStatus healtCheck() {
|
||||||
return HttpStatus.OK;
|
return HttpStatus.OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Value("${BUILD_TIME_BACK:unknown}")
|
||||||
|
private String buildTimeBack;
|
||||||
|
|
||||||
|
@GetMapping("/build")
|
||||||
|
public BuildInfo getBuildInfo() {
|
||||||
|
return new BuildInfo(buildTimeBack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/api/debug/memory")
|
||||||
|
public Map<String, String> getMemoryInfo() {
|
||||||
|
Runtime runtime = Runtime.getRuntime();
|
||||||
|
long mb = 1024 * 1024;
|
||||||
|
|
||||||
|
Map<String, String> info = new HashMap<>();
|
||||||
|
info.put("maxMemory (MB)", String.valueOf(runtime.maxMemory() / mb));
|
||||||
|
info.put("totalMemory (MB)", String.valueOf(runtime.totalMemory() / mb));
|
||||||
|
info.put("freeMemory (MB)", String.valueOf(runtime.freeMemory() / mb));
|
||||||
|
info.put("usedMemory (MB)", String.valueOf((runtime.totalMemory() - runtime.freeMemory()) / mb));
|
||||||
|
info.put("availableProcessors", String.valueOf(runtime.availableProcessors()));
|
||||||
|
|
||||||
|
info.put("JAVA_TOOL_OPTIONS", System.getenv("JAVA_TOOL_OPTIONS"));
|
||||||
|
info.put("JAVA_OPTS", System.getenv("JAVA_OPTS"));
|
||||||
|
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
|
||||||
|
static class BuildInfo {
|
||||||
|
public String buildTimeBack;
|
||||||
|
|
||||||
|
public BuildInfo(String buildTimeBack) {
|
||||||
|
this.buildTimeBack = buildTimeBack;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,119 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
|
||||||
|
import ru.soune.nocopy.entity.payment.Payment;
|
||||||
|
import ru.soune.nocopy.exception.PaymentNotFoundException;
|
||||||
|
import ru.soune.nocopy.exception.TariffNotFoundException;
|
||||||
|
import ru.soune.nocopy.exception.UserNotFoundException;
|
||||||
|
import ru.soune.nocopy.service.payment.PaymentService;
|
||||||
|
import ru.soune.nocopy.service.register.AuthService;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/payments")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Slf4j
|
||||||
|
public class PaymentController {
|
||||||
|
|
||||||
|
private final PaymentService paymentService;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
@PostMapping("/create")
|
||||||
|
public ResponseEntity<?> createPayment(@RequestParam String email, @RequestParam Long tariffId,
|
||||||
|
@RequestParam String operationType, @RequestParam String operationUuid) {
|
||||||
|
try {
|
||||||
|
Payment payment = paymentService.createPayment(email, tariffId, operationType, operationUuid);
|
||||||
|
|
||||||
|
return ResponseEntity.ok(payment);
|
||||||
|
} catch (TariffNotFoundException e) {
|
||||||
|
return ResponseEntity
|
||||||
|
.status(HttpStatus.NOT_FOUND)
|
||||||
|
.body(Map.of("error", "Tariff not found", "message", e.getMessage()));
|
||||||
|
} catch (UserNotFoundException e) {
|
||||||
|
return ResponseEntity
|
||||||
|
.status(HttpStatus.NOT_FOUND)
|
||||||
|
.body(Map.of("error", "User not found", "message", e.getMessage()));
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ResponseEntity
|
||||||
|
.status(HttpStatus.INTERNAL_SERVER_ERROR)
|
||||||
|
.body(Map.of("error", "Internal server error", "message", e.getMessage()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("webhook/yookassa")
|
||||||
|
public void handleYooKassaNotification(@RequestBody Map<String, Object> notification) {
|
||||||
|
try {
|
||||||
|
paymentService.handlePaymentNotification(notification);
|
||||||
|
log.info("Notification from yookassa: " + notification);
|
||||||
|
} catch (PaymentNotFoundException e) {
|
||||||
|
log.error("Error processing payment notification", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/auto-renewal")
|
||||||
|
public ResponseEntity<?> disableAutoRenewal(@RequestParam(value = "renewal") Boolean renewal,
|
||||||
|
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
|
try {
|
||||||
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
paymentService.changeAutoRenewal(authService.useUserAuthToken(tokenHeader), renewal);
|
||||||
|
return ResponseEntity.ok(Map.of("message", "Auto-renewal disabled"));
|
||||||
|
} catch (UserNotFoundException e) {
|
||||||
|
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
||||||
|
.body(Map.of("error", e.getMessage()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/methods/{paymentMethodId}")
|
||||||
|
public ResponseEntity<?> deletePaymentMethod(@RequestHeader(value = "Authorization", required = false) String tokenHeader,
|
||||||
|
@PathVariable String paymentMethodId) {
|
||||||
|
try {
|
||||||
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
paymentService.deletePaymentMethod(authService.useUserAuthToken(tokenHeader), paymentMethodId);
|
||||||
|
return ResponseEntity.ok(Map.of("message", "Payment method deleted"));
|
||||||
|
} catch (UserNotFoundException e) {
|
||||||
|
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
||||||
|
.body(Map.of("error", e.getMessage()));
|
||||||
|
} catch (RuntimeException e) {
|
||||||
|
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
|
||||||
|
.body(Map.of("error", e.getMessage()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/methods")
|
||||||
|
public ResponseEntity<?> getPaymentMethods(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
|
try {
|
||||||
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok(paymentService.getUserPaymentMethods(
|
||||||
|
authService.useUserAuthToken(tokenHeader)));
|
||||||
|
} catch (UserNotFoundException e) {
|
||||||
|
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
||||||
|
.body(Map.of("error", e.getMessage()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,209 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import ru.soune.nocopy.dto.payout.*;
|
||||||
|
import ru.soune.nocopy.entity.payout.BankTransferPayoutMethod;
|
||||||
|
import ru.soune.nocopy.entity.payout.CardPayoutMethod;
|
||||||
|
import ru.soune.nocopy.entity.payout.PayoutRequest;
|
||||||
|
import ru.soune.nocopy.entity.payout.PayoutType;
|
||||||
|
import ru.soune.nocopy.entity.user.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.user.User;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
import ru.soune.nocopy.service.payout.PayoutMethodService;
|
||||||
|
import ru.soune.nocopy.service.payout.PayoutRequestService;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/payouts")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Slf4j
|
||||||
|
public class PayoutController {
|
||||||
|
|
||||||
|
private final PayoutRequestService payoutRequestService;
|
||||||
|
|
||||||
|
private final PayoutMethodService payoutMethodService;
|
||||||
|
|
||||||
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Create payout
|
||||||
|
*/
|
||||||
|
@PostMapping("/create-request")
|
||||||
|
public ResponseEntity<PayoutRequest> createPayoutRequest(@RequestHeader("Authorization") String tokenHeader,
|
||||||
|
@Valid @RequestBody PayoutRequestDTO request) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
PayoutRequest payoutRequest = payoutRequestService.createPayoutRequest(user.getId(), request);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.CREATED).body(payoutRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Completed payout
|
||||||
|
*/
|
||||||
|
@PostMapping("/requests/{requestId}/process")
|
||||||
|
public ResponseEntity<PayoutRequest> processPayoutRequest(@PathVariable Long requestId) {
|
||||||
|
PayoutRequest processed = payoutRequestService.processRequest(requestId);
|
||||||
|
|
||||||
|
return ResponseEntity.ok(processed);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Cancel payout
|
||||||
|
*/
|
||||||
|
@PostMapping("/requests/{requestId}/cancel")
|
||||||
|
public ResponseEntity<PayoutRequest> cancelPayoutRequest(@PathVariable Long requestId,
|
||||||
|
@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
PayoutRequest cancelled = payoutRequestService.cancelPayoutRequest(user.getId(), requestId);
|
||||||
|
|
||||||
|
return ResponseEntity.ok(cancelled);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Get user payouts
|
||||||
|
*/
|
||||||
|
@GetMapping("/requests")
|
||||||
|
public ResponseEntity<List<PayoutRequest>> getUserRequests(@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
return ResponseEntity.ok(payoutRequestService.getUserPayoutRequests(user.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Get payout by id
|
||||||
|
*/
|
||||||
|
@GetMapping("/requests/{requestId}")
|
||||||
|
public ResponseEntity<PayoutRequest> getPayoutRequest(@PathVariable Long requestId,
|
||||||
|
@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
return ResponseEntity.ok(payoutRequestService.getPayoutRequest(user.getId(), requestId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Get payout by id
|
||||||
|
*/
|
||||||
|
@GetMapping("user/payout-methods")
|
||||||
|
public ResponseEntity<List<PayoutMethodDTO>> getUserMethods(@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
return ResponseEntity.ok(payoutMethodService.getUserMethods(user.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Get payout-methods
|
||||||
|
*/
|
||||||
|
@GetMapping("/payout-methods")
|
||||||
|
public ResponseEntity<List<PayoutMethodTypeDTO>> getAvailableMethodTypes() {
|
||||||
|
List<PayoutMethodTypeDTO> types = Arrays.stream(PayoutType.values())
|
||||||
|
.map(type -> PayoutMethodTypeDTO.builder()
|
||||||
|
.code(type.name())
|
||||||
|
.name(type.getDisplayName())
|
||||||
|
.build())
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
return ResponseEntity.ok(types);
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
add card method by userId
|
||||||
|
*/
|
||||||
|
@PostMapping("/payout-method/card")
|
||||||
|
public ResponseEntity<PayoutMethodDTO> addCardMethod(@Valid @RequestBody AddCardRequest request,
|
||||||
|
@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
CardPayoutMethod method = payoutMethodService.addCardMethod(user.getId(), request);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.CREATED)
|
||||||
|
.body(payoutMethodService.convertToDto(method));
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
add bank payout-method
|
||||||
|
*/
|
||||||
|
@PostMapping("/payout-method/bank-transfer")
|
||||||
|
public ResponseEntity<PayoutMethodDTO> addBankTransferMethod(@Valid @RequestBody AddBankTransferRequest request,
|
||||||
|
@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
BankTransferPayoutMethod method = payoutMethodService.addBankTransferMethod(user.getId(), request);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.CREATED)
|
||||||
|
.body(payoutMethodService.convertToDto(method));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
set default bank payout-method
|
||||||
|
*/
|
||||||
|
@PutMapping("/payout-method/{methodId}/default")
|
||||||
|
public ResponseEntity<Void> setDefaultMethod(@PathVariable Long methodId,
|
||||||
|
@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
payoutMethodService.setDefaultMethod(user.getId(), methodId);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import ru.soune.nocopy.configuration.search.SearchProperties;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.search.config.SearchSettingsDto;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/search/settings")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class SearchSettingsController {
|
||||||
|
|
||||||
|
private final SearchProperties searchProperties;
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public ResponseEntity<?> getSettings() {
|
||||||
|
SearchSettingsDto dto = new SearchSettingsDto();
|
||||||
|
|
||||||
|
dto.setEngines(Map.of(
|
||||||
|
"yandex", searchProperties.getEngines().get("yandex").isEnabled(),
|
||||||
|
"google", searchProperties.getEngines().get("google").isEnabled()));
|
||||||
|
|
||||||
|
dto.setProxyEnabled(searchProperties.getProxy().isEnabled());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(BaseResponse.builder()
|
||||||
|
.messageDesc("Success")
|
||||||
|
.messageBody(dto)
|
||||||
|
.build());
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping
|
||||||
|
public ResponseEntity<?> updateSettings(@RequestBody SearchSettingsDto settings) {
|
||||||
|
if (settings.getEngines() != null) {
|
||||||
|
settings.getEngines().forEach((key, value) -> {
|
||||||
|
if (searchProperties.getEngines().containsKey(key)) {
|
||||||
|
searchProperties.getEngines().get(key).setEnabled(value);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (settings.getProxyEnabled() != null) {
|
||||||
|
searchProperties.getProxy().setEnabled(settings.getProxyEnabled());
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info("Settings updated: {}", settings);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(BaseResponse.builder()
|
||||||
|
.messageDesc("Settings updated")
|
||||||
|
.build());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("v1/api/content")
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class UserContentController {
|
|
||||||
}
|
|
||||||
@@ -2,20 +2,34 @@ package ru.soune.nocopy.controller;
|
|||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import ru.soune.nocopy.dto.ChangePasswordRequest;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import ru.soune.nocopy.dto.UserDTO;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.UserRequest;
|
import ru.soune.nocopy.dto.register.ChangePasswordRequest;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.dto.register.RegRequest;
|
||||||
|
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||||
|
import ru.soune.nocopy.dto.user.UserDTO;
|
||||||
|
import ru.soune.nocopy.dto.user.UserRequest;
|
||||||
|
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||||
|
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||||
|
import ru.soune.nocopy.entity.user.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.user.User;
|
||||||
import ru.soune.nocopy.exception.InvalidUserEmail;
|
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.mapper.UserMapper;
|
import ru.soune.nocopy.mapper.UserMapper;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.UserService;
|
import ru.soune.nocopy.service.file.FileStatsService;
|
||||||
|
import ru.soune.nocopy.service.register.AuthService;
|
||||||
|
import ru.soune.nocopy.service.tariff.TariffService;
|
||||||
|
import ru.soune.nocopy.service.user.UserService;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@@ -31,12 +45,21 @@ public class UserController {
|
|||||||
|
|
||||||
private final UserMapper userMapper;
|
private final UserMapper userMapper;
|
||||||
|
|
||||||
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
|
private final TariffService tariffService;
|
||||||
|
|
||||||
|
private final FileStatsService fileStatsService;
|
||||||
|
|
||||||
@GetMapping("/all")
|
@GetMapping("/all")
|
||||||
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
||||||
List<UserDTO> allUsers = userRepository.findAll().stream()
|
List<UserDTO> allUsers = userRepository.findAll().stream()
|
||||||
.map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.getIsActive(),
|
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
|
||||||
u.getPhone(), u.getGenderType(),
|
u.getPhone(), u.getGenderType(),
|
||||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
|
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
||||||
|
null, null))
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
return ResponseEntity.ok(allUsers);
|
return ResponseEntity.ok(allUsers);
|
||||||
@@ -49,26 +72,69 @@ public class UserController {
|
|||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
if (tokenOptional.isPresent()) {
|
||||||
|
User user = userRepository.findByEmail(email);
|
||||||
|
|
||||||
if (authToken != null) {
|
if (user != null) {
|
||||||
Optional<User> user = userRepository.findByEmail(email);
|
UserDTO userDTO = userMapper.toDTO(user);
|
||||||
//TODO add mapper
|
|
||||||
if (user.isPresent()) {
|
|
||||||
UserDTO userDTO = userMapper.toDTO(user.get());
|
|
||||||
userDTO.setEmail(email);
|
userDTO.setEmail(email);
|
||||||
userDTO.setFullName(user.get().getFullName());
|
userDTO.setFullName(user.getFullName());
|
||||||
userDTO.setCompany(user.get().getCompany());
|
|
||||||
userDTO.setPhone(user.get().getPhone());
|
if (user.getCompany() != null) {
|
||||||
userDTO.setGenderType(user.get().getGenderType());
|
userDTO.setCompany(user.getCompany().getCompanyName());
|
||||||
userDTO.setBirthday(user.get().getBirthday());
|
}
|
||||||
userDTO.setCreatedAt(user.get().getCreatedAt());
|
|
||||||
userDTO.setSubscriptionType(user.get().getSubscriptionType());
|
if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
|
||||||
userDTO.setActive(user.get().getIsActive());
|
userDTO.setTariffs(tariffService.getTariffByAccountType(user));
|
||||||
|
|
||||||
|
Long fileOnDisk = user.canManageCompanySettings() ?
|
||||||
|
fileStatsService.calculateCompanyFileSize(user.getId()):
|
||||||
|
fileStatsService.calculateUserFileSize(user.getId());
|
||||||
|
|
||||||
|
Integer filesCount = user.canManageCompanySettings() ?
|
||||||
|
fileStatsService.filesCompanyCount(user.getId()):
|
||||||
|
fileStatsService.filesUserCount(user.getId());
|
||||||
|
|
||||||
|
TariffInfo personalTariffInfo;
|
||||||
|
|
||||||
|
if (user.getCompany() == null) {
|
||||||
|
personalTariffInfo = user.getPersonalTariffInfo();
|
||||||
|
} else {
|
||||||
|
personalTariffInfo = user.getCompany().getTariffInfo();
|
||||||
|
}
|
||||||
|
|
||||||
|
Tariff tariff = personalTariffInfo.getTariff();
|
||||||
|
|
||||||
|
TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
|
||||||
|
.id(personalTariffInfo.getId())
|
||||||
|
.tariffName(tariff.getName())
|
||||||
|
.status(personalTariffInfo.getStatus().name())
|
||||||
|
.tariffId(tariff.getId())
|
||||||
|
.currentFileCounts(filesCount)
|
||||||
|
.maxFileCounts(tariff.getMaxFilesCount())
|
||||||
|
.currentFileOnDisk(fileOnDisk)
|
||||||
|
.maxFileOnDisk(tariff.getDiskSize())
|
||||||
|
.startTariff(personalTariffInfo.getStartTariff())
|
||||||
|
.endTariff(personalTariffInfo.getEndTariff())
|
||||||
|
.tokens(personalTariffInfo.getTokens() + personalTariffInfo.getBoughtTokens())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
userDTO.setTariffInfo(infoDTO);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
userDTO.setPhone(user.getPhone());
|
||||||
|
userDTO.setGenderType(user.getGenderType());
|
||||||
|
userDTO.setBirthday(user.getBirthday());
|
||||||
|
userDTO.setCreatedAt(user.getCreatedAt());
|
||||||
|
userDTO.setSubscriptionType(user.getSubscriptionType());
|
||||||
|
userDTO.setActive(user.isActive());
|
||||||
|
userDTO.setPermission(user.getUserPermissions());
|
||||||
|
|
||||||
return ResponseEntity.ok(userDTO);
|
return ResponseEntity.ok(userDTO);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
}
|
}
|
||||||
|
|
||||||
return ResponseEntity.notFound().build();
|
return ResponseEntity.notFound().build();
|
||||||
@@ -108,4 +174,46 @@ public class UserController {
|
|||||||
|
|
||||||
return ResponseEntity.ok(userService.updateUser(userRequest, user));
|
return ResponseEntity.ok(userService.updateUser(userRequest, user));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/create-user")
|
||||||
|
public ResponseEntity<User> addUser(@RequestBody RegRequest registerRequest) {
|
||||||
|
|
||||||
|
if (userRepository.existsByEmail(registerRequest.getEmail()) ||
|
||||||
|
userRepository.existsByPhone(registerRequest.getPhone())) {
|
||||||
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
|
regAnswer.setFieldErrors(Arrays.asList(Map.of("email", registerRequest.getEmail())));
|
||||||
|
regAnswer.setFieldErrors(Arrays.asList(Map.of("phone", registerRequest.getPhone())));
|
||||||
|
|
||||||
|
throw new NotValidFieldException("User already exists with email:" + registerRequest.getEmail() + " or phone: " +
|
||||||
|
registerRequest.getPhone(), new BaseResponse(2,
|
||||||
|
MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getCode(),
|
||||||
|
MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer));
|
||||||
|
}
|
||||||
|
|
||||||
|
User user = new User();
|
||||||
|
user.setFullName(registerRequest.getFullName());
|
||||||
|
user.setEmail(registerRequest.getEmail());
|
||||||
|
user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
|
||||||
|
user.setActive(true);
|
||||||
|
user.setEmailVerified(true);
|
||||||
|
|
||||||
|
if (registerRequest.getPhone() != null) {
|
||||||
|
user.setPhone(registerRequest.getPhone());
|
||||||
|
}
|
||||||
|
|
||||||
|
User savedUser = userRepository.save(user);
|
||||||
|
|
||||||
|
AuthToken authToken = authService.generateAuthToken(savedUser);
|
||||||
|
|
||||||
|
authTokenRepository.save(authToken);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(savedUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/delete-user/{userId}")
|
||||||
|
public ResponseEntity<?> addUser(@PathVariable Long userId) {
|
||||||
|
userRepository.deleteById(userId);
|
||||||
|
return ResponseEntity.ok().body(Map.of("userId", userId, "deleted", "true"));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,172 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller.file;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.core.io.Resource;
|
|
||||||
import org.springframework.core.io.UrlResource;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
|
||||||
import org.springframework.http.MediaType;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/files")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class FileDownloadController {
|
|
||||||
|
|
||||||
private final FileEntityService fileEntityService;
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Скачать файл по ID FileEntity
|
|
||||||
*/
|
|
||||||
@GetMapping("/download/{fileId}")
|
|
||||||
public ResponseEntity<Resource> downloadFile(
|
|
||||||
@PathVariable String fileId,
|
|
||||||
@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
|
||||||
|
|
||||||
if (!fileInfo.getUserId().equals(userId)) {
|
|
||||||
return ResponseEntity.status(403).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!fileInfo.isExistsOnDisk()) {
|
|
||||||
return ResponseEntity.status(404)
|
|
||||||
.body(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Path filePath = Paths.get(fileInfo.getFilePath());
|
|
||||||
Resource resource = new UrlResource(filePath.toUri());
|
|
||||||
|
|
||||||
if (!resource.exists()) {
|
|
||||||
return ResponseEntity.status(404).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
String contentType = determineContentType(filePath);
|
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
|
||||||
.contentType(MediaType.parseMediaType(contentType))
|
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
|
||||||
"attachment; filename=\"" + fileInfo.getOriginalFileName() + "\"")
|
|
||||||
.header(HttpHeaders.CONTENT_LENGTH, String.valueOf(fileInfo.getFileSize()))
|
|
||||||
.body(resource);
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401).build();
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error downloading file", e);
|
|
||||||
return ResponseEntity.status(500).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Получить предпросмотр файла (если поддерживается)
|
|
||||||
*/
|
|
||||||
@GetMapping("/preview/{fileId}")
|
|
||||||
public ResponseEntity<Resource> previewFile(
|
|
||||||
@PathVariable String fileId,
|
|
||||||
@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
|
||||||
|
|
||||||
if (!fileInfo.getUserId().equals(userId)) {
|
|
||||||
return ResponseEntity.status(403).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isPreviewSupported(fileInfo.getMimeType())) {
|
|
||||||
return ResponseEntity.status(415)
|
|
||||||
.body(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Path filePath = Paths.get(fileInfo.getFilePath());
|
|
||||||
Resource resource = new UrlResource(filePath.toUri());
|
|
||||||
|
|
||||||
if (!resource.exists()) {
|
|
||||||
return ResponseEntity.status(404).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
String contentType = determineContentType(filePath);
|
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
|
||||||
.contentType(MediaType.parseMediaType(contentType))
|
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
|
||||||
"inline; filename=\"" + fileInfo.getOriginalFileName() + "\"")
|
|
||||||
.body(resource);
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401).build();
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error previewing file", e);
|
|
||||||
return ResponseEntity.status(500).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Получить информацию о файле для фронтенда
|
|
||||||
*/
|
|
||||||
@GetMapping("/info/{fileId}")
|
|
||||||
public ResponseEntity<FileEntityResponse> getFileInfo(
|
|
||||||
@PathVariable String fileId,
|
|
||||||
@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
|
||||||
|
|
||||||
if (!fileInfo.getUserId().equals(userId)) {
|
|
||||||
return ResponseEntity.status(403).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(fileInfo);
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401).build();
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error getting file info", e);
|
|
||||||
return ResponseEntity.status(500).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String determineContentType(Path filePath) throws IOException {
|
|
||||||
String contentType = Files.probeContentType(filePath);
|
|
||||||
if (contentType == null) {
|
|
||||||
contentType = "application/octet-stream";
|
|
||||||
}
|
|
||||||
return contentType;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isPreviewSupported(String mimeType) {
|
|
||||||
if (mimeType == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return mimeType.startsWith("image/") ||
|
|
||||||
mimeType.startsWith("text/") ||
|
|
||||||
mimeType.equals("application/pdf") ||
|
|
||||||
mimeType.startsWith("video/") ||
|
|
||||||
mimeType.startsWith("audio/");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Long getUserIdFromToken(String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
|
||||||
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
|
||||||
return authToken.getUser().getId();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,210 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller.file;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import ru.soune.nocopy.dto.file.FileApiResponse;
|
|
||||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
|
||||||
import ru.soune.nocopy.dto.file.FileListResponse;
|
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/file-entities")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class FileEntityController {
|
|
||||||
|
|
||||||
private final FileEntityService fileEntityService;
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Получить информацию о файле по ID
|
|
||||||
*/
|
|
||||||
@GetMapping("/{fileId}")
|
|
||||||
public ResponseEntity<FileApiResponse<FileEntityResponse>> getFileInfo(
|
|
||||||
@PathVariable String fileId,
|
|
||||||
@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
|
||||||
|
|
||||||
if (!fileInfo.getUserId().equals(userId)) {
|
|
||||||
return ResponseEntity.status(403)
|
|
||||||
.body(FileApiResponse.error("Access denied"));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(fileInfo));
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401)
|
|
||||||
.body(FileApiResponse.error("Authentication required"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error getting file info", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Failed to get file info: " + e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Получить информацию о файле по ID сессии загрузки
|
|
||||||
*/
|
|
||||||
@GetMapping("/by-session/{uploadSessionId}")
|
|
||||||
public ResponseEntity<FileApiResponse<FileEntityResponse>> getFileByUploadSession(
|
|
||||||
@PathVariable String uploadSessionId,
|
|
||||||
@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(uploadSessionId);
|
|
||||||
|
|
||||||
if (!fileInfo.getUserId().equals(userId)) {
|
|
||||||
return ResponseEntity.status(403)
|
|
||||||
.body(FileApiResponse.error("Access denied"));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(fileInfo));
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401)
|
|
||||||
.body(FileApiResponse.error("Authentication required"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error getting file by session", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Failed to get file: " + e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Получить все файлы пользователя
|
|
||||||
*/
|
|
||||||
@GetMapping("/my-files")
|
|
||||||
public ResponseEntity<FileApiResponse<FileListResponse>> getUserFiles(
|
|
||||||
@RequestHeader("Authorization") String tokenHeader,
|
|
||||||
@RequestParam(defaultValue = "1") int page,
|
|
||||||
@RequestParam(defaultValue = "20") int pageSize) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
FileListResponse files = fileEntityService.getUserFiles(userId, page, pageSize);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(files));
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401)
|
|
||||||
.body(FileApiResponse.error("Authentication required"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error getting user files", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Failed to get files: " + e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Поиск файлов пользователя
|
|
||||||
*/
|
|
||||||
@GetMapping("/search")
|
|
||||||
public ResponseEntity<FileApiResponse<FileListResponse>> searchFiles(
|
|
||||||
@RequestParam String query,
|
|
||||||
@RequestHeader("Authorization") String tokenHeader,
|
|
||||||
@RequestParam(defaultValue = "1") int page,
|
|
||||||
@RequestParam(defaultValue = "20") int pageSize) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
FileListResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000);
|
|
||||||
|
|
||||||
var filteredFiles = allFiles.getFiles().stream()
|
|
||||||
.filter(f -> f.getOriginalFileName().toLowerCase().contains(query.toLowerCase()))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
int start = (page - 1) * pageSize;
|
|
||||||
int end = Math.min(start + pageSize, filteredFiles.size());
|
|
||||||
|
|
||||||
FileListResponse response = FileListResponse.builder()
|
|
||||||
.files(filteredFiles.subList(start, Math.min(end, filteredFiles.size())))
|
|
||||||
.totalCount(filteredFiles.size())
|
|
||||||
.totalSize(allFiles.getTotalSize())
|
|
||||||
.formattedTotalSize(allFiles.getFormattedTotalSize())
|
|
||||||
.page(page)
|
|
||||||
.pageSize(pageSize)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(response));
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401)
|
|
||||||
.body(FileApiResponse.error("Authentication required"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error searching files", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Failed to search files: " + e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Получить общий размер файлов пользователя
|
|
||||||
*/
|
|
||||||
@GetMapping("/storage/usage")
|
|
||||||
public ResponseEntity<FileApiResponse<Long>> getStorageUsage(
|
|
||||||
@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
long usage = fileEntityService.getUserStorageUsed(userId);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(usage));
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401)
|
|
||||||
.body(FileApiResponse.error("Authentication required"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error getting storage usage", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Failed to get storage usage: " + e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Пометить файл как удаленный
|
|
||||||
*/
|
|
||||||
@DeleteMapping("/{fileId}")
|
|
||||||
public ResponseEntity<FileApiResponse<Void>> deleteFile(
|
|
||||||
@PathVariable String fileId,
|
|
||||||
@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
|
||||||
|
|
||||||
if (!fileInfo.getUserId().equals(userId)) {
|
|
||||||
return ResponseEntity.status(403)
|
|
||||||
.body(FileApiResponse.error("Access denied"));
|
|
||||||
}
|
|
||||||
|
|
||||||
fileEntityService.markAsDeleted(fileId);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(
|
|
||||||
"File marked as deleted", null));
|
|
||||||
|
|
||||||
} catch (NotFoundAuthToken e) {
|
|
||||||
return ResponseEntity.status(401)
|
|
||||||
.body(FileApiResponse.error("Authentication required"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error deleting file", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Failed to delete file: " + e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private Long getUserIdFromToken(String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
|
||||||
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
|
||||||
return authToken.getUser().getId();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,224 +0,0 @@
|
|||||||
package ru.soune.nocopy.controller.file;
|
|
||||||
|
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
|
||||||
import ru.soune.nocopy.dto.file.FileApiResponse;
|
|
||||||
import ru.soune.nocopy.dto.file.InitUploadRequest;
|
|
||||||
import ru.soune.nocopy.dto.file.UploadProgressResponse;
|
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
|
||||||
import ru.soune.nocopy.entity.file.FileType;
|
|
||||||
import ru.soune.nocopy.entity.file.FileUploadSession;
|
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
|
||||||
import ru.soune.nocopy.exception.FileUploadException;
|
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
|
||||||
import ru.soune.nocopy.exception.UploadSessionNotFoundException;
|
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/files")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class FileUploadController {
|
|
||||||
|
|
||||||
private final FileUploadService fileUploadService;
|
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
|
||||||
|
|
||||||
private final FileUploadSessionRepository fileUploadSessionRepository;
|
|
||||||
|
|
||||||
//TODO ADD TEMPLATE JSON, RESPONSE OK,ADD MESSAGE CODE
|
|
||||||
@PostMapping("/init")
|
|
||||||
public ResponseEntity<FileApiResponse<FileUploadSession>> initUpload(@Valid @RequestBody InitUploadRequest request,
|
|
||||||
@RequestHeader("Authorization") String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
|
||||||
|
|
||||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
|
||||||
|
|
||||||
try {
|
|
||||||
FileUploadSession session = fileUploadService.initUpload(authToken.getUser().getId(), request.getFileName(),
|
|
||||||
request.getFileType(), request.getExtension(), request.getFileSize());
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(session));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error initializing upload", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error(e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/file-types")
|
|
||||||
public ResponseEntity<List<FileType>> getFileTypes() {
|
|
||||||
return ResponseEntity.ok(Arrays.asList(FileType.values()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/chunk")
|
|
||||||
public ResponseEntity<FileApiResponse<UploadProgressResponse>> uploadChunk(
|
|
||||||
@RequestParam("uploadId") String uploadId,
|
|
||||||
@RequestParam("chunkNumber") Integer chunkNumber,
|
|
||||||
@RequestParam("chunk") MultipartFile chunk) {
|
|
||||||
|
|
||||||
log.info("Uploading chunk {} for session {}, file size: {} bytes",
|
|
||||||
chunkNumber, uploadId, chunk.getSize());
|
|
||||||
|
|
||||||
if (chunk.isEmpty()) {
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Chunk file is empty"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (uploadId == null || uploadId.isBlank()) {
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Upload ID is required"));
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
UploadProgressResponse progress = fileUploadService.uploadChunk(
|
|
||||||
uploadId, chunkNumber, chunk);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(progress));
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error uploading chunk", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error(e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/progress/{uploadId}")
|
|
||||||
public ResponseEntity<FileApiResponse<UploadProgressResponse>> getProgress(
|
|
||||||
@PathVariable String uploadId) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
UploadProgressResponse progress = fileUploadService.getUploadProgress(uploadId);
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(progress));
|
|
||||||
|
|
||||||
} catch (UploadSessionNotFoundException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(FileApiResponse.error("Upload session not found"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error getting progress", e);
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error("Failed to get progress"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/{uploadId}/complete")
|
|
||||||
public ResponseEntity<FileApiResponse<UploadProgressResponse>> completeUpload(
|
|
||||||
@PathVariable String uploadId) {
|
|
||||||
|
|
||||||
log.info("Manual completion requested for session: {}", uploadId);
|
|
||||||
|
|
||||||
try {
|
|
||||||
UploadProgressResponse progress = fileUploadService.getUploadProgress(uploadId);
|
|
||||||
|
|
||||||
if (progress.getStatus() == UploadStatus.COMPLETED) {
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(
|
|
||||||
"Upload already completed", progress));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (progress.getUploadedChunks() < progress.getTotalChunks()) {
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error(
|
|
||||||
String.format("Not all chunks uploaded: %d/%d",
|
|
||||||
progress.getUploadedChunks(), progress.getTotalChunks())));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(
|
|
||||||
"File assembly in progress", progress));
|
|
||||||
|
|
||||||
} catch (UploadSessionNotFoundException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(FileApiResponse.error("Upload session not found"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error completing upload", e);
|
|
||||||
return ResponseEntity.internalServerError()
|
|
||||||
.body(FileApiResponse.error("Failed to complete upload"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/{uploadId}/cancel")
|
|
||||||
public ResponseEntity<FileApiResponse<Void>> cancelUpload(
|
|
||||||
@PathVariable String uploadId) {
|
|
||||||
|
|
||||||
log.info("Cancelling upload session: {}", uploadId);
|
|
||||||
|
|
||||||
try {
|
|
||||||
fileUploadService.cancelUpload(uploadId);
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(
|
|
||||||
"Upload cancelled successfully", null));
|
|
||||||
|
|
||||||
} catch (UploadSessionNotFoundException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(FileApiResponse.error("Upload session not found"));
|
|
||||||
} catch (FileUploadException e) {
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error(e.getMessage()));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error cancelling upload", e);
|
|
||||||
return ResponseEntity.internalServerError()
|
|
||||||
.body(FileApiResponse.error("Failed to cancel upload"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/{uploadId}/retry")
|
|
||||||
public ResponseEntity<FileApiResponse<UploadProgressResponse>> retryUpload(
|
|
||||||
@PathVariable String uploadId) {
|
|
||||||
|
|
||||||
log.info("Retry requested for failed upload: {}", uploadId);
|
|
||||||
|
|
||||||
try {
|
|
||||||
fileUploadService.retryFailedUpload(uploadId);
|
|
||||||
UploadProgressResponse progress = fileUploadService.getUploadProgress(uploadId);
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(
|
|
||||||
"Upload retry initiated", progress));
|
|
||||||
|
|
||||||
} catch (UploadSessionNotFoundException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(FileApiResponse.error("Upload session not found"));
|
|
||||||
} catch (FileUploadException e) {
|
|
||||||
return ResponseEntity.badRequest()
|
|
||||||
.body(FileApiResponse.error(e.getMessage()));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error retrying upload", e);
|
|
||||||
return ResponseEntity.internalServerError()
|
|
||||||
.body(FileApiResponse.error("Failed to retry upload"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/{uploadId}/chunks")
|
|
||||||
public ResponseEntity<FileApiResponse<Map<Integer, Boolean>>> getChunkStatus(
|
|
||||||
@PathVariable String uploadId) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
FileUploadSession session = fileUploadSessionRepository.findById(uploadId)
|
|
||||||
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
|
||||||
|
|
||||||
Map<Integer, Boolean> chunkStatus = new HashMap<>();
|
|
||||||
for (int i = 0; i < session.getTotalChunks(); i++) {
|
|
||||||
chunkStatus.put(i, session.getChunkPaths().containsKey(i));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResponseEntity.ok(FileApiResponse.success(chunkStatus));
|
|
||||||
|
|
||||||
} catch (UploadSessionNotFoundException e) {
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
|
||||||
.body(FileApiResponse.error("Upload session not found"));
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error getting chunk status", e);
|
|
||||||
return ResponseEntity.internalServerError()
|
|
||||||
.body(FileApiResponse.error("Failed to get chunk status"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
public record AuthResponse (
|
|
||||||
boolean success,
|
|
||||||
String message,
|
|
||||||
String token,
|
|
||||||
LocalDateTime expiresAt
|
|
||||||
) {}
|
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
|
public class BaseRequest {
|
||||||
|
@JsonProperty("version")
|
||||||
|
Integer version;
|
||||||
|
|
||||||
|
@JsonProperty("msg_id")
|
||||||
|
Integer msgId;
|
||||||
|
|
||||||
|
@JsonProperty("message_body")
|
||||||
|
Object messageBody;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Builder
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
|
public class BaseResponse {
|
||||||
|
@JsonProperty("msg_id")
|
||||||
|
private Integer msgId;
|
||||||
|
|
||||||
|
@JsonProperty("message_code")
|
||||||
|
private Integer messageCode;
|
||||||
|
|
||||||
|
@JsonProperty("message_desc")
|
||||||
|
private String messageDesc;
|
||||||
|
|
||||||
|
@JsonProperty("message_body")
|
||||||
|
private Object messageBody;
|
||||||
|
}
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class LoginResponse {
|
|
||||||
private boolean success;
|
|
||||||
private String email;
|
|
||||||
private String token;
|
|
||||||
private String expiresAt;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
public enum MessageCode {
|
||||||
|
SUCCESS(0, "Operation successful"),
|
||||||
|
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"),
|
||||||
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
|
MAIL_VERIFIED_NULL(2, "Mail verified null"),
|
||||||
|
INVALID_TOKEN(2, "Token not found or time expired"),
|
||||||
|
TOKEN_IS_ALIVE(2, "Token is alive"),
|
||||||
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
|
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
||||||
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
|
FILE_NOT_EXIST(2, "File not exist on disk"),
|
||||||
|
FILE_DELETE(2, "File was deleted"),
|
||||||
|
USER_NOT_HAD_PERMISSION(2, "User not have permission for file"),
|
||||||
|
USER_NOT_VERIFIED(2, "User not verified"),
|
||||||
|
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
||||||
|
USER_NOT_FOUND(2, "User 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"),
|
||||||
|
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
||||||
|
FILE_ENTITY_ERROR(2, "File entity error"),
|
||||||
|
ACCESS_DENIED(2, "Access denied"),
|
||||||
|
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
||||||
|
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"),
|
||||||
|
FILE_NOT_FOUND(4, "File not found"),
|
||||||
|
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
|
||||||
|
SEND_EMAIL_EXCEPTION(2, "Send email exception"),
|
||||||
|
SIMILAR_FILES_FOUND(0, "Similar files found"),
|
||||||
|
FILE_IS_PROTECTED(0, "File is protected"),
|
||||||
|
FILE_IS_NOT_PROTECTED(0, "File is not protected"),
|
||||||
|
TARIFF_IS_ADD(0, "Tariff is added"),
|
||||||
|
TARIFF_IS_DELETED(0, "Tariff is deleted"),
|
||||||
|
TARIFF_IS_UPDATED(0, "Tariff is updated"),
|
||||||
|
TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
|
||||||
|
VALIDATION_ERROR(2, "Validation error"),
|
||||||
|
RESOURCE_NOT_FOUND(4, "Resource not found"),
|
||||||
|
INTERNAL_ERROR(4, "Internal server error"),
|
||||||
|
COMPANY_NOT_FOUND(4, "Company not found"),
|
||||||
|
PAYMENT_NOT_FOUND(4, "Payment not found"),
|
||||||
|
COMPANY_ALREADY_EXISTS(2, "Company already exists"),
|
||||||
|
USER_LIMIT_IS_OVER(2, "Over user limits"),
|
||||||
|
MONITORING_TYPE_NOT_FOUND(4, "Monitoring type not found"),
|
||||||
|
ERROR_TARIFF_INFO(2, "Erorr with tariff info"),
|
||||||
|
FILE_FOR_SEARCH_NOT_VALID(2, "File for search unsupported"),
|
||||||
|
NOT_VALID_FILE_TYPE_OR_COUNT_FILE(2, "Cost for file type not found, count is negative or files count" +
|
||||||
|
"more than max valid"),
|
||||||
|
USER_NOT_ACTIVE(2, "User not active"),
|
||||||
|
NOTION_NOT_FOUND(4, "Notion not found"),
|
||||||
|
MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion");
|
||||||
|
|
||||||
|
private final Integer code;
|
||||||
|
|
||||||
|
private final String description;
|
||||||
|
|
||||||
|
MessageCode(Integer code, String description) {
|
||||||
|
this.code = code;
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getCode() {
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import jakarta.validation.constraints.Email;
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import jakarta.validation.constraints.Past;
|
|
||||||
import jakarta.validation.constraints.Size;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
import ru.soune.nocopy.entity.GenderType;
|
|
||||||
import ru.soune.nocopy.entity.SubscriptionType;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
|
||||||
|
|
||||||
public record RegisterRequest(
|
|
||||||
@NotBlank(message = "error.name.length")
|
|
||||||
String fullName,
|
|
||||||
|
|
||||||
String companyName,
|
|
||||||
|
|
||||||
@Size(min = 11, max = 14)
|
|
||||||
String phone,
|
|
||||||
|
|
||||||
@NotBlank(message = "error.not.blank")
|
|
||||||
@Email(message = "error.not.email")
|
|
||||||
@Size(max = 128)
|
|
||||||
String email,
|
|
||||||
|
|
||||||
@DateTimeFormat(pattern = "dd-MM-yyyy")
|
|
||||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
|
||||||
@Past
|
|
||||||
LocalDate birthday,
|
|
||||||
|
|
||||||
@NotBlank(message = "error.not.blank")
|
|
||||||
@Size(min = 8)
|
|
||||||
String password,
|
|
||||||
|
|
||||||
SubscriptionType subscriptionType,
|
|
||||||
|
|
||||||
GenderType genderType
|
|
||||||
) {}
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class TokenProcessRequest {
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class UserContentDTO {
|
|
||||||
String fileName;
|
|
||||||
String originalFilename;
|
|
||||||
String fileType;
|
|
||||||
String fileExtension;
|
|
||||||
Long fileSize;
|
|
||||||
String filePath;
|
|
||||||
Integer protectionLevel;
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto;
|
|
||||||
|
|
||||||
import ru.soune.nocopy.entity.ContentStatus;
|
|
||||||
import ru.soune.nocopy.entity.file.FileType;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
public record UserContentResponse(
|
|
||||||
Long id,
|
|
||||||
String filename,
|
|
||||||
String originalFilename,
|
|
||||||
FileType fileType,
|
|
||||||
long fileSize,
|
|
||||||
String filePath,
|
|
||||||
ContentStatus status,
|
|
||||||
LocalDateTime uploadDate
|
|
||||||
) {}
|
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package ru.soune.nocopy.dto.company;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class CompanyActionRequestDto {
|
||||||
|
private String action;
|
||||||
|
private String companyId;
|
||||||
|
private String companyName;
|
||||||
|
private Map<String, Object> companyData;
|
||||||
|
private Long userId;
|
||||||
|
private Map<String, Object> searchParams;
|
||||||
|
private PageableParams pageable;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public static class PageableParams {
|
||||||
|
private int page;
|
||||||
|
private int size;
|
||||||
|
private String sort;
|
||||||
|
private String direction;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.dto.company;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class CompanyResponseDto {
|
||||||
|
private String id;
|
||||||
|
private String companyName;
|
||||||
|
private String phone;
|
||||||
|
private String address;
|
||||||
|
private String email;
|
||||||
|
private LocalDateTime registerDate;
|
||||||
|
private LocalDateTime updateDate;
|
||||||
|
private long userCount;
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.cost;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class CostRequest {
|
||||||
|
String action;
|
||||||
|
|
||||||
|
@JsonProperty("file_type")
|
||||||
|
String fileType;
|
||||||
|
|
||||||
|
@JsonProperty("count_files")
|
||||||
|
Integer countFilesForProtect;
|
||||||
|
|
||||||
|
@JsonProperty("auth_token")
|
||||||
|
String authToken;
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package ru.soune.nocopy.dto.cost;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class CostResponse {
|
||||||
|
private int cost;
|
||||||
|
|
||||||
|
private Boolean success;
|
||||||
|
|
||||||
|
@JsonProperty("max_files_for_check")
|
||||||
|
private Integer maxFilesForCheck;
|
||||||
|
|
||||||
|
@JsonProperty("count_file")
|
||||||
|
private Integer countFile;
|
||||||
|
|
||||||
|
@JsonProperty("tokens_count")
|
||||||
|
private int needTokensCount;
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.dto.dadata;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public class DaDataAddress {
|
||||||
|
private String value;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto.dadata;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public class DaDataData {
|
||||||
|
private String inn;
|
||||||
|
private DaDataAddress address;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto.dadata;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class DaDataRequest {
|
||||||
|
|
||||||
|
@JsonProperty("inn")
|
||||||
|
private String inn;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.dto.dadata;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class DaDataResponse {
|
||||||
|
@JsonProperty("companyName")
|
||||||
|
private String companyName;
|
||||||
|
|
||||||
|
@JsonProperty("inn")
|
||||||
|
private String inn;
|
||||||
|
|
||||||
|
@JsonProperty("address")
|
||||||
|
private String address;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto.dadata;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public class DaDataSuggestion {
|
||||||
|
private String value;
|
||||||
|
private DaDataData data;
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package ru.soune.nocopy.dto.dadata;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public class DaDataWrapper {
|
||||||
|
private List<DaDataSuggestion> suggestions;
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class ActionResponse {
|
||||||
|
private List<String> availableActions;
|
||||||
|
private String action;
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class CanceledUploadResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class CheckIncrementResult {
|
||||||
|
private boolean success;
|
||||||
|
private Integer countChecked;
|
||||||
|
private Integer remainingLimit;
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
public static CheckIncrementResult success(Integer countChecked) {
|
||||||
|
return CheckIncrementResult.builder()
|
||||||
|
.success(true)
|
||||||
|
.countChecked(countChecked)
|
||||||
|
.message("Check count incremented successfully")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class CheckStatus {
|
||||||
|
private Long userId;
|
||||||
|
private Integer countChecked;
|
||||||
|
private Integer remainingLimit;
|
||||||
|
private LocalDateTime lastCheckAt;
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class ChunkStatusResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_status")
|
||||||
|
private Map<String, Boolean> chunkStatus;
|
||||||
|
|
||||||
|
@JsonProperty("uploaded_chunks")
|
||||||
|
private Integer uploadedChunks;
|
||||||
|
|
||||||
|
@JsonProperty("missing_chunks")
|
||||||
|
private Integer missingChunks;
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class ChunkUploadResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_number")
|
||||||
|
private Integer chunkNumber;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_size")
|
||||||
|
private Long chunkSize;
|
||||||
|
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class CompleteUploadResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("uploaded_chunks")
|
||||||
|
private Integer uploadedChunks;
|
||||||
|
|
||||||
|
@JsonProperty("total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
@JsonProperty("file_path")
|
||||||
|
private String filePath;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class DeleteFileResponse {
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class FileApiResponse<T> {
|
|
||||||
|
|
||||||
private boolean success;
|
|
||||||
private String message;
|
|
||||||
private T data;
|
|
||||||
private String error;
|
|
||||||
|
|
||||||
public static <T> FileApiResponse<T> success(T data) {
|
|
||||||
return FileApiResponse.<T>builder()
|
|
||||||
.success(true)
|
|
||||||
.message("Operation completed successfully")
|
|
||||||
.data(data)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> FileApiResponse<T> success(String message, T data) {
|
|
||||||
return FileApiResponse.<T>builder()
|
|
||||||
.success(true)
|
|
||||||
.message(message)
|
|
||||||
.data(data)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> FileApiResponse<T> error(String error) {
|
|
||||||
return FileApiResponse.<T>builder()
|
|
||||||
.success(false)
|
|
||||||
.error(error)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class FileEntityRequest {
|
||||||
|
@JsonProperty("action")
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("full_delete")
|
||||||
|
private Integer fullDelete;
|
||||||
|
|
||||||
|
@JsonProperty("upload_session_id")
|
||||||
|
private String uploadSessionId;
|
||||||
|
|
||||||
|
@JsonProperty("query")
|
||||||
|
private String query;
|
||||||
|
|
||||||
|
@JsonProperty("page")
|
||||||
|
private Integer page;
|
||||||
|
|
||||||
|
@JsonProperty("page_size")
|
||||||
|
private Integer pageSize;
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
|
||||||
|
@JsonProperty("sort_by")
|
||||||
|
private String sortBy;
|
||||||
|
|
||||||
|
@JsonProperty("sort_order")
|
||||||
|
private String sortOrder;
|
||||||
|
|
||||||
|
@JsonProperty("type")
|
||||||
|
private String type;
|
||||||
|
|
||||||
|
@JsonProperty("date_filter")
|
||||||
|
private String dateFilter;
|
||||||
|
}
|
||||||
@@ -19,6 +19,8 @@ public class FileEntityResponse {
|
|||||||
private String originalFileName;
|
private String originalFileName;
|
||||||
private String storedFileName;
|
private String storedFileName;
|
||||||
private String filePath;
|
private String filePath;
|
||||||
|
private String protectedFilePath;
|
||||||
|
private String thumbnailFileUrl;
|
||||||
private Long fileSize;
|
private Long fileSize;
|
||||||
private String mimeType;
|
private String mimeType;
|
||||||
private String fileExtension;
|
private String fileExtension;
|
||||||
@@ -30,4 +32,14 @@ public class FileEntityResponse {
|
|||||||
private String formattedSize;
|
private String formattedSize;
|
||||||
private String downloadUrl;
|
private String downloadUrl;
|
||||||
private boolean existsOnDisk;
|
private boolean existsOnDisk;
|
||||||
|
private Integer supportId;
|
||||||
|
private String protectStatus;
|
||||||
|
private String ownerName;
|
||||||
|
private String ownerEmail;
|
||||||
|
private String ownerCompany;
|
||||||
|
private String fileName;
|
||||||
|
private String fileFormat;
|
||||||
|
private Integer checksCount;
|
||||||
|
private LocalDateTime fileUploadDate;
|
||||||
|
private String monitoring;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class FileExtensionResponse {
|
||||||
|
@JsonProperty("file_extension")
|
||||||
|
private List<String> extension;
|
||||||
|
|
||||||
|
@JsonProperty("count")
|
||||||
|
private Integer count;
|
||||||
|
|
||||||
|
@JsonProperty("max_file_size")
|
||||||
|
private Long maxFileSize;
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class FileInfoUserResponse {
|
||||||
|
@JsonProperty("all_files_size")
|
||||||
|
private Long allFileSize;
|
||||||
|
|
||||||
|
@JsonProperty("all_files_quantity")
|
||||||
|
private Integer fileCount;
|
||||||
|
|
||||||
|
@JsonProperty("all_files_check")
|
||||||
|
private Integer filesCheck;
|
||||||
|
|
||||||
|
@JsonProperty("all_files_violation")
|
||||||
|
private Integer filesViolation;
|
||||||
|
|
||||||
|
@JsonProperty("images_size")
|
||||||
|
private Long imagesSize;
|
||||||
|
|
||||||
|
@JsonProperty("images_quantity")
|
||||||
|
private Integer imagesCount;
|
||||||
|
|
||||||
|
@JsonProperty("images_check")
|
||||||
|
private Integer imagesCheck;
|
||||||
|
|
||||||
|
@JsonProperty("images_violations")
|
||||||
|
private Integer imagesViolations;
|
||||||
|
|
||||||
|
@JsonProperty("videos_size")
|
||||||
|
private Long videosSize;
|
||||||
|
|
||||||
|
@JsonProperty("videos_quantity")
|
||||||
|
private Integer videosCount;
|
||||||
|
|
||||||
|
@JsonProperty("videos_check")
|
||||||
|
private Integer videosCheck;
|
||||||
|
|
||||||
|
@JsonProperty("videos_violations")
|
||||||
|
private Integer videosViolations;
|
||||||
|
|
||||||
|
@JsonProperty("audios_size")
|
||||||
|
private Long audiosSize;
|
||||||
|
|
||||||
|
@JsonProperty("audios_quantity")
|
||||||
|
private Integer audiosCount;
|
||||||
|
|
||||||
|
@JsonProperty("audios_check")
|
||||||
|
private Integer audiosCheck;
|
||||||
|
|
||||||
|
@JsonProperty("audios_violations")
|
||||||
|
private Integer audiosViolations;
|
||||||
|
|
||||||
|
@JsonProperty("document_size")
|
||||||
|
private Long documentSize;
|
||||||
|
|
||||||
|
@JsonProperty("document_quantity")
|
||||||
|
private Integer documentCount;
|
||||||
|
|
||||||
|
@JsonProperty("document_check")
|
||||||
|
private Integer documentCheck;
|
||||||
|
|
||||||
|
@JsonProperty("document_violations")
|
||||||
|
private Integer documentViolations;
|
||||||
|
|
||||||
|
@JsonProperty("protected_document_files_count")
|
||||||
|
private Long protectedDocumentFilesCount;
|
||||||
|
|
||||||
|
@JsonProperty("protected_files_count")
|
||||||
|
private Long protectedFilesCount;
|
||||||
|
|
||||||
|
@JsonProperty("protected_audio_files_count")
|
||||||
|
private Long protectedAudioFilesCount;
|
||||||
|
|
||||||
|
@JsonProperty("protected_video_files_count")
|
||||||
|
private Long protectedVideoFilesCount;
|
||||||
|
|
||||||
|
@JsonProperty("protected_image_files_count")
|
||||||
|
private Long protectedImageFilesCount;
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -9,14 +10,30 @@ import java.util.List;
|
|||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Builder
|
@Builder
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
public class FileListResponse {
|
public class FileListResponse {
|
||||||
|
@JsonProperty("files")
|
||||||
private List<FileEntityResponse> files;
|
private List<FileEntityResponse> files;
|
||||||
private int totalCount;
|
|
||||||
private long totalSize;
|
@JsonProperty("total_count")
|
||||||
|
private Integer totalCount;
|
||||||
|
|
||||||
|
@JsonProperty("total_size")
|
||||||
|
private Long totalSize;
|
||||||
|
|
||||||
|
@JsonProperty("formatted_total_size")
|
||||||
private String formattedTotalSize;
|
private String formattedTotalSize;
|
||||||
private int page;
|
|
||||||
private int pageSize;
|
@JsonProperty("page")
|
||||||
|
private Integer page;
|
||||||
|
|
||||||
|
@JsonProperty("page_size")
|
||||||
|
private Integer pageSize;
|
||||||
|
|
||||||
|
@JsonProperty("sort_by")
|
||||||
|
private String sortBy;
|
||||||
|
|
||||||
|
@JsonProperty("sort_order")
|
||||||
|
private String sortOrder;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class FileResponse {
|
||||||
|
|
||||||
|
private List<FileEntityResponse> files;
|
||||||
|
private int totalCount;
|
||||||
|
private long totalSize;
|
||||||
|
private String formattedTotalSize;
|
||||||
|
private int page;
|
||||||
|
private int pageSize;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class FileTypeStatsDto {
|
||||||
|
private String fileType;
|
||||||
|
private Integer count;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.file.FileType;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class FileTypesResponse {
|
||||||
|
@JsonProperty("file_types")
|
||||||
|
private List<FileType> fileTypes;
|
||||||
|
|
||||||
|
@JsonProperty("count")
|
||||||
|
private Integer count;
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class FileUploadRequest {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("file_name")
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@JsonProperty("file_type")
|
||||||
|
private String fileType;
|
||||||
|
|
||||||
|
@JsonProperty("extension")
|
||||||
|
private String extension;
|
||||||
|
|
||||||
|
@JsonProperty("file_size")
|
||||||
|
private Long fileSize;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_number")
|
||||||
|
private Integer chunkNumber;
|
||||||
|
|
||||||
|
@JsonProperty("action")
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
|
||||||
|
@JsonProperty("convertTo")
|
||||||
|
private String convertTo;
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public class GoogleVisionSearchResponse {
|
||||||
|
|
||||||
|
@JsonProperty("bestGuessLabels")
|
||||||
|
private List<BestGuessLabel> bestGuessLabels;
|
||||||
|
|
||||||
|
@JsonProperty("fullMatchingImages")
|
||||||
|
private List<ImageResult> fullMatchingImages;
|
||||||
|
|
||||||
|
@JsonProperty("visuallySimilarImages")
|
||||||
|
private List<ImageResult> visuallySimilarImages;
|
||||||
|
|
||||||
|
@JsonProperty("pagesWithMatchingImages")
|
||||||
|
private List<PageResult> pagesWithMatchingImages;
|
||||||
|
|
||||||
|
@JsonProperty("partialMatchingImages")
|
||||||
|
private List<ImageResult> partialMatchingImages;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public static class BestGuessLabel {
|
||||||
|
@JsonProperty("label")
|
||||||
|
private String label;
|
||||||
|
|
||||||
|
@JsonProperty("languageCode")
|
||||||
|
private String languageCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public static class ImageResult {
|
||||||
|
@JsonProperty("url")
|
||||||
|
private String url;
|
||||||
|
|
||||||
|
@JsonProperty("score")
|
||||||
|
private Float score;
|
||||||
|
|
||||||
|
@JsonProperty("height")
|
||||||
|
private Integer height;
|
||||||
|
|
||||||
|
@JsonProperty("width")
|
||||||
|
private Integer width;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public static class PageResult {
|
||||||
|
@JsonProperty("url")
|
||||||
|
private String url;
|
||||||
|
|
||||||
|
@JsonProperty("pageTitle")
|
||||||
|
private String pageTitle;
|
||||||
|
|
||||||
|
@JsonProperty("fullMatchingImages")
|
||||||
|
private List<ImageResult> fullMatchingImages;
|
||||||
|
|
||||||
|
@JsonProperty("partialMatchingImages")
|
||||||
|
private List<ImageResult> partialMatchingImages;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ImageSearchRequest {
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("page")
|
||||||
|
private Integer page = 1;
|
||||||
|
|
||||||
|
@JsonProperty("page_size")
|
||||||
|
private Integer pageSize = 10;
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class InitFileResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("file_name")
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@JsonProperty("total_chunks")
|
||||||
|
private Integer totalChunks;
|
||||||
|
|
||||||
|
@JsonProperty("chunk_size")
|
||||||
|
private Long chunkSize;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("field_errors")
|
||||||
|
private List<Map<String, String>> fieldErrors;
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
class PeriodHistoryDto {
|
||||||
|
private LocalDate periodStart;
|
||||||
|
private LocalDate periodEnd;
|
||||||
|
private Integer totalChecks;
|
||||||
|
private Map<String, Integer> checksByType;
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class ProtectionLimitsDto {
|
||||||
|
private Long userId;
|
||||||
|
private String userName;
|
||||||
|
private String userEmail;
|
||||||
|
private LocalDate lastResetDate;
|
||||||
|
private Integer totalChecksAllTime;
|
||||||
|
private Integer periodChecksCount;
|
||||||
|
private Map<String, Integer> checksByFileType;
|
||||||
|
private LocalDate periodStartDate;
|
||||||
|
private LocalDate periodEndDate;
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private LocalDateTime lastCheckAt;
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class RetryUploadResponse {
|
||||||
|
@JsonProperty("upload_id")
|
||||||
|
private String uploadId;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Value;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Value
|
||||||
|
@Builder
|
||||||
|
public class SimilarFileDTO {
|
||||||
|
String fileId;
|
||||||
|
String originalFileName;
|
||||||
|
Long fileSize;
|
||||||
|
Integer hammingDistance;
|
||||||
|
String similarityLevel;
|
||||||
|
Long ownerId;
|
||||||
|
Long supportId;
|
||||||
|
ProtectionStatus status;
|
||||||
|
LocalDateTime uploadDate;
|
||||||
|
String url;
|
||||||
|
Boolean owner;
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class SimilarityFilter {
|
||||||
|
private List<String> similarityLevels;
|
||||||
|
private Integer page;
|
||||||
|
private Integer size;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public enum SortOrder {
|
||||||
|
ASC("asc"),
|
||||||
|
DESC("desc");
|
||||||
|
|
||||||
|
private final String value;
|
||||||
|
|
||||||
|
SortOrder(String value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SortOrder fromString(String value) {
|
||||||
|
if (value == null) return ASC;
|
||||||
|
for (SortOrder order : SortOrder.values()) {
|
||||||
|
if (order.value.equalsIgnoreCase(value)) {
|
||||||
|
return order;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ASC;
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user