Compare commits
439
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4dd6c4a3c0 | ||
|
|
da84490198 | ||
|
|
b723247b9c | ||
|
|
cc43b92f69 | ||
|
|
d92a9a7d86 | ||
|
|
6dec7838ce | ||
|
|
83ed7c5b01 | ||
|
|
e66ae81d18 | ||
|
|
6c3742913c | ||
|
|
dfc9a22bc5 | ||
|
|
d0be6580e4 | ||
|
|
1dd6a6b7e2 | ||
|
|
c33ffe516a | ||
|
|
ac7cc54b5e | ||
|
|
ea7dd5e5df | ||
|
|
c2a649a252 | ||
|
|
f680f766cd | ||
|
|
82827c9a2a | ||
|
|
e6e8461b9b | ||
|
|
1b2337ea2f | ||
|
|
5fc9563a4e | ||
|
|
fdc17b8325 | ||
|
|
3b68b3337c | ||
|
|
631066b217 | ||
|
|
61dcada973 | ||
|
|
7492b8aa7f | ||
|
|
9ad4830edb | ||
|
|
6366cbc96b | ||
|
|
4e0e953253 | ||
|
|
1476509b48 | ||
|
|
9cde6f3bb6 | ||
|
|
9cd5965b37 | ||
|
|
2ab91dee58 | ||
|
|
b0cc5720a6 | ||
|
|
ed89d315ae | ||
|
|
74f9be8bf7 | ||
|
|
bbf8e3ee3d | ||
|
|
db3dcb8166 | ||
|
|
42a5368003 | ||
|
|
be62dd458a | ||
|
|
2d80b40b27 | ||
|
|
1b921b525a | ||
|
|
b56fb63a37 | ||
|
|
bb41898abf | ||
|
|
9974e22abe | ||
|
|
064a888188 | ||
|
|
484475eadc | ||
|
|
c60aeec6f5 | ||
|
|
0bb952c4e6 | ||
|
|
11ee4e18ed | ||
|
|
684888aa2c | ||
|
|
eb43621b74 | ||
|
|
dd73227db1 | ||
|
|
a7939845c7 | ||
|
|
40cb53a3b0 | ||
|
|
bac45ec738 | ||
|
|
01cfc16583 | ||
|
|
f71252bb5e | ||
|
|
934f3459fb | ||
|
|
75643ae84c | ||
|
|
7df791f9b8 | ||
|
|
b518504e58 | ||
|
|
3558588da9 | ||
|
|
6e8ada2429 | ||
|
|
64dce8601a | ||
|
|
86fa3b555a | ||
|
|
e089d370cf | ||
|
|
28ddf49af1 | ||
|
|
93946cc2e3 | ||
|
|
671625e0cf | ||
|
|
40c9b2a796 | ||
|
|
b859b175f0 | ||
|
|
d827e2ca16 | ||
|
|
1ae2819245 | ||
|
|
dbefc21e6d | ||
|
|
e32e2d990b | ||
|
|
3896477783 | ||
|
|
b5d4509769 | ||
|
|
aa6c0c1b94 | ||
|
|
31140e810b | ||
|
|
aef2c1dfe0 | ||
|
|
c1360fce87 | ||
|
|
9e4035bf83 | ||
|
|
b5de6c04f7 | ||
|
|
a8a7a78ebf | ||
|
|
29ed74745f | ||
|
|
9e81b45922 | ||
|
|
c7c3bbe07a | ||
|
|
0f71f5d58b | ||
|
|
4ffd830f09 | ||
|
|
4fdd14f81d | ||
|
|
8f2127bed5 | ||
|
|
b71ba527d2 | ||
|
|
e71ce9bc10 | ||
|
|
d8f6a08a2f | ||
|
|
077902f4ab | ||
|
|
5f063354e6 | ||
|
|
48a83591da | ||
|
|
724e72c71a | ||
|
|
f4fc1f26a7 | ||
|
|
be1ad7f066 | ||
|
|
7cd2aa7d32 | ||
|
|
6bffd5b385 | ||
|
|
283f0b9e6f | ||
|
|
a9eda37aad | ||
|
|
ecd42ce263 | ||
|
|
9d33c7532a | ||
|
|
0f2908b037 | ||
|
|
37abdeca9a | ||
|
|
e87c14198b | ||
|
|
8bc95efa2b | ||
|
|
051f1ef5d4 | ||
|
|
549d248cb7 | ||
|
|
9a3a8bde05 | ||
|
|
69e758a710 | ||
|
|
d7874aa37a | ||
|
|
ad4850414a | ||
|
|
3d2c7ecb05 | ||
|
|
51170891ce | ||
|
|
d775802a99 | ||
|
|
dfb1fca8cd | ||
|
|
3f375d3b12 | ||
|
|
a7b9f22939 | ||
|
|
e78f882417 | ||
|
|
2445b70c7a | ||
|
|
41ac8933e9 | ||
|
|
7af909c4f2 | ||
|
|
976d1f751e | ||
|
|
dbef82d896 | ||
|
|
7e1877ffc3 | ||
|
|
8ce07c6b81 | ||
|
|
fa1892585a | ||
|
|
6d6721fb0a | ||
|
|
535be69840 | ||
|
|
fdea57d947 | ||
|
|
0aa7f5c865 | ||
|
|
067b967a17 | ||
|
|
9a8a4a72f4 | ||
|
|
964910ec69 | ||
|
|
547e70ecdd | ||
|
|
78b97b48c9 | ||
|
|
4e0579c952 | ||
|
|
57dcc12cf2 | ||
|
|
a01adfc848 | ||
|
|
8965ffdd1f | ||
|
|
a21eb899b3 | ||
|
|
95ebcf0241 | ||
|
|
a3e6e0091a | ||
|
|
2f38a7c455 | ||
|
|
17aa52d4ac | ||
|
|
8eb0772196 | ||
|
|
c1782cf59b | ||
|
|
46cf252699 | ||
|
|
ebcb68135b | ||
|
|
e68ad3d3d3 | ||
|
|
12e001211b | ||
|
|
40f8effb31 | ||
|
|
69c3d876ae | ||
|
|
610415951d | ||
|
|
9ca116856c | ||
|
|
86db70caf4 | ||
|
|
0b2ef108ca | ||
|
|
0fbe725eb9 | ||
|
|
29cdbb887f | ||
|
|
2bf5e99fbb | ||
|
|
655e8f0844 | ||
|
|
31aa1c0545 | ||
|
|
97d6c8317e | ||
|
|
a42f3e8ed8 | ||
|
|
46c75deacb | ||
|
|
4930a73762 | ||
|
|
726da25ddf | ||
|
|
a9b7b7ca6e | ||
|
|
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 | ||
|
|
daef30ec11 | ||
|
|
a25b33fe13 | ||
|
|
7a02b94bd0 | ||
|
|
f15a24acc2 | ||
|
|
e555436d54 | ||
|
|
814d137937 | ||
|
|
1e14fa3f23 | ||
|
|
2985d84b04 | ||
|
|
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 |
@@ -14,6 +14,9 @@ COPY --from=build /app/build/libs/*.jar app.jar
|
|||||||
|
|
||||||
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
||||||
|
|
||||||
|
ENV BUILD_TIME_BACK="unknown"\
|
||||||
|
BUILD_TIME_FRONT="unknown"
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
CMD ["java", "-jar", "app.jar"]
|
CMD ["java", "-jar", "app.jar"]
|
||||||
@@ -122,3 +122,382 @@ SELECT 1
|
|||||||
FROM protect_check pc
|
FROM protect_check pc
|
||||||
WHERE pc.user_id = u.id
|
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:8082;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
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 # Проверка порта
|
||||||
|
|
||||||
|
------
|
||||||
|
|
||||||
|
Настройка Яндекс Клауд
|
||||||
|
|
||||||
|
1. YCAJEpWAtaVkVGX0sH6_EupEg - индетификатор ключа
|
||||||
|
2. YCMmVykfXrZ_nfU13Vo4yoCVGa70DnTlBgF1pUzO - секретный ключ
|
||||||
|
|
||||||
|
private static final String KEY_ID = "YCAJEmHZcWxzf4oGWvETG3mms";
|
||||||
|
private static final String SECRET_KEY = "YCPAPZ32XC-LWb8xE0b_xTcBD8NZUCHpSOfu8LUG";
|
||||||
+9
-2
@@ -34,7 +34,7 @@ dependencies {
|
|||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
implementation 'commons-validator:commons-validator:1.7'
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
|
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
|
||||||
|
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.17.2'
|
||||||
implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
|
implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
|
||||||
implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
|
implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
|
||||||
|
|
||||||
@@ -59,12 +59,19 @@ dependencies {
|
|||||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
|
|
||||||
implementation name: 'testlib-fat-0.2.1-all'
|
implementation name: 'testlib-fat-0.3.1-all'
|
||||||
|
|
||||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
|
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
|
||||||
|
implementation 'com.maxmind.geoip2:geoip2:4.2.0'
|
||||||
|
|
||||||
implementation project(':referral')
|
implementation project(':referral')
|
||||||
|
|
||||||
|
//cloud
|
||||||
|
implementation("software.amazon.awssdk:aws-sdk-java:2.29.33")
|
||||||
|
implementation("software.amazon.awssdk:apache-client:2.29.33")
|
||||||
|
|
||||||
|
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")
|
||||||
|
implementation("org.springframework.boot:spring-boot-starter-web")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('test') {
|
tasks.named('test') {
|
||||||
|
|||||||
+32
-1
@@ -181,7 +181,7 @@ services:
|
|||||||
command:
|
command:
|
||||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||||
- '--storage.tsdb.path=/prometheus'
|
- '--storage.tsdb.path=/prometheus'
|
||||||
- '--storage.tsdb.retention.time=15d' # Удерживать 15 дней
|
- '--storage.tsdb.retention.time=15d'
|
||||||
- '--web.enable-lifecycle'
|
- '--web.enable-lifecycle'
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
||||||
@@ -216,6 +216,33 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- app-network
|
- app-network
|
||||||
|
|
||||||
|
nexus:
|
||||||
|
image: sonatype/nexus3:latest
|
||||||
|
container_name: nexus
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "9000:8081"
|
||||||
|
volumes:
|
||||||
|
- nexus-data:/nexus-data
|
||||||
|
environment:
|
||||||
|
- INSTALL4J_ADD_VM_PARAMS=-Xms512m -Xmx1024m -XX:MaxDirectMemorySize=512m
|
||||||
|
networks:
|
||||||
|
- app-network
|
||||||
|
|
||||||
|
mongodb:
|
||||||
|
image: mongo:latest
|
||||||
|
container_name: mongo_ncp
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "27017:27017"
|
||||||
|
environment:
|
||||||
|
MONGO_INITDB_ROOT_USERNAME: mongo_db
|
||||||
|
MONGO_INITDB_ROOT_PASSWORD: mongo_ncp
|
||||||
|
volumes:
|
||||||
|
- mongodb_data:/data/db
|
||||||
|
networks:
|
||||||
|
- app-network
|
||||||
|
|
||||||
tempo:
|
tempo:
|
||||||
image: grafana/tempo:2.4.1
|
image: grafana/tempo:2.4.1
|
||||||
container_name: tempo
|
container_name: tempo
|
||||||
@@ -267,6 +294,8 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
pgdata:
|
pgdata:
|
||||||
|
mongodb_data:
|
||||||
|
name: mongodb_data
|
||||||
artifacts:
|
artifacts:
|
||||||
tempo_data:
|
tempo_data:
|
||||||
loki_data:
|
loki_data:
|
||||||
@@ -275,6 +304,8 @@ volumes:
|
|||||||
loki_rules:
|
loki_rules:
|
||||||
uploads_data:
|
uploads_data:
|
||||||
prometheus_data:
|
prometheus_data:
|
||||||
|
nexus-data:
|
||||||
|
driver: local
|
||||||
# postfix-data:
|
# postfix-data:
|
||||||
networks:
|
networks:
|
||||||
app-network:
|
app-network:
|
||||||
|
|||||||
@@ -9,14 +9,29 @@ pipeline {
|
|||||||
)
|
)
|
||||||
string(
|
string(
|
||||||
name: 'PORT',
|
name: 'PORT',
|
||||||
defaultValue: '3000',
|
defaultValue: '3001',
|
||||||
description: 'Порт для запуска экземпляра'
|
description: 'Порт для запуска экземпляра'
|
||||||
)
|
)
|
||||||
|
string(
|
||||||
|
name: 'PORT_DB',
|
||||||
|
defaultValue: '',
|
||||||
|
description: 'Порт для запуска БД'
|
||||||
|
)
|
||||||
string(
|
string(
|
||||||
name: 'SERVER',
|
name: 'SERVER',
|
||||||
defaultValue: '92.242.61.23',
|
defaultValue: '92.242.61.23',
|
||||||
description: 'Сервер для деплоя'
|
description: 'Сервер для деплоя'
|
||||||
)
|
)
|
||||||
|
string(
|
||||||
|
name: 'NETWORK',
|
||||||
|
defaultValue: 'app-network-dev',
|
||||||
|
description: 'Имя сети (будет создана если не существует)'
|
||||||
|
)
|
||||||
|
choice(
|
||||||
|
name: 'SPRING_PROFILE',
|
||||||
|
choices: ['dev', 'prod'],
|
||||||
|
description: 'Профиль Spring для запуска'
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
@@ -36,7 +51,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Deploy with docker-compose') {
|
stage('Copy to server') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
withCredentials([
|
withCredentials([
|
||||||
@@ -44,12 +59,38 @@ pipeline {
|
|||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
usernameVariable: 'SSH_USER',
|
usernameVariable: 'SSH_USER',
|
||||||
passwordVariable: 'SSH_PASS'
|
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_USER', variable: 'DB_USER'),
|
||||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD'),
|
||||||
|
string(credentialsId: 'MONGO_USER', variable: 'MONGO_USER'),
|
||||||
|
string(credentialsId: 'MONGO_PASSWORD', variable: 'MONGO_PASSWORD')
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
# Тестируем подключение сначала
|
|
||||||
echo "Testing SSH connection..."
|
echo "Testing SSH connection..."
|
||||||
if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
|
if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
|
||||||
echo "SSH connection OK"
|
echo "SSH connection OK"
|
||||||
@@ -58,12 +99,17 @@ pipeline {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Основная команда
|
|
||||||
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
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}
|
cd /opt/deployments/${params.BRANCH}-${params.PORT}
|
||||||
|
|
||||||
echo '1. Создаем изолированную сеть для порта ${params.PORT}...'
|
echo '1. Проверяем/создаем сеть ${params.NETWORK}...'
|
||||||
docker network create app-network-${params.PORT} 2>/dev/null || echo 'Сеть уже существует'
|
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}...'
|
echo '2. Останавливаем старые контейнеры порта ${params.PORT}...'
|
||||||
docker stop app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
docker stop app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
||||||
@@ -72,49 +118,68 @@ pipeline {
|
|||||||
docker rm 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 stop file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
||||||
docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
||||||
|
docker stop mongodb-${params.PORT} 2>/dev/null || echo 'Контейнер MongoDB не найден'
|
||||||
|
docker rm mongodb-${params.PORT} 2>/dev/null || echo 'Контейнер MongoDB не найден'
|
||||||
|
|
||||||
echo '3. Запускаем БД...'
|
echo '3. Запускаем БД...'
|
||||||
docker run -d \\
|
docker run -d \\
|
||||||
--name postgres-${params.PORT} \\
|
--name postgres-${params.PORT} \\
|
||||||
--network app-network-${params.PORT} \\
|
--network ${params.NETWORK} \\
|
||||||
--network-alias no_copy_${params.PORT} \\
|
--network-alias no_copy_${params.PORT} \\
|
||||||
--network-alias database-${params.PORT} \\
|
--network-alias database-${params.PORT} \\
|
||||||
--network-alias db-${params.PORT} \\
|
--network-alias db-${params.PORT} \\
|
||||||
-p ${params.PORT}0:5432 \\
|
-p ${params.PORT}0:5432 \\
|
||||||
-e POSTGRES_DB=no_copy_${params.PORT} \\
|
-e POSTGRES_DB=no_copy${params.PORT_DB} \\
|
||||||
-e POSTGRES_USER=${DB_USER} \\
|
-e POSTGRES_USER=${DB_USER} \\
|
||||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
||||||
-v pgdata_${params.PORT}:/var/lib/postgresql/data \\
|
-v pgdata_${params.PORT}:/var/lib/postgresql/data \\
|
||||||
|
-e BUILD_TIME_BACK='${buildTime}' \\
|
||||||
postgres:17.7
|
postgres:17.7
|
||||||
|
|
||||||
echo '4. Запускаем storage...'
|
echo '4. Запускаем MongoDB...'
|
||||||
|
docker run -d \\
|
||||||
|
--name mongodb-${params.PORT} \\
|
||||||
|
--network ${params.NETWORK} \\
|
||||||
|
--network-alias mongodb-${params.PORT} \\
|
||||||
|
-p ${params.PORT}1:27017 \\
|
||||||
|
-e MONGO_INITDB_ROOT_USERNAME=${MONGO_USER} \\
|
||||||
|
-e MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD} \\
|
||||||
|
-v mongodb_data_${params.PORT}:/data/db \\
|
||||||
|
mongo:7.0
|
||||||
|
|
||||||
|
echo '5. Запускаем storage...'
|
||||||
docker run -d \\
|
docker run -d \\
|
||||||
--name file-storage-${params.PORT} \\
|
--name file-storage-${params.PORT} \\
|
||||||
--network app-network-${params.PORT} \\
|
--network ${params.NETWORK} \\
|
||||||
-v uploads_data_${params.PORT}:/storage:rw \\
|
-v uploads_data_${params.PORT}:/storage:rw \\
|
||||||
alpine:latest tail -f /dev/null
|
alpine:latest tail -f /dev/null
|
||||||
|
|
||||||
echo '5. Ждем БД...'
|
echo '6. Ждем БД...'
|
||||||
sleep 15
|
sleep 15
|
||||||
|
|
||||||
echo '6. Собираем приложение...'
|
echo '7. Собираем приложение...'
|
||||||
docker build --no-cache -t app-backend-${params.PORT}:latest .
|
docker build --no-cache -t app-backend-${params.PORT}:latest .
|
||||||
|
|
||||||
echo '7. Запускаем приложение...'
|
echo '8. Запускаем приложение...'
|
||||||
docker run -d \\
|
docker run -d \\
|
||||||
--name app-backend-${params.PORT} \\
|
--name app-backend-${params.PORT} \\
|
||||||
--network app-network-${params.PORT} \\
|
--network ${params.NETWORK} \\
|
||||||
|
--network-alias app \\
|
||||||
|
--network-alias app-${params.PORT} \\
|
||||||
-p ${params.PORT}:8080 \\
|
-p ${params.PORT}:8080 \\
|
||||||
-v uploads_data_${params.PORT}:/data/uploads:rw \\
|
-v uploads_data_${params.PORT}:/data/uploads:rw \\
|
||||||
-e POSTGRES_DB=no_copy_${params.PORT} \\
|
-e POSTGRES_DB=no_copy${params.PORT_DB} \\
|
||||||
-e POSTGRES_USER=${DB_USER} \\
|
-e POSTGRES_USER=${DB_USER} \\
|
||||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
||||||
-e POSTGRES_PORT=5432 \\
|
-e POSTGRES_PORT=5432 \\
|
||||||
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
||||||
-e FILE_STORAGE_PATH=/data/uploads \\
|
-e FILE_STORAGE_PATH=/data/uploads \\
|
||||||
|
-e SPRING_PROFILES_ACTIVE=${springProfile} \\
|
||||||
|
-e MONGO_URI=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@mongodb-${params.PORT}:27017 \\
|
||||||
|
-e MONGO_DATABASE=no_copy \\
|
||||||
app-backend-${params.PORT}:latest
|
app-backend-${params.PORT}:latest
|
||||||
|
|
||||||
echo '8. Проверка...'
|
echo '9. Проверка...'
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
||||||
if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
|
if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
|
||||||
@@ -129,12 +194,39 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 {
|
post {
|
||||||
success {
|
success {
|
||||||
echo "Deployment successful"
|
script {
|
||||||
echo "Application URL: http://${params.SERVER}:${params.PORT}"
|
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 {
|
failure {
|
||||||
echo "Deployment failed for branch ${params.BRANCH} on port ${params.PORT}"
|
echo "Deployment failed for branch ${params.BRANCH} on port ${params.PORT}"
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ pipeline {
|
|||||||
defaultValue: '2998',
|
defaultValue: '2998',
|
||||||
description: 'Порт для запуска экземпляра'
|
description: 'Порт для запуска экземпляра'
|
||||||
)
|
)
|
||||||
|
string(
|
||||||
|
name: 'NETWORK',
|
||||||
|
defaultValue: 'app-network-dev',
|
||||||
|
description: 'Docker сеть для подключения'
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
@@ -85,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',
|
||||||
@@ -93,23 +100,20 @@ pipeline {
|
|||||||
)
|
)
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||||
|
|
||||||
echo '=== Редактируем docker-compose.yml ==='
|
# 1. СОЗДАЕМ JSON ФАЙЛ (ЭТО РАБОТАЕТ 100%)
|
||||||
|
mkdir -p public
|
||||||
|
echo '{\\"buildTime\\": \\"${BUILD_TIME_FRONT}\\"}' > public/build-info.json
|
||||||
|
|
||||||
# Меняем имя контейнера
|
# 2. Меняем имя контейнера и порт
|
||||||
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
||||||
|
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
||||||
|
|
||||||
# Меняем порт (2998 на нужный порт)
|
# 3. Собираем образ
|
||||||
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
|
||||||
|
"
|
||||||
echo 'Проверяем изменения:'
|
|
||||||
grep -n 'container_name\\|ports' docker-compose.yml
|
|
||||||
|
|
||||||
echo '=== Строим образ ==='
|
|
||||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
|
|
||||||
"
|
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -190,6 +194,70 @@ 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 {
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ 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',
|
||||||
@@ -92,6 +93,7 @@ pipeline {
|
|||||||
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
-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
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -9,5 +9,6 @@ interface Referral {
|
|||||||
val totalIncome: Int
|
val totalIncome: Int
|
||||||
val availableIncome: Int
|
val availableIncome: Int
|
||||||
val holdBalance: Int
|
val holdBalance: Int
|
||||||
|
val spentBalance: Int
|
||||||
val active: Boolean
|
val active: Boolean
|
||||||
}
|
}
|
||||||
@@ -18,6 +18,7 @@ class ReferralService(
|
|||||||
override val totalIncome = 0
|
override val totalIncome = 0
|
||||||
override val availableIncome = 0
|
override val availableIncome = 0
|
||||||
override val holdBalance: Int = 0
|
override val holdBalance: Int = 0
|
||||||
|
override val spentBalance: Int = 0
|
||||||
override val active: Boolean = false
|
override val active: Boolean = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,7 +60,8 @@ class ReferralService(
|
|||||||
totalIncome = referral.totalIncome,
|
totalIncome = referral.totalIncome,
|
||||||
availableIncome = referral.availableIncome,
|
availableIncome = referral.availableIncome,
|
||||||
holdBalance = referral.holdBalance,
|
holdBalance = referral.holdBalance,
|
||||||
referralLink = referral.referralLink
|
referralLink = referral.referralLink,
|
||||||
|
spentBalance = referral.spentBalance,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,4 +7,5 @@ data class ReferralStat(
|
|||||||
val availableIncome: Int,
|
val availableIncome: Int,
|
||||||
val holdBalance: Int,
|
val holdBalance: Int,
|
||||||
val referralLink: String,
|
val referralLink: String,
|
||||||
|
val spentBalance: Int,
|
||||||
)
|
)
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,9 +3,9 @@ package ru.soune.nocopy.configuration;
|
|||||||
import com.vrt.AudioFilePathProvider;
|
import com.vrt.AudioFilePathProvider;
|
||||||
import com.vrt.fileprotection.FileProtector;
|
import com.vrt.fileprotection.FileProtector;
|
||||||
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
||||||
|
import com.vrt.fileprotection.documents.DocumentLocalSearch;
|
||||||
import com.vrt.fileprotection.image.ImageLocalSearch;
|
import com.vrt.fileprotection.image.ImageLocalSearch;
|
||||||
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
||||||
import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
|
|
||||||
import lombok.AllArgsConstructor;
|
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;
|
||||||
@@ -20,6 +20,10 @@ import java.util.Collections;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class ApplicationConfig {
|
public class ApplicationConfig {
|
||||||
|
|
||||||
|
// private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
// private final FileUtil fileUtil;
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
PasswordEncoder passwordEncoder() {
|
PasswordEncoder passwordEncoder() {
|
||||||
return new BCryptPasswordEncoder();
|
return new BCryptPasswordEncoder();
|
||||||
@@ -33,8 +37,12 @@ public class ApplicationConfig {
|
|||||||
ImageUniqueCheck imageUniqueCheck,
|
ImageUniqueCheck imageUniqueCheck,
|
||||||
ImageLocalSearch imageLocalSearch,
|
ImageLocalSearch imageLocalSearch,
|
||||||
AudioLocalSearch audioLocalSearch,
|
AudioLocalSearch audioLocalSearch,
|
||||||
AudioFilePathProvider audioFilePathProvider) {
|
AudioFilePathProvider audioFilePathProvider,
|
||||||
|
DocumentLocalSearch documentLocalSearch) {
|
||||||
|
|
||||||
|
// List<FileProtector.FileInfo> initialFiles = loadProcessingFile();
|
||||||
|
|
||||||
|
//TODO инициализация файлов при создании
|
||||||
return new com.vrt.NoCopyFileService(
|
return new com.vrt.NoCopyFileService(
|
||||||
Collections.emptyList(),
|
Collections.emptyList(),
|
||||||
fileProvider,
|
fileProvider,
|
||||||
@@ -42,8 +50,17 @@ public class ApplicationConfig {
|
|||||||
imageUniqueCheck,
|
imageUniqueCheck,
|
||||||
imageLocalSearch,
|
imageLocalSearch,
|
||||||
audioLocalSearch,
|
audioLocalSearch,
|
||||||
audioFilePathProvider
|
audioFilePathProvider,
|
||||||
|
documentLocalSearch
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// private List<FileProtector.FileInfo> loadProcessingFile() {
|
||||||
|
// List<FileEntity> byProtectionStatus =
|
||||||
|
// fileEntityRepository.findByProtectionStatus(ProtectionStatus.PROCESSING);
|
||||||
|
//
|
||||||
|
// return byProtectionStatus.stream().map(fileEntity ->
|
||||||
|
// fileUtil.createFileInfo(fileEntity, null)).toList();
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,7 +23,31 @@ public class HandlerConfig {
|
|||||||
CompanyHandler companyHandler,
|
CompanyHandler companyHandler,
|
||||||
TariffHandler tariffHandler,
|
TariffHandler tariffHandler,
|
||||||
TariffInfoHandler tariffInfoHandler,
|
TariffInfoHandler tariffInfoHandler,
|
||||||
ReferralHandler referralHandler
|
ReferralHandler referralHandler,
|
||||||
|
ResetPasswordHandler resetPasswordHandler,
|
||||||
|
DaDataHandler daDataHandler,
|
||||||
|
PaymentHandler paymentHandler,
|
||||||
|
CostHandler costHandler,
|
||||||
|
MonitoringHandler monitoringHandler,
|
||||||
|
ViolationHandler violationHandler,
|
||||||
|
ViolationStatisticsHandler violationStatisticsHandler,
|
||||||
|
GlobalSearchHandler globalSearchHandler,
|
||||||
|
ViolationNotionHandler violationNotionHandler,
|
||||||
|
ComplaintEntityHandler complaintEntityHandler,
|
||||||
|
UserInfoHandler userInfoHandler,
|
||||||
|
NotificationHandler notificationHandler,
|
||||||
|
UserVerificationHandler userVerificationHandler,
|
||||||
|
LawCaseHandler lawCaseHandler,
|
||||||
|
TokenOperationHandler tokenOperationHandler,
|
||||||
|
StatisticUserFilesHandler statisticUserHandler,
|
||||||
|
StatisticTariffInfoFileHandler statisticTariffInfoFileHandler,
|
||||||
|
StatisticUserDynamicHandler statisticUserDynamicHandler,
|
||||||
|
StatisticProtectedFilesHandler statisticProtectedFilesHandler,
|
||||||
|
StatisticViolationHandler statisticViolationHandler,
|
||||||
|
StatisticSubscriberHandler statisticSubscriberHandler,
|
||||||
|
StatisticTokenHandler statisticTokenHandler,
|
||||||
|
StatisticIncomeHandler statisticIncomeHandler
|
||||||
|
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
map.put(20001, login);
|
map.put(20001, login);
|
||||||
@@ -34,10 +58,33 @@ public class HandlerConfig {
|
|||||||
map.put(20007, imageFoundRequestHandler);
|
map.put(20007, imageFoundRequestHandler);
|
||||||
map.put(20008, authRequestHandler);
|
map.put(20008, authRequestHandler);
|
||||||
map.put(20009, verifyRegisterUser);
|
map.put(20009, verifyRegisterUser);
|
||||||
|
map.put(20010, resetPasswordHandler);
|
||||||
map.put(30000, companyHandler);
|
map.put(30000, companyHandler);
|
||||||
map.put(30001, tariffHandler);
|
map.put(30001, tariffHandler);
|
||||||
map.put(30002, tariffInfoHandler);
|
map.put(30002, tariffInfoHandler);
|
||||||
map.put(30003, referralHandler);
|
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);
|
||||||
|
map.put(30013, complaintEntityHandler);
|
||||||
|
map.put(30014, userInfoHandler);
|
||||||
|
map.put(30015, notificationHandler);
|
||||||
|
map.put(30016, userVerificationHandler);
|
||||||
|
map.put(30017, lawCaseHandler);
|
||||||
|
map.put(30018, tokenOperationHandler);
|
||||||
|
map.put(30019, statisticUserHandler);
|
||||||
|
map.put(30020, statisticTariffInfoFileHandler);
|
||||||
|
map.put(30021, statisticUserDynamicHandler);
|
||||||
|
map.put(30022, statisticProtectedFilesHandler);
|
||||||
|
map.put(30023, statisticViolationHandler);
|
||||||
|
map.put(30024, statisticSubscriberHandler);
|
||||||
|
map.put(30025, statisticTokenHandler);
|
||||||
|
map.put(30026, statisticIncomeHandler);
|
||||||
|
|
||||||
return map;
|
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();
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
package ru.soune.nocopy.configuration.file;
|
|
||||||
|
|
||||||
import jakarta.annotation.PostConstruct;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@ConfigurationProperties(prefix = "file.storage")
|
|
||||||
@Data
|
|
||||||
public class FileStorageConfig {
|
|
||||||
private String basePath;
|
|
||||||
private long maxFileSize;
|
|
||||||
private int chunkSize;
|
|
||||||
private int authTokenLifeHours;
|
|
||||||
|
|
||||||
@PostConstruct
|
|
||||||
public void init() throws IOException {
|
|
||||||
Files.createDirectories(Paths.get(basePath));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,16 +4,12 @@ import lombok.AllArgsConstructor;
|
|||||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||||
import org.springframework.context.event.EventListener;
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import ru.soune.nocopy.service.file.FileProcessingOrchestrator;
|
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class NoCopyInitializer {
|
public class NoCopyInitializer {
|
||||||
|
|
||||||
private final FileProcessingOrchestrator orchestrator;
|
|
||||||
|
|
||||||
@EventListener(ApplicationReadyEvent.class)
|
@EventListener(ApplicationReadyEvent.class)
|
||||||
public void initializeOnStartup() {
|
public void initializeOnStartup() {
|
||||||
orchestrator.initializeProcessingQueue();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,51 +1,62 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import com.google.api.client.util.IOUtils;
|
||||||
|
import com.google.common.io.ByteStreams;
|
||||||
import com.vrt.NoCopyFileService;
|
import com.vrt.NoCopyFileService;
|
||||||
import com.vrt.fileprotection.FileProtector;
|
import com.vrt.fileprotection.FileProtector;
|
||||||
import com.vrt.fileprotection.NoCopyCheckResult;
|
import com.vrt.fileprotection.NoCopyCheckResult;
|
||||||
|
import com.vrt.fileprotection.audio.AudioCheckResult;
|
||||||
|
import com.vrt.fileprotection.documents.DocumentCheckResult;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.core.io.FileSystemResource;
|
import org.springframework.core.io.FileSystemResource;
|
||||||
|
import org.springframework.core.io.InputStreamResource;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.data.web.PageableDefault;
|
import org.springframework.data.web.PageableDefault;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.validation.BindingResult;
|
import org.springframework.validation.BindingResult;
|
||||||
import org.springframework.validation.FieldError;
|
import org.springframework.validation.FieldError;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
|
||||||
import ru.soune.nocopy.dto.BaseRequest;
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
import ru.soune.nocopy.dto.BaseResponse;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.file.*;
|
import ru.soune.nocopy.dto.file.*;
|
||||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||||
|
import ru.soune.nocopy.entity.company.Company;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.entity.user.AuthToken;
|
import ru.soune.nocopy.entity.user.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.user.User;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
import ru.soune.nocopy.handler.*;
|
import ru.soune.nocopy.handler.*;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.FileSimilarityService;
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
import ru.soune.nocopy.service.file.*;
|
||||||
|
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||||
import ru.soune.nocopy.service.file.ProtectionsLimitService;
|
import ru.soune.nocopy.service.file.ProtectionsLimitService;
|
||||||
|
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
|
||||||
import ru.soune.nocopy.service.register.AuthService;
|
import ru.soune.nocopy.service.register.AuthService;
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
import ru.soune.nocopy.service.user.moderation.UserVerificationService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
|
||||||
import ru.soune.nocopy.util.FileUtil;
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -73,6 +84,16 @@ public class ApiController {
|
|||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
|
private final CheckCounterService checkCounterService;
|
||||||
|
|
||||||
|
private final CloudStorageService cloudStorageService;
|
||||||
|
|
||||||
|
private final ZipService zipService;
|
||||||
|
|
||||||
|
private final UserVerificationService userVerificationService;
|
||||||
|
|
||||||
@PostMapping("/v{version}/data")
|
@PostMapping("/v{version}/data")
|
||||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
@PathVariable("version") int version) {
|
@PathVariable("version") int version) {
|
||||||
@@ -153,46 +174,172 @@ public class ApiController {
|
|||||||
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
||||||
duplicateData
|
duplicateData
|
||||||
));
|
));
|
||||||
|
} catch (FileFormatException e){
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error uploading chunk", e);
|
log.error("Error uploading chunk", e);
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/v{version}/private/files/chunk")
|
||||||
|
public ResponseEntity<BaseResponse> uploadChunk(
|
||||||
|
@RequestParam(value = "upload_id", required = false) String uploadId,
|
||||||
|
@RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
|
||||||
|
@RequestParam(value = "chunk", required = false) MultipartFile chunk,
|
||||||
|
@RequestParam(value = "last_file", required = false) Boolean last_file,
|
||||||
|
@RequestParam(value = "token") String token) {
|
||||||
|
try {
|
||||||
|
if (chunk == null || chunk.isEmpty()) {
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
|
||||||
|
}
|
||||||
|
if (uploadId == null || uploadId.isBlank()) {
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, "Upload Id is required");
|
||||||
|
}
|
||||||
|
if (chunkNumber == null || chunkNumber < 0) {
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
Long userId = authService.useUserAuthToken(token);
|
||||||
|
|
||||||
|
UploadProgressResponse uploadProgressResponse = fileUploadService.uploadPassportChunk(uploadId, chunkNumber,
|
||||||
|
chunk, userId);
|
||||||
|
|
||||||
|
if (last_file) {
|
||||||
|
zipService.createAndSplitZip(userId,
|
||||||
|
fileEntityService.getAllUserFiles(userId, List.of(FileStatus.PRIVATE)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return buildSuccessResponse(uploadId, chunkNumber, chunk,
|
||||||
|
fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
|
||||||
|
}catch (FileFormatException e){
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error uploading chunk", e);
|
||||||
|
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/check/{fileId}")
|
||||||
|
public ResponseEntity<BaseResponse> check(@PathVariable String fileId) {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
|
||||||
|
|
||||||
|
File file = new File(fileEntity.getFilePath());
|
||||||
|
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, FileProtector.Type.IMAGE);
|
||||||
|
log.info("checkResult: {}", checkResult);
|
||||||
|
|
||||||
|
|
||||||
|
return ResponseEntity.ok(new BaseResponse(1, 1, "1", checkResult));
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/{fileId}/similar")
|
@GetMapping("/v{version}/files/{fileId}/similar")
|
||||||
public ResponseEntity<BaseResponse> findSimilarFiles(
|
public ResponseEntity<BaseResponse> findSimilarFiles(
|
||||||
@PathVariable("version") int version,
|
@PathVariable("version") int version,
|
||||||
@PathVariable String fileId,
|
@PathVariable String fileId,
|
||||||
@RequestParam(value = "auth_token",required = false) String authToken,
|
@RequestParam(value = "auth_token", required = false) String authToken,
|
||||||
@RequestParam(required = false) List<String> similarityLevels,
|
@RequestParam(required = false) List<String> similarityLevels,
|
||||||
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
||||||
SimilarityFilter filter = SimilarityFilter.builder()
|
|
||||||
.similarityLevels(similarityLevels)
|
|
||||||
.build();
|
|
||||||
Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable, authToken);
|
|
||||||
|
|
||||||
String messageDesc;
|
try {
|
||||||
MessageCode success;
|
FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
|
||||||
|
|
||||||
if (similarFiles.isEmpty()) {
|
if (fileEntity == null) {
|
||||||
messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
|
return ResponseEntity.ok().body(new BaseResponse(0, MessageCode.INVALID_FIELD.getCode(),
|
||||||
success = MessageCode.SUCCESS;
|
MessageCode.INVALID_FIELD.getDescription(), null));
|
||||||
} else {
|
}
|
||||||
messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
|
|
||||||
success = MessageCode.SUCCESS;
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, Object> responseData = new HashMap<>();
|
File file = new File(fileEntity.getFilePath());
|
||||||
responseData.put("content", similarFiles.getContent());
|
FileProtector.Type type = "document".equals(fileEntity.getMimeType()) ?
|
||||||
responseData.put("page", similarFiles.getNumber());
|
FileProtector.Type.DOC : FileProtector.Type.AUDIO;
|
||||||
responseData.put("size", similarFiles.getSize());
|
|
||||||
responseData.put("totalElements", similarFiles.getTotalElements());
|
|
||||||
responseData.put("totalPages", similarFiles.getTotalPages());
|
|
||||||
responseData.put("hasNext", similarFiles.hasNext());
|
|
||||||
responseData.put("hasPrevious", similarFiles.hasPrevious());
|
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
|
||||||
.body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
|
log.info("checkResult: {}", checkResult);
|
||||||
|
|
||||||
|
switch (checkResult) {
|
||||||
|
case DocumentCheckResult.Success success -> {
|
||||||
|
FileProtector.FileInfo info = success.getInfo();
|
||||||
|
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
|
||||||
|
if (entity != null) {
|
||||||
|
results.add(fileSimilarityService.buildDTO(entity));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case AudioCheckResult.Success success -> {
|
||||||
|
FileProtector.FileInfo info = success.getInfo();
|
||||||
|
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
|
||||||
|
if (entity != null) {
|
||||||
|
results.add(fileSimilarityService.buildDTO(entity));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case DocumentCheckResult.Failed failed ->
|
||||||
|
log.warn("Document check failed: {}", failed.getMessage());
|
||||||
|
case AudioCheckResult.Failed failed ->
|
||||||
|
log.warn("Audio check failed: {}", failed.getMessage());
|
||||||
|
default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
|
||||||
|
}
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse buildSuccessResponse(Page<SimilarFileDTO> page, MessageCode messageCode) {
|
||||||
|
Map<String, Object> responseData = new HashMap<>();
|
||||||
|
responseData.put("content", page.getContent());
|
||||||
|
responseData.put("page", page.getNumber());
|
||||||
|
responseData.put("size", page.getSize());
|
||||||
|
responseData.put("totalElements", page.getTotalElements());
|
||||||
|
responseData.put("totalPages", page.getTotalPages());
|
||||||
|
responseData.put("hasNext", page.hasNext());
|
||||||
|
responseData.put("hasPrevious", page.hasPrevious());
|
||||||
|
|
||||||
|
return new BaseResponse(20004, messageCode.getCode(),
|
||||||
|
messageCode.getDescription(), responseData);
|
||||||
|
}
|
||||||
|
|
||||||
|
private BaseResponse buildSuccessResponse(List<SimilarFileDTO> list, MessageCode messageCode) {
|
||||||
|
Map<String, Object> responseData = new HashMap<>();
|
||||||
|
responseData.put("content", list);
|
||||||
|
responseData.put("totalElements", list.size());
|
||||||
|
|
||||||
|
return new BaseResponse(20004, messageCode.getCode(),
|
||||||
|
messageCode.getDescription(), responseData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/progress/{uploadId}")
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
@@ -297,28 +444,52 @@ public class ApiController {
|
|||||||
@PathVariable(required = false) Integer version,
|
@PathVariable(required = false) Integer version,
|
||||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||||
try {
|
try {
|
||||||
if (tokenHeader == null) {
|
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("token", tokenHeader);
|
errorData.put("token", tokenHeader);
|
||||||
errorData.put("fileId", fileId);
|
|
||||||
errorData.put("version", version);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
|
MessageCode.TOKEN_IS_NULL.getCode(),
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
|
MessageCode.TOKEN_IS_NULL.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||||
|
FileStatus status = entityResponse.getStatus();
|
||||||
|
|
||||||
if (!entityResponse.getUserId().equals(userId)) {
|
if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
|
||||||
|
status.equals(FileStatus.REMOVED)) {
|
||||||
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
|
errorData.put("fileId", entityResponse.getId());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
MessageCode.FILE_IS_BLOCKED.getCode(),
|
||||||
|
MessageCode.FILE_IS_BLOCKED.getDescription(),
|
||||||
|
errorData));
|
||||||
|
}
|
||||||
|
|
||||||
|
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<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("token", tokenHeader);
|
errorData.put("token", tokenHeader);
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
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));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -327,45 +498,39 @@ public class ApiController {
|
|||||||
errorData.put("file_status", entityResponse.getStatus());
|
errorData.put("file_status", entityResponse.getStatus());
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
MessageCode.FILE_DELETE.getCode(),
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
MessageCode.FILE_DELETE.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
//TODO
|
||||||
|
|
||||||
if (!entityResponse.isExistsOnDisk()) {
|
// if (!entityResponse.isExistsOnDisk()) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
// Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
// errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
||||||
|
//
|
||||||
|
// return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
// MessageCode.FILE_NOT_EXIST.getCode(),
|
||||||
|
// MessageCode.FILE_NOT_EXIST.getDescription(),
|
||||||
|
// errorData));
|
||||||
|
// }
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
// if (!file.exists()) {
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
// Map<String, Object> errorData = new HashMap<>();
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
// errorData.put("file", file.exists());
|
||||||
errorData));
|
//
|
||||||
}
|
// return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
|
// MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||||
|
// MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||||
|
// errorData));
|
||||||
|
// }
|
||||||
|
|
||||||
|
byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
|
||||||
Path filePath = Paths.get(entityResponse.getProtectedFilePath());
|
|
||||||
// Resource resource = new UrlResource(filePath.toUri());
|
|
||||||
FileSystemResource resource = new FileSystemResource(filePath);
|
|
||||||
long fileSize = Files.size(filePath);
|
|
||||||
|
|
||||||
if (!resource.exists()) {
|
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
|
||||||
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()
|
return ResponseEntity.ok()
|
||||||
.contentLength(fileSize)
|
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||||
.contentType(MediaType.parseMediaType(contentType))
|
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||||
"attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
|
"attachment; filename=\"" + entityResponse.getFileName() + "\"")
|
||||||
.body(resource);
|
.body(bytes);
|
||||||
} catch (FileEntityNotFoundException e) {
|
} catch (FileEntityNotFoundException e) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("fileId", fileId);
|
errorData.put("fileId", fileId);
|
||||||
@@ -374,58 +539,27 @@ public class ApiController {
|
|||||||
MessageCode.FILE_NOT_FOUND.getCode(),
|
MessageCode.FILE_NOT_FOUND.getCode(),
|
||||||
MessageCode.FILE_NOT_FOUND.getDescription(),
|
MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
errorData));
|
errorData));
|
||||||
} catch (NotFoundAuthToken | IOException e) {
|
} catch (NotFoundAuthToken e) {
|
||||||
Map<String, Object> errorData = new HashMap<>();
|
Map<String, Object> errorData = new HashMap<>();
|
||||||
errorData.put("token", tokenHeader);
|
errorData.put("token", tokenHeader);
|
||||||
errorData.put("fileId", fileId);
|
|
||||||
errorData.put("version", version);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||||
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
|
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
|
||||||
errorData));
|
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("/protect/{fileId}")
|
|
||||||
public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
|
|
||||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
|
||||||
|
|
||||||
if (!optionalFileEntity.isPresent()) {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
FileEntity fileEntity = optionalFileEntity.get();
|
|
||||||
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
|
|
||||||
|
|
||||||
noCopyFileService.addFile(fileInfo);
|
|
||||||
|
|
||||||
fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
|
|
||||||
fileEntityRepository.save(fileEntity);
|
|
||||||
|
|
||||||
return ResponseEntity.ok().build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/check/{fileId}/{type}")
|
|
||||||
public ResponseEntity<?> check(@PathVariable(required = false) String fileId,
|
|
||||||
@PathVariable(required = false) String type) {
|
|
||||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
|
||||||
|
|
||||||
if (!optionalFileEntity.isPresent()) {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
|
|
||||||
FileEntity fileEntity = optionalFileEntity.get();
|
|
||||||
|
|
||||||
Path path = Paths.get(fileEntity.getProtectedFilePath());
|
|
||||||
|
|
||||||
File file = path.toFile();
|
|
||||||
|
|
||||||
NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
|
|
||||||
FileProtector.Type.valueOf(type.toUpperCase()));
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(noCopyCheckResult);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/check/file_stats")
|
@GetMapping("/check/file_stats")
|
||||||
public ResponseEntity<?> checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) {
|
public ResponseEntity<?> checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) {
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
@@ -439,33 +573,6 @@ public class ApiController {
|
|||||||
return ResponseEntity.ok().body(fileTypeStats);
|
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,
|
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
|
||||||
String fileId) {
|
String fileId) {
|
||||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
@@ -522,13 +629,4 @@ public class ApiController {
|
|||||||
|
|
||||||
return errorDetail;
|
return errorDetail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private String determineContentType(Path filePath) throws IOException {
|
|
||||||
String contentType = Files.probeContentType(filePath);
|
|
||||||
if (contentType == null) {
|
|
||||||
contentType = "application/octet-stream";
|
|
||||||
}
|
|
||||||
return contentType;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,16 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import com.google.api.client.util.IOUtils;
|
||||||
|
import com.google.common.io.ByteStreams;
|
||||||
|
import com.vrt.NoCopyFileService;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.core.io.InputStreamResource;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.*;
|
||||||
import org.springframework.http.MediaType;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
|
||||||
import ru.soune.nocopy.dto.file.CheckStatus;
|
import ru.soune.nocopy.dto.file.CheckStatus;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
@@ -16,60 +20,134 @@ import ru.soune.nocopy.repository.FileEntityRepository;
|
|||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.file.CheckCounterService;
|
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||||
import ru.soune.nocopy.service.file.FileStorageService;
|
import ru.soune.nocopy.service.file.FileStorageService;
|
||||||
|
import ru.soune.nocopy.service.file.ImageResizeService;
|
||||||
|
import ru.soune.nocopy.service.file.ZipService;
|
||||||
|
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
|
||||||
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.*;
|
||||||
|
import java.net.URLEncoder;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/files")
|
@RequestMapping("/api/files")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
@AllArgsConstructor
|
||||||
public class FileController {
|
public class FileController {
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private FileStorageService fileStorageService;
|
private FileStorageService fileStorageService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private FileEntityRepository fileRepository;
|
private FileEntityRepository fileRepository;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private CheckCounterService checkCounterService;
|
private CheckCounterService checkCounterService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private UserRepository userRepository;
|
private UserRepository userRepository;
|
||||||
|
|
||||||
|
private ImageResizeService imageResizeService;
|
||||||
|
|
||||||
|
private NoCopyFileService noCopyFileService;
|
||||||
|
|
||||||
|
private FileUtil fileUtil;
|
||||||
|
|
||||||
|
private ZipService zipService;
|
||||||
|
|
||||||
|
private CloudStorageService cloudStorageService;
|
||||||
|
|
||||||
@GetMapping("/public/{fileId}")
|
@GetMapping("/public/{fileId}")
|
||||||
public ResponseEntity<Resource> getPublicFile(
|
public ResponseEntity<StreamingResponseBody> getPublicFile(@PathVariable String fileId) {
|
||||||
@PathVariable String fileId) throws IOException {
|
try {
|
||||||
|
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new FileNotFoundException("Not found in DB: " + fileId));
|
||||||
|
|
||||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
MediaType mediaType = getMediaType(fileEntity);
|
||||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
|
||||||
|
|
||||||
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getFilePath());
|
ContentDisposition contentDisposition = ContentDisposition.inline()
|
||||||
|
.filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
|
||||||
|
.build();
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
StreamingResponseBody responseBody = outputStream -> {
|
||||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
try (InputStream inputStream = cloudStorageService.readFileFromStorage(fileEntity.getFilePath())) {
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
ByteStreams.copy(inputStream, outputStream);
|
||||||
"inline; filename=\"" + fileEntity.getOriginalFileName() + "\"")
|
} catch (NoSuchKeyException e) {
|
||||||
.body(resource);
|
log.error("File disappeared from S3 during streaming: {}", fileId, e);
|
||||||
|
throw new IOException("File not found in storage", e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.contentType(mediaType)
|
||||||
|
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
|
||||||
|
.header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600")
|
||||||
|
.body(responseBody);
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
log.warn("File not found in DB: {}", fileId);
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
|
} catch (NoSuchKeyException e) {
|
||||||
|
log.warn("File not found in S3: {}", fileId);
|
||||||
|
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error reading file: {}", fileId, e);
|
||||||
|
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/protected/{fileId}")
|
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(
|
public ResponseEntity<Resource> getProtectedFile(
|
||||||
@PathVariable String fileId) throws IOException {
|
@PathVariable String fileId, @PathVariable String type) throws IOException {
|
||||||
|
|
||||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
.orElseThrow(() -> new RuntimeException("File not found"));
|
||||||
|
|
||||||
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getProtectedFilePath());
|
String filePath = type.equals("thumbnail") ? fileEntity.getThumbnailPath(): fileEntity.getFilePath();
|
||||||
|
|
||||||
|
// InputStream file = cloudStorageService.readFileFromStorage(filePath);
|
||||||
|
|
||||||
|
// if (file == null || !file.exists()) {
|
||||||
|
// log.error("File not found in storage: {}", fileEntity.getFilePath());
|
||||||
|
// return ResponseEntity.notFound().build();
|
||||||
|
// }
|
||||||
|
|
||||||
if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
|
if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
|
||||||
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
|
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
|
||||||
throw new RuntimeException("File is not protected");
|
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");
|
||||||
|
|
||||||
|
InputStreamResource resource = new InputStreamResource(cloudStorageService.readFileFromStorage(filePath));
|
||||||
|
|
||||||
return ResponseEntity.ok()
|
return ResponseEntity.ok()
|
||||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
||||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||||
"inline; filename=\"" + fileEntity.getOriginalFileName() + "\"")
|
"inline; filename*=UTF-8''" + encodedFileName)
|
||||||
.body(resource);
|
.body(resource);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,4 +167,33 @@ public class FileController {
|
|||||||
.ok()
|
.ok()
|
||||||
.body(protectedFileCheck);
|
.body(protectedFileCheck);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("protect/{fileId}/{convertTo}")
|
||||||
|
public ResponseEntity<FileProtector.FileInfo> convert(@PathVariable String fileId, @PathVariable String convertTo) {
|
||||||
|
FileEntity file = fileRepository.findByFileId(fileId);
|
||||||
|
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(file, convertTo);
|
||||||
|
|
||||||
|
noCopyFileService.addFile(fileInfo);
|
||||||
|
|
||||||
|
return ResponseEntity
|
||||||
|
.ok()
|
||||||
|
.body(fileInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/download/user-passport/archive/{userId}")
|
||||||
|
public ResponseEntity<byte[]> downloadPassportZip(@PathVariable Long userId) {
|
||||||
|
try {
|
||||||
|
byte[] zipBytes = zipService.assembleZipFromSplitFiles(userId);
|
||||||
|
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||||
|
"attachment; filename=passport_" + userId + ".zip")
|
||||||
|
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||||
|
.contentLength(zipBytes.length)
|
||||||
|
.body(zipBytes);
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error("Failed to assemble passport for user {}", userId, e);
|
||||||
|
return ResponseEntity.internalServerError().build();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,5 +1,6 @@
|
|||||||
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.*;
|
||||||
|
|
||||||
@@ -15,6 +16,14 @@ public class HealtCheckController {
|
|||||||
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")
|
@GetMapping("/api/debug/memory")
|
||||||
public Map<String, String> getMemoryInfo() {
|
public Map<String, String> getMemoryInfo() {
|
||||||
Runtime runtime = Runtime.getRuntime();
|
Runtime runtime = Runtime.getRuntime();
|
||||||
@@ -32,4 +41,12 @@ public class HealtCheckController {
|
|||||||
|
|
||||||
return info;
|
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 changed:" + renewal));
|
||||||
|
} 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,216 @@
|
|||||||
|
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.InsufficientFundsException;
|
||||||
|
import ru.soune.nocopy.exception.InvalidPayoutMethodException;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
|
import ru.soune.nocopy.exception.PendingPayoutExistsException;
|
||||||
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
import ru.soune.nocopy.service.payout.PayoutMethodService;
|
||||||
|
import ru.soune.nocopy.service.payout.PayoutRequestService;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@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<?> 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();
|
||||||
|
|
||||||
|
try {
|
||||||
|
PayoutRequest payoutRequest = payoutRequestService.createPayoutRequest(user.getId(), request);
|
||||||
|
return ResponseEntity.status(HttpStatus.CREATED).body(payoutRequest);
|
||||||
|
} catch (InsufficientFundsException | PendingPayoutExistsException | InvalidPayoutMethodException e) {
|
||||||
|
return ResponseEntity.status(HttpStatus.CONFLICT).body(e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
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());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -59,7 +59,7 @@ public class UserController {
|
|||||||
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
|
.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(), tariffService.getAllTariffs(),
|
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
||||||
null, null))
|
null, null, u.getVerificationStatus()))
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
return ResponseEntity.ok(allUsers);
|
return ResponseEntity.ok(allUsers);
|
||||||
@@ -79,13 +79,14 @@ public class UserController {
|
|||||||
UserDTO userDTO = userMapper.toDTO(user);
|
UserDTO userDTO = userMapper.toDTO(user);
|
||||||
userDTO.setEmail(email);
|
userDTO.setEmail(email);
|
||||||
userDTO.setFullName(user.getFullName());
|
userDTO.setFullName(user.getFullName());
|
||||||
|
userDTO.setVerifiedStatus(user.getVerificationStatus());
|
||||||
|
|
||||||
if (user.getCompany() != null) {
|
if (user.getCompany() != null) {
|
||||||
userDTO.setCompany(user.getCompany().getCompanyName());
|
userDTO.setCompany(user.getCompany().getCompanyName());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
|
if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
|
||||||
userDTO.setTariffs(tariffService.getAllTariffs());
|
userDTO.setTariffs(tariffService.getTariffByAccountType(user));
|
||||||
|
|
||||||
Long fileOnDisk = user.canManageCompanySettings() ?
|
Long fileOnDisk = user.canManageCompanySettings() ?
|
||||||
fileStatsService.calculateCompanyFileSize(user.getId()):
|
fileStatsService.calculateCompanyFileSize(user.getId()):
|
||||||
@@ -116,6 +117,7 @@ public class UserController {
|
|||||||
.maxFileOnDisk(tariff.getDiskSize())
|
.maxFileOnDisk(tariff.getDiskSize())
|
||||||
.startTariff(personalTariffInfo.getStartTariff())
|
.startTariff(personalTariffInfo.getStartTariff())
|
||||||
.endTariff(personalTariffInfo.getEndTariff())
|
.endTariff(personalTariffInfo.getEndTariff())
|
||||||
|
.tokens(personalTariffInfo.getTokens() + personalTariffInfo.getBoughtTokens())
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
userDTO.setTariffInfo(infoDTO);
|
userDTO.setTariffInfo(infoDTO);
|
||||||
|
|||||||
@@ -3,10 +3,12 @@ package ru.soune.nocopy.dto;
|
|||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
@Builder
|
||||||
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class BaseResponse {
|
public class BaseResponse {
|
||||||
@JsonProperty("msg_id")
|
@JsonProperty("msg_id")
|
||||||
|
|||||||
@@ -2,24 +2,35 @@ package ru.soune.nocopy.dto;
|
|||||||
|
|
||||||
public enum MessageCode {
|
public enum MessageCode {
|
||||||
SUCCESS(0, "Operation successful"),
|
SUCCESS(0, "Operation successful"),
|
||||||
|
SUCCESS_MODERATION(0, "File moderated successfully"),
|
||||||
REG_EMAIL_EXISTS(1, "Email already registered"),
|
REG_EMAIL_EXISTS(1, "Email already registered"),
|
||||||
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||||
|
REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"),
|
||||||
|
FILE_IS_BLOCKED(1, "File is blocked,deleted or removed"),
|
||||||
INVALID_FIELD(2, "Invalid field"),
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
INVALID_TOKEN(2, "Invalid token"),
|
MAIL_VERIFIED_NULL(2, "Mail verified null"),
|
||||||
|
INVALID_TOKEN(2, "Token not found or time expired"),
|
||||||
TOKEN_IS_ALIVE(2, "Token is alive"),
|
TOKEN_IS_ALIVE(2, "Token is alive"),
|
||||||
INVALID_ACTION(2, "Invalid action"),
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
||||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
|
FILE_NOT_EXIST(2, "File not exist on disk"),
|
||||||
|
FILE_DELETE(2, "File was deleted"),
|
||||||
|
USER_NOT_HAD_PERMISSION(2, "User not have permission for file"),
|
||||||
USER_NOT_VERIFIED(2, "User not verified"),
|
USER_NOT_VERIFIED(2, "User not verified"),
|
||||||
|
LAW_CASE_NOT_FOUND(4, "Law case not found"),
|
||||||
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
||||||
USER_NOT_FOUND(2, "User not found"),
|
USER_NOT_FOUND(2, "User not found"),
|
||||||
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
||||||
|
TOKEN_IS_NULL(2, "Token field is null"),
|
||||||
IMAGE_FOUND_ERROR(2, "Image found error"),
|
IMAGE_FOUND_ERROR(2, "Image found error"),
|
||||||
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
||||||
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||||
|
USER_NOT_HAVE_TOKEN(2, "Not have tokens"),
|
||||||
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
||||||
FILE_ENTITY_ERROR(2, "File entity error"),
|
FILE_ENTITY_ERROR(2, "File entity error"),
|
||||||
|
NOT_VALID_FIELD(2, "Not valid field"),
|
||||||
ACCESS_DENIED(2, "Access denied"),
|
ACCESS_DENIED(2, "Access denied"),
|
||||||
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
||||||
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
||||||
@@ -37,10 +48,24 @@ public enum MessageCode {
|
|||||||
TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
|
TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
|
||||||
VALIDATION_ERROR(2, "Validation error"),
|
VALIDATION_ERROR(2, "Validation error"),
|
||||||
RESOURCE_NOT_FOUND(4, "Resource not found"),
|
RESOURCE_NOT_FOUND(4, "Resource not found"),
|
||||||
|
OPERATION_NOT_FOUND(4, "Operation not found"),
|
||||||
INTERNAL_ERROR(4, "Internal server error"),
|
INTERNAL_ERROR(4, "Internal server error"),
|
||||||
COMPANY_NOT_FOUND(4, "Company not found"),
|
COMPANY_NOT_FOUND(4, "Company not found"),
|
||||||
|
PAYMENT_NOT_FOUND(4, "Payment not found"),
|
||||||
COMPANY_ALREADY_EXISTS(2, "Company already exists"),
|
COMPANY_ALREADY_EXISTS(2, "Company already exists"),
|
||||||
ERROR_TARIFF_INFO(2, "Erorr with tariff info");
|
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"),
|
||||||
|
ILLEGAL_STATE(2, "File is not in moderation state"),
|
||||||
|
NOT_VALID_FILE_TYPE_OR_COUNT_FILE(2, "Cost for file type not found, count is negative or files count" +
|
||||||
|
"more than max valid"),
|
||||||
|
USER_NOT_ACTIVE(2, "User not active"),
|
||||||
|
NOTION_NOT_FOUND(4, "Notion not found"),
|
||||||
|
NOT_FOUND(4, "Notion not found"),
|
||||||
|
MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion"),
|
||||||
|
USER_VERIFICATIONS_NOT_FOUND(4, "Verifications not found"),
|
||||||
|
ADMIN_USER_NOT_FOUND(4, "Verifications ,user or admin not found");
|
||||||
|
|
||||||
private final Integer code;
|
private final Integer code;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package ru.soune.nocopy.dto.complaint;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class BaseResponse {
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("message")
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
@JsonProperty("data")
|
||||||
|
private Object data;
|
||||||
|
|
||||||
|
@JsonProperty("error_code")
|
||||||
|
private String errorCode;
|
||||||
|
|
||||||
|
public static BaseResponse success(Object data) {
|
||||||
|
return BaseResponse.builder()
|
||||||
|
.status("SUCCESS")
|
||||||
|
.data(data)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static BaseResponse error(String message, String errorCode) {
|
||||||
|
return BaseResponse.builder()
|
||||||
|
.status("ERROR")
|
||||||
|
.message(message)
|
||||||
|
.errorCode(errorCode)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package ru.soune.nocopy.dto.complaint;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ComplaintRequest {
|
||||||
|
@JsonProperty("action")
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
@JsonProperty("id")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@JsonProperty("violation_id")
|
||||||
|
private Long violationId;
|
||||||
|
|
||||||
|
@JsonProperty("text")
|
||||||
|
private String complaintText;
|
||||||
|
|
||||||
|
@JsonProperty("email")
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("page")
|
||||||
|
private Integer page;
|
||||||
|
|
||||||
|
@JsonProperty("size")
|
||||||
|
private Integer size;
|
||||||
|
|
||||||
|
@JsonProperty("sort_by")
|
||||||
|
private String sortBy;
|
||||||
|
|
||||||
|
@JsonProperty("sort_direction")
|
||||||
|
private String sortDirection;
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package ru.soune.nocopy.dto.complaint;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class ComplaintResponse {
|
||||||
|
@JsonProperty("id")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("complaint_text")
|
||||||
|
private String complaintText;
|
||||||
|
|
||||||
|
@JsonProperty("violation_id")
|
||||||
|
private Long violationId;
|
||||||
|
|
||||||
|
@JsonProperty("email")
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
@JsonProperty("created_at")
|
||||||
|
private String createdAt;
|
||||||
|
|
||||||
|
@JsonProperty("updated_at")
|
||||||
|
private String updatedAt;
|
||||||
|
|
||||||
|
@JsonProperty("not_moderated")
|
||||||
|
private Boolean notModerated;
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto.complaint;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class LawCasePageResponse {
|
||||||
|
private List<LawCaseResponse> content;
|
||||||
|
private int pageNumber;
|
||||||
|
private int pageSize;
|
||||||
|
private long totalElements;
|
||||||
|
private int totalPages;
|
||||||
|
private boolean last;
|
||||||
|
private boolean first;
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package ru.soune.nocopy.dto.complaint;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.complaint.LawCasePriority;
|
||||||
|
import ru.soune.nocopy.entity.complaint.LawCaseType;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class LawCaseRequest {
|
||||||
|
private Long id;
|
||||||
|
//required
|
||||||
|
private String name;
|
||||||
|
//required
|
||||||
|
private String description;
|
||||||
|
private BigDecimal amount;
|
||||||
|
private String priority = LawCasePriority.HIGH.toString();
|
||||||
|
private String type;
|
||||||
|
private String lawyer;
|
||||||
|
private String token;
|
||||||
|
private Integer pageSize = 5;
|
||||||
|
private Integer pageNumber = 0;
|
||||||
|
private String sortBy = "updatedAt";
|
||||||
|
private String sortDir = "desc";
|
||||||
|
private String action;
|
||||||
|
private LawCaseType filterType;
|
||||||
|
private String filterLawyer;
|
||||||
|
private LawCasePriority filterPriority;
|
||||||
|
@JsonProperty("violation_id")
|
||||||
|
private Long violationId;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package ru.soune.nocopy.dto.complaint;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.complaint.LawCase;
|
||||||
|
import ru.soune.nocopy.entity.complaint.LawCasePriority;
|
||||||
|
import ru.soune.nocopy.entity.complaint.LawCaseType;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class LawCaseResponse {
|
||||||
|
private Long id;
|
||||||
|
private String name;
|
||||||
|
private String description;
|
||||||
|
private BigDecimal amount;
|
||||||
|
private LawCasePriority priority;
|
||||||
|
private LawCaseType type;
|
||||||
|
private String lawyer;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
private LocalDateTime updatedAt;
|
||||||
|
private int pageNumber;
|
||||||
|
private int pageSize;
|
||||||
|
private long totalElements;
|
||||||
|
private int totalPages;
|
||||||
|
private long violationId;
|
||||||
|
private List<LawCaseResponse> content;
|
||||||
|
|
||||||
|
public static LawCaseResponse fromEntity(LawCase lawCase) {
|
||||||
|
return LawCaseResponse.builder()
|
||||||
|
.id(lawCase.getId())
|
||||||
|
.name(lawCase.getName())
|
||||||
|
.description(lawCase.getDescription())
|
||||||
|
.amount(lawCase.getAmount())
|
||||||
|
.priority(lawCase.getPriority())
|
||||||
|
.type(lawCase.getType())
|
||||||
|
.lawyer(lawCase.getLawyer())
|
||||||
|
.createdAt(lawCase.getCreatedAt())
|
||||||
|
.updatedAt(lawCase.getUpdatedAt())
|
||||||
|
.violationId(lawCase.getViolationId())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto.complaint;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PaginatedResponse<T> {
|
||||||
|
private List<T> content;
|
||||||
|
private long totalElements;
|
||||||
|
private int totalPages;
|
||||||
|
private int pageNumber;
|
||||||
|
private int pageSize;
|
||||||
|
private boolean first;
|
||||||
|
private boolean last;
|
||||||
|
}
|
||||||
@@ -0,0 +1,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,14 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class AppealInfo {
|
||||||
|
private String appealId;
|
||||||
|
private String status;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class AppealRequest {
|
||||||
|
private String fileId;
|
||||||
|
private String appealReason;
|
||||||
|
private String additionalInfo;
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class AppealResponse {
|
||||||
|
private String appealId;
|
||||||
|
private String fileId;
|
||||||
|
private String appealReason;
|
||||||
|
private String additionalInfo;
|
||||||
|
private String status;
|
||||||
|
private String adminComment;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
private LocalDateTime resolvedAt;
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Builder
|
@Builder
|
||||||
@@ -34,4 +35,40 @@ public class FileEntityRequest {
|
|||||||
|
|
||||||
@JsonProperty("token")
|
@JsonProperty("token")
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
|
@JsonProperty("sort_by")
|
||||||
|
private String sortBy;
|
||||||
|
|
||||||
|
@JsonProperty("sort_order")
|
||||||
|
private String sortOrder;
|
||||||
|
|
||||||
|
@JsonProperty("type")
|
||||||
|
private String type;
|
||||||
|
|
||||||
|
@JsonProperty("file_status")
|
||||||
|
private FileStatus fileStatus;
|
||||||
|
|
||||||
|
@JsonProperty("date_filter")
|
||||||
|
private String dateFilter;
|
||||||
|
|
||||||
|
@JsonProperty("comment")
|
||||||
|
private String comment;
|
||||||
|
|
||||||
|
@JsonProperty("appeal_reason")
|
||||||
|
private String appealReason;
|
||||||
|
|
||||||
|
@JsonProperty("additional_info")
|
||||||
|
private String additionalInfo;
|
||||||
|
|
||||||
|
@JsonProperty("appeal_id")
|
||||||
|
private String appealId;
|
||||||
|
|
||||||
|
@JsonProperty("approve")
|
||||||
|
private Boolean approve;
|
||||||
|
|
||||||
|
@JsonProperty("reason_text")
|
||||||
|
private String reasonText;
|
||||||
|
|
||||||
|
@JsonProperty("search_query")
|
||||||
|
private String searchQuery;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ public class FileEntityResponse {
|
|||||||
private String storedFileName;
|
private String storedFileName;
|
||||||
private String filePath;
|
private String filePath;
|
||||||
private String protectedFilePath;
|
private String protectedFilePath;
|
||||||
|
private String thumbnailFileUrl;
|
||||||
private Long fileSize;
|
private Long fileSize;
|
||||||
private String mimeType;
|
private String mimeType;
|
||||||
private String fileExtension;
|
private String fileExtension;
|
||||||
@@ -40,4 +41,5 @@ public class FileEntityResponse {
|
|||||||
private String fileFormat;
|
private String fileFormat;
|
||||||
private Integer checksCount;
|
private Integer checksCount;
|
||||||
private LocalDateTime fileUploadDate;
|
private LocalDateTime fileUploadDate;
|
||||||
|
private String monitoring;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,6 +59,21 @@ public class FileInfoUserResponse {
|
|||||||
@JsonProperty("audios_violations")
|
@JsonProperty("audios_violations")
|
||||||
private Integer audiosViolations;
|
private Integer audiosViolations;
|
||||||
|
|
||||||
|
@JsonProperty("document_size")
|
||||||
|
private Long documentSize;
|
||||||
|
|
||||||
|
@JsonProperty("document_quantity")
|
||||||
|
private Integer documentCount;
|
||||||
|
|
||||||
|
@JsonProperty("document_check")
|
||||||
|
private Integer documentCheck;
|
||||||
|
|
||||||
|
@JsonProperty("document_violations")
|
||||||
|
private Integer documentViolations;
|
||||||
|
|
||||||
|
@JsonProperty("protected_document_files_count")
|
||||||
|
private Long protectedDocumentFilesCount;
|
||||||
|
|
||||||
@JsonProperty("protected_files_count")
|
@JsonProperty("protected_files_count")
|
||||||
private Long protectedFilesCount;
|
private Long protectedFilesCount;
|
||||||
|
|
||||||
|
|||||||
@@ -30,4 +30,10 @@ public class FileListResponse {
|
|||||||
|
|
||||||
@JsonProperty("page_size")
|
@JsonProperty("page_size")
|
||||||
private Integer pageSize;
|
private Integer pageSize;
|
||||||
|
|
||||||
|
@JsonProperty("sort_by")
|
||||||
|
private String sortBy;
|
||||||
|
|
||||||
|
@JsonProperty("sort_order")
|
||||||
|
private String sortOrder;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class FileModerationInfo {
|
||||||
|
private String fileId;
|
||||||
|
private String fileName;
|
||||||
|
private String ownerName;
|
||||||
|
private String ownerEmail;
|
||||||
|
private FileStatus currentStatus;
|
||||||
|
private LocalDateTime uploadDate;
|
||||||
|
private Boolean hasActiveAppeal;
|
||||||
|
private AppealInfo activeAppeal;
|
||||||
|
}
|
||||||
@@ -28,4 +28,7 @@ public class FileUploadRequest {
|
|||||||
|
|
||||||
@JsonProperty("token")
|
@JsonProperty("token")
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
|
@JsonProperty("convertTo")
|
||||||
|
private String convertTo;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,4 +7,10 @@ import lombok.Data;
|
|||||||
public class ImageSearchRequest {
|
public class ImageSearchRequest {
|
||||||
@JsonProperty("file_id")
|
@JsonProperty("file_id")
|
||||||
private String fileId;
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("page")
|
||||||
|
private Integer page = 1;
|
||||||
|
|
||||||
|
@JsonProperty("page_size")
|
||||||
|
private Integer pageSize = 10;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class ModerationActionRequest {
|
||||||
|
private String fileId;
|
||||||
|
private FileStatus newStatus;
|
||||||
|
private String comment;
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -19,4 +19,6 @@ public class SimilarFileDTO {
|
|||||||
ProtectionStatus status;
|
ProtectionStatus status;
|
||||||
LocalDateTime uploadDate;
|
LocalDateTime uploadDate;
|
||||||
String url;
|
String url;
|
||||||
|
Boolean owner;
|
||||||
|
String fileStatus;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,15 +12,6 @@ public class YandexSearchResponse {
|
|||||||
@JsonProperty("images")
|
@JsonProperty("images")
|
||||||
private List<ImageResult> images;
|
private List<ImageResult> images;
|
||||||
|
|
||||||
@JsonProperty("images")
|
|
||||||
public void setImages(List<ImageResult> images) {
|
|
||||||
if (images != null && images.size() > 5) {
|
|
||||||
this.images = images.subList(0, 5);
|
|
||||||
} else {
|
|
||||||
this.images = images;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public static class ImageResult {
|
public static class ImageResult {
|
||||||
@@ -42,4 +33,12 @@ public class YandexSearchResponse {
|
|||||||
@JsonProperty("host")
|
@JsonProperty("host")
|
||||||
private String host;
|
private String host;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private int page;
|
||||||
|
|
||||||
|
private int pageSize;
|
||||||
|
|
||||||
|
private int totalResults;
|
||||||
|
|
||||||
|
private int totalPages;
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package ru.soune.nocopy.dto.monitoring;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class GetViolationsRequest {
|
||||||
|
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("page")
|
||||||
|
private Integer page;
|
||||||
|
|
||||||
|
@JsonProperty("page_size")
|
||||||
|
private Integer pageSize;
|
||||||
|
|
||||||
|
@JsonProperty("mark_as_read")
|
||||||
|
private boolean markAsRead;
|
||||||
|
|
||||||
|
@JsonProperty("auth_token")
|
||||||
|
private String authToken;
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package ru.soune.nocopy.dto.monitoring;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.monitoring.MonitoringType;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Response for status monitoring
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class MonitoringStatusResponse {
|
||||||
|
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("file_name")
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
@JsonProperty("monitoring_type")
|
||||||
|
private MonitoringType monitoringType;
|
||||||
|
|
||||||
|
@JsonProperty("next_run")
|
||||||
|
private LocalDateTime nextRun;
|
||||||
|
|
||||||
|
@JsonProperty("last_run")
|
||||||
|
private LocalDateTime lastRun;
|
||||||
|
|
||||||
|
@JsonProperty("last_run_status")
|
||||||
|
private String lastRunStatus;
|
||||||
|
|
||||||
|
@JsonProperty("is_active")
|
||||||
|
private boolean isActive;
|
||||||
|
|
||||||
|
@JsonProperty("need_add_tokens")
|
||||||
|
private boolean needAddTokens;
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package ru.soune.nocopy.dto.monitoring;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.monitoring.MonitoringType;
|
||||||
|
/**
|
||||||
|
Set monitoring request
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class SetMonitoringRequest {
|
||||||
|
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
|
||||||
|
@JsonProperty("monitoring_type")
|
||||||
|
private String monitoringType;
|
||||||
|
|
||||||
|
@JsonProperty("auth_token")
|
||||||
|
private String authToken;
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package ru.soune.nocopy.dto.notification;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ActivateNotificationRequest {
|
||||||
|
private String authToken;
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package ru.soune.nocopy.dto.notification;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class ActiveNotificationsResponse {
|
||||||
|
private List<NotificationDto> notifications;
|
||||||
|
private long unreadCount;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto.notification;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class MarkAsReadRequest {
|
||||||
|
private List<Long> notificationIds;
|
||||||
|
private String authToken;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto.notification;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class MarkAsReadResponse {
|
||||||
|
private boolean success;
|
||||||
|
private int updatedCount;
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.notification;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.notification.NotificationStatus;
|
||||||
|
import ru.soune.nocopy.entity.notification.NotificationType;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class NotificationDto {
|
||||||
|
private Long id;
|
||||||
|
private String message;
|
||||||
|
private NotificationType type;
|
||||||
|
private NotificationStatus status;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.notification;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.notification.NotificationStatus;
|
||||||
|
import ru.soune.nocopy.entity.notification.NotificationType;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class NotificationListRequest {
|
||||||
|
private int page = 0;
|
||||||
|
private int size = 10;
|
||||||
|
private String sortBy = "createdAt";
|
||||||
|
private String sortDirection = "DESC";
|
||||||
|
private List<NotificationType> types;
|
||||||
|
private List<NotificationStatus> statuses;
|
||||||
|
private String authToken;
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package ru.soune.nocopy.dto.notification;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class NotificationListResponse {
|
||||||
|
private List<NotificationDto> notifications;
|
||||||
|
private int currentPage;
|
||||||
|
private int totalPages;
|
||||||
|
private long totalElements;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.dto.payment;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PaymentMethodDTO {
|
||||||
|
private String paymentMethodId;
|
||||||
|
private String lastFour;
|
||||||
|
private String cardType;
|
||||||
|
private String expiryMonth;
|
||||||
|
private String expiryYear;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package ru.soune.nocopy.dto.payment;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
@Builder
|
||||||
|
public class PaymentRequest {
|
||||||
|
private String email;
|
||||||
|
private String paymentUuid;
|
||||||
|
private String action;
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto.payment;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import ru.soune.nocopy.entity.payment.Payment;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
@Builder
|
||||||
|
public class PaymentResponse {
|
||||||
|
List<Payment> payments;
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package ru.soune.nocopy.dto.payout;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.Pattern;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class AddBankTransferRequest {
|
||||||
|
|
||||||
|
@NotBlank(message = "Bank name is required")
|
||||||
|
@Size(min = 2, max = 200, message = "Bank name must be between 2 and 200 characters")
|
||||||
|
private String bankName;
|
||||||
|
|
||||||
|
@NotBlank(message = "BIC is required")
|
||||||
|
@Pattern(regexp = "^[0-9]{9}$", message = "BIC must contain 9 digits")
|
||||||
|
private String bic;
|
||||||
|
|
||||||
|
@Pattern(regexp = "^[0-9]{20}$", message = "Correspondent account must contain 20 digits")
|
||||||
|
private String correspondentAccount;
|
||||||
|
|
||||||
|
@NotBlank(message = "Account number is required")
|
||||||
|
@Pattern(regexp = "^[0-9]{20}$", message = "Account number must contain 20 digits")
|
||||||
|
private String accountNumber;
|
||||||
|
|
||||||
|
@NotBlank(message = "Account holder name is required")
|
||||||
|
@Size(min = 3, max = 200, message = "Account holder name must be between 3 and 200 characters")
|
||||||
|
private String accountHolder;
|
||||||
|
|
||||||
|
@Pattern(regexp = "^[0-9]{10}$|^[0-9]{12}$", message = "INN must contain 10 or 12 digits")
|
||||||
|
private String inn;
|
||||||
|
|
||||||
|
@Pattern(regexp = "^[0-9]{9}$", message = "KPP must contain 9 digits")
|
||||||
|
private String kpp;
|
||||||
|
|
||||||
|
@Builder.Default
|
||||||
|
private boolean saveAsDefault = false;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.dto.payout;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.Pattern;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class AddCardRequest {
|
||||||
|
|
||||||
|
@NotBlank(message = "Card number required")
|
||||||
|
@Pattern(regexp = "^[0-9]{16}$", message = "Card number 16 cipher")
|
||||||
|
private String cardNumber;
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package ru.soune.nocopy.dto.payout;
|
||||||
|
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PayoutMethodDTO {
|
||||||
|
private Long id;
|
||||||
|
private String type;
|
||||||
|
private String displayName;
|
||||||
|
private String maskedDetails;
|
||||||
|
private String cardNumber;
|
||||||
|
private boolean isDefault;
|
||||||
|
private boolean isVerified;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package ru.soune.nocopy.dto.payout;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PayoutMethodResponse {
|
||||||
|
private Long id;
|
||||||
|
private String type;
|
||||||
|
private String displayName;
|
||||||
|
private String maskedDetails;
|
||||||
|
private boolean isDefault;
|
||||||
|
private boolean isVerified;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
private String bankName;
|
||||||
|
private String cardBrand;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package ru.soune.nocopy.dto.payout;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PayoutMethodTypeDTO {
|
||||||
|
private String code;
|
||||||
|
private String name;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package ru.soune.nocopy.dto.payout;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.DecimalMin;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PayoutRequestDTO {
|
||||||
|
|
||||||
|
@NotNull(message = "Sum of pay is required")
|
||||||
|
@DecimalMin(value = "1000.00", message = "Min sum for pay 1000")
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
@NotNull(message = "Способ выплаты обязателен")
|
||||||
|
private Long payoutMethodId;
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package ru.soune.nocopy.dto.payout;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import ru.soune.nocopy.entity.payout.PayoutRequest;
|
||||||
|
import ru.soune.nocopy.entity.payout.PayoutRequestStatus;
|
||||||
|
import ru.soune.nocopy.entity.payout.PayoutType;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
|
||||||
|
public class PayoutResponse {
|
||||||
|
private Long id;
|
||||||
|
private BigDecimal amount;
|
||||||
|
private String formattedAmount;
|
||||||
|
private PayoutRequestStatus status;
|
||||||
|
private PayoutType payoutType;
|
||||||
|
private String payoutMethodDisplay;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
private String formattedCreatedAt;
|
||||||
|
private LocalDateTime processedAt;
|
||||||
|
private LocalDateTime completedAt;
|
||||||
|
private String transactionId;
|
||||||
|
private String rejectionReason;
|
||||||
|
private boolean canCancel;
|
||||||
|
|
||||||
|
public static PayoutResponse fromEntity(PayoutRequest request) {
|
||||||
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm");
|
||||||
|
|
||||||
|
return PayoutResponse.builder()
|
||||||
|
.id(request.getId())
|
||||||
|
.amount(request.getAmount())
|
||||||
|
.formattedAmount(String.format("%.2f ₽", request.getAmount()))
|
||||||
|
.status(request.getStatus())
|
||||||
|
.payoutType(request.getPayoutType())
|
||||||
|
.payoutMethodDisplay(request.getPayoutMethod() != null ?
|
||||||
|
request.getPayoutMethod().getDisplayName() : null)
|
||||||
|
.createdAt(request.getCreatedAt())
|
||||||
|
.formattedCreatedAt(request.getCreatedAt() != null ?
|
||||||
|
request.getCreatedAt().format(formatter) : null)
|
||||||
|
.processedAt(request.getProcessAt())
|
||||||
|
.completedAt(request.getCompletedAt())
|
||||||
|
.rejectionReason(request.getRejectionReason())
|
||||||
|
.canCancel(request.getStatus() == PayoutRequestStatus.PENDING)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -13,6 +14,8 @@ public class RegRequest {
|
|||||||
|
|
||||||
private String companyName;
|
private String companyName;
|
||||||
|
|
||||||
|
private String inn;
|
||||||
|
|
||||||
@NotEmpty(message = "Need account type")
|
@NotEmpty(message = "Need account type")
|
||||||
private String accountType;
|
private String accountType;
|
||||||
|
|
||||||
@@ -31,4 +34,13 @@ public class RegRequest {
|
|||||||
private String authToken;
|
private String authToken;
|
||||||
|
|
||||||
private String referralLink;
|
private String referralLink;
|
||||||
|
|
||||||
|
@JsonProperty("mail_verified")
|
||||||
|
private String mailVerified;
|
||||||
|
|
||||||
|
@JsonProperty("ip")
|
||||||
|
private String ip;
|
||||||
|
|
||||||
|
@JsonProperty("user_agent")
|
||||||
|
private String userAgent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class ResetPasswordRequest {
|
||||||
|
|
||||||
|
@JsonProperty("email")
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
@JsonProperty("verifyToken")
|
||||||
|
private String verifyToken;
|
||||||
|
|
||||||
|
@JsonProperty("action")
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
@JsonProperty("password")
|
||||||
|
private String password;
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ResetPasswordResponse {
|
||||||
|
@JsonProperty("user_id")
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
@JsonProperty("authToken")
|
||||||
|
private String authToken;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.dto.search;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class GlobalSearchFileResult {
|
||||||
|
private String fileId;
|
||||||
|
private String fileName;
|
||||||
|
private String thumbnail;
|
||||||
|
private String fileStatus;
|
||||||
|
private List<YandexSearchResponse.ImageResult> images;
|
||||||
|
private int page;
|
||||||
|
private int pageSize;
|
||||||
|
private int totalResults;
|
||||||
|
private int totalPages;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package ru.soune.nocopy.dto.search;
|
||||||
|
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Builder
|
||||||
|
@Data
|
||||||
|
public class GlobalSearchStartRequest {
|
||||||
|
private String searchType;
|
||||||
|
|
||||||
|
private List<String> fileIds;
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package ru.soune.nocopy.dto.search;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class GlobalSearchStartResponse {
|
||||||
|
private String taskId;
|
||||||
|
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
private Integer totalFiles;
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto.search;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class GlobalSearchStatisticsRequest {
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
|
||||||
|
@JsonProperty("limit")
|
||||||
|
private Integer limit = 10;
|
||||||
|
|
||||||
|
@JsonProperty("days")
|
||||||
|
private Integer days;
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
package ru.soune.nocopy.dto.search;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import ru.soune.nocopy.entity.search.GlobalSearchTask;
|
||||||
|
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public class GlobalSearchStatisticsResponse {
|
||||||
|
|
||||||
|
@JsonProperty("total_searches")
|
||||||
|
private long totalSearches;
|
||||||
|
|
||||||
|
@JsonProperty("searches_by_status")
|
||||||
|
private StatusCountDto searchesByStatus;
|
||||||
|
|
||||||
|
@JsonProperty("recent_searches")
|
||||||
|
private List<SearchStatDto> recentSearches;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public static class StatusCountDto {
|
||||||
|
@JsonProperty("processing")
|
||||||
|
private long processing;
|
||||||
|
|
||||||
|
@JsonProperty("completed")
|
||||||
|
private long completed;
|
||||||
|
|
||||||
|
@JsonProperty("failed")
|
||||||
|
private long failed;
|
||||||
|
|
||||||
|
@JsonProperty("total")
|
||||||
|
private long total;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public static class SearchStatDto {
|
||||||
|
@JsonProperty("task_id")
|
||||||
|
private String taskId;
|
||||||
|
|
||||||
|
@JsonProperty("search_type")
|
||||||
|
private String searchType;
|
||||||
|
|
||||||
|
@JsonProperty("status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
@JsonProperty("total_files")
|
||||||
|
private Integer totalFiles;
|
||||||
|
|
||||||
|
@JsonProperty("violations_found")
|
||||||
|
private long violationsFound;
|
||||||
|
|
||||||
|
@JsonProperty("created_at")
|
||||||
|
private String createdAt;
|
||||||
|
|
||||||
|
@JsonProperty("duration_seconds")
|
||||||
|
private Long durationSeconds;
|
||||||
|
|
||||||
|
@JsonProperty("file_ids")
|
||||||
|
private List<String> fileIds;
|
||||||
|
|
||||||
|
public static SearchStatDto fromEntity(GlobalSearchTask task, long violationsCount, List<String> fileIds ) {
|
||||||
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||||
|
|
||||||
|
Long duration = null;
|
||||||
|
if (task.getUpdatedAt() != null && task.getCreatedAt() != null) {
|
||||||
|
duration = java.time.Duration.between(task.getCreatedAt(), task.getUpdatedAt()).getSeconds();
|
||||||
|
}
|
||||||
|
|
||||||
|
return SearchStatDto.builder()
|
||||||
|
.taskId(task.getTaskId())
|
||||||
|
.searchType(task.getSearchType())
|
||||||
|
.status(task.getStatus())
|
||||||
|
.totalFiles(task.getTotalFiles())
|
||||||
|
.violationsFound(violationsCount)
|
||||||
|
.fileIds(fileIds)
|
||||||
|
.createdAt(task.getCreatedAt() != null ? task.getCreatedAt().format(formatter) : null)
|
||||||
|
.durationSeconds(duration)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.search;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class GlobalSearchStatusResponse {
|
||||||
|
private String taskId;
|
||||||
|
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
private String searchType;
|
||||||
|
|
||||||
|
private Integer progress;
|
||||||
|
|
||||||
|
private List<GlobalSearchFileResult> results;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto.search.config;
|
||||||
|
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class SearchSettingsDto {
|
||||||
|
private Map<String, Boolean> engines;
|
||||||
|
private Boolean proxyEnabled;
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class IncomeStatisticRequest {
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class IncomeStatisticResponse {
|
||||||
|
|
||||||
|
@JsonProperty("total_income")
|
||||||
|
private Long totalIncome;
|
||||||
|
|
||||||
|
@JsonProperty("total_available")
|
||||||
|
private Long totalAvailable;
|
||||||
|
|
||||||
|
@JsonProperty("total_hold")
|
||||||
|
private Long totalHold;
|
||||||
|
|
||||||
|
@JsonProperty("income_per_user")
|
||||||
|
private Percentiles incomePerUser;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public static class Percentiles {
|
||||||
|
@JsonProperty("p5")
|
||||||
|
private Long p5;
|
||||||
|
|
||||||
|
@JsonProperty("p50")
|
||||||
|
private Long p50;
|
||||||
|
|
||||||
|
@JsonProperty("p95")
|
||||||
|
private Long p95;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ProtectedFilesStatisticRequest {
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class ProtectedFilesStatisticResponse {
|
||||||
|
|
||||||
|
@JsonProperty("total_files")
|
||||||
|
private Long totalFiles;
|
||||||
|
|
||||||
|
@JsonProperty("total_size_bytes")
|
||||||
|
private Long totalSizeBytes;
|
||||||
|
|
||||||
|
@JsonProperty("total_size_gb")
|
||||||
|
private Double totalSizeGb;
|
||||||
|
|
||||||
|
@JsonProperty("files_per_user_percentiles")
|
||||||
|
private Percentiles filesPerUser;
|
||||||
|
|
||||||
|
@JsonProperty("size_per_user_percentiles")
|
||||||
|
private SizePercentiles sizePerUser;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public static class Percentiles {
|
||||||
|
@JsonProperty("p5")
|
||||||
|
private Long p5;
|
||||||
|
|
||||||
|
@JsonProperty("p50")
|
||||||
|
private Long p50;
|
||||||
|
|
||||||
|
@JsonProperty("p95")
|
||||||
|
private Long p95;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public static class SizePercentiles {
|
||||||
|
@JsonProperty("p5_bytes")
|
||||||
|
private Long p5;
|
||||||
|
|
||||||
|
@JsonProperty("p50_bytes")
|
||||||
|
private Long p50;
|
||||||
|
|
||||||
|
@JsonProperty("p95_bytes")
|
||||||
|
private Long p95;
|
||||||
|
|
||||||
|
@JsonProperty("p5_mb")
|
||||||
|
private Double p5Mb;
|
||||||
|
|
||||||
|
@JsonProperty("p50_mb")
|
||||||
|
private Double p50Mb;
|
||||||
|
|
||||||
|
@JsonProperty("p95_mb")
|
||||||
|
private Double p95Mb;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class SubscriberStatisticRequest {
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class SubscriberStatisticResponse {
|
||||||
|
|
||||||
|
@JsonProperty("monthly")
|
||||||
|
private PeriodStatistics monthly;
|
||||||
|
|
||||||
|
@JsonProperty("yearly")
|
||||||
|
private PeriodStatistics yearly;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public static class PeriodStatistics {
|
||||||
|
|
||||||
|
@JsonProperty("current_active_subscriptions")
|
||||||
|
private Long currentActiveSubscriptions;
|
||||||
|
|
||||||
|
@JsonProperty("first_time_subscriptions")
|
||||||
|
private Long firstTimeSubscriptions;
|
||||||
|
|
||||||
|
@JsonProperty("renewals")
|
||||||
|
private Long renewals;
|
||||||
|
|
||||||
|
@JsonProperty("upgrades")
|
||||||
|
private Long upgrades;
|
||||||
|
|
||||||
|
@JsonProperty("downgrades")
|
||||||
|
private Long downgrades;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class TariffStatisticFullResponse {
|
||||||
|
|
||||||
|
@JsonProperty("tariffs")
|
||||||
|
private List<TariffStatisticResponse> tariffs;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class TariffStatisticRequest {
|
||||||
|
|
||||||
|
@JsonProperty("company_only")
|
||||||
|
private Boolean companyOnly = false;
|
||||||
|
|
||||||
|
@JsonProperty("active_only")
|
||||||
|
private Boolean activeOnly = true;
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class TariffStatisticResponse {
|
||||||
|
|
||||||
|
@JsonProperty("tariff_name")
|
||||||
|
private String tariffName;
|
||||||
|
|
||||||
|
@JsonProperty("user_count")
|
||||||
|
private Long userCount;
|
||||||
|
|
||||||
|
@JsonProperty("usage_percent")
|
||||||
|
private Double usagePercent;
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package ru.soune.nocopy.dto.statistic;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class TokenStatisticRequest {
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user