230 Commits
Author SHA1 Message Date
backdev 22e9d6c9db Add file info public
Test Workflow / test (push) Has been cancelled
2026-06-02 16:07:08 +07:00
backdev 8bad5a4619 Add file info public
Test Workflow / test (push) Has been cancelled
2026-06-02 15:53:03 +07:00
backdev 3b04cc8907 Add file info public
Test Workflow / test (push) Has been cancelled
2026-06-02 15:39:38 +07:00
backdev ebbd69b452 Add file info public
Test Workflow / test (push) Has been cancelled
2026-06-02 15:26:08 +07:00
backdev 47bed4149a Add file info public
Test Workflow / test (push) Has been cancelled
2026-06-02 15:06:45 +07:00
backdev e788b062b8 Add file info public
Test Workflow / test (push) Has been cancelled
2026-06-02 14:09:25 +07:00
backdev db606284cb Add file info public
Test Workflow / test (push) Has been cancelled
2026-06-02 13:01:41 +07:00
backdev de32f9b4d1 Add file info public
Test Workflow / test (push) Has been cancelled
2026-06-01 16:56:19 +07:00
backdev bc26b39d86 dev check fileName
Test Workflow / test (push) Has been cancelled
2026-05-29 12:12:26 +07:00
backdev 9423a44e17 dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-28 14:26:06 +07:00
backdev 1f49c49679 dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-28 13:38:35 +07:00
backdev be779ec496 dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-28 13:07:09 +07:00
backdev 6f2d8320dc dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-28 12:44:51 +07:00
backdev ea33e9cfe3 dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-28 12:18:46 +07:00
backdev a2e94b744c dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-28 11:23:12 +07:00
backdev de2a7f83fd dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-27 18:52:46 +07:00
backdev 1ac6d6f1b0 dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-27 17:47:12 +07:00
backdev d82ee69d6f dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-27 17:35:47 +07:00
backdev 6555f4c0c2 dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-27 16:44:07 +07:00
backdev c83dc10125 dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-27 16:31:08 +07:00
backdev 71cd0ebf10 dev add tariff info and control
Test Workflow / test (push) Has been cancelled
2026-05-27 16:15:36 +07:00
backdev ca9a7478f4 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-27 14:31:40 +07:00
backdev ea763edbec dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-27 11:31:04 +07:00
backdev 357ca3ec62 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-27 11:21:33 +07:00
backdev cb8a564afe dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-27 11:02:35 +07:00
backdev 398bfe74bb dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-27 10:35:28 +07:00
backdev 1e8e1f48db dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-26 16:33:08 +07:00
backdev 8a4f299941 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-26 16:17:16 +07:00
backdev 9891b1d9b2 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-26 15:37:38 +07:00
backdev e26b5928a4 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-26 15:17:58 +07:00
backdev 2dc9a760bc dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-26 14:56:35 +07:00
backdev 646d6fa11d dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-26 14:47:56 +07:00
backdev 16791d35de dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-26 13:21:01 +07:00
backdev 4a85e415a7 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-26 11:45:43 +07:00
backdev 85f8528b0c dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-25 19:08:41 +07:00
backdev 31d257c9bb dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-25 18:31:41 +07:00
backdev b87a4aff39 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-25 17:20:40 +07:00
backdev 859a95fda7 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-25 16:39:19 +07:00
backdev 7ec130e006 dev add complaint all info with pagination
Test Workflow / test (push) Has been cancelled
2026-05-25 15:20:50 +07:00
backdev 8ee60229f0 dev add User info for internal-data
Test Workflow / test (push) Has been cancelled
2026-05-25 14:51:09 +07:00
backdev d55b1620d5 dev add statistic complaints by status
Test Workflow / test (push) Has been cancelled
2026-05-25 14:16:39 +07:00
backdev 6929060661 dev add statistic complaints by status
Test Workflow / test (push) Has been cancelled
2026-05-25 12:57:22 +07:00
backdev 670f14e955 dev add statistic complaints by status
Test Workflow / test (push) Has been cancelled
2026-05-25 12:38:20 +07:00
backdev 1536dbc845 dev fix download with cyrrilic symbols
Test Workflow / test (push) Has been cancelled
2026-05-22 16:57:03 +07:00
backdev 59c1b30669 dev fix download with cyrrilic symbols
Test Workflow / test (push) Has been cancelled
2026-05-22 16:47:32 +07:00
backdev 992cc1747c dev fix download with cyrrilic symbols
Test Workflow / test (push) Has been cancelled
2026-05-22 16:37:49 +07:00
backdev b557b851e4 dev fix download with cyrrilic symbols
Test Workflow / test (push) Has been cancelled
2026-05-22 15:20:34 +07:00
backdev 9713f383a6 dev fix download with cyrrilic symbols
Test Workflow / test (push) Has been cancelled
2026-05-22 15:12:21 +07:00
backdev 34d5f159a4 dev fix download with cyrrilic symbols
Test Workflow / test (push) Has been cancelled
2026-05-22 15:01:43 +07:00
backdev 71e410aef5 dev fix download with cyrrilic symbols
Test Workflow / test (push) Has been cancelled
2026-05-22 14:55:51 +07:00
backdev b143b29a78 dev fix download with cyrrilic symbols
Test Workflow / test (push) Has been cancelled
2026-05-22 14:50:15 +07:00
backdev 9afe09ccc5 dev add cache for search
Test Workflow / test (push) Has been cancelled
2026-05-21 17:05:57 +07:00
backdev e20e4f6b48 dev add cache for search
Test Workflow / test (push) Has been cancelled
2026-05-21 16:55:21 +07:00
backdev 246d55da55 dev add cache for search
Test Workflow / test (push) Has been cancelled
2026-05-21 16:42:50 +07:00
backdev 81130fc238 dev add cache for search
Test Workflow / test (push) Has been cancelled
2026-05-21 16:26:07 +07:00
backdev 942e4d4926 dev add cache for search
Test Workflow / test (push) Has been cancelled
2026-05-21 16:15:50 +07:00
backdev cf2aefe6c3 dev add cache for search
Test Workflow / test (push) Has been cancelled
2026-05-21 16:06:47 +07:00
backdev ab796932e6 dev fields for notion
Test Workflow / test (push) Has been cancelled
2026-05-21 14:38:33 +07:00
backdev 55081d51a3 dev fields for notion
Test Workflow / test (push) Has been cancelled
2026-05-21 14:26:50 +07:00
backdev 0c522e2faf dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-21 13:15:11 +07:00
backdev 5c0a0c146b dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 17:10:20 +07:00
backdev 42e8648f53 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 17:00:52 +07:00
backdev e03c9ff0ff dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 16:34:16 +07:00
backdev 3a1f4ea9d9 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 16:22:22 +07:00
backdev 24bae18311 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 16:04:33 +07:00
backdev 7845304f87 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 15:54:29 +07:00
backdev 4dc479e31b dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 15:45:40 +07:00
backdev e633d43a74 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 15:36:55 +07:00
backdev 31713550ce dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 14:55:43 +07:00
backdev 2aac3bbdf4 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 14:35:23 +07:00
backdev 6415053840 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 14:30:56 +07:00
backdev 772cf9f40f dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 14:22:40 +07:00
backdev 20911982a6 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 13:08:55 +07:00
backdev 82e84514e4 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 12:59:17 +07:00
backdev 9dd1f8e6c8 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 12:22:39 +07:00
backdev 73ef7a57a3 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-19 12:11:14 +07:00
backdev 284bde0e27 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-18 15:13:16 +07:00
backdev 218582958c dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-18 14:01:02 +07:00
backdev 16620213c7 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-18 13:52:41 +07:00
backdev 0e0fac02a8 dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
2026-05-18 13:25:53 +07:00
backdev 57a39d0cb0 dev add tarriff description
Test Workflow / test (push) Has been cancelled
2026-05-15 16:52:55 +07:00
backdev df38da6d5f dev add tarriff description
Test Workflow / test (push) Has been cancelled
2026-05-15 16:06:31 +07:00
backdev cbff850da6 dev add tarriff description
Test Workflow / test (push) Has been cancelled
2026-05-15 15:52:50 +07:00
backdev afe78f74f2 dev add tarriff description
Test Workflow / test (push) Has been cancelled
2026-05-15 15:41:24 +07:00
backdev c0818146bc dev add tarriff description
Test Workflow / test (push) Has been cancelled
2026-05-15 15:29:07 +07:00
backdev a4928395b9 dev add tarriff description
Test Workflow / test (push) Has been cancelled
2026-05-15 14:44:54 +07:00
backdev 7c7ad61397 dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-15 13:37:15 +07:00
backdev dfc24b77c4 dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-15 13:27:29 +07:00
backdev 8c8ae0eb3c dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-15 13:17:47 +07:00
backdev ae81c42b89 dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-15 13:07:16 +07:00
backdev cfe3520bad dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-15 12:56:56 +07:00
backdev b0c66720b0 dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-15 12:40:26 +07:00
backdev 0c373acc7f dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-15 10:49:44 +07:00
backdev 59e9de2684 dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-14 13:01:40 +07:00
backdev 5dc3bb7157 dev add field locale for get info for view doc
Test Workflow / test (push) Has been cancelled
2026-05-14 12:44:19 +07:00
backdev 48cdca56a2 dev add check name with locale
Test Workflow / test (push) Has been cancelled
2026-05-14 12:28:52 +07:00
backdev 59909c05c3 dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-14 11:44:08 +07:00
backdev 675c93c0c6 dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 16:31:55 +07:00
backdev cc77f481dc dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 16:21:04 +07:00
backdev 51feca36d0 dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 16:00:35 +07:00
backdev 17850710b5 dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 15:43:43 +07:00
backdev de8120c737 dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 15:32:55 +07:00
backdev 2319dd498f dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 15:19:45 +07:00
backdev b77efcbce5 dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 14:27:01 +07:00
backdev a6e73be032 dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 14:15:54 +07:00
backdev cda829829c dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 14:03:15 +07:00
backdev 48c14d475d dev add context for notifcations
Test Workflow / test (push) Has been cancelled
2026-05-13 13:39:02 +07:00
backdev 0546f6acd5 dev add user info method by id
Test Workflow / test (push) Has been cancelled
2026-05-13 07:59:28 +07:00
backdev 807a8e1d53 dev add user info method by id
Test Workflow / test (push) Has been cancelled
2026-05-13 07:44:24 +07:00
backdev 0314618db5 dev add user info method by id
Test Workflow / test (push) Has been cancelled
2026-05-12 16:15:23 +07:00
backdev 6bc6592f37 dev add user info method by id
Test Workflow / test (push) Has been cancelled
2026-05-12 14:22:56 +07:00
backdev 4d8d3d4df2 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-09 09:58:54 +07:00
backdev 153a875b16 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 21:07:32 +07:00
backdev 01ba4c3892 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 15:34:57 +07:00
backdev 6565c18958 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 15:19:17 +07:00
backdev f433b4dc01 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 15:05:17 +07:00
backdev 891a900a53 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 14:56:15 +07:00
backdev 96a329cc48 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 14:35:15 +07:00
backdev d506b1cdaf dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 14:09:26 +07:00
backdev ed8eb25ec1 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 13:58:40 +07:00
backdev ec8f3af710 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 12:10:38 +07:00
backdev 394259c2c7 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 11:57:29 +07:00
backdev ff44763f88 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-08 11:42:59 +07:00
backdev 9dd174eb60 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-07 12:49:01 +07:00
backdev 957b10c5b9 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-07 11:35:04 +07:00
backdev 89124a0a73 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-07 11:24:29 +07:00
backdev b864d7e9bd dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 14:30:01 +07:00
backdev 5c918d48ad dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 14:19:30 +07:00
backdev 0d943da120 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 14:09:15 +07:00
backdev af4e4717d1 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 13:59:40 +07:00
backdev d0df78730f dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 13:49:16 +07:00
backdev ef22693691 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 13:29:13 +07:00
backdev b09e4e3bdb dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 13:08:34 +07:00
backdev f88b6fd353 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 13:07:52 +07:00
backdev d23df37b45 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 12:59:38 +07:00
backdev 8b8db46c29 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 12:45:00 +07:00
backdev 3fd4cbeab5 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-06 12:28:07 +07:00
backdev 367af98994 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 15:41:05 +07:00
backdev ba89406417 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 15:31:49 +07:00
backdev d2b94802de dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 14:53:25 +07:00
backdev d98a5ce692 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 14:43:28 +07:00
backdev cdc45e400d dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 14:36:30 +07:00
backdev c9e95edf1d dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 14:22:17 +07:00
backdev 352fe2c5cf dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 14:04:54 +07:00
backdev 6d80498402 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 13:54:11 +07:00
backdev bb43b6ef4f dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 13:44:49 +07:00
backdev 6793bbfc5c dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 10:43:07 +07:00
backdev 851528ead8 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-05 10:40:25 +07:00
backdev dad0c9db3b dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 17:24:46 +07:00
backdev 50577b43a2 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 16:59:30 +07:00
backdev 25b4601bfb dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 15:15:42 +07:00
backdev aacd485584 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 14:51:56 +07:00
backdev bc86854596 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 14:37:06 +07:00
backdev 0aa30736d8 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 14:25:40 +07:00
backdev c82d67ab6f dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 13:25:33 +07:00
backdev 83a325a5ac dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 13:22:19 +07:00
backdev b7ef3c86e8 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 12:59:51 +07:00
backdev d3ab48d40c dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 11:34:43 +07:00
backdev b79f2a4969 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 11:23:33 +07:00
backdev b19abf32e9 dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 11:09:52 +07:00
backdev bbc2508a9e dev add method link
Test Workflow / test (push) Has been cancelled
2026-05-04 10:50:42 +07:00
backdev 377a71a28e dev add method link
Test Workflow / test (push) Has been cancelled
2026-04-30 18:49:48 +07:00
backdev e1894168b6 dev add method link
Test Workflow / test (push) Has been cancelled
2026-04-30 18:35:35 +07:00
backdev fa4cb2ed1b dev add method link
Test Workflow / test (push) Has been cancelled
2026-04-30 18:24:19 +07:00
backdev c46c3842aa dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-30 16:04:37 +07:00
backdev d885f3fc4c dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-30 15:51:16 +07:00
backdev fb48ce45a0 dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 18:22:07 +07:00
backdev d9249c4ebc dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 18:14:46 +07:00
backdev 18383b1b62 dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 18:14:15 +07:00
backdev 9686eb453f dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 18:01:47 +07:00
backdev 93da73e90b dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 17:41:41 +07:00
backdev 67204d1c5c dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 17:29:19 +07:00
backdev 9a27b56f05 dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 17:16:34 +07:00
backdev f032caf0a3 dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 16:59:27 +07:00
backdev 0f8017a5a9 dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 15:20:46 +07:00
backdev c75ec6aa39 dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 15:13:19 +07:00
backdev ef35c62a61 dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 15:05:56 +07:00
backdev aa14f0dfbf dev add check similar
Test Workflow / test (push) Has been cancelled
2026-04-29 14:53:45 +07:00
backdev ddaf729e18 dev add violation id like required parameters
Test Workflow / test (push) Has been cancelled
2026-04-29 13:33:48 +07:00
backdev 2ca39eca3a dev add violation id like required parameters
Test Workflow / test (push) Has been cancelled
2026-04-29 11:55:18 +07:00
backdev 136b2b2082 dev add violation id like required parameters
Test Workflow / test (push) Has been cancelled
2026-04-29 11:42:11 +07:00
backdev fb091496de dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 17:40:37 +07:00
backdev 5c8431195b dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 17:11:51 +07:00
backdev e5d4ec2f07 dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 16:37:00 +07:00
backdev a87567e45d dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 16:32:30 +07:00
backdev 63e065373f dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 16:09:34 +07:00
backdev c44c251790 dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 15:58:35 +07:00
backdev 61e47975ff dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 15:41:57 +07:00
backdev 7adb52d86f dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 15:13:46 +07:00
backdev e8bcca6ee0 dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 15:07:12 +07:00
backdev 99f4db1d76 dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 14:58:47 +07:00
backdev 097a31fd7b dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 14:52:55 +07:00
backdev cca3a58f5a dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 14:42:41 +07:00
backdev 8a1035c6e1 dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 14:25:31 +07:00
backdev 284b402cdc dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 14:15:29 +07:00
backdev 610ab0977d dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 14:03:43 +07:00
backdev 66af0ea285 dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 13:53:51 +07:00
backdev cb01e24d87 dev fix add count
Test Workflow / test (push) Has been cancelled
2026-04-28 13:30:00 +07:00
backdev b67fb403e6 dev fix check file mimetype
Test Workflow / test (push) Has been cancelled
2026-04-28 12:33:51 +07:00
backdev b3d99b0c02 dev add check for change status
Test Workflow / test (push) Has been cancelled
2026-04-28 09:06:38 +07:00
backdev d1b695a65b dev add check for change status
Test Workflow / test (push) Has been cancelled
2026-04-27 17:56:28 +07:00
backdev 67e547e185 dev add check for change status
Test Workflow / test (push) Has been cancelled
2026-04-27 13:57:19 +07:00
backdev ced8768332 dev add check for change status
Test Workflow / test (push) Has been cancelled
2026-04-27 13:56:52 +07:00
backdev 3e90609ae0 dev add check for change status
Test Workflow / test (push) Has been cancelled
2026-04-27 12:44:13 +07:00
backdev dc27e2ccf2 dev add check for change status
Test Workflow / test (push) Has been cancelled
2026-04-27 12:21:26 +07:00
backdev 3f0a514660 dev fix sort
Test Workflow / test (push) Has been cancelled
2026-04-24 14:14:04 +07:00
backdev 0797ce20e5 dev fix sort
Test Workflow / test (push) Has been cancelled
2026-04-24 13:36:30 +07:00
backdev ab4151b68b dev fix sort
Test Workflow / test (push) Has been cancelled
2026-04-24 13:24:50 +07:00
backdev 0047cfd4f6 dev fix sort
Test Workflow / test (push) Has been cancelled
2026-04-24 13:11:49 +07:00
backdev cdaa6c7ce2 dev fix sort
Test Workflow / test (push) Has been cancelled
2026-04-24 12:54:48 +07:00
backdev d2d78b5117 dev fix sort
Test Workflow / test (push) Has been cancelled
2026-04-23 18:16:50 +07:00
backdev 3002f4b04c dev fix sort
Test Workflow / test (push) Has been cancelled
2026-04-23 18:05:37 +07:00
backdev a34fb9ffa7 dev fix sort
Test Workflow / test (push) Has been cancelled
2026-04-23 16:45:16 +07:00
backdev d0b977291c dev add cold storage
Test Workflow / test (push) Has been cancelled
2026-04-23 14:28:06 +07:00
backdev 71aa8ee01a dev add cold storage
Test Workflow / test (push) Has been cancelled
2026-04-23 14:11:05 +07:00
backdev 04506f4b42 dev add cold storage
Test Workflow / test (push) Has been cancelled
2026-04-23 13:10:24 +07:00
backdev e0ecd91ed0 dev add cold storage
Test Workflow / test (push) Has been cancelled
2026-04-23 12:56:13 +07:00
backdev 2f167a0150 dev add cold storage
Test Workflow / test (push) Has been cancelled
2026-04-23 12:37:14 +07:00
backdev 33c0275a37 dev add cold storage
Test Workflow / test (push) Has been cancelled
2026-04-23 00:38:40 +07:00
backdev d1e36a8dd0 dev merge
Test Workflow / test (push) Has been cancelled
2026-04-22 18:13:20 +07:00
backdev d5f7c73306 dev merge
Test Workflow / test (push) Has been cancelled
2026-04-22 18:05:02 +07:00
backdev 0529af6526 dev merge
Test Workflow / test (push) Has been cancelled
2026-04-22 17:53:36 +07:00
backdev 5de7e828c2 dev merge
Test Workflow / test (push) Has been cancelled
2026-04-22 17:10:25 +07:00
backdev d29258855e dev merge
Test Workflow / test (push) Has been cancelled
2026-04-22 16:24:43 +07:00
backdev cbcd16d376 Merge branch 'NCBACK-35' into dev 2026-04-22 16:03:28 +07:00
backdev eb223c2ecb dev add new action
Test Workflow / test (push) Has been cancelled
2026-04-22 12:38:05 +07:00
backdev bb96e3ac93 dev add new action
Test Workflow / test (push) Has been cancelled
2026-04-22 12:16:37 +07:00
backdev 572255c066 dev add monitoring statistic
Test Workflow / test (push) Has been cancelled
2026-04-20 16:15:08 +07:00
backdev d01ea6e2bd dev fix save to storage
Test Workflow / test (push) Has been cancelled
2026-04-20 15:35:24 +07:00
backdev d1a91fec1a dev add user_id for find all complaints
Test Workflow / test (push) Has been cancelled
2026-04-17 22:00:33 +07:00
120 changed files with 4825 additions and 801 deletions
+9
View File
@@ -63,6 +63,7 @@ dependencies {
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
implementation 'com.maxmind.geoip2:geoip2:4.2.0'
implementation 'org.sejda.imageio:webp-imageio:0.1.6'
implementation project(':referral')
@@ -72,6 +73,14 @@ dependencies {
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.1.0'
implementation 'io.github.resilience4j:resilience4j-spring-boot3:2.2.0'
//cache
implementation("org.springframework.boot:spring-boot-starter-cache:4.0.6")
implementation 'com.github.ben-manes.caffeine:caffeine'
}
tasks.named('test') {
+1 -1
View File
@@ -156,7 +156,7 @@ pipeline {
echo '6. Ждем БД...'
sleep 15
echo '7. Собираем приложение...'
docker build --no-cache -t app-backend-${params.PORT}:latest .
@@ -2,10 +2,12 @@ package ru.soune.nocopy;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableScheduling
@EnableCaching
public class NoCopyApplication {
public static void main(String[] args) {
@@ -1,5 +1,6 @@
package ru.soune.nocopy.configuration;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.vrt.AudioFilePathProvider;
import com.vrt.fileprotection.FileProtector;
import com.vrt.fileprotection.audio.AudioLocalSearch;
@@ -8,16 +9,21 @@ import com.vrt.fileprotection.image.ImageLocalSearch;
import com.vrt.fileprotection.image.ImageUniqueCheck;
import lombok.AllArgsConstructor;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.caffeine.CaffeineCacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
@Configuration
@EnableAutoConfiguration
@AllArgsConstructor
@EnableCaching
public class ApplicationConfig {
// private final FileEntityRepository fileEntityRepository;
@@ -55,6 +61,21 @@ public class ApplicationConfig {
);
}
@Bean
public CacheManager cacheManager() {
CaffeineCacheManager cacheManager = new CaffeineCacheManager(
"reverseImageSearch", "parsedImages");
cacheManager.setCaffeine(Caffeine.newBuilder()
.maximumSize(2_000)
.expireAfterWrite(1, TimeUnit.HOURS)
.expireAfterAccess(30, TimeUnit.MINUTES)
.softValues()
.recordStats()
);
return cacheManager;
}
// private List<FileProtector.FileInfo> loadProcessingFile() {
// List<FileEntity> byProtectionStatus =
// fileEntityRepository.findByProtectionStatus(ProtectionStatus.PROCESSING);
@@ -39,15 +39,7 @@ public class HandlerConfig {
UserVerificationHandler userVerificationHandler,
LawCaseHandler lawCaseHandler,
TokenOperationHandler tokenOperationHandler,
StatisticUserFilesHandler statisticUserHandler,
StatisticTariffInfoFileHandler statisticTariffInfoFileHandler,
StatisticUserDynamicHandler statisticUserDynamicHandler,
StatisticProtectedFilesHandler statisticProtectedFilesHandler,
StatisticViolationHandler statisticViolationHandler,
StatisticSubscriberHandler statisticSubscriberHandler,
StatisticTokenHandler statisticTokenHandler,
StatisticIncomeHandler statisticIncomeHandler
DockViewFileHandler dockViewFileHandler
) {
Map<Integer, RequestHandler> map = new HashMap<>();
map.put(20001, login);
@@ -77,6 +69,30 @@ public class HandlerConfig {
map.put(30016, userVerificationHandler);
map.put(30017, lawCaseHandler);
map.put(30018, tokenOperationHandler);
map.put(30028, dockViewFileHandler);
return map;
}
@Bean
public Map<Integer, RequestHandler> internalInfoHandler(
StatisticComplaintHandler statisticComplaintHandler,
StatisticUserFilesHandler statisticUserHandler,
StatisticTariffInfoFileHandler statisticTariffInfoFileHandler,
StatisticUserDynamicHandler statisticUserDynamicHandler,
StatisticProtectedFilesHandler statisticProtectedFilesHandler,
StatisticViolationHandler statisticViolationHandler,
StatisticSubscriberHandler statisticSubscriberHandler,
StatisticTokenHandler statisticTokenHandler,
StatisticIncomeHandler statisticIncomeHandler,
MonitoringStatisticHandler monitoringStatisticHandler,
FileInteranlInfoHandler fileInfo,
TariffInformationHandler tariffInformationHandler,
UserInfoHandler userInfoHandler
)
{
Map<Integer, RequestHandler> map = new HashMap<>();
map.put(30014, userInfoHandler);
map.put(30019, statisticUserHandler);
map.put(30020, statisticTariffInfoFileHandler);
map.put(30021, statisticUserDynamicHandler);
@@ -85,6 +101,27 @@ public class HandlerConfig {
map.put(30024, statisticSubscriberHandler);
map.put(30025, statisticTokenHandler);
map.put(30026, statisticIncomeHandler);
map.put(30027, monitoringStatisticHandler);
map.put(30029, statisticComplaintHandler);
map.put(40001, fileInfo);
map.put(40004, tariffInformationHandler);
return map;
}
@Bean
public Map<Integer, RequestHandler> internalControlHandler(
ControlComplaintHandler controlComplaintHandler,
FileInternalControlHandler fileInternalControlHandler,
TariffControlHandler tariffControlHandler,
UserInfoHandler userInfoHandler
)
{
Map<Integer, RequestHandler> map = new HashMap<>();
map.put(30014, userInfoHandler);
map.put(30030, controlComplaintHandler);
map.put(40002, fileInternalControlHandler);
map.put(40003, tariffControlHandler);
return map;
}
@@ -1,7 +1,5 @@
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 com.vrt.fileprotection.NoCopyCheckResult;
@@ -9,30 +7,28 @@ import com.vrt.fileprotection.audio.AudioCheckResult;
import com.vrt.fileprotection.documents.DocumentCheckResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.FileSystemResource;
import org.apache.commons.io.IOUtils;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.*;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.*;
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.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.docviewer.DocViewerRequest;
import ru.soune.nocopy.dto.file.*;
import ru.soune.nocopy.dto.register.RegAnswer;
import ru.soune.nocopy.entity.company.Company;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.UploadStatus;
import ru.soune.nocopy.entity.file.permission.PermissionType;
import ru.soune.nocopy.entity.user.AuthToken;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.exception.*;
@@ -41,21 +37,20 @@ import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.FileSimilarityService;
import ru.soune.nocopy.service.dockview.DockViewService;
import ru.soune.nocopy.service.file.*;
import ru.soune.nocopy.service.file.CheckCounterService;
import ru.soune.nocopy.service.file.ProtectionsLimitService;
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import ru.soune.nocopy.service.register.AuthService;
import ru.soune.nocopy.service.user.moderation.UserVerificationService;
import ru.soune.nocopy.util.FileUtil;
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
import java.io.File;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -68,6 +63,10 @@ public class ApiController {
private final Map<Integer, RequestHandler> handlers;
private final Map<Integer, RequestHandler> internalInfoHandler;
private final Map<Integer, RequestHandler> internalControlHandler;
private final FileEntityService fileEntityService;
private final AuthService authService;
@@ -92,7 +91,7 @@ public class ApiController {
private final ZipService zipService;
private final UserVerificationService userVerificationService;
private final DockViewService dockViewService;
@PostMapping("/v{version}/data")
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
@@ -135,6 +134,96 @@ public class ApiController {
}
}
@PostMapping("/internal/data-info")
public ResponseEntity<?> handleInternalInfoPostRequest(@RequestBody BaseRequest request) {
Integer msgId = request.getMsgId();
BaseResponse response;
RequestHandler internalHandler = internalInfoHandler.get(msgId);
try {
if (internalHandler == null) {
response = new BaseResponse(msgId,
MessageCode.MSG_ID_NOT_FOUND.getCode(),
MessageCode.MSG_ID_NOT_FOUND.getDescription(),
new HashMap<>());
} else {
response = internalHandler.handle(request);
}
return ResponseEntity.ok().body(response);
} catch (Exception e) {
log.error("Handler execution failed for msgId: {}", msgId, e);
BaseResponse errorResponse = new BaseResponse(msgId,
MessageCode.INVALID_JSON_BODY.getCode(),
MessageCode.INVALID_JSON_BODY.getDescription(),
new HashMap<>());
return ResponseEntity.ok().body(errorResponse);
}
}
@GetMapping("/internal/data-download/{fileId}")
public ResponseEntity<byte[]> getPublicFile(@PathVariable String fileId) {
try {
FileEntity fileEntity = fileEntityRepository.findById(fileId)
.orElseThrow(() -> new FileNotFoundException("Not found in DB: " + fileId));
MediaType mediaType = getMediaType(fileEntity);
ContentDisposition contentDisposition = ContentDisposition.inline()
.filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
.build();
byte[] fileBytes;
try (InputStream inputStream = cloudStorageService.readFileFromStorage(fileEntity.getFilePath())) {
fileBytes = IOUtils.toByteArray(inputStream);
}
return ResponseEntity.ok()
.contentType(mediaType)
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
.header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600")
.body(fileBytes);
} catch (FileNotFoundException e) {
return ResponseEntity.notFound().build();
} catch (NoSuchKeyException e) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
} catch (Exception e) {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
}
}
@PostMapping("/internal/data-control")
public ResponseEntity<?> handleInternalControlPostRequest(@RequestBody BaseRequest request) {
Integer msgId = request.getMsgId();
BaseResponse response;
RequestHandler internalHandler = internalControlHandler.get(msgId);
try {
if (internalHandler == null) {
response = new BaseResponse(msgId,
MessageCode.MSG_ID_NOT_FOUND.getCode(),
MessageCode.MSG_ID_NOT_FOUND.getDescription(),
new HashMap<>());
} else {
response = internalHandler.handle(request);
}
return ResponseEntity.ok().body(response);
} catch (Exception e) {
log.error("Handler execution failed for msgId: {}", msgId, e);
BaseResponse errorResponse = new BaseResponse(msgId,
MessageCode.INVALID_JSON_BODY.getCode(),
MessageCode.INVALID_JSON_BODY.getDescription(),
new HashMap<>());
return ResponseEntity.ok().body(errorResponse);
}
}
@PostMapping("/v{version}/files/chunk")
public ResponseEntity<BaseResponse> uploadChunk(
@PathVariable("version") int version,
@@ -254,14 +343,13 @@ public class ApiController {
fileId, similarityLevels, pageable, authToken);
response = buildSuccessResponse(similarFilesPage, MessageCode.SIMILAR_FILES_FOUND);
} else {
List<SimilarFileDTO> results = processNonImageFile(fileEntity, authToken);
List<SimilarFileDTO> results = processNonImageFile(fileEntity, true);
log.info("results: {}", results);
response = buildSuccessResponse(results, MessageCode.SIMILAR_FILES_FOUND);
checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
}
return ResponseEntity.ok(response);
} catch(IllegalArgumentException e) {
log.error("Error with file extensions : {}", e.getMessage(), e);
return ResponseEntity.ok().body(new BaseResponse(MessageCode.FILE_FOR_SEARCH_NOT_VALID.getCode(),
@@ -275,45 +363,55 @@ public class ApiController {
}
}
private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, String authToken) throws Exception {
private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, boolean cloud) throws Exception {
List<SimilarFileDTO> results = new ArrayList<>();
File file = null;
FileEntity duplicateByHash = fileSimilarityService.findDuplicateByHash(fileEntity.getFilePath(),
fileEntity.getMimeType(), fileEntity.getUserId());
fileEntity.getMimeType(), fileEntity.getUserId(), cloud);
log.info("duplicateByHash: {}", duplicateByHash);
if (duplicateByHash != null) {
results.add(fileSimilarityService.buildDTO(duplicateByHash));
return results;
}
File file = new File(fileEntity.getFilePath());
FileProtector.Type type = "document".equals(fileEntity.getMimeType()) ?
FileProtector.Type.DOC : FileProtector.Type.AUDIO;
try {
file = cloudStorageService.readFileFromStorageByPath(fileEntity.getFilePath());
FileProtector.Type type = "document".equals(fileEntity.getMimeType()) ?
FileProtector.Type.DOC : FileProtector.Type.AUDIO;
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
log.info("checkResult: {}", checkResult);
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
log.info("checkResult: {}", checkResult);
switch (checkResult) {
case DocumentCheckResult.Success success -> {
FileProtector.FileInfo info = success.getInfo();
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
if (entity != null) {
results.add(fileSimilarityService.buildDTO(entity));
switch (checkResult) {
case DocumentCheckResult.Success success -> {
FileProtector.FileInfo info = success.getInfo();
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
if (entity != null) {
results.add(fileSimilarityService.buildDTO(entity));
}
}
}
case AudioCheckResult.Success success -> {
FileProtector.FileInfo info = success.getInfo();
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
if (entity != null) {
results.add(fileSimilarityService.buildDTO(entity));
case AudioCheckResult.Success success -> {
FileProtector.FileInfo info = success.getInfo();
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
if (entity != null) {
results.add(fileSimilarityService.buildDTO(entity));
}
}
case DocumentCheckResult.Failed failed ->
log.warn("Document check failed: {}", failed.getMessage());
case AudioCheckResult.Failed failed ->
log.warn("Audio check failed: {}", failed.getMessage());
default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
}
} catch (Exception e) {
throw new Exception("Files for search not valid");
} finally {
if (file != null && file.exists()) {
file.delete();
}
case DocumentCheckResult.Failed failed ->
log.warn("Document check failed: {}", failed.getMessage());
case AudioCheckResult.Failed failed ->
log.warn("Audio check failed: {}", failed.getMessage());
default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
}
return results;
@@ -438,6 +536,42 @@ public class ApiController {
}
}
@GetMapping("/v{version}/files/public-download/{fileId}")
public ResponseEntity<?> downloadFile(
@PathVariable(required = false) String fileId, @PathVariable(required = false) Integer version) {
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
FileStatus status = entityResponse.getStatus();
if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
status.equals(FileStatus.REMOVED)) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("fileId", entityResponse.getId());
return ResponseEntity.ok().body(new BaseResponse(20004,
MessageCode.FILE_IS_BLOCKED.getCode(),
MessageCode.FILE_IS_BLOCKED.getDescription(),
errorData));
}
if (!entityResponse.getPermissions().get(PermissionType.DOWNLOAD)) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("fileId", entityResponse.getId());
return ResponseEntity.ok().body(new BaseResponse(20004,
MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getCode(),
MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getDescription(),
errorData));
}
byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
return ResponseEntity.ok()
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.header(HttpHeaders.CONTENT_DISPOSITION,
"attachment; filename=\"" + entityResponse.getFileName() + "\"")
.body(bytes);
}
@GetMapping("/v{version}/files/download/{fileId}")
public ResponseEntity<?> downloadFile(
@PathVariable(required = false) String fileId,
@@ -469,6 +603,16 @@ public class ApiController {
errorData));
}
if (!entityResponse.getPermissions().get(PermissionType.DOWNLOAD)) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("fileId", entityResponse.getId());
return ResponseEntity.ok().body(new BaseResponse(20004,
MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getCode(),
MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getDescription(),
errorData));
}
User fileUser = userRepository.findById(entityResponse.getUserId()).orElseThrow();
User user = userRepository.findById(userId).orElseThrow();
Company companyUser = user.getCompany();
@@ -502,27 +646,6 @@ public class ApiController {
MessageCode.FILE_DELETE.getDescription(),
errorData));
}
//TODO
// if (!entityResponse.isExistsOnDisk()) {
// Map<String, Object> errorData = new HashMap<>();
// errorData.put("onDisk", entityResponse.isExistsOnDisk());
//
// return ResponseEntity.ok().body(new BaseResponse(20004,
// MessageCode.FILE_NOT_EXIST.getCode(),
// MessageCode.FILE_NOT_EXIST.getDescription(),
// errorData));
// }
// if (!file.exists()) {
// Map<String, Object> errorData = new HashMap<>();
// errorData.put("file", file.exists());
//
// return ResponseEntity.ok().body(new BaseResponse(20004,
// MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
// MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
// errorData));
// }
byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
@@ -547,16 +670,67 @@ public class ApiController {
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
errorData));
// } catch (IOException e) {
// Map<String, Object> errorData = new HashMap<>();
// errorData.put("token", tokenHeader);
// errorData.put("fileId", fileId);
// errorData.put("version", version);
//
// return ResponseEntity.ok().body(new BaseResponse(20004,
// MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
// MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
// errorData));
}
}
@PostMapping("/file/link")
public ResponseEntity<?> downloadFile(@RequestBody DocViewerRequest viewerRequest) {
try {
String tokenHeader = viewerRequest.getToken();
Long userId = tokenHeader == null ? 0L: authService.useUserAuthToken(tokenHeader);
if (viewerRequest.getFileId() == null) {
return ResponseEntity.ok().body(new BaseResponse(0,
MessageCode.NOT_VALID_FIELD.getCode(),
MessageCode.NOT_VALID_FIELD.getDescription(),
"file_id is required"));
}
FileEntityResponse entityResponse = fileEntityService.getById(viewerRequest.getFileId(), 0);
FileStatus status = entityResponse.getStatus();
if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
status.equals(FileStatus.REMOVED)) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("fileId", entityResponse.getId());
return ResponseEntity.ok().body(new BaseResponse(0,
MessageCode.FILE_IS_BLOCKED.getCode(),
MessageCode.FILE_IS_BLOCKED.getDescription(),
errorData));
}
byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
dockViewService.createDockView(viewerRequest, userId);
String filename = entityResponse.getFileName();
String encodedFilename = URLEncoder.encode(filename, StandardCharsets.UTF_8)
.replace("+", "%20");
String safeFilename = filename.replaceAll("[^\\x00-\\x7F]", "_");
return ResponseEntity.ok()
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.header(HttpHeaders.CONTENT_DISPOSITION,
"attachment; filename=\"" + safeFilename + "\"; filename*=UTF-8''" + encodedFilename)
.body(bytes);
} catch (FileEntityNotFoundException e) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("fileId", viewerRequest.getFileId());
return ResponseEntity.ok().body(new BaseResponse(0,
MessageCode.FILE_NOT_FOUND.getCode(),
MessageCode.FILE_NOT_FOUND.getDescription(),
errorData));
} catch (NotFoundAuthToken e) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("token", viewerRequest.getFileId());
return ResponseEntity.ok().body(new BaseResponse(0,
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
errorData));
}
}
@@ -629,4 +803,23 @@ public class ApiController {
return errorDetail;
}
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;
}
}
}
}
@@ -1,6 +1,5 @@
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;
@@ -12,28 +11,23 @@ import org.springframework.http.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
import ru.soune.nocopy.dto.file.CheckStatus;
import ru.soune.nocopy.dto.file.FileEntityResponse;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.ProtectionStatus;
import ru.soune.nocopy.entity.user.ProtectedFileCheck;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.file.CheckCounterService;
import ru.soune.nocopy.service.file.FileStorageService;
import ru.soune.nocopy.service.file.ImageResizeService;
import ru.soune.nocopy.service.file.ZipService;
import ru.soune.nocopy.service.file.*;
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import ru.soune.nocopy.util.FileUtil;
import software.amazon.awssdk.services.mq.model.NotFoundException;
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
import java.io.*;
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
@RequestMapping("/api/files")
@Slf4j
@@ -48,7 +42,7 @@ public class FileController {
private UserRepository userRepository;
private ImageResizeService imageResizeService;
private final FileEntityService fileEntityService;
private NoCopyFileService noCopyFileService;
@@ -96,6 +90,24 @@ public class FileController {
}
}
@GetMapping("/public/file-info/{fileId}")
public ResponseEntity<FileEntityResponse> getPublicFileInfo(@PathVariable String fileId) {
return handleGetFileInfo(fileId);
}
private ResponseEntity<FileEntityResponse> handleGetFileInfo(String fileId) {
try {
FileEntityResponse fileInfo = fileEntityService.getById(fileId, 1);
return ResponseEntity
.ok()
.body(fileInfo);
} catch (NotFoundException e) {
return ResponseEntity
.notFound().build();
}
}
private MediaType getMediaType(FileEntity fileEntity) {
try {
return MediaType.parseMediaType(fileEntity.getMimeType());
@@ -124,13 +136,6 @@ public class FileController {
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 ||
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
throw new RuntimeException("File is not protected");
@@ -2,12 +2,14 @@ package ru.soune.nocopy.controller;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import ru.soune.nocopy.dto.search.GlobalSearchStartRequest;
import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
import ru.soune.nocopy.dto.search.GlobalSearchStatusResponse;
import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO;
import ru.soune.nocopy.dto.violation.ViolationRequest;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.search.GlobalSearchTask;
import ru.soune.nocopy.entity.search.SearchStatus;
@@ -57,15 +59,9 @@ public class GlobalSearchController {
String taskId = globalSearchService.startSearch(request, userId, filesToProcess);
Optional<GlobalSearchTask> taskOptional = globalSearchTaskRepository.findById(taskId);
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
GlobalSearchTask task = taskOptional.orElseThrow();
response.setTaskId(taskId);
response.setStatus(SearchStatus.ACCEPTED.name());
response.setTotalFiles(task.getTotalFiles());
response.setTotalFiles(filesToProcess.size());
} catch (NotFoundAuthToken e) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("token", tokenHeader);
@@ -120,8 +116,7 @@ public class GlobalSearchController {
try {
Long userId = authService.useUserAuthToken(tokenHeader);
fileViolationsSummary =
violationService.getFileViolationsSummary(userId);
fileViolationsSummary = violationService.getFileViolationsSummary(userId);
if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found");
} catch (NotFoundAuthToken e) {
@@ -134,6 +129,31 @@ public class GlobalSearchController {
return ResponseEntity.ok(fileViolationsSummary);
}
@PostMapping("/violation-summary-with-files")
public ResponseEntity<?> getViolations(@RequestBody ViolationRequest request) {
if (request.getToken() == null || request.getToken().isBlank()) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("token", request.getToken());
return ResponseEntity.ok().body(Map.of("error", errorData));
}
try {
Long userId = authService.useUserAuthToken(request.getToken());
Page<FileViolationSummaryDTO> result = violationService.getFileViolationsSummary(
userId, request.getFileName(), request.getSortDirection(),
request.getPage(), request.getSize(), request.getStartDate(), request.getEndDate());
return ResponseEntity.ok(result);
} catch (NotFoundAuthToken e) {
Map<String, Object> errorData = new HashMap<>();
errorData.put("token", request.getToken());
return ResponseEntity.ok().body(Map.of("error", errorData));
}
}
@GetMapping("/status/{taskId}")
public ResponseEntity<?> getStatus(@PathVariable String taskId,
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
@@ -0,0 +1,83 @@
package ru.soune.nocopy.controller;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import ru.soune.nocopy.dto.docviewer.DockViewResponse;
import ru.soune.nocopy.entity.docviewer.DockView;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.migration.S3MigrationTool;
import ru.soune.nocopy.repository.DockViewRepository;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.geo.GeoCountryService;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@RestController
@RequestMapping("/api/admin/migration")
@RequiredArgsConstructor
@Slf4j
public class MigrationController {
private final S3MigrationTool migrationTool;
private final DockViewRepository dockViewRepository;
private final GeoCountryService geoCountryService;
private final UserRepository userRepository;
private final FileEntityRepository fileEntityRepository;
@PostMapping("/start")
public ResponseEntity<String> startMigration() {
log.info("Migration triggered via API");
CompletableFuture.runAsync(() -> {
try {
migrationTool.migrationFilesToS3();
} catch (Exception e) {
log.error("Migration failed", e);
}
});
return ResponseEntity.ok("Migration started. Check logs for progress.");
}
@PostMapping("/status")
public ResponseEntity<String> getStatus() {
return ResponseEntity.ok("Check application logs and migration_failed.txt for details");
}
@PostMapping("/fill-dock-view")
public ResponseEntity<String> fillDockView() {
List<DockView> dockViews = dockViewRepository.findAll();
for (DockView dockView: dockViews) {
String viewerIp = dockView.getViewerIp();
Long viewerId = dockView.getViewerId();
String geoEnName = geoCountryService.getCityByIp(viewerIp, "en") + "/" +
geoCountryService.getCountryByIp(viewerIp, "en");
String geoRuName = geoCountryService.getCityByIp(viewerIp, "ru") + "/" +
geoCountryService.getCountryByIp(viewerIp, "ru");
User user = userRepository.findById(viewerId).orElse(null);
FileEntity file = fileEntityRepository.findByFileId(dockView.getFileId());
dockView.setGeoNameRu(geoRuName);
dockView.setGeoNameEn(geoEnName);
dockView.setViewerName(user == null ? "guest" : user.getFullName());
dockView.setDocName(file.getOriginalFileName());
dockViewRepository.save(dockView);
}
return ResponseEntity.ok("fill old dock view");
}
}
@@ -53,17 +53,6 @@ public class UserController {
private final FileStatsService fileStatsService;
@GetMapping("/all")
public ResponseEntity<List<UserDTO>> getAllUsers() {
List<UserDTO> allUsers = userRepository.findAll().stream()
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
u.getPhone(), u.getGenderType(),
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
null, null, u.getVerificationStatus()))
.toList();
return ResponseEntity.ok(allUsers);
}
@GetMapping
public ResponseEntity<UserDTO> getUser(@RequestParam("email") String email,
@@ -121,14 +110,12 @@ public class UserController {
.build();
userDTO.setTariffInfo(infoDTO);
}
userDTO.setPhone(user.getPhone());
userDTO.setGenderType(user.getGenderType());
userDTO.setBirthday(user.getBirthday());
userDTO.setCreatedAt(user.getCreatedAt());
userDTO.setSubscriptionType(user.getSubscriptionType());
userDTO.setActive(user.isActive());
userDTO.setPermission(user.getUserPermissions());
@@ -15,4 +15,7 @@ public class BaseRequest {
@JsonProperty("message_body")
Object messageBody;
@JsonProperty(value = "admin_id", required = false)
Long adminId;
}
@@ -18,10 +18,14 @@ public enum MessageCode {
FILE_NOT_EXIST(2, "File not exist on disk"),
FILE_DELETE(2, "File was deleted"),
USER_NOT_HAD_PERMISSION(2, "User not have permission for file"),
NOT_OWNER_FILE_STATUS_VIOLATION(2, "Violation in not owner file status"),
USER_NOT_VERIFIED(2, "User not verified"),
LAW_CASE_NOT_FOUND(4, "Law case not found"),
PERMISSION_NOT_FOUND(2, "Permission not found"),
USER_NOT_FOUND(2, "User not found"),
LAW_CASE_ALREADY_EXIST(2, "Law case already exists"),
COMPLAINT_ALREADY_EXIST(2, "Complaint already exists"),
COMPLAINT_NOT_FOUND(4, "Complaint not found"),
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
TOKEN_IS_NULL(2, "Token field is null"),
IMAGE_FOUND_ERROR(2, "Image found error"),
@@ -32,7 +36,7 @@ public enum MessageCode {
FILE_ENTITY_ERROR(2, "File entity error"),
NOT_VALID_FIELD(2, "Not valid field"),
ACCESS_DENIED(2, "Access denied"),
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
AUTH_EMAIL_NOT_FOUND(4, "Email not COMPLAINT_OR_LAW_CASE_IN_WORK"),
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
@@ -44,6 +48,7 @@ public enum MessageCode {
FILE_IS_NOT_PROTECTED(0, "File is not protected"),
TARIFF_IS_ADD(0, "Tariff is added"),
TARIFF_IS_DELETED(0, "Tariff is deleted"),
TARIFF_IS_NOT_DELETED(0, "Tariff is not deleted,use some users"),
TARIFF_IS_UPDATED(0, "Tariff is updated"),
TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
VALIDATION_ERROR(2, "Validation error"),
@@ -65,8 +70,13 @@ public enum MessageCode {
NOT_FOUND(4, "Notion not found"),
MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion"),
USER_VERIFICATIONS_NOT_FOUND(4, "Verifications not found"),
COMPLAINT_OR_LAW_CASE_IN_WORK(2, "Complaint or lawcase in work"),
NOT_VALID_STATUS(2, "Not valid status"),
PERMISSION_NOT_VALID(2, "Not valid permission"),
NOT_HAVE_DOWNLOAD_PERMISSION(2, "Not haver permission for download"),
ADMIN_USER_NOT_FOUND(4, "Verifications ,user or admin not found");
private final Integer code;
private final String description;
@@ -35,4 +35,7 @@ public class ComplaintRequest {
@JsonProperty("sort_direction")
private String sortDirection;
@JsonProperty("token")
private String token;
}
@@ -36,4 +36,7 @@ public class ComplaintResponse {
@JsonProperty("not_moderated")
private Boolean notModerated;
@JsonProperty("file_id")
private String fileId;
}
@@ -24,9 +24,9 @@ public class LawCaseRequest {
private String sortBy = "updatedAt";
private String sortDir = "desc";
private String action;
private LawCaseType filterType;
private String filterType;
private String filterLawyer;
private LawCasePriority filterPriority;
private String filterPriority;
@JsonProperty("violation_id")
private Long violationId;
@@ -1,5 +1,6 @@
package ru.soune.nocopy.dto.complaint;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import ru.soune.nocopy.entity.complaint.LawCase;
@@ -14,19 +15,43 @@ import java.util.List;
@Builder
public class LawCaseResponse {
private Long id;
private String name;
private String description;
private BigDecimal amount;
private LawCasePriority priority;
private LawCaseType type;
private String lawyer;
@JsonProperty("created_at")
private LocalDateTime createdAt;
@JsonProperty("updated_at")
private LocalDateTime updatedAt;
@JsonProperty("page_number")
private int pageNumber;
@JsonProperty("page_size")
private int pageSize;
@JsonProperty("total_elements")
private long totalElements;
@JsonProperty("total_pages")
private int totalPages;
@JsonProperty("violation_id")
private long violationId;
@JsonProperty("file_id")
private String fileId;
private List<LawCaseResponse> content;
public static LawCaseResponse fromEntity(LawCase lawCase) {
@@ -0,0 +1,39 @@
package ru.soune.nocopy.dto.docviewer;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class DocViewerRequest {
@JsonProperty("file_id")
private String fileId;
@JsonProperty("token")
private String token;
@JsonProperty("ip")
private String ip;
@JsonProperty("user_agent")
private String userAgent;
@JsonProperty("page")
private int page = 0;
@JsonProperty("size")
private int size = 10;
@JsonProperty("sort_by")
private String sortBy = "createdAt";
@JsonProperty("sort_direction")
private String sortDirection = "desc";
@JsonProperty("action")
private String action;
@JsonProperty("locale")
private String locale;
}
@@ -0,0 +1,31 @@
package ru.soune.nocopy.dto.docviewer;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DockViewResponse {
@JsonProperty("city")
private String city;
@JsonProperty("country")
private String country;
@JsonProperty("viewer")
private String viewer;
@JsonProperty("document")
private String document;
@JsonProperty("view_date")
private LocalDateTime viewDate;
}
@@ -0,0 +1,55 @@
package ru.soune.nocopy.dto.docviewer;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@JsonInclude(JsonInclude.Include.NON_NULL)
public class DockViewStatsResponse {
private String fileId;
private Long totalViews;
private Long uniqueIps;
private Long uniqueUsers;
private int documentsCount;
private int uniqueCountryCount;
private int uniqueCityCount;
private LocalDateTime firstViewDate;
private LocalDateTime lastViewDate;
private List<DockViewStatsResponse> content;
private List<DockViewResponse> history;
private Integer pageNumber;
private Integer pageSize;
private Long totalElements;
private Integer totalPages;
private Boolean isLast;
private Boolean isFirst;
private Boolean hasNext;
private Boolean hasPrevious;
}
@@ -14,6 +14,7 @@ public class AppealResponse {
private String additionalInfo;
private String status;
private String adminComment;
private String fileName;
private LocalDateTime createdAt;
private LocalDateTime resolvedAt;
}
@@ -6,6 +6,10 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.permission.PermissionType;
import java.util.List;
import java.util.Map;
@Data
@Builder
@@ -18,6 +22,9 @@ public class FileEntityRequest {
@JsonProperty("file_id")
private String fileId;
@JsonProperty("file_ids")
private List<String> fileIds;
@JsonProperty("full_delete")
private Integer fullDelete;
@@ -71,4 +78,13 @@ public class FileEntityRequest {
@JsonProperty("search_query")
private String searchQuery;
@JsonProperty("permissions")
private Map<String, Boolean> permissions;
@JsonProperty("is_appeal")
private Boolean isAppeal;
@JsonProperty("statuses")
private List<String> statuses;
}
@@ -5,8 +5,11 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.permission.PermissionType;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@Data
@Builder
@@ -42,4 +45,6 @@ public class FileEntityResponse {
private Integer checksCount;
private LocalDateTime fileUploadDate;
private String monitoring;
private Map<PermissionType, Boolean> permissions;
private List<Map<String, Object>> appealInfos;
}
@@ -16,12 +16,6 @@ public class FileListResponse {
@JsonProperty("files")
private List<FileEntityResponse> files;
@JsonProperty("total_count")
private Integer totalCount;
@JsonProperty("total_size")
private Long totalSize;
@JsonProperty("formatted_total_size")
private String formattedTotalSize;
@@ -36,4 +30,13 @@ public class FileListResponse {
@JsonProperty("sort_order")
private String sortOrder;
@JsonProperty("total_count")
private Integer totalCount;
@JsonProperty("total_size")
private Long totalSize;
@JsonProperty("statuses")
private List<String> statuses;
}
@@ -2,6 +2,7 @@ package ru.soune.nocopy.dto.file;
import lombok.Builder;
import lombok.Data;
import ru.soune.nocopy.entity.file.FileAppeal;
import ru.soune.nocopy.entity.file.FileStatus;
import java.time.LocalDateTime;
@@ -16,5 +17,5 @@ public class FileModerationInfo {
private FileStatus currentStatus;
private LocalDateTime uploadDate;
private Boolean hasActiveAppeal;
private AppealInfo activeAppeal;
private FileAppeal activeAppeal;
}
@@ -8,6 +8,9 @@ public class ImageSearchRequest {
@JsonProperty("file_id")
private String fileId;
@JsonProperty("check_similar_first")
private Boolean checkSimilarFirst;
@JsonProperty("page")
private Integer page = 1;
@@ -10,7 +10,7 @@ public class ModerationActionRequest {
private String fileId;
private FileStatus newStatus;
private String comment;
private String token;
private Long adminId;
}
@@ -15,4 +15,5 @@ public class NotificationDto {
private NotificationType type;
private NotificationStatus status;
private LocalDateTime createdAt;
private Object context;
}
@@ -0,0 +1,7 @@
package ru.soune.nocopy.dto.statistic;
import lombok.Data;
@Data
public class ComplaintStatisticRequest {
}
@@ -0,0 +1,34 @@
package ru.soune.nocopy.dto.statistic;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Map;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ComplaintStatisticResponse {
@JsonProperty("total_complaint")
private Long totalComplaints;
@JsonProperty("total_created")
private Long totalCreated;
@JsonProperty("total_in_work")
private Long totalInWork;
@JsonProperty("total_completed")
private Long totalCompleted;
@JsonProperty("total_cancelled")
private Long totalCancelled;
@JsonProperty("complaints")
private Map<String, Object> complaints;
}
@@ -0,0 +1,8 @@
package ru.soune.nocopy.dto.statistic;
import lombok.Data;
@Data
public class MonitoringStatisticRequest {
private String authToken;
}
@@ -0,0 +1,20 @@
package ru.soune.nocopy.dto.statistic;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class MonitoringStatisticResponse {
@JsonProperty("day")
private Long everyDay;
@JsonProperty("month")
private Long everyMonth;
@JsonProperty("weekly")
private Long everyWeekly;
}
@@ -17,4 +17,5 @@ public class TariffDTO {
private Long diskSize;
private Long maxUsers;
private String tariffTerm;
private String description;
}
@@ -24,25 +24,20 @@ public class TariffRequest {
@JsonProperty("tariff_name")
private String name;
@Min(value = 0, message = "Price cannot be negative")
@JsonProperty("tariff_price")
private double price;
private Double price;
@Min(value = 0, message = "Tokens must be at least 0")
@JsonProperty("tariff_tokens")
private int tokens;
private Integer tokens;
@Min(value = 0, message = "Max files count must be at least 0")
@JsonProperty("max_files")
private int maxFilesCount;
private Integer maxFilesCount;
@Min(value = 0, message = "Disk size must be at least 0")
@JsonProperty("disk_size")
private int diskSize;
private Long diskSize;
@Min(value = 0, message = "Max users must be at least 0")
@JsonProperty("max_users")
private int maxUsers;
private Long maxUsers;
@JsonProperty("action")
private String action;
@@ -52,4 +47,22 @@ public class TariffRequest {
@JsonProperty("tariff_term")
private String tariffTerm;
@JsonProperty("description")
private String description;
@JsonProperty("account_type")
private String accountType;
@JsonProperty("page")
private Integer page;
@JsonProperty("page_size")
private Integer size;
@JsonProperty("sort_by")
private String sortBy;
@JsonProperty("sort_direction")
private String sortDirection = "desc";
}
@@ -1,12 +1,41 @@
package ru.soune.nocopy.dto.tarriff;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import ru.soune.nocopy.entity.tarif.Tariff;
import java.util.List;
@Data
@Builder
@JsonInclude(JsonInclude.Include.NON_NULL)
public class TariffResponse {
@JsonProperty("tariff_name")
private String tariffName;
@JsonProperty("type")
private String tariffType;
@JsonProperty("page")
private Integer page;
@JsonProperty("page_size")
private Integer pageSize;
@JsonProperty("sort_by")
private String sortBy;
@JsonProperty("sort_direction")
private String sortDirection;
@JsonProperty("total_pages")
private Integer totalPages;
@JsonProperty("total_elements")
private Long totalElements;
@JsonProperty("tariffs")
private List<TariffDTO> tariffs;
}
@@ -2,6 +2,9 @@ package ru.soune.nocopy.dto.user;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import ru.soune.nocopy.entity.user.SubscriptionType;
import java.time.LocalDate;
@Data
public class UserAdditionalInfoBody {
@@ -17,4 +20,37 @@ public class UserAdditionalInfoBody {
@JsonProperty("user_agent")
private String userAgent;
@JsonProperty("page")
private int page = 0;
@JsonProperty("size")
private int size = 5;
@JsonProperty("sort_by")
private String sortBy;
@JsonProperty("sort_direction")
private String sortDirection = "desc";
@JsonProperty("full_name")
private String fullName;
@JsonProperty("email")
private String email;
@JsonProperty("is_active")
private Boolean isActive;
@JsonProperty("email_verified")
private Boolean emailVerified;
@JsonProperty("sub_type")
private SubscriptionType subscriptionType;
@JsonProperty("date_from")
private LocalDate dateFrom;
@JsonProperty("date_to")
private LocalDate dateTo;
}
@@ -27,7 +27,7 @@ public class UserDTO {
private GenderType genderType;
private LocalDate birthday;
private LocalDateTime createdAt;
private SubscriptionType subscriptionType;
private String subscriptionType;
private List<TariffDTO> tariffs;
private TariffInfoDTO tariffInfo;
private Long permission;
@@ -18,5 +18,7 @@ public class FileViolationSummaryDTO {
private FileStatus status;
private LocalDateTime createdAt;
private long violationCount;
private long countLawCase;
private long countComplaint;
private LocalDateTime latestViolationDate;
}
@@ -1,12 +1,22 @@
package ru.soune.nocopy.dto.violation;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
public class ViolationNotionRequest {
@JsonProperty("token")
private String token;
@JsonProperty("action")
private String action;
@JsonProperty("violation_id")
private Long violationId;
@JsonProperty("notion_id")
private Long notionId;
@JsonProperty("message")
private String message;
}
@@ -13,15 +13,6 @@ public class ViolationRequest {
@JsonProperty("violation_id")
private Long violationId;
@JsonProperty("page")
private Integer page = 0;
@JsonProperty("size")
private Integer size = 10;
@JsonProperty("sort_direction")
private String sortDirection = "desc";
@JsonProperty("status")
private String status;
@@ -31,12 +22,25 @@ public class ViolationRequest {
@JsonProperty("end_date")
private String endDate;
@JsonProperty("group_by")
private String groupBy;
@JsonProperty("action")
private String action;
@JsonProperty("token")
private String token;
@JsonProperty("file_name")
private String fileName = null;
@JsonProperty("page")
private Integer page = 0;
@JsonProperty("size")
private Integer size = 10;
@JsonProperty("sort_direction")
private String sortDirection = "desc";
@JsonProperty("group_by")
private String groupBy;
}
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import ru.soune.nocopy.entity.violation.Violation;
import ru.soune.nocopy.service.geo.GeoCountryService;
import java.time.LocalDateTime;
import java.util.List;
@@ -13,8 +12,6 @@ import java.util.List;
@Builder
public class ViolationResponse {
private final GeoCountryService geoCountryService;
@JsonProperty("violations")
private List<ViolationDto> violations;
@@ -14,6 +14,12 @@ public class ViolationStatisticsResponse {
@JsonProperty("new_violations")
private long newViolations;
@JsonProperty("total_complaints")
private Long totalComplaints;
@JsonProperty("total_law_cases")
private Long totalLawCases;
@JsonProperty("in_progress_violations")
private long inProgressViolations;
@@ -51,7 +51,7 @@ public class Company {
@ToString.Exclude
private List<User> users = new ArrayList<>();
@OneToOne(cascade = CascadeType.ALL)
@OneToOne(cascade = CascadeType.MERGE)
@JoinColumn(name = "tariff_info_id")
private TariffInfo tariffInfo;
}
@@ -0,0 +1,48 @@
package ru.soune.nocopy.entity.docviewer;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import java.time.LocalDateTime;
@Table(name = "dock_view")
@RequiredArgsConstructor
@AllArgsConstructor
@Entity
@Setter @Getter
public class DockView {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "viewer_id")
private Long viewerId;
@Column(name = "viewer_ip")
private String viewerIp;
@Column(name = "user_agent")
private String userAgent;
@Column(name = "file_id")
private String fileId;
@Column(name = "geo_name_ru")
private String geoNameRu;
@Column(name = "geo_name_en")
private String geoNameEn;
@Column(name = "viewer_name")
private String viewerName;
@Column(name = "document_name")
private String docName;
@Column(name = "created_at",updatable = false)
private LocalDateTime createdAt = LocalDateTime.now();
}
@@ -6,10 +6,13 @@ import lombok.*;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import ru.soune.nocopy.entity.file.permission.PermissionType;
import ru.soune.nocopy.entity.monitoring.FileMonitoringEntity;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@Data
@@ -92,6 +95,14 @@ public class FileEntity {
@Column
private String newExtension;
@ElementCollection
@CollectionTable(name = "file_permissions",
joinColumns = @JoinColumn(name = "file_id"))
@Column(name = "allowed")
@MapKeyEnumerated(EnumType.STRING)
@MapKeyColumn(name = "permission_type")
private Map<PermissionType, Boolean> permissions = new HashMap<>();
@OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
@JsonIgnore
private ImageHashEntity imageHash;
@@ -113,6 +124,15 @@ public class FileEntity {
if (this.createdAt == null) {
this.createdAt = LocalDateTime.now();
}
if (this.permissions == null) {
this.permissions = new HashMap<>();
this.permissions.put(PermissionType.DOWNLOAD, true);
// this.permissions.put(PermissionType.VIEW, true);
// this.permissions.put(PermissionType.EDIT, true);
}
this.updatedAt = LocalDateTime.now();
}
@@ -124,4 +144,29 @@ public class FileEntity {
public static void initializeCounter(int maxId) {
supportIdCounter = new AtomicInteger(maxId);
}
@Transient
public boolean hasPermission(PermissionType type) {
return permissions.getOrDefault(type, false);
}
@Transient
public void setPermission(PermissionType type, boolean allowed) {
permissions.put(type, allowed);
}
@Transient
public boolean canDownload() {
return hasPermission(PermissionType.DOWNLOAD);
}
// @Transient
// public boolean canView() {
// return hasPermission(PermissionType.VIEW);
// }
//
// @Transient
// public boolean canEdit() {
// return hasPermission(PermissionType.EDIT);
// }
}
@@ -0,0 +1,27 @@
package ru.soune.nocopy.entity.file.permission;
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
public enum PermissionType {
DOWNLOAD;
public static Set<String> getValidPermissionNames() {
return Arrays.stream(PermissionType.values())
.map(Enum::name)
.collect(Collectors.toSet());
}
public static Set<String> getInvalidPermissions(Map<String, Boolean> permissions) {
Set<String> validNames = getValidPermissionNames();
return permissions.keySet().stream()
.filter(key -> !validNames.contains(key))
.collect(Collectors.toSet());
}
public static boolean areAllValid(Map<String, Boolean> permissions) {
return getInvalidPermissions(permissions).isEmpty();
}
}
@@ -42,6 +42,9 @@ public class Notification {
@Column(name = "status")
private NotificationStatus status = NotificationStatus.NEW;
@Column(name = "context", columnDefinition = "TEXT")
private String context;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
@JsonIgnore
@@ -31,4 +31,7 @@ public class GlobalSearchTask {
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
@Version
private Long version;
}
@@ -41,6 +41,9 @@ public class Tariff {
@Column(name = "tariffAccountType")
private String tariffAccountType;
@Column(name = "description", columnDefinition = "TEXT")
private String description;
@Column(name = "tariff_term")
@Enumerated(EnumType.STRING)
private TariffTimeTerm tariffTerm;
@@ -49,10 +49,6 @@ public class User {
@Column(unique = true)
private String phone;
@Enumerated(EnumType.STRING)
@Column(name = "subscription_type", nullable = false, length = 20)
private SubscriptionType subscriptionType = SubscriptionType.DEMO;
@Enumerated(EnumType.STRING)
@Column(name = "gender")
private GenderType genderType = GenderType.MALE;
@@ -0,0 +1,7 @@
package ru.soune.nocopy.exception;
public class TaskCancelledException extends RuntimeException {
public TaskCancelledException(String message) {
super(message);
}
}
@@ -12,10 +12,20 @@ import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.complaint.ComplaintRequest;
import ru.soune.nocopy.dto.complaint.ComplaintResponse;
import ru.soune.nocopy.entity.complaint.ComplaintEntity;
import ru.soune.nocopy.entity.complaint.ComplaintStatus;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.entity.violation.Violation;
import ru.soune.nocopy.repository.ComplaintEntityRepository;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.repository.ViolationRepository;
import ru.soune.nocopy.service.complaint.ComplaintEntityService;
import java.util.HashMap;
import java.util.Map;
import ru.soune.nocopy.service.register.AuthService;
import ru.soune.nocopy.service.user.UserService;
import ru.soune.nocopy.service.violation.ViolationStatus;
import java.util.*;
@Slf4j
@Component
@@ -25,66 +35,112 @@ public class ComplaintEntityHandler implements RequestHandler {
private final ObjectMapper objectMapper;
private final UserRepository userRepository;
private final UserService userService;
private final AuthService authService;
private final FileEntityRepository fileEntityRepository;
private final ComplaintEntityRepository complaintEntityRepository;
private final ViolationRepository violationRepository;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
Integer msgId = request.getMsgId();
ComplaintRequest complaintRequest = objectMapper.convertValue(request.getMessageBody(), ComplaintRequest.class);
String action = complaintRequest.getAction();
String action = complaintRequest.getAction() == null ? "" : complaintRequest.getAction();
String token = complaintRequest.getToken();
Long userId = authService.useUserAuthToken(token);
User user = userRepository.findById(userId).orElse(null);
if (user == null) {
return new BaseResponse(
request.getMsgId(),
MessageCode.USER_NOT_FOUND.getCode(),
MessageCode.USER_NOT_FOUND.getDescription(),
Map.of("token: ", token));
}
List<String> emails = user.getCompany() == null ? List.of(user.getEmail()):
userService.getUsersCompanyEmails(user.getCompany().getId());
try {
switch (action.toLowerCase()) {
case "create":
return handleCreate(msgId, complaintRequest);
case "get":
return handleGet(msgId, complaintRequest);
case "get_all":
return handleGetAll(msgId, complaintRequest);
case "get_by_violation":
return handleGetByViolation(msgId, complaintRequest);
case "update_status":
return handleUpdateStatus(msgId, complaintRequest);
case "update":
return handleUpdate(msgId, complaintRequest);
case "delete":
return handleDelete(msgId, complaintRequest);
default:
return errorResponse(msgId, MessageCode.MSG_ID_NOT_FOUND.getCode(), "Unknown action: " + action);
}
return switch (action) {
case "create" -> handleCreate(msgId, complaintRequest, userId);
case "get" -> handleGet(msgId, complaintRequest, userId);
case "get_all" -> handleGetAll(msgId, complaintRequest, emails);
case "get_by_violation" -> handleGetByViolation(msgId, complaintRequest, userId);
case "update_status" -> handleUpdateStatus(msgId, complaintRequest, userId);
case "update" -> handleUpdate(msgId, complaintRequest, userId);
case "delete" -> handleDelete(msgId, complaintRequest);
default -> errorResponse(msgId, MessageCode.MSG_ID_NOT_FOUND.getCode(), "Valid actions: " +
List.of("create", "get", "get_all", "get_by_violation", "update_status",
"update", "delete"));
};
} catch (Exception e) {
log.error("Error handling complaint request", e);
return errorResponse(msgId, MessageCode.INVALID_JSON_BODY.getCode(), e.getMessage());
}
}
private BaseResponse handleCreate(Integer msgId, ComplaintRequest req) {
private BaseResponse handleCreate(Integer msgId, ComplaintRequest req, Long userId) {
if (req.getViolationId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(),
"violation_id is required");
if (req.getComplaintText() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(),
"text is required");
Long violationId = req.getViolationId();
Violation violation = violationRepository.findById(violationId).orElse(null);
if (violation == null || !Objects.equals(violation.getFileEntity().getUserId(), userId)) {
return errorResponse(msgId, MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
MessageCode.USER_NOT_HAD_PERMISSION.getDescription());
}
if (violation.getStatus().equals(ViolationStatus.NOT_OWNER_FILE.name())) {
return errorResponse(msgId, MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
MessageCode.USER_NOT_HAD_PERMISSION.getDescription());
}
if (complaintEntityRepository.existsByViolationId(violationId)) {
return errorResponse(msgId, MessageCode.COMPLAINT_ALREADY_EXIST.getCode(),
MessageCode.COMPLAINT_ALREADY_EXIST.getDescription());
}
ComplaintResponse response = complaintService.createComplaint(req);
return successResponse(msgId, "Complaint created successfully", response);
}
private BaseResponse handleGet(Integer msgId, ComplaintRequest req) {
private BaseResponse handleGet(Integer msgId, ComplaintRequest req, Long userId) {
if (req.getId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(), "id is required");
ComplaintResponse response = complaintService.getComplaintById(req.getId());
if (!Objects.equals(fileEntityRepository.findByFileId(response.getFileId()).getUserId(), userId)) {
return errorResponse(msgId, MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
"User not have permission for file");
}
return successResponse(msgId, "Complaint retrieved successfully", response);
}
private BaseResponse handleGetAll(Integer msgId, ComplaintRequest req) {
private BaseResponse handleGetAll(Integer msgId, ComplaintRequest req, List<String> emails) {
Pageable pageable = PageRequest.of(
req.getPage() != null ? req.getPage() : 0,
req.getSize() != null ? req.getSize() : 5,
Sort.by(Sort.Direction.fromString(req.getSortDirection() != null ? req.getSortDirection() : "desc"),
Sort.by(Sort.Direction.fromString(
req.getSortDirection() != null ? req.getSortDirection() : "desc"),
req.getSortBy() != null ? req.getSortBy() : "updatedAt"));
var page = complaintService.getAllComplaints(pageable);
var page = complaintService.getAllComplaintsByEmail(pageable, emails);
Map<String, Object> data = new HashMap<>();
data.put("content", page.getContent());
data.put("page", page.getNumber());
data.put("page", page.getNumber() + 1);
data.put("size", page.getSize());
data.put("totalElements", page.getTotalElements());
data.put("totalPages", page.getTotalPages());
@@ -92,30 +148,56 @@ public class ComplaintEntityHandler implements RequestHandler {
return successResponse(msgId, "Complaints retrieved successfully", data);
}
private BaseResponse handleGetByViolation(Integer msgId, ComplaintRequest req) {
private BaseResponse handleGetByViolation(Integer msgId, ComplaintRequest req, Long userId) {
if (req.getViolationId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(),
"violation_id is required");
var complaints = complaintService.getComplaintsByViolationId(req.getViolationId());
Map<String, Object> data = new HashMap<>();
data.put("content", complaints);
data.put("totalElements", complaints.size());
ComplaintResponse response = complaintService.getComplaintsByViolationId(req.getViolationId());
return successResponse(msgId, "Complaints retrieved successfully", data);
if (!Objects.equals(fileEntityRepository.findByFileId(response.getFileId()).getUserId(), userId)) {
return errorResponse(msgId, MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
"User not have permission for file");
}
return successResponse(msgId, "Complaints retrieved successfully", response);
}
private BaseResponse handleUpdateStatus(Integer msgId, ComplaintRequest req) {
private BaseResponse handleUpdateStatus(Integer msgId, ComplaintRequest req, Long userId) {
if (req.getId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(), "id is required");
if (req.getStatus() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(), "status is required");
List<String> statuses = Arrays.stream(ComplaintStatus.values()).map(ComplaintStatus::name).toList();
if (statuses.stream().noneMatch(status -> status.equals(req.getStatus().toUpperCase()))) {
return errorResponse(msgId, MessageCode.NOT_VALID_STATUS.getCode(), "Valid statuses: " + statuses);
}
ComplaintStatus status = ComplaintStatus.valueOf(req.getStatus().toUpperCase());
ComplaintResponse response = complaintService.updateComplaintStatus(req.getId(), status);
ComplaintEntity complaintEntity = complaintEntityRepository.findById(req.getId()).orElse(null);
if (complaintEntity == null || !Objects.equals(
complaintEntity.getViolation().getFileEntity().getUserId(), userId)) {
return errorResponse(msgId, MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
MessageCode.USER_NOT_HAD_PERMISSION.getDescription());
}
ComplaintResponse response = complaintService.updateComplaintStatus(complaintEntity, status);
return successResponse(msgId, "Status updated successfully", response);
}
private BaseResponse handleUpdate(Integer msgId, ComplaintRequest req) {
private BaseResponse handleUpdate(Integer msgId, ComplaintRequest req, Long userId) {
if (req.getId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(), "id is required");
ComplaintEntity complaintEntity = complaintEntityRepository.findById(req.getId()).orElse(null);
if (complaintEntity == null || !Objects.equals(
complaintEntity.getViolation().getFileEntity().getUserId(), userId)) {
return errorResponse(msgId, MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
MessageCode.USER_NOT_HAD_PERMISSION.getDescription());
}
ComplaintResponse response = complaintService.updateComplaint(req.getId(), req);
return successResponse(msgId, "Complaint updated successfully", response);
@@ -0,0 +1,121 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.complaint.ComplaintRequest;
import ru.soune.nocopy.dto.complaint.ComplaintResponse;
import ru.soune.nocopy.entity.complaint.ComplaintEntity;
import ru.soune.nocopy.entity.complaint.ComplaintStatus;
import ru.soune.nocopy.repository.ComplaintEntityRepository;
import ru.soune.nocopy.service.complaint.ComplaintEntityService;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@Component
@RequiredArgsConstructor
@Slf4j
public class ControlComplaintHandler implements RequestHandler{
private final ObjectMapper objectMapper;
private final ComplaintEntityRepository complaintEntityRepository;
private final ComplaintEntityService complaintService;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
ComplaintRequest complaintRequest = objectMapper.convertValue(request.getMessageBody(), ComplaintRequest.class);
Integer msgId = request.getMsgId();
log.info("start create complaint!");
try {
return switch (complaintRequest.getAction()) {
case "update_status" -> updateStatus(msgId, complaintRequest);
case "update" -> update(msgId, complaintRequest);
case "delete" -> delete(msgId, complaintRequest);
case "create" -> create(msgId, complaintRequest);
default -> errorResponse(msgId, MessageCode.MSG_ID_NOT_FOUND.getCode(), "Valid actions: " +
List.of("create", "update_status", "update", "delete"));
};
} catch (Exception e) {
log.error("Error handling complaint request", e);
return errorResponse(msgId, MessageCode.INVALID_JSON_BODY.getCode(), e.getMessage());
}
}
private BaseResponse create(Integer msgId, ComplaintRequest req) {
if (req.getViolationId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(),
"violation_id is required");
if (req.getComplaintText() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(),
"text is required");
Long violationId = req.getViolationId();
if (complaintEntityRepository.existsByViolationId(violationId)) {
return errorResponse(msgId, MessageCode.COMPLAINT_ALREADY_EXIST.getCode(),
MessageCode.COMPLAINT_ALREADY_EXIST.getDescription());
}
return successResponse(msgId, "Complaint created successfully", complaintService.createComplaint(req));
}
private BaseResponse updateStatus(Integer msgId, ComplaintRequest req) {
if (req.getId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(), "id is required");
if (req.getStatus() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(), "status is required");
List<String> statuses = Arrays.stream(ComplaintStatus.values()).map(ComplaintStatus::name).toList();
if (statuses.stream().noneMatch(status -> status.equals(req.getStatus().toUpperCase()))) {
return errorResponse(msgId, MessageCode.NOT_VALID_STATUS.getCode(), "Valid statuses: " + statuses);
}
ComplaintStatus status = ComplaintStatus.valueOf(req.getStatus().toUpperCase());
ComplaintEntity complaintEntity = complaintEntityRepository.findById(req.getId()).orElse(null);
if (complaintEntity == null) {
return errorResponse(msgId, MessageCode.COMPLAINT_NOT_FOUND.getCode(),
MessageCode.COMPLAINT_NOT_FOUND.getDescription());
}
ComplaintResponse response = complaintService.updateComplaintStatus(complaintEntity, status);
return successResponse(msgId, "Status updated successfully", response);
}
private BaseResponse update(Integer msgId, ComplaintRequest req) {
if (req.getId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(), "id is required");
ComplaintEntity complaintEntity = complaintEntityRepository.findById(req.getId()).orElse(null);
if (complaintEntity == null) {
return errorResponse(msgId, MessageCode.COMPLAINT_NOT_FOUND.getCode(),
MessageCode.COMPLAINT_NOT_FOUND.getDescription());
}
ComplaintResponse response = complaintService.updateComplaint(req.getId(), req);
return successResponse(msgId, "Complaint updated successfully", response);
}
private BaseResponse delete(Integer msgId, ComplaintRequest req) {
if (req.getId() == null) return errorResponse(msgId, MessageCode.NOT_FOUND.getCode(), "id is required");
ComplaintResponse response = complaintService.deleteComplaint(req.getId());
return successResponse(msgId, "Complaint deleted successfully", response);
}
private BaseResponse successResponse(Integer msgId, String message, Object data) {
return new BaseResponse(msgId, MessageCode.SUCCESS.getCode(), message, data);
}
private BaseResponse errorResponse(Integer msgId, Integer code, String message) {
return new BaseResponse(msgId, code, message, new HashMap<>());
}
}
@@ -0,0 +1,125 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.docviewer.DocViewerRequest;
import ru.soune.nocopy.dto.docviewer.DockViewStatsResponse;
import ru.soune.nocopy.dto.file.ActionResponse;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.exception.NotFoundAuthToken;
import ru.soune.nocopy.service.dockview.DockViewService;
import ru.soune.nocopy.service.file.FileEntityService;
import ru.soune.nocopy.service.register.AuthService;
import java.util.Arrays;
import java.util.List;
@Component
@RequiredArgsConstructor
@Slf4j
public class DockViewFileHandler implements RequestHandler {
private final DockViewService dockViewService;
private final FileEntityService fileEntityService;
private final AuthService authService;
private final ObjectMapper objectMapper;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
DocViewerRequest docViewerRequest = objectMapper.convertValue(request.getMessageBody(), DocViewerRequest.class);
String action = docViewerRequest.getAction();
switch (action) {
case "history_view":
return handleGetHistory(request, docViewerRequest);
case "view_stats":
return handleGetViewStats(request, docViewerRequest);
default:
ActionResponse response = ActionResponse.builder()
.action(action)
.availableActions(Arrays.asList("history_view", "view_stats"))
.build();
return new BaseResponse(request.getMsgId(), MessageCode.INVALID_ACTION.getCode(),
"Invalid action: " + action, response);
}
}
private BaseResponse handleGetHistory(BaseRequest request, DocViewerRequest docViewerRequest) {
try {
Long userId = authService.useUserAuthToken(docViewerRequest.getToken());
List<String> fileIds = fileEntityService.getAllUserFiles(userId)
.stream()
.filter(fileEntity -> fileEntity.getMimeType().equals("document"))
.map(FileEntity::getId)
.toList();
if (fileIds.isEmpty()) {
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_NOT_FOUND.getCode(),
"Files for search not found",
null);
}
DockViewStatsResponse openLastHistory = dockViewService.getOpenLastHistory(docViewerRequest.getPage(),
docViewerRequest.getSize(), docViewerRequest.getSortDirection(), docViewerRequest.getSortBy(),
fileIds, docViewerRequest.getLocale());
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
openLastHistory);
} catch (NotFoundAuthToken e) {
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_TOKEN.getCode(),
"Authentication required",
null);
} catch (Exception e) {
log.error("Error getting view history", e);
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_NOT_FOUND.getCode(),
"Failed to get file view history: " + e.getMessage(),
null);
}
}
private BaseResponse handleGetViewStats(BaseRequest request, DocViewerRequest docViewerRequest) {
try {
Long userId = authService.useUserAuthToken(docViewerRequest.getToken());
List<String> fileIds = fileEntityService.getAllUserFiles(userId)
.stream()
.filter(fileEntity -> fileEntity.getMimeType().equals("document"))
.map(FileEntity::getId)
.toList();
if (fileIds.isEmpty()) {
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_NOT_FOUND.getCode(),
"Files for search not found",
null);
}
DockViewStatsResponse totalStats = dockViewService.getTotalStatsByFileIds(fileIds,
docViewerRequest.getLocale());
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
totalStats);
} catch (NotFoundAuthToken e) {
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_TOKEN.getCode(),
"Authentication required",
null);
}
}
}
@@ -8,23 +8,26 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.dto.*;
import ru.soune.nocopy.dto.file.*;
import ru.soune.nocopy.entity.file.FileAppeal;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.ProtectionStatus;
import ru.soune.nocopy.entity.file.*;
import ru.soune.nocopy.entity.file.moderation.ModerationLog;
import ru.soune.nocopy.entity.file.permission.PermissionType;
import ru.soune.nocopy.entity.monitoring.FileMonitoringEntity;
import ru.soune.nocopy.exception.*;
import ru.soune.nocopy.repository.FileAppealRepository;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.*;
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import ru.soune.nocopy.repository.ModerationLogRepository;
import ru.soune.nocopy.service.file.moderation.ModerationService;
import ru.soune.nocopy.service.file.permission.FileAccessService;
import ru.soune.nocopy.service.register.AuthService;
import ru.soune.nocopy.service.file.FileEntityService;
import ru.soune.nocopy.service.file.FileStatsService;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -44,6 +47,8 @@ public class FileEntityHandler implements RequestHandler {
private final FileEntityRepository fileEntityRepository;
private final FileMonitoringRepository fileMonitoringRepository;
private final CloudStorageService cloudStorageService;
private final ModerationService moderationService;
@@ -52,6 +57,10 @@ public class FileEntityHandler implements RequestHandler {
private final ModerationLogRepository moderationLogRepository;
private final ImageHashRepository imageHashRepository;
private final FileAccessService fileAccessService;
@Override
public BaseResponse handle(BaseRequest request) {
try {
@@ -77,18 +86,14 @@ public class FileEntityHandler implements RequestHandler {
return handleProtectFile(request, fileRequest);
case "delete_file":
return handleDeleteFile(request, fileRequest);
case "change_file_status":
return handleChangeStatus(request, fileRequest);
case "moderate_file":
return handleModerateFile(request, fileRequest);
case "delete_files":
return handleDeleteFiles(request, fileRequest);
case "submit_appeal":
return handleSubmitAppeal(request, fileRequest);
case "review_appeal":
return handleReviewAppeal(request, fileRequest);
case "user_appeals":
return handleGetUserAppeals(request, fileRequest);
case "files_for_moderation":
return handleGetFilesForModeration(request, fileRequest);
case "change_permission":
return handleChangePermission(request, fileRequest);
default:
ActionResponse response = ActionResponse.builder()
.action(action)
@@ -153,6 +158,57 @@ public class FileEntityHandler implements RequestHandler {
}
}
private BaseResponse handleChangePermission(BaseRequest request, FileEntityRequest fileRequest) {
try {
Long userId = authService.useUserAuthToken(fileRequest.getToken());
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
if (!fileInfo.getUserId().equals(userId)) {
return new BaseResponse(request.getMsgId(),
MessageCode.ACCESS_DENIED.getCode(),
"Access denied",
null);
}
Map<String, Boolean> permissions = fileRequest.getPermissions();
if (!PermissionType.areAllValid(permissions)) {
return new BaseResponse(request.getMsgId(),
MessageCode.PERMISSION_NOT_VALID.getCode(),
MessageCode.PERMISSION_NOT_VALID.getDescription(),
null);
}
for (Map.Entry<String, Boolean> entry: permissions.entrySet()) {
try {
fileAccessService.changePermission(fileInfo.getId(), PermissionType.valueOf(entry.getKey()),
entry.getValue());
} catch (FileEntityNotFoundException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_NOT_FOUND.getCode(),
MessageCode.FILE_NOT_FOUND.getDescription(),
null);
}
}
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
fileInfo);
} catch (NotFoundAuthToken e) {
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_TOKEN.getCode(),
"Authentication required",
null);
} catch (Exception e) {
log.error("Error getting file info", e);
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_UPLOAD_ERROR.getCode(),
"Failed to get file info: " + e.getMessage(),
null);
}
}
private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
try {
Long userId = authService.useUserAuthToken(fileRequest.getToken());
@@ -212,71 +268,6 @@ public class FileEntityHandler implements RequestHandler {
}
}
private BaseResponse handleChangeStatus(BaseRequest request, FileEntityRequest fileRequest) {
FileStatus newStatus = fileRequest.getFileStatus();
String fileId = fileRequest.getFileId();
try {
fileEntityService.changeFileStatus(newStatus ,fileRequest.getFileId());
} catch (FileEntityNotFoundException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_NOT_FOUND.getCode(),
MessageCode.FILE_NOT_FOUND.getDescription(),
FileEntityResponse.builder().id(fileId).build());
}
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
Map.of("file_status", newStatus, "file_id", fileId));
}
// private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
// try {
// Long userId = authService.useUserAuthToken(fileRequest.getToken());
// int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
// int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
// String fileRequestSortBy = fileRequest.getSortBy();
// String sortBy = !fileRequestSortBy.equals("") ? fileRequest.getSortBy(): "createdAt";
// sortBy = sortBy.equals("fileName") ? "originalFileName" : sortBy;
//
// String sortOrder = fileRequest.getSortOrder();
// Sort.Direction direction = (sortOrder != null && sortOrder.equalsIgnoreCase("desc"))
// ? Sort.Direction.DESC
// : Sort.Direction.ASC;
// Sort sort = Sort.by(direction, sortBy);
//
// Pageable pageable = PageRequest.of(page, pageSize, sort);
// FileResponse userFiles = fileEntityService.getUserFiles(userId, pageable, request.getVersion());
//
// FileListResponse response = FileListResponse.builder()
// .files(userFiles.getFiles())
// .totalCount(userFiles.getTotalCount())
// .totalSize(userFiles.getTotalSize())
// .formattedTotalSize(fileEntityService.formatFileSize(userFiles.getTotalSize()))
// .page(page)
// .pageSize(pageSize)
// .sortBy(sortBy)
// .sortOrder(sortOrder)
// .build();
//
// return new BaseResponse(request.getMsgId(),
// MessageCode.SUCCESS.getCode(),
// MessageCode.SUCCESS.getDescription(),
// response);
//
// } catch (NotFoundAuthToken e) {
// return new BaseResponse(request.getMsgId(),
// MessageCode.INVALID_TOKEN.getCode(),
// "Authentication required", null);
// } catch (Exception e) {
// log.error("Error searching files", e);
// return new BaseResponse(request.getMsgId(),
// MessageCode.FILE_UPLOAD_ERROR.getCode(),
// "Failed to search files: " + e.getMessage(), null);
// }
// }
private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
try {
Long userId = authService.useUserAuthToken(fileRequest.getToken());
@@ -292,10 +283,14 @@ public class FileEntityHandler implements RequestHandler {
String[] searchTerms = searchQuery.split("\\s+");
String filterType = fileRequest.getType();
String dateFilter = fileRequest.getDateFilter();
List<String> statuses = fileRequest.getStatuses();
Boolean isAppeal = fileRequest.getIsAppeal();
List<FileEntityResponse> filteredFiles = allFiles.getFiles().stream()
.filter(f -> matchesSearch(f, searchTerms, searchQuery, filterType))
.filter(f -> matchesDateFilter(f, dateFilter))
.filter(f -> matchesStatuses(f, statuses))
.filter(f -> matchesAppeal(f, isAppeal))
.collect(Collectors.toList());
Comparator<FileEntityResponse> comparator = getComparator(sortBy, sortOrder);
@@ -322,6 +317,8 @@ public class FileEntityHandler implements RequestHandler {
.pageSize(pageSize)
.sortBy(sortBy)
.sortOrder(sortOrder.getValue())
.statuses(List.of(FileStatus.BLOCKED.name(), FileStatus.ACTIVE.name(),
FileStatus.MODERATION.name()))
.build();
return new BaseResponse(request.getMsgId(),
@@ -341,73 +338,6 @@ public class FileEntityHandler implements RequestHandler {
}
}
/**
*
* private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
* try {
* Long userId = authService.useUserAuthToken(fileRequest.getToken());
* int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
* int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
*
* String sortBy = fileRequest.getSortBy() != null ? fileRequest.getSortBy() : "fileName";
* SortOrder sortOrder = SortOrder.fromString(fileRequest.getSortOrder());
*
* FileResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000, request.getVersion());
*
* String searchQuery = fileRequest.getQuery() != null ? fileRequest.getQuery().toLowerCase().trim() : "";
* String[] searchTerms = searchQuery.split("\\s+");
* String filterType = fileRequest.getType();
* String dateFilter = fileRequest.getDateFilter();
*
* List<FileEntityResponse> filteredFiles = allFiles.getFiles().stream()
* .filter(f -> matchesSearch(f, searchTerms, searchQuery, filterType))
* .filter(f -> matchesDateFilter(f, dateFilter))
* .collect(Collectors.toList());
*
* Comparator<FileEntityResponse> comparator = getComparator(sortBy, sortOrder);
* filteredFiles.sort(comparator);
*
* int start = (page - 1) * pageSize;
* int end = Math.min(start + pageSize, filteredFiles.size());
*
* if (start >= filteredFiles.size()) {
* return createEmptyResponse(request, page, pageSize, sortBy, sortOrder.getValue());
* }
*
* List<FileEntityResponse> paginatedFiles = filteredFiles.subList(start, end);
* long totalSize = paginatedFiles.stream()
* .mapToLong(FileEntityResponse::getFileSize)
* .sum();
*
* FileListResponse response = FileListResponse.builder()
* .files(paginatedFiles)
* .totalCount(filteredFiles.size())
* .totalSize(totalSize)
* .formattedTotalSize(fileEntityService.formatFileSize(totalSize))
* .page(page)
* .pageSize(pageSize)
* .sortBy(sortBy)
* .sortOrder(sortOrder.getValue())
* .build();
*
* return new BaseResponse(request.getMsgId(),
* MessageCode.SUCCESS.getCode(),
* MessageCode.SUCCESS.getDescription(),
* response);
*
* } catch (NotFoundAuthToken e) {
* return new BaseResponse(request.getMsgId(),
* MessageCode.INVALID_TOKEN.getCode(),
* "Authentication required", null);
* } catch (Exception e) {
* log.error("Error searching files", e);
* return new BaseResponse(request.getMsgId(),
* MessageCode.FILE_UPLOAD_ERROR.getCode(),
* "Failed to search files: " + e.getMessage(), null);
* }
* }
*/
private boolean matchesDateFilter(FileEntityResponse file, String dateFilter) {
if (dateFilter == null || dateFilter.isEmpty()) {
return true;
@@ -428,6 +358,22 @@ public class FileEntityHandler implements RequestHandler {
}
}
private boolean matchesStatuses(FileEntityResponse file, List<String> statuses) {
if (statuses == null || statuses.isEmpty()) {
return true;
}
return statuses.contains(file.getStatus().name());
}
private boolean matchesAppeal(FileEntityResponse file, Boolean isAppeal) {
if (isAppeal == null) {
return true;
}
return !file.getAppealInfos().isEmpty() == isAppeal;
}
private boolean matchesSearch(FileEntityResponse file, String[] searchTerms, String fullQuery, String type) {
String fileName = getSafeString(file.getFileName());
String originalFileName = getSafeString(file.getOriginalFileName());
@@ -540,9 +486,15 @@ public class FileEntityHandler implements RequestHandler {
);
break;
case "monitoring":
Map<String, Integer> monitoringOrder = Map.of(
"MONITORING_DAILY", 1,
"MONITORING_WEEKLY", 2,
"MONITORING_MONTHLY", 3
);
comparator = Comparator.comparing(
FileEntityResponse::getMonitoring,
Comparator.nullsLast(Comparator.naturalOrder())
response -> monitoringOrder.getOrDefault(response.getMonitoring(),
Integer.MAX_VALUE), Comparator.nullsLast(Comparator.naturalOrder())
);
break;
@@ -684,6 +636,64 @@ public class FileEntityHandler implements RequestHandler {
request.getVersion()));
}
@Transactional
public BaseResponse handleDeleteFiles(BaseRequest request, FileEntityRequest fileRequest) {
List<String> fileIds = fileRequest.getFileIds();
List<String> deletedIds = new ArrayList<>();
List<String> failedIds = new ArrayList<>();
for (String fileId : fileIds) {
try {
FileEntity fileEntity = fileEntityRepository.findById(fileId)
.orElseThrow(() -> new FileEntityNotFoundException(fileId));
deleteFileIfExists(fileEntity.getFilePath());
deleteFileIfExists(fileEntity.getProtectedFilePath());
deleteFileIfExists(fileEntity.getThumbnailPath());
deleteFileIfExists(fileEntity.getMediumPath());
deletedIds.add(fileId);
log.info("Physical files deleted for entity: {}", fileId);
} catch (Exception e) {
failedIds.add(fileId);
log.error("Failed to delete files for entity: {}", fileId, e);
}
}
if (!deletedIds.isEmpty()) {
fileMonitoringRepository.deleteAllByFileIdIn(deletedIds);
moderationLogRepository.deleteAllByFileIdIn(deletedIds);
imageHashRepository.deleteAllByFileIdIn(deletedIds);
fileAppealRepository.deleteAllByFileIdIn(deletedIds);
fileEntityRepository.deleteAllByIdIn(deletedIds);
log.info("Deleted {} entities from database", deletedIds.size());
}
return new BaseResponse(
request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
failedIds
);
}
private void deleteFileIfExists(String filePath) {
if (filePath != null && !filePath.isEmpty()) {
try {
Path path = Paths.get(filePath);
boolean deleted = Files.deleteIfExists(path);
if (deleted) {
log.debug("Deleted file: {}", filePath);
}
} catch (IOException e) {
log.warn("Failed to delete file: {}", filePath, e);
throw new RuntimeException("Failed to delete file: " + filePath, e);
}
}
}
private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
try {
Long userId = authService.useUserAuthToken(fileRequest.getToken());
@@ -803,52 +813,6 @@ public class FileEntityHandler implements RequestHandler {
}
}
private BaseResponse handleReviewAppeal(BaseRequest request, FileEntityRequest fileRequest) {
try {
// TODO
// Long moderatorId = authService.useAdminAuthToken(fileRequest.getToken());
String appealId = fileRequest.getAppealId();
Boolean approve = fileRequest.getApprove();
String comment = fileRequest.getComment();
if (appealId == null || approve == null) {
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
"appealId and approve are required",
null);
}
//TODO
moderationService.reviewAppeal(appealId, approve, comment, 0L);
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
"Appeal reviewed successfully",
Map.of(
"appealId", appealId,
"approved", approve,
"comment", comment
));
} catch (SecurityException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.ACCESS_DENIED.getCode(),
"Admin access required",
null);
} catch (IllegalStateException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
e.getMessage(),
null);
} catch (Exception e) {
log.error("Error reviewing appeal", e);
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
"Failed to review appeal: " + e.getMessage(),
null);
}
}
private BaseResponse handleGetUserAppeals(BaseRequest request, FileEntityRequest fileRequest) {
try {
Long userId = authService.useUserAuthToken(fileRequest.getToken());
@@ -884,72 +848,6 @@ public class FileEntityHandler implements RequestHandler {
}
}
private BaseResponse handleGetFilesForModeration(BaseRequest request, FileEntityRequest fileRequest) {
try {
//TODO
// authService.useAdminAuthToken(fileRequest.getToken());
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
Page<FileEntity> files = moderationService.getFilesForModeration(page - 1, pageSize);
List<Map<String, Object>> filesWithInfo = files.getContent().stream()
.map(file -> {
FileModerationInfo info = moderationService.getFileModerationInfo(file.getId());
Map<String, Object> fileMap = new HashMap<>();
fileMap.put("fileId", file.getId());
fileMap.put("fileName", file.getOriginalFileName());
fileMap.put("userId", file.getUserId());
fileMap.put("status", file.getStatus() != null ? file.getStatus().name() : null);
Map<String, Object> moderationInfoMap = new HashMap<>();
moderationInfoMap.put("hasActiveAppeal", info != null && info.getHasActiveAppeal());
if (info != null && info.getActiveAppeal() != null) {
Map<String, Object> appealInfoMap = new HashMap<>();
appealInfoMap.put("appealId", info.getActiveAppeal().getAppealId());
appealInfoMap.put("status", info.getActiveAppeal().getStatus());
appealInfoMap.put("createdAt", info.getActiveAppeal().getCreatedAt());
moderationInfoMap.put("appealInfo", appealInfoMap);
} else {
moderationInfoMap.put("appealInfo", null);
}
fileMap.put("moderationInfo", moderationInfoMap);
return fileMap;
})
.collect(Collectors.toList());
Map<String, Object> response = Map.of(
"files", filesWithInfo,
"totalCount", files.getTotalElements(),
"totalPages", files.getTotalPages(),
"currentPage", page,
"pageSize", pageSize
);
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
response);
} catch (SecurityException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.ACCESS_DENIED.getCode(),
"Admin access required",
null);
} catch (Exception e) {
log.error("Error getting files for moderation", e);
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
"Failed to get files: " + e.getMessage(),
null);
}
}
private BaseResponse handleGetFileModerationInfo(BaseRequest request, FileEntityRequest fileRequest) {
try {
// TODO
@@ -0,0 +1,172 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.file.ActionResponse;
import ru.soune.nocopy.dto.file.AppealResponse;
import ru.soune.nocopy.dto.file.FileEntityRequest;
import ru.soune.nocopy.dto.file.FileModerationInfo;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.service.file.moderation.ModerationService;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Component
@Slf4j
@RequiredArgsConstructor
public class FileInteranlInfoHandler implements RequestHandler {
private final ObjectMapper objectMapper;
private final ModerationService moderationService;
@Value("${server.baseurl}")
private String baseUrl;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
try {
FileEntityRequest fileRequest = objectMapper.convertValue(
request.getMessageBody(), FileEntityRequest.class);
String action = fileRequest.getAction();
switch (action) {
case "files_for_moderation":
return handleGetFilesForModeration(request, fileRequest);
case "all_appeals":
return handleGetAllAppeals(request, fileRequest);
default:
ActionResponse response = ActionResponse.builder()
.action(action)
.availableActions(Arrays.asList("files_for_moderation", "all_appeals"))
.build();
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_ACTION.getCode(),
"Invalid action: " + action,
response);
}
} catch (Exception e) {
log.error("Error in FileEntityHandler", e);
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_UPLOAD_ERROR.getCode(),
"Handler error: " + e.getMessage(),
null);
}
}
private BaseResponse handleGetFilesForModeration(BaseRequest request, FileEntityRequest fileRequest) {
try {
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 0;
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
List<String> statuses = fileRequest.getStatuses() == null ? List.of(FileStatus.MODERATION.name(),
FileStatus.BLOCKED.name(), FileStatus.ACTIVE.name()): fileRequest.getStatuses();
Page<FileEntity> files = moderationService.getFilesForModeration(page, pageSize,
fileRequest.getSortOrder(), fileRequest.getSortBy(), statuses, fileRequest.getIsAppeal());
List<Map<String, Object>> filesWithInfo = files.getContent().stream()
.map(file -> {
FileModerationInfo info = moderationService.getFileModerationInfo(file.getId());
Map<String, Object> fileMap = new HashMap<>();
fileMap.put("fileId", file.getId());
fileMap.put("fileName", file.getOriginalFileName());
fileMap.put("downloadUrl", "/api/admin/download/" + file.getId());
fileMap.put("image", baseUrl + "/api/files/protected/" + file.getId() + "/thumbnail");
fileMap.put("userId", file.getUserId());
fileMap.put("status", file.getStatus() != null ? file.getStatus().name() : null);
Map<String, Object> moderationInfoMap = new HashMap<>();
moderationInfoMap.put("hasActiveAppeal", info != null && info.getHasActiveAppeal());
if (info != null && info.getActiveAppeal() != null) {
AppealResponse appealResponse = moderationService.convertToResponse(info.getActiveAppeal());
moderationInfoMap.put("appealInfo", appealResponse);
} else {
moderationInfoMap.put("appealInfo", null);
}
fileMap.put("moderationInfo", moderationInfoMap);
return fileMap;
})
.collect(Collectors.toList());
Map<String, Object> response = Map.of(
"files", filesWithInfo,
"totalCount", files.getTotalElements(),
"totalPages", files.getTotalPages(),
"currentPage", page,
"statuses",List.of(FileStatus.ACTIVE.name(), FileStatus.BLOCKED.name(), FileStatus.MODERATION.name()),
"pageSize", pageSize
);
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
response);
} catch (SecurityException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.ACCESS_DENIED.getCode(),
"Admin access required",
null);
} catch (Exception e) {
log.error("Error getting files for moderation", e);
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
"Failed to get files: " + e.getMessage(),
null);
}
}
private BaseResponse handleGetAllAppeals(BaseRequest request, FileEntityRequest fileRequest) {
try {
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 0;
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
Page<AppealResponse> appeals = moderationService.getAllAppeals(page, pageSize,
fileRequest.getSortOrder(), fileRequest.getSortBy());
Map<String, Object> response = Map.of(
"appeals", appeals.getContent(),
"totalCount", appeals.getTotalElements(),
"totalPages", appeals.getTotalPages(),
"currentPage", page,
"pageSize", pageSize);
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
response);
} catch (SecurityException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_TOKEN.getCode(),
"Authentication required",
null);
} catch (Exception e) {
log.error("Error getting user appeals", e);
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
"Failed to get appeals: " + e.getMessage(),
null);
}
}
}
@@ -0,0 +1,160 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.file.ActionResponse;
import ru.soune.nocopy.dto.file.FileEntityRequest;
import ru.soune.nocopy.dto.file.FileEntityResponse;
import ru.soune.nocopy.dto.file.ModerationActionRequest;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.exception.FileEntityNotFoundException;
import ru.soune.nocopy.service.file.FileEntityService;
import ru.soune.nocopy.service.file.moderation.ModerationService;
import java.util.Arrays;
import java.util.Map;
@Component
@Slf4j
@RequiredArgsConstructor
public class FileInternalControlHandler implements RequestHandler {
private final ObjectMapper objectMapper;
private final ModerationService moderationService;
private final FileEntityService fileEntityService;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
try {
FileEntityRequest fileRequest = objectMapper.convertValue(request.getMessageBody(), FileEntityRequest.class);
String action = fileRequest.getAction();
switch (action) {
case "moderate_file":
return handleModerateFile(request, fileRequest);
case "review_appeal":
return handleReviewAppeal(request, fileRequest);
case "change_file_status":
return handleChangeStatus(request, fileRequest);
default:
ActionResponse response = ActionResponse.builder()
.action(action)
.availableActions(Arrays.asList(
"moderate_file", "change_file_status", "review_appeal"))
.build();
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_ACTION.getCode(),
"Invalid action: " + action,
response);
}
} catch (Exception e) {
log.error("Error in FileEntityHandler", e);
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_UPLOAD_ERROR.getCode(),
"Handler error: " + e.getMessage(),
null);
}
}
private BaseResponse handleChangeStatus(BaseRequest request, FileEntityRequest fileRequest) {
FileStatus newStatus = fileRequest.getFileStatus();
String fileId = fileRequest.getFileId();
try {
fileEntityService.changeFileStatus(newStatus ,fileRequest.getFileId());
} catch (FileEntityNotFoundException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_NOT_FOUND.getCode(),
MessageCode.FILE_NOT_FOUND.getDescription(),
FileEntityResponse.builder().id(fileId).build());
}
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
Map.of("file_status", newStatus, "file_id", fileId));
}
private BaseResponse handleReviewAppeal(BaseRequest request, FileEntityRequest fileRequest) {
try {
String appealId = fileRequest.getAppealId();
Boolean approve = fileRequest.getApprove();
String comment = fileRequest.getComment() == null ? "": fileRequest.getComment();
if (appealId == null || approve == null) {
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
"appealId and approve are required",
null);
}
moderationService.reviewAppeal(appealId, approve, comment, request.getAdminId());
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS.getCode(),
"Appeal reviewed successfully",
Map.of(
"appealId", appealId,
"approved", approve,
"comment", comment
));
} catch (SecurityException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.ACCESS_DENIED.getCode(),
"Admin access required", null);
} catch (IllegalStateException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
e.getMessage(),
null);
} catch (Exception e) {
log.error("Error reviewing appeal", e);
return new BaseResponse(request.getMsgId(),
MessageCode.INVALID_FIELD.getCode(),
"Failed to review appeal: " + e.getMessage(),
null);
}
}
private BaseResponse handleModerateFile(BaseRequest request, FileEntityRequest fileRequest) {
try {
ModerationActionRequest moderationRequest = ModerationActionRequest.builder()
.fileId(fileRequest.getFileId())
.newStatus(fileRequest.getFileStatus())
.comment(fileRequest.getComment())
.build();
moderationService.moderateFile(moderationRequest, request.getAdminId());
return new BaseResponse(request.getMsgId(),
MessageCode.SUCCESS_MODERATION.getCode(),
MessageCode.SUCCESS_MODERATION.getDescription(),
Map.of("file_id", fileRequest.getFileId()));
} catch (SecurityException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.ACCESS_DENIED.getCode(),
MessageCode.ACCESS_DENIED.getDescription(),
Map.of("file_id", fileRequest.getFileId()));
} catch (FileEntityNotFoundException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.FILE_NOT_FOUND.getCode(),
MessageCode.FILE_NOT_FOUND.getDescription(),
Map.of("file_id", fileRequest.getFileId()));
} catch (IllegalStateException e) {
return new BaseResponse(request.getMsgId(),
MessageCode.ILLEGAL_STATE.getCode(),
MessageCode.ILLEGAL_STATE.getDescription(),
Map.of("file_id", fileRequest.getFileId()));
}
}
}
@@ -1,6 +1,11 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.vrt.NoCopyFileService;
import com.vrt.fileprotection.FileProtector;
import com.vrt.fileprotection.NoCopyCheckResult;
import com.vrt.fileprotection.documents.DocumentCheckResult;
import com.vrt.fileprotection.image.ImageCheckResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -11,18 +16,32 @@ import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.file.ImageSearchRequest;
import ru.soune.nocopy.dto.file.YandexSearchResponse;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.ImageHashEntity;
import ru.soune.nocopy.entity.tokenoperation.OperationType;
import ru.soune.nocopy.exception.NotValidFieldException;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.ImageHashRepository;
import ru.soune.nocopy.repository.SimilarImageProjection;
import ru.soune.nocopy.service.FileSimilarityService;
import ru.soune.nocopy.service.ImageHashService;
import ru.soune.nocopy.service.file.CheckCounterService;
import ru.soune.nocopy.service.file.FileUploadService;
import ru.soune.nocopy.service.search.SearchImageService;
import ru.soune.nocopy.service.tariff.TariffConstants;
import ru.soune.nocopy.service.tariff.TariffInfoService;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.concurrent.TimeoutException;
import static java.awt.SystemColor.info;
@Slf4j
@Component
@RequiredArgsConstructor
@@ -40,6 +59,16 @@ public class ImageFoundRequestHandler implements RequestHandler {
private final SearchProperties searchProperties;
private final FileUploadService fileUploadService;
private final ImageHashService imageHashService;
private final ImageHashRepository imageHashRepository;
private final FileSimilarityService fileSimilarityService;
private final NoCopyFileService noCopyFileService;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
@@ -125,6 +154,38 @@ public class ImageFoundRequestHandler implements RequestHandler {
int page = imageSearchRequest.getPage() != null ? imageSearchRequest.getPage() : 1;
int pageSize = 5;
boolean checkSimilar = imageSearchRequest.getCheckSimilarFirst() != null &&
imageSearchRequest.getCheckSimilarFirst();
if (checkSimilar && !allUniqueImages.isEmpty()) {
YandexSearchResponse.ImageResult image = allUniqueImages.getFirst();
String url = image.getUrl();
Path tempFile = null;
try {
tempFile = convertToSupportedFormat(fileUploadService.downloadImageFromUrl(url));
File file = tempFile.toFile();
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, FileProtector.Type.IMAGE);
if (checkResult instanceof ImageCheckResult.Success success) {
double watermarkCorrelation = success.getWatermarkCorrelation();
log.info("watermarkCorrelation: " + watermarkCorrelation);
if (watermarkCorrelation < 0.5) {
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
"Not found similar pictures", new YandexSearchResponse());
}
}
} finally {
if (tempFile != null) {
try {
Files.deleteIfExists(tempFile);
} catch (IOException e) {
log.warn("Not delete temp file: {}", tempFile, e);
}
}
}
}
List<YandexSearchResponse.ImageResult> pagedResults = searchImageService.paginateResults(allUniqueImages, page,
pageSize * 2);
@@ -140,4 +201,18 @@ public class ImageFoundRequestHandler implements RequestHandler {
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
message, finalResponse);
}
public Path convertToSupportedFormat(Path imagePath) throws IOException {
String fileName = imagePath.getFileName().toString().toLowerCase();
if (fileName.matches(".*\\.(jpg|jpeg|png|bmp)$")) {
return imagePath;
}
BufferedImage image = ImageIO.read(imagePath.toFile());
Path pngFile = Files.createTempFile("converted_", ".png");
ImageIO.write(image, "PNG", pngFile.toFile());
return pngFile;
}
}
@@ -15,8 +15,10 @@ import ru.soune.nocopy.dto.complaint.PaginatedResponse;
import ru.soune.nocopy.entity.complaint.LawCase;
import ru.soune.nocopy.entity.complaint.LawCasePriority;
import ru.soune.nocopy.entity.complaint.LawCaseType;
import ru.soune.nocopy.entity.file.FileType;
import ru.soune.nocopy.entity.tokenoperation.OperationType;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.entity.violation.Violation;
import ru.soune.nocopy.exception.NotValidFieldException;
import ru.soune.nocopy.exception.TariffNotFoundException;
import ru.soune.nocopy.exception.UserNotFoundException;
@@ -25,10 +27,11 @@ import ru.soune.nocopy.service.complaint.LawCaseService;
import ru.soune.nocopy.service.register.AuthService;
import ru.soune.nocopy.service.tariff.TariffConstants;
import ru.soune.nocopy.service.tariff.TariffInfoService;
import ru.soune.nocopy.service.violation.ViolationService;
import ru.soune.nocopy.service.violation.ViolationStatus;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -46,9 +49,10 @@ public class LawCaseHandler implements RequestHandler {
private final TariffInfoService tariffInfoService;
private final ViolationService violationService;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
LawCaseRequest lawCaseRequest = objectMapper.convertValue(request.getMessageBody(),
LawCaseRequest.class);
Long userId = authService.useUserAuthToken(lawCaseRequest.getToken());
@@ -73,20 +77,34 @@ public class LawCaseHandler implements RequestHandler {
}
private BaseResponse getAllUserLawCases(Long userId, LawCaseRequest lawCaseRequest, BaseRequest request) {
validateLawCaseRequestFilters(lawCaseRequest);
LawCaseType lawCaseType = lawCaseRequest.getFilterType() != null ?
LawCaseType.valueOf(lawCaseRequest.getFilterType().toUpperCase()) : null;
LawCasePriority lawCasePriority = lawCaseRequest.getFilterPriority() != null ?
LawCasePriority.valueOf(lawCaseRequest.getFilterPriority().toUpperCase()) : null;
Page<LawCase> lawCases = lawCaseService.getAllUserLawCases(
userId,
lawCaseRequest.getPageSize(),
lawCaseRequest.getPageNumber(),
lawCaseRequest.getFilterType(),
lawCaseType,
lawCaseRequest.getFilterLawyer(),
lawCaseRequest.getFilterPriority(),
lawCasePriority,
lawCaseRequest.getViolationId(),
lawCaseRequest.getSortBy(),
lawCaseRequest.getSortDir());
List<LawCaseResponse> responses = lawCases.getContent().stream()
.map(LawCaseResponse::fromEntity)
.collect(Collectors.toList());
List<LawCaseResponse> responses = new ArrayList<>();
List<LawCase> content = lawCases.getContent();
for (LawCase lawCase: content) {
LawCaseResponse lawCaseResponse = LawCaseResponse.fromEntity(lawCase);
Violation violation = violationService.getById(lawCase.getViolationId());
if (violation != null) lawCaseResponse.setFileId(violation.getFileEntity().getId());
responses.add(lawCaseResponse);
}
PaginatedResponse<LawCaseResponse> paginatedResponse = new PaginatedResponse<>(
responses,
@@ -101,6 +119,36 @@ public class LawCaseHandler implements RequestHandler {
MessageCode.SUCCESS.getDescription(), paginatedResponse);
}
private void validateLawCaseRequestFilters(LawCaseRequest lawCaseRequest) {
if (lawCaseRequest.getFilterPriority() != null) {
validateEnumValue(lawCaseRequest.getFilterPriority(),
LawCasePriority.class,
"filterPriority");
}
if (lawCaseRequest.getFilterType() != null) {
validateEnumValue(lawCaseRequest.getFilterType(),
LawCaseType.class,
"filterType");
}
}
private <T extends Enum<T>> void validateEnumValue(String value, Class<T> enumClass, String fieldName) {
boolean valid = Arrays.stream(enumClass.getEnumConstants())
.anyMatch(e -> e.name().equals(value));
if (!valid) {
throw new NotValidFieldException("Not valid " + fieldName,
new BaseResponse(30017, MessageCode.NOT_VALID_FIELD.getCode(),
MessageCode.NOT_VALID_FIELD.getDescription(),
Map.of("field", fieldName,
"valid_values", Arrays.stream(enumClass.getEnumConstants())
.map(Enum::name)
.collect(Collectors.toList()),
"received_value", value)));
}
}
private BaseResponse getLawCaseById(Long id, BaseRequest request) {
LawCase lawCase = lawCaseService.getById(id);
@@ -114,6 +162,20 @@ public class LawCaseHandler implements RequestHandler {
}
private BaseResponse createLawCase(Long userId, LawCaseRequest lawCaseRequest, BaseRequest request) {
validateRequiredParameters(lawCaseRequest, request, userId);
Long violationId = lawCaseRequest.getViolationId();
Violation violation = violationService.getById(violationId);
if (lawCaseService.lawCaseExistByViolationId(violationId)) {
return new BaseResponse(request.getMsgId(), MessageCode.LAW_CASE_ALREADY_EXIST.getCode(),
MessageCode.LAW_CASE_ALREADY_EXIST.getDescription(), "Law case was already exists");
}
if (violation != null && violation.getStatus().equals(ViolationStatus.NOT_OWNER_FILE.name())) {
return new BaseResponse(request.getMsgId(), MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
MessageCode.USER_NOT_HAD_PERMISSION.getDescription(), "Wrong status");
}
try {
tariffInfoService.writeOffTokens(userId, TariffConstants.LEGAL_COST, OperationType.CREATE_LEGAL_CASE);
} catch (TariffNotFoundException e) {
@@ -125,8 +187,6 @@ public class LawCaseHandler implements RequestHandler {
MessageCode.INVALID_FIELD.getDescription(), Map.of("id", lawCaseRequest.getId()));
}
validateRequiredParameters(lawCaseRequest, request);
User user = userRepository.findById(userId).orElseThrow(() -> new UserNotFoundException("User not found"));
LawCase lawCase = lawCaseService.addLawCase(
@@ -134,7 +194,7 @@ public class LawCaseHandler implements RequestHandler {
lawCaseRequest.getDescription(),
lawCaseRequest.getName(),
LawCasePriority.valueOf(lawCaseRequest.getPriority()),
lawCaseRequest.getViolationId(), user);
violationId, user);
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(), LawCaseResponse.fromEntity(lawCase));
@@ -188,13 +248,50 @@ public class LawCaseHandler implements RequestHandler {
MessageCode.SUCCESS.getDescription(), Map.of("id", id));
}
private void validateRequiredParameters(LawCaseRequest lawCaseRequest, BaseRequest request) {
private void validateRequiredParameters(LawCaseRequest lawCaseRequest, BaseRequest request, Long userId) {
if (lawCaseRequest.getName() == null) throw new NotValidFieldException("Name is required",
new BaseResponse(request.getMsgId(), MessageCode.NOT_VALID_FIELD.getCode(),
MessageCode.NOTION_NOT_FOUND.getDescription(), Map.of("fields", "name")));
MessageCode.NOT_VALID_FIELD.getDescription(), Map.of("fields", "name")));
if (lawCaseRequest.getDescription() == null) throw new NotValidFieldException("Description is required",
new BaseResponse(request.getMsgId(), MessageCode.NOT_VALID_FIELD.getCode(),
MessageCode.NOTION_NOT_FOUND.getDescription(), Map.of("fields", "description")));
MessageCode.NOT_VALID_FIELD.getDescription(), Map.of("fields", "description")));
if (lawCaseRequest.getViolationId() == null) throw new NotValidFieldException("Violation id is required",
new BaseResponse(request.getMsgId(), MessageCode.NOT_VALID_FIELD.getCode(),
MessageCode.NOT_VALID_FIELD.getDescription(), Map.of("fields", "violation_id")));
Violation violation = violationService.getById(lawCaseRequest.getViolationId());
if (!Objects.equals(violation.getFileEntity().getUserId(), userId))
throw new NotValidFieldException("Not user violation",
new BaseResponse(request.getMsgId(), MessageCode.NOT_VALID_FIELD.getCode(),
MessageCode.NOT_VALID_FIELD.getDescription(), Map.of("fields", "violation_id")));
if (lawCaseRequest.getType() != null &&
!FileType.DOCUMENT.getDisplayName().equals(lawCaseRequest.getType().toLowerCase()) &&
!FileType.AUDIO.getDisplayName().equals(lawCaseRequest.getType().toLowerCase()) &&
!FileType.IMAGE.getDisplayName().equals(lawCaseRequest.getType().toLowerCase()) &&
!FileType.VIDEO.getDisplayName().equals(lawCaseRequest.getType().toLowerCase()))
throw new NotValidFieldException("Not valid type",
new BaseResponse(request.getMsgId(), MessageCode.NOT_VALID_FIELD.getCode(),
MessageCode.NOT_VALID_FIELD.getDescription(), Map.of("valid_types",
List.of(FileType.DOCUMENT.getDisplayName(),
FileType.AUDIO.getDisplayName(),
FileType.IMAGE.getDisplayName(),
FileType.VIDEO.getDisplayName()))));
if (lawCaseRequest.getPriority() != null &&
!LawCasePriority.HIGH.name().equalsIgnoreCase(lawCaseRequest.getPriority()) &&
!LawCasePriority.LOW.name().equalsIgnoreCase(lawCaseRequest.getPriority()) &&
!LawCasePriority.MIDDLE.name().equalsIgnoreCase(lawCaseRequest.getPriority()) &&
!LawCasePriority.CRITICAL.name().equalsIgnoreCase(lawCaseRequest.getPriority()))
throw new NotValidFieldException("Not valid type",
new BaseResponse(request.getMsgId(), MessageCode.NOT_VALID_FIELD.getCode(),
MessageCode.NOT_VALID_FIELD.getDescription(), Map.of("valid_types",
List.of(LawCasePriority.LOW.name(),
LawCasePriority.MIDDLE.name(),
LawCasePriority.HIGH.name(),
LawCasePriority.CRITICAL.name()))));
}
}
@@ -0,0 +1,72 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.statistic.MonitoringStatisticRequest;
import ru.soune.nocopy.dto.statistic.MonitoringStatisticResponse;
import ru.soune.nocopy.entity.company.Company;
import ru.soune.nocopy.entity.monitoring.MonitoringType;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.repository.FileMonitoringRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.register.AuthService;
import java.util.List;
@Slf4j
@Component
@RequiredArgsConstructor
public class MonitoringStatisticHandler implements RequestHandler {
private final ObjectMapper objectMapper;
private final AuthService authService;
private final FileMonitoringRepository fileMonitoringRepository;
private final UserRepository userRepository;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
MonitoringStatisticRequest monitoringStatisticRequest = objectMapper.convertValue(request.getMessageBody(),
MonitoringStatisticRequest.class);
try {
String authToken = monitoringStatisticRequest.getAuthToken();
Long userId = authService.useUserAuthToken(authToken);
User user = userRepository.findById(userId).orElseThrow();
Company company = user.getCompany();
List<Long> userIds = company == null ? List.of(userId) :
user.getCompany()
.getUsers()
.stream()
.map(User::getId).toList();
MonitoringStatisticResponse monitoringStatisticResponse = MonitoringStatisticResponse.builder()
.everyDay(fileMonitoringRepository.countByUserIdsAndMonitoringType(userIds,
MonitoringType.MONITORING_DAILY))
.everyMonth(fileMonitoringRepository.countByUserIdsAndMonitoringType(userIds,
MonitoringType.MONITORING_MONTHLY))
.everyWeekly(fileMonitoringRepository.countByUserIdsAndMonitoringType(userIds,
MonitoringType.MONITORING_WEEKLY))
.build();
return new BaseResponse(
request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
monitoringStatisticResponse);
} catch (Exception e) {
return new BaseResponse(
request.getMsgId(),
MessageCode.INVALID_JSON_BODY.getCode(),
MessageCode.INVALID_JSON_BODY.getDescription(),
null);
}
}
}
@@ -153,12 +153,23 @@ public class NotificationHandler implements RequestHandler {
}
private NotificationDto toDto(Notification notification) {
Object contextObject = null;
if (notification.getContext() != null) {
try {
ObjectMapper objectMapper = new ObjectMapper();
contextObject = objectMapper.readValue(notification.getContext(), Object.class);
} catch (Exception e) {
contextObject = notification.getContext();
}
}
return NotificationDto.builder()
.id(notification.getId())
.message(notification.getMessage())
.type(notification.getNotificationType())
.status(notification.getStatus())
.createdAt(notification.getCreatedAt())
.context(contextObject)
.build();
}
}
@@ -0,0 +1,34 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.complaint.ComplaintRequest;
import ru.soune.nocopy.dto.statistic.ComplaintStatisticResponse;
import ru.soune.nocopy.service.statistic.ComplaintStatisticService;
@Component
@RequiredArgsConstructor
@Slf4j
public class StatisticComplaintHandler implements RequestHandler {
private final ComplaintStatisticService complaintStatisticService;
private final ObjectMapper objectMapper;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
ComplaintRequest complaintRequest = objectMapper.convertValue(request.getMessageBody(), ComplaintRequest.class);
ComplaintStatisticResponse complaintStatisticResponse = complaintStatisticService.complaintStatistic(complaintRequest);
return new BaseResponse(
request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
complaintStatisticResponse);
}
}
@@ -1,6 +1,5 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -15,7 +14,6 @@ import ru.soune.nocopy.service.statistic.ViolationStatisticService;
@Slf4j
public class StatisticViolationHandler implements RequestHandler {
private final ObjectMapper objectMapper;
private final ViolationStatisticService statisticService;
@Override
@@ -0,0 +1,117 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.tarriff.TariffDTO;
import ru.soune.nocopy.dto.tarriff.TariffRequest;
import ru.soune.nocopy.dto.tarriff.TariffResponse;
import ru.soune.nocopy.entity.tarif.Tariff;
import ru.soune.nocopy.entity.tarif.TariffTimeTerm;
import ru.soune.nocopy.service.tariff.TariffService;
import java.util.List;
import java.util.Map;
@RequiredArgsConstructor
@Component
@Slf4j
public class TariffControlHandler implements RequestHandler {
private final ObjectMapper objectMapper;
private final TariffService tariffService;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
try {
TariffRequest tariffRequest = objectMapper.convertValue(request.getMessageBody(), TariffRequest.class);
String action = tariffRequest.getAction();
switch (action) {
case "add":
return handleAddTariff(request, tariffRequest);
case "remove":
return handleRemoveTariff(request, tariffRequest);
case "update":
return handleUpdateTariff(request, tariffRequest);
}
} catch (Exception e) {
log.error("Error add tariff", e);
return new BaseResponse(
request.getMsgId(),
MessageCode.SUCCESS.getCode(),
"Error processing request: " + e.getMessage(),
null);
}
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(), null);
}
private BaseResponse handleAddTariff(BaseRequest request, TariffRequest tariffRequest) {
tariffService.addTariff(tariffRequest.getName(), tariffRequest.getPrice(), tariffRequest.getType(),
tariffRequest.getTokens(), tariffRequest.getDiskSize(), tariffRequest.getMaxUsers(),
tariffRequest.getMaxFilesCount(), tariffRequest.getTariffTerm(), tariffRequest.getDescription(),
tariffRequest.getAccountType());
TariffResponse tariffResponse = TariffResponse.builder()
.tariffName(tariffRequest.getName())
.tariffType(tariffRequest.getType())
.build();
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_ADD.getCode(),
MessageCode.TARIFF_IS_ADD.getDescription(),
tariffResponse);
}
private BaseResponse handleRemoveTariff(BaseRequest request, TariffRequest tariffRequest) {
TariffDTO tariff = tariffService.getTariffById(tariffRequest.getId());
if (tariff == null) {
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_NOT_FOUND.getCode(),
MessageCode.TARIFF_IS_NOT_FOUND.getDescription(),
Map.of("id", tariffRequest.getId()));
}
TariffResponse tariffResponse = TariffResponse.builder()
.tariffName(tariff.getName())
.tariffType(tariff.getType())
.build();
if (tariffService.existTariffInfoByTariffId(tariffRequest.getId())) {
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_NOT_DELETED.getCode(),
MessageCode.TARIFF_IS_NOT_DELETED.getDescription(),
tariffResponse);
}
tariffService.deleteTariff(tariffRequest.getId());
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_DELETED.getCode(),
MessageCode.TARIFF_IS_DELETED.getDescription(),
tariffResponse);
}
private BaseResponse handleUpdateTariff(BaseRequest request, TariffRequest tariffRequest) {
TariffDTO tariff = tariffService.getTariffById(tariffRequest.getId());
if (tariff == null) {
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_NOT_FOUND.getCode(),
MessageCode.TARIFF_IS_NOT_FOUND.getDescription(),
Map.of("id", tariffRequest.getId()));
}
TariffDTO tariffDTO = tariffService.updateTariff(tariffRequest.getId(), tariff, tariffRequest);
TariffResponse tariffResponse = TariffResponse.builder()
.tariffs(List.of(tariffDTO))
.build();
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_UPDATED.getCode(),
MessageCode.TARIFF_IS_UPDATED.getDescription(),
tariffResponse);
}
}
@@ -65,7 +65,8 @@ public class TariffHandler implements RequestHandler {
private BaseResponse handleAddTariff(BaseRequest request, TariffRequest tariffRequest) {
tariffService.addTariff(tariffRequest.getName(), tariffRequest.getPrice(), tariffRequest.getType(),
tariffRequest.getTokens(), tariffRequest.getDiskSize(), tariffRequest.getMaxUsers(),
tariffRequest.getMaxFilesCount(), tariffRequest.getTariffTerm());
tariffRequest.getMaxFilesCount(), tariffRequest.getTariffTerm(), tariffRequest.getDescription(),
tariffRequest.getAccountType());
TariffResponse tariffResponse = TariffResponse.builder()
.tariffName(tariffRequest.getName())
@@ -91,6 +92,12 @@ public class TariffHandler implements RequestHandler {
.tariffType(tariff.getType())
.build();
if (tariffService.existTariffInfoByTariffId(tariffRequest.getId())) {
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_NOT_DELETED.getCode(),
MessageCode.TARIFF_IS_NOT_DELETED.getDescription(),
tariffResponse);
}
tariffService.deleteTariff(tariffRequest.getId());
return new BaseResponse(request.getMsgId(), MessageCode.TARIFF_IS_DELETED.getCode(),
@@ -107,7 +114,7 @@ public class TariffHandler implements RequestHandler {
Map.of("id", tariffRequest.getId()));
}
TariffDTO tariffDTO = tariffService.updateTariff(tariffRequest.getId(), tariff);
TariffDTO tariffDTO = tariffService.updateTariff(tariffRequest.getId(), tariff, tariffRequest);
TariffResponse tariffResponse = TariffResponse.builder()
.tariffName(tariffDTO.getName())
@@ -20,7 +20,6 @@ import ru.soune.nocopy.service.tariff.TariffInfoService;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
@Component
@@ -0,0 +1,130 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.tarriff.TariffDTO;
import ru.soune.nocopy.dto.tarriff.TariffRequest;
import ru.soune.nocopy.dto.tarriff.TariffResponse;
import ru.soune.nocopy.entity.tarif.Tariff;
import ru.soune.nocopy.entity.tarif.TariffTimeTerm;
import ru.soune.nocopy.service.tariff.TariffService;
import java.util.List;
@RequiredArgsConstructor
@Component
@Slf4j
public class TariffInformationHandler implements RequestHandler {
private final ObjectMapper objectMapper;
private final TariffService tariffService;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
try {
TariffRequest tariffRequest = objectMapper.convertValue(request.getMessageBody(), TariffRequest.class);
String action = tariffRequest.getAction();
switch (action) {
case "get_all" :
return handleGetTariffs(request, tariffRequest);
case "tariffs_by_type" :
return handleGetTariffsByType(request, tariffRequest);
}
} catch (Exception e) {
log.error("Error add tariff", e);
return new BaseResponse(
request.getMsgId(),
MessageCode.SUCCESS.getCode(),
"Error processing request: " + e.getMessage(),
null);
}
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(), null);
}
private BaseResponse handleGetTariffsByType(BaseRequest request, TariffRequest req) {
int page = req.getPage() != null ? req.getPage() : 0;
int pageSize = req.getSize() != null ? req.getSize() : 5;
String sortDirection = req.getSortDirection() != null ? req.getSortDirection() : "desc";
String sortBy = req.getSortBy() != null ? req.getSortBy() : "name";
Pageable pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.fromString(sortDirection), sortBy));
Page<Tariff> allTariffs = tariffService.getTariffs(pageable);
List<TariffDTO> tariffDTOS = allTariffs.stream()
.map(this::convertToDTO)
.toList();
TariffResponse tariffResponse = TariffResponse.builder()
.tariffs(tariffDTOS)
.page(page)
.pageSize(pageSize)
.sortBy(sortBy)
.sortDirection(sortDirection)
.totalElements(allTariffs.getTotalElements())
.totalPages(allTariffs.getTotalPages())
.build();
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(), tariffResponse);
}
private BaseResponse handleGetTariffs(BaseRequest request, TariffRequest req) {
int page = req.getPage() != null ? req.getPage() : 0;
int pageSize = req.getSize() != null ? req.getSize() : 5;
String sortDirection = req.getSortDirection() != null ? req.getSortDirection() : "desc";
String sortBy = req.getSortBy() != null ? req.getSortBy() : "name";
Pageable pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.fromString(sortDirection), sortBy));
Page<Tariff> allTariffs = tariffService.getTariffs(pageable);
List<TariffDTO> tariffDTOS = allTariffs.stream()
.map(this::convertToDTO)
.toList();
TariffResponse tariffResponse = TariffResponse.builder()
.tariffs(tariffDTOS)
.page(page)
.pageSize(pageSize)
.sortBy(sortBy)
.sortDirection(sortDirection)
.totalElements(allTariffs.getTotalElements())
.totalPages(allTariffs.getTotalPages())
.build();
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(), tariffResponse);
}
private TariffDTO convertToDTO(Tariff tariff) {
TariffTimeTerm tariffTerm = tariff.getTariffTerm();
return new TariffDTO(
tariff.getId(),
tariff.getType(),
tariff.getName(),
tariff.getPrice(),
tariff.getTokens(),
tariff.getMaxFilesCount(),
tariff.getDiskSize(),
tariff.getMaxUsers(),
tariffTerm == null ? "" : tariffTerm.name(),
tariff.getDescription() == null ? "" : tariff.getDescription()
);
}
}
@@ -3,6 +3,11 @@ package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
@@ -10,13 +15,20 @@ import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.user.UserAdditionalInfoBody;
import ru.soune.nocopy.dto.user.UserDTO;
import ru.soune.nocopy.entity.tarif.TariffInfo;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.entity.user.UserAdditionalInfo;
import ru.soune.nocopy.entity.user.UserAdditionalInfoAnswer;
import ru.soune.nocopy.entity.user.UserAdditionalInfoListAnswer;
import ru.soune.nocopy.exception.UserAdditionalInfoNotFound;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.user.AdditionalInfoService;
import ru.soune.nocopy.service.user.UserService;
import ru.soune.nocopy.service.user.UserSpecifications;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -28,8 +40,13 @@ import java.util.stream.Collectors;
public class UserInfoHandler implements RequestHandler {
private final AdditionalInfoService additionalInfoService;
private final ObjectMapper objectMapper;
private final UserRepository userRepository;
private final UserService userService;
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
try {
@@ -40,15 +57,17 @@ public class UserInfoHandler implements RequestHandler {
return switch (body.getAction()) {
case "getAll" -> getAllAdditionalInfos(request);
case "getAllWithPagination" -> getAllAdditionalInfoWithPagination(request, body);
case "getById" -> getAdditionalInfoById(request, body.getUserId());
case "getIngoById" -> getInfoById(request, body.getUserId());
case "update" -> updateAdditionalInfo(request, body);
case "delete" -> deleteAdditionalInfo(request, body.getUserId());
default -> new BaseResponse(
request.getMsgId(),
MessageCode.INVALID_ACTION.getCode(),
"Invalid action: " + body.getAction(),
null
);
"valid actions: " + List.of("getAll", "getAllWithPagination", "getById",
"getIngoById", "update", "delete"));
};
} catch (IllegalArgumentException e) {
log.error("Validation error in UserInfoHandler", e);
@@ -96,6 +115,81 @@ public class UserInfoHandler implements RequestHandler {
);
}
private BaseResponse getAllAdditionalInfoWithPagination(BaseRequest request, UserAdditionalInfoBody req) {
Sort.Direction direction =
Sort.Direction.fromString(req.getSortDirection() != null ? req.getSortDirection() : "desc");
String sortBy = req.getSortBy() != null ? req.getSortBy() : "createdAt";
String sortField = switch (sortBy) {
case "fullName" -> "fullName";
case "email" -> "email";
case "createdAt" -> "createdAt";
case "verificationStatus" -> "verificationStatus";
case "tariff" -> "personalTariffInfo.status";
case "tokens" -> "personalTariffInfo.tokens";
default -> "createdAt";
};
Pageable pageable = PageRequest.of(req.getPage(), req.getSize(), Sort.by(direction, sortField));
Specification<User> spec = (root, query, cb) -> cb.conjunction();
if (req.getFullName() != null) {
spec = spec.and(UserSpecifications.byFullName(req.getFullName()));
}
if (req.getEmail() != null) {
spec = spec.and(UserSpecifications.byEmail(req.getEmail()));
}
if (req.getIsActive() != null) {
spec = spec.and(UserSpecifications.byIsActive(req.getIsActive()));
}
if (req.getEmailVerified() != null) {
spec = spec.and(UserSpecifications.byEmailVerified(req.getEmailVerified()));
}
if (req.getSubscriptionType() != null) {
spec = spec.and(UserSpecifications.bySubscriptionType(req.getSubscriptionType()));
}
if (req.getDateFrom() != null || req.getDateTo() != null) {
spec = spec.and(UserSpecifications.byCreatedAtRange(req.getDateFrom(), req.getDateTo()));
}
Page<User> allUsers = userRepository.findAll(spec, pageable);
Page<Map<String, Object>> dtoPage = allUsers.map(user -> {
Map<String, Object> map = new LinkedHashMap<>();
map.put("id", user.getId());
map.put("fullName", user.getFullName());
map.put("email", user.getEmail());
map.put("verificationStatus", user.getVerificationStatus() != null ? user.getVerificationStatus().name() : null);
map.put("createdAt", user.getCreatedAt() != null ? user.getCreatedAt().toString() : null);
TariffInfo tariff = user.getActiveTariffInfo();
if (tariff != null) {
map.put("tariff", tariff.getStatus() != null ? tariff.getStatus().name() : null);
map.put("tokens", tariff.getTokens() != null ? tariff.getTokens() : 0);
} else {
map.put("tariff", null);
map.put("tokens", 0);
}
return map;
});
Map<String, Object> response = new LinkedHashMap<>();
response.put("content", dtoPage.getContent());
response.put("totalElements", allUsers.getTotalElements());
response.put("totalPages", allUsers.getTotalPages());
response.put("number", allUsers.getNumber());
response.put("size", allUsers.getSize());
return new BaseResponse(
request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
response);
}
private BaseResponse getAdditionalInfoById(BaseRequest request, Long userId) {
log.info("Getting additional info for user: {}", userId);
@@ -121,6 +215,22 @@ public class UserInfoHandler implements RequestHandler {
);
}
private BaseResponse getInfoById(BaseRequest request, Long userId) {
log.info("Getting info for user: {}", userId);
if (userId == null) {
throw new IllegalArgumentException("User Id is required for getById action");
}
UserDTO userInfo = userService.getUserInfo(userId);
return new BaseResponse(
request.getMsgId(),
MessageCode.SUCCESS.getCode(),
MessageCode.SUCCESS.getDescription(),
userInfo);
}
private BaseResponse updateAdditionalInfo(BaseRequest request, UserAdditionalInfoBody body) {
log.info("Updating additional info for user: {}", body.getUserId());
@@ -1,21 +1,25 @@
package ru.soune.nocopy.handler;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.complaint.ComplaintRequest;
import ru.soune.nocopy.dto.file.ActionResponse;
import ru.soune.nocopy.dto.user.moderation.UserVerificationRequest;
import ru.soune.nocopy.dto.user.moderation.UserVerificationResponse;
import ru.soune.nocopy.entity.complaint.ComplaintEntity;
import ru.soune.nocopy.entity.notification.NotificationType;
import ru.soune.nocopy.entity.user.ModerationStatus;
import ru.soune.nocopy.entity.user.moderation.UserVerification;
import ru.soune.nocopy.service.notification.NotificationService;
import ru.soune.nocopy.service.user.moderation.UserVerificationService;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
@@ -81,10 +85,7 @@ public class UserVerificationHandler implements RequestHandler {
null);
}
NotificationType notificationType = userVerification.getModerationStatus() == ModerationStatus.VERIFIED?
NotificationType.USER_VERIFIED: NotificationType.USER_NOT_VERIFIED;
notificationService.addNotification(notificationType, userVerification.getUserId());
addComplaintNotification(userVerification);
return BaseResponse.builder()
.msgId(request.getMsgId())
@@ -95,6 +96,18 @@ public class UserVerificationHandler implements RequestHandler {
.build();
}
private void addComplaintNotification(UserVerification userVerification) {
NotificationType notificationType = userVerification.getModerationStatus() == ModerationStatus.VERIFIED ?
NotificationType.USER_VERIFIED: NotificationType.USER_NOT_VERIFIED;
ObjectMapper mapper = new ObjectMapper();
ObjectNode context = mapper.createObjectNode();
context.put("status", userVerification.getModerationStatus().name());
context.put("update_date",
userVerification.getUpdatedAt().format(DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")));
notificationService.addNotification(notificationType, userVerification.getUserId(), context.toString());
}
private UserVerificationResponse convertDto(UserVerification userVerification) {
return UserVerificationResponse.builder()
@@ -7,11 +7,14 @@ import org.springframework.data.domain.Page;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.violation.ViolationRequest;
import ru.soune.nocopy.dto.violation.ViolationResponse;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.violation.Violation;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.service.complaint.ComplaintEntityService;
import ru.soune.nocopy.service.complaint.LawCaseService;
import ru.soune.nocopy.service.file.FileEntityService;
import ru.soune.nocopy.service.geo.GeoCountryService;
import ru.soune.nocopy.service.register.AuthService;
@@ -25,6 +28,7 @@ import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Component
@Slf4j
@@ -42,6 +46,10 @@ public class ViolationHandler implements RequestHandler {
private final GeoCountryService geoCountryService;
private final LawCaseService lawCaseService;
private final ComplaintEntityService complaintEntityService;
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@Override
@@ -58,6 +66,16 @@ public class ViolationHandler implements RequestHandler {
if (violationRequest.getFileId() != null && !violationRequest.getFileId().isEmpty()) {
FileEntity file = fileRepository.findById(violationRequest.getFileId())
.orElseThrow(() -> new FileNotFoundException("File not found with id: " + violationRequest.getFileId()));
if (!Objects.equals(file.getUserId(), userId)) {
return BaseResponse.builder()
.messageCode(MessageCode.USER_NOT_HAD_PERMISSION.getCode())
.messageDesc(MessageCode.USER_NOT_HAD_PERMISSION.getDescription())
.msgId(request.getMsgId())
.messageBody(Map.of("user_id", userId))
.build();
}
targetFiles = List.of(file);
} else {
targetFiles = fileEntityService.getAllUserFiles(userId);
@@ -69,16 +87,34 @@ public class ViolationHandler implements RequestHandler {
if (violationRequest.getStartDate() != null && violationRequest.getEndDate() != null) {
startDate = parseDate(violationRequest.getStartDate());
endDate = parseDate(violationRequest.getEndDate());
if (endDate != null && !violationRequest.getEndDate().contains(" ")) {
endDate = endDate.withHour(23).withMinute(59).withSecond(59);
}
}
if ("updateStatus".equals(violationRequest.getAction())) {
String status = violationRequest.getStatus();
Long violationId = violationRequest.getViolationId();
if (status.equals(ViolationStatus.NOT_OWNER_FILE.name()) &&
lawCaseService.fetchByViolationId(violationId) != null &&
complaintEntityService.fetchComplaintByViolation(violationId) != null) {
return BaseResponse.builder()
.messageCode(MessageCode.COMPLAINT_OR_LAW_CASE_IN_WORK.getCode())
.messageCode(MessageCode.COMPLAINT_OR_LAW_CASE_IN_WORK.getCode())
.msgId(request.getMsgId())
.messageBody(Map.of("status", status))
.build();
}
violationService.changeStatus(ViolationStatus.valueOf(status), violationId);
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageCode(MessageCode.SUCCESS.getCode())
.messageDesc(MessageCode.SUCCESS.getDescription())
.messageBody(Map.of("status", status))
.build();
}
@@ -94,35 +130,65 @@ public class ViolationHandler implements RequestHandler {
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageCode(MessageCode.SUCCESS.getCode())
.messageDesc(MessageCode.SUCCESS.getDescription())
.messageBody(groupedData)
.build();
} else {
Page<Violation> violationPage;
if (startDate != null && endDate != null) {
violationPage = violationService.getViolationsByFilesAndDateRange(
targetFiles, startDate, endDate,
violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
);
} else if (violationRequest.getStatus() != null && !violationRequest.getStatus().isEmpty()) {
violationPage = violationService.getViolationsByFilesAndStatus(
targetFiles, violationRequest.getStatus(),
violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
);
} else {
violationPage = violationService.getViolationsByFiles(
targetFiles,
violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
);
}
// Page<Violation> violationPage;
//
// if (startDate != null && endDate != null) {
// violationPage = violationService.getViolationsByFilesAndDateRange(
// targetFiles, startDate, endDate,
// violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
// );
// } else if (violationRequest.getStatus() != null && !violationRequest.getStatus().isEmpty()) {
// violationPage = violationService.getViolationsByFilesAndStatus(
// targetFiles, violationRequest.getStatus(),
// violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
// );
// } else {
// violationPage = violationService.getViolationsByFiles(
// targetFiles, violationRequest.getPage(), violationRequest.getSize(),
// violationRequest.getSortDirection());
// }
Page<Violation> violationPage = violationService.getViolationsByFilesAndFilters(
targetFiles,
startDate,
endDate,
violationRequest.getStatus(),
violationRequest.getPage(),
violationRequest.getSize(),
violationRequest.getSortDirection());
ViolationResponse.ViolationDto firstShowViolation = null;
List<Violation> content = violationPage.getContent();
List<ViolationResponse.ViolationDto> violationDtos = new ArrayList<>();
if ("getByViolationId".equals(violationRequest.getAction())) {
Violation violation = violationService.getById(violationRequest.getViolationId());
if (violation != null) {
firstShowViolation = ViolationResponse.ViolationDto.fromEntity(violation);
violationDtos.add(firstShowViolation);
}
}
for (Violation violation : content) {
if (firstShowViolation != null && Objects.equals(firstShowViolation.getId(), violation.getId())) continue;
String country;
String countryCode;
ViolationResponse.ViolationDto violationDto = ViolationResponse.ViolationDto.fromEntity(violation);
violationDto.setCountry(geoCountryService.getCountryName(violation.getPageUrl()));
violationDto.setCountryCode(geoCountryService.getCountryCode(violation.getPageUrl()));
try {
country = geoCountryService.getCountryName(violation.getHost());
countryCode = geoCountryService.getCountryCode(violation.getHost());
} catch (Exception e) {
country = geoCountryService.getCountryName(violation.getUrl());
countryCode = geoCountryService.getCountryCode(violation.getUrl());
}
violationDto.setCountry(country);
violationDto.setCountryCode(countryCode);
violationDtos.add(violationDto);
}
@@ -140,6 +206,8 @@ public class ViolationHandler implements RequestHandler {
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody(response)
.messageCode(MessageCode.SUCCESS.getCode())
.messageDesc(MessageCode.SUCCESS.getDescription())
.build();
}
}
@@ -12,6 +12,7 @@ import ru.soune.nocopy.entity.user.AuthToken;
import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.nocopy.service.violation.ViolationNotionService;
import java.util.List;
import java.util.Optional;
@Slf4j
@@ -35,7 +36,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_TOKEN.getCode(),
"Token is required",
null);
"field: token");
}
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(notionRequest.getToken());
@@ -44,7 +45,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_TOKEN.getCode(),
"Invalid token",
null);
notionRequest.getToken());
}
Long userId = tokenOptional.get().getUser().getId();
@@ -55,7 +56,9 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_ACTION.getCode(),
"Action is required",
null);
List.of("get_notions", "get_notion",
"add_notion", "update_notion",
"delete_notion"));
}
switch (action) {
@@ -74,7 +77,9 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_ACTION.getCode(),
"Invalid action: " + action,
null);
List.of("get_notions", "get_notion",
"add_notion", "update_notion",
"delete_notion"));
}
} catch (IllegalArgumentException e) {
@@ -83,21 +88,21 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.VALIDATION_ERROR.getCode(),
e.getMessage(),
null);
"Validation error: " + e.getMessage());
} catch (SecurityException e) {
log.error("Security error: {}", e.getMessage());
return new BaseResponse(
request.getMsgId(),
MessageCode.ACCESS_DENIED.getCode(),
e.getMessage(),
null);
"Security error: " + e.getMessage());
} catch (Exception e) {
log.error("Unexpected error", e);
return new BaseResponse(
request.getMsgId(),
MessageCode.INTERNAL_ERROR.getCode(),
"Internal server error",
null);
"Unexpected error: " + e);
}
}
@@ -107,7 +112,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_JSON_BODY.getCode(),
"ViolationId is required for get_notions action",
null);
"field: violation_id");
}
try {
@@ -116,13 +121,15 @@ public class ViolationNotionHandler implements RequestHandler {
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody(notions)
.messageDesc(MessageCode.SUCCESS.getDescription())
.messageCode(MessageCode.SUCCESS.getCode())
.build();
} catch (IllegalArgumentException e) {
return new BaseResponse(
request.getMsgId(),
MessageCode.NOTION_NOT_FOUND.getCode(),
e.getMessage(),
null);
"Unexpected error: " + e);
}
}
@@ -132,7 +139,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_JSON_BODY.getCode(),
"NotionId is required for get_notion action",
null);
"field: notion_id");
}
try {
@@ -141,13 +148,15 @@ public class ViolationNotionHandler implements RequestHandler {
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody(notion)
.messageDesc(MessageCode.SUCCESS.getDescription())
.messageCode(MessageCode.SUCCESS.getCode())
.build();
} catch (IllegalArgumentException e) {
return new BaseResponse(
request.getMsgId(),
MessageCode.NOTION_NOT_FOUND.getCode(),
e.getMessage(),
null);
"Unexpected error: " + e);
}
}
@@ -157,7 +166,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_JSON_BODY.getCode(),
"ViolationId is required for add_notion action",
null);
"field: notion_id");
}
if (notionRequest.getMessage() == null || notionRequest.getMessage().trim().isEmpty()) {
@@ -165,7 +174,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_JSON_BODY.getCode(),
"Message is required for add_notion action",
null);
"field: message");
}
try {
@@ -174,13 +183,15 @@ public class ViolationNotionHandler implements RequestHandler {
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody(created)
.messageDesc(MessageCode.SUCCESS.getDescription())
.messageCode(MessageCode.SUCCESS.getCode())
.build();
} catch (IllegalArgumentException e) {
return new BaseResponse(
request.getMsgId(),
MessageCode.NOTION_NOT_FOUND.getCode(),
e.getMessage(),
null);
"Unexpected error: " + e);
}
}
@@ -190,7 +201,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_JSON_BODY.getCode(),
"NotionId is required for update_notion action",
null);
"field: notion_id");
}
if (notionRequest.getMessage() == null || notionRequest.getMessage().trim().isEmpty()) {
@@ -198,7 +209,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_JSON_BODY.getCode(),
"Message is required for update_notion action",
null);
"field: message");
}
try {
@@ -207,19 +218,21 @@ public class ViolationNotionHandler implements RequestHandler {
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody(updated)
.messageDesc(MessageCode.SUCCESS.getDescription())
.messageCode(MessageCode.SUCCESS.getCode())
.build();
} catch (IllegalArgumentException e) {
return new BaseResponse(
request.getMsgId(),
MessageCode.NOTION_NOT_FOUND.getCode(),
e.getMessage(),
null);
"IllegalArgumentException error: " + e);
} catch (SecurityException e) {
return new BaseResponse(
request.getMsgId(),
MessageCode.ACCESS_DENIED.getCode(),
e.getMessage(),
null);
"SecurityException error: " + e);
}
}
@@ -229,7 +242,7 @@ public class ViolationNotionHandler implements RequestHandler {
request.getMsgId(),
MessageCode.INVALID_JSON_BODY.getCode(),
"NotionId is required for delete_notion action",
null);
"field: notion_id");
}
try {
@@ -239,9 +252,12 @@ public class ViolationNotionHandler implements RequestHandler {
.message("Notion deleted successfully")
.deleted(true)
.build();
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody(deleteResponse)
.messageDesc(MessageCode.SUCCESS.getDescription())
.messageCode(MessageCode.SUCCESS.getCode())
.build();
} catch (IllegalArgumentException e) {
return new BaseResponse(
@@ -6,9 +6,12 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.violation.ViolationStatisticsRequest;
import ru.soune.nocopy.dto.violation.ViolationStatisticsResponse;
import ru.soune.nocopy.entity.user.AuthToken;
import ru.soune.nocopy.exception.FileEntityNotFoundException;
import ru.soune.nocopy.exception.UserNotHavePermission;
import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.nocopy.service.violation.ViolationService;
@@ -31,8 +34,8 @@ public class ViolationStatisticsHandler implements RequestHandler {
@Override
public BaseResponse handle(BaseRequest request) throws Exception {
ViolationStatisticsRequest statRequest = objectMapper.convertValue(
request.getMessageBody(), ViolationStatisticsRequest.class);
ViolationStatisticsRequest statRequest = objectMapper.convertValue(request.getMessageBody(),
ViolationStatisticsRequest.class);
validateRequest(statRequest);
@@ -48,24 +51,43 @@ public class ViolationStatisticsHandler implements RequestHandler {
}
}
Optional<AuthToken> tokenOptional =
authTokenRepository.findByToken(statRequest.getToken());
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(statRequest.getToken());
if (tokenOptional.isEmpty()) {
throw new IllegalArgumentException("User token is required");
}
Long userId = tokenOptional.orElseThrow().getUser().getId();
ViolationStatisticsResponse statistics;
try {
statistics = violationService.getViolationStatistics(
userId,
statRequest.getFileId(),
startDate,
endDate);
} catch (UserNotHavePermission e) {
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody("userId: " + userId)
.messageCode(MessageCode.USER_NOT_HAD_PERMISSION.getCode())
.messageDesc(MessageCode.USER_NOT_HAD_PERMISSION.getDescription())
.build();
} catch (FileEntityNotFoundException e) {
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody("fileId: " + statRequest.getFileId())
.messageDesc(MessageCode.FILE_NOT_FOUND.getDescription())
.messageCode(MessageCode.FILE_NOT_FOUND.getCode())
.build();
}
ViolationStatisticsResponse statistics = violationService.getViolationStatistics(
userId,
statRequest.getFileId(),
startDate,
endDate);
return BaseResponse.builder()
.msgId(request.getMsgId())
.messageBody(statistics)
.messageCode(MessageCode.SUCCESS.getCode())
.messageDesc(MessageCode.SUCCESS.getDescription())
.build();
}
@@ -0,0 +1,119 @@
package ru.soune.nocopy.migration;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
@Component
@Slf4j
@RequiredArgsConstructor
public class S3MigrationTool {
private final FileEntityRepository fileEntityRepository;
private final CloudStorageService cloudStorageService;
private static final Path FAILED_LOG = Paths.get("migration_failed.txt");
public void migrationFilesToS3() {
log.info("=== START MIGRATION ===");
clearLogFile();
List<FileEntity> allFiles = fileEntityRepository.findAll();
log.info("Total files: {}", allFiles.size());
int success = 0;
List<String> failedIds = new ArrayList<>();
for (FileEntity file : allFiles) {
if (migrateFile(file)) {
success++;
} else {
failedIds.add(file.getId());
}
}
log.info("=== COMPLETED: success {}, failed {} ===", success, failedIds.size());
if (!failedIds.isEmpty()) {
log.info("Failed file IDs: {}", String.join(", ", failedIds));
log.info("Details saved to: {}", FAILED_LOG.toAbsolutePath());
}
}
private boolean migrateFile(FileEntity file) {
StringBuilder errors = new StringBuilder();
try {
cloudStorageService.saveFilesToStorage(
file.getMimeType(), file.getFileExtension(), file.getFilePath()
);
} catch (Exception e) {
errors.append("main:").append(e.getMessage()).append("; ");
}
if ("image".equals(file.getMimeType())) {
try {
cloudStorageService.saveFilesToStorage(
file.getMimeType(), file.getFileExtension(), file.getMediumPath()
);
} catch (Exception e) {
errors.append("medium:").append(e.getMessage()).append("; ");
}
try {
cloudStorageService.saveFilesToStorage(
file.getMimeType(), file.getFileExtension(), file.getThumbnailPath()
);
} catch (Exception e) {
errors.append("thumb:").append(e.getMessage()).append("; ");
}
}
if (file.getProtectedFilePath() != null) {
try {
cloudStorageService.saveFilesToStorage(
file.getMimeType() != null ? file.getMimeType() : "application",
file.getFileExtension(),
file.getProtectedFilePath()
);
} catch (Exception e) {
errors.append("protected:").append(e.getMessage()).append("; ");
}
}
if (errors.length() > 0) {
writeToFile(String.format("%s | %s | %s",
file.getId(), file.getOriginalFileName(), errors));
log.warn("Failed to migrate: {} | {}", file.getId(), file.getOriginalFileName());
return false;
}
return true;
}
private void clearLogFile() {
try {
Files.deleteIfExists(FAILED_LOG);
} catch (IOException e) {
log.warn("Failed to clear log file");
}
}
private void writeToFile(String line) {
try {
Files.write(FAILED_LOG, (line + "\n").getBytes(),
StandardOpenOption.CREATE, StandardOpenOption.APPEND);
} catch (IOException e) {
log.error("Failed to write to log file", e);
}
}
}
@@ -5,11 +5,13 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.entity.complaint.ComplaintEntity;
import ru.soune.nocopy.entity.complaint.ComplaintStatus;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
@@ -18,7 +20,9 @@ public interface ComplaintEntityRepository extends JpaRepository<ComplaintEntity
Optional<ComplaintEntity> findById(Long id);
Page<ComplaintEntity> findAll(Pageable pageable);
Page<ComplaintEntity> findByStatus(ComplaintStatus status, Pageable pageable);
List<ComplaintEntity> findByViolationId(Long violationId);
ComplaintEntity findByViolationId(Long violationId);
@Query("SELECT c FROM ComplaintEntity c WHERE c.violation.id = :violationId AND c.status IN :statuses")
List<ComplaintEntity> findByViolationIdAndStatuses(@Param("violationId") Long violationId, @Param("statuses") List<String> statuses);
boolean existsByViolationId(Long violationId);
@Modifying
@@ -29,6 +33,9 @@ public interface ComplaintEntityRepository extends JpaRepository<ComplaintEntity
@Query("SELECT COUNT(c.id) FROM ComplaintEntity c")
Long getTotalComplaintsCount();
@Query("SELECT COUNT(c.id) FROM ComplaintEntity c WHERE c.status = :status")
Long getTotalComplaintsCountByStatus(@Param("status")ComplaintStatus status);
@Query("""
SELECT COUNT(c.id)
FROM ComplaintEntity c
@@ -37,4 +44,12 @@ public interface ComplaintEntityRepository extends JpaRepository<ComplaintEntity
)
""")
Long getComplaintsWithoutLawCaseCount();
Long countComplaintEntityByEmailAndCreatedAtBetween(String email, LocalDateTime startDate, LocalDateTime endDate);
@Query("SELECT COUNT(c) FROM ComplaintEntity c WHERE c.violation.id IN :violations")
Long countComplaintByViolations(@Param("violations") List<Long> violations);
@Query("SELECT c FROM ComplaintEntity c WHERE c.email IN :emails")
Page<ComplaintEntity> getComplaintsByUserEmails(@Param("emails") List<String> emails, Pageable pageable);
}
@@ -0,0 +1,103 @@
package ru.soune.nocopy.repository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import ru.soune.nocopy.entity.docviewer.DockView;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
@Repository
public interface DockViewRepository extends JpaRepository<DockView, Long> {
List<DockView> findAllByFileId(String fileId);
@Query("SELECT d.viewerIp FROM DockView d WHERE d.fileId IN :fileIds")
List<String> findAllViewerIps(@Param("fileIds") List<String> fileIds);
List<DockView> findAllByViewerId(Long viewerId);
Optional<DockView> findByFileIdAndViewerId(String fileId, Long viewerId);
List<DockView> findAllByViewerIp(String viewerIp);
Page<DockView> findAllByFileIdOrderByCreatedAtDesc(String fileId, Pageable pageable);
@Query("SELECT dv FROM DockView dv WHERE dv.fileId IN :fileIds")
Page<DockView> findAllByFileIds(@Param("fileIds") List<String> fileIds, Pageable pageable);
@Query("SELECT " +
"COUNT(dv) as totalViews, " +
"COUNT(DISTINCT dv.viewerIp) as uniqueIps, " +
"COUNT(DISTINCT dv.viewerId) as uniqueUsers, " +
"MAX(dv.createdAt) as lastViewDate, " +
"MIN(dv.createdAt) as firstViewDate " +
"FROM DockView dv " +
"WHERE dv.fileId IN :fileIds")
List<Object[]> findTotalViewsStatsByFileIds(@Param("fileIds") List<String> fileIds);
Page<DockView> findAllByViewerIdOrderByCreatedAtDesc(Long viewerId, Pageable pageable);
long countByFileId(String fileId);
@Query("SELECT COUNT(DISTINCT dv.viewerIp) FROM DockView dv WHERE dv.fileId = :fileId")
long countUniqueIpsByFileId(@Param("fileId") String fileId);
@Query("SELECT COUNT(DISTINCT dv.viewerId) FROM DockView dv WHERE dv.fileId = :fileId")
long countUniqueViewersByFileId(@Param("fileId") String fileId);
@Query("SELECT MAX(dv.createdAt) FROM DockView dv WHERE dv.fileId = :fileId")
Optional<LocalDateTime> findLastViewDateByFileId(@Param("fileId") String fileId);
@Query("SELECT dv.fileId, " +
"COUNT(dv) as totalViews, " +
"COUNT(DISTINCT dv.viewerIp) as uniqueIps, " +
"MAX(dv.createdAt) as lastViewDate " +
"FROM DockView dv " +
"GROUP BY dv.fileId " +
"ORDER BY lastViewDate DESC")
Page<Object[]> findViewsStatsPaginated(Pageable pageable);
@Query("SELECT dv.fileId, " +
"COUNT(dv) as totalViews, " +
"COUNT(DISTINCT dv.viewerIp) as uniqueIps, " +
"COUNT(DISTINCT dv.viewerId) as uniqueUsers, " +
"MAX(dv.createdAt) as lastViewDate, " +
"MIN(dv.createdAt) as firstViewDate " +
"FROM DockView dv " +
"WHERE dv.fileId = :fileId " +
"GROUP BY dv.fileId")
Optional<Object[]> findViewsStatsByFileId(@Param("fileId") String fileId);
@Query("SELECT dv.fileId, " +
"COUNT(dv) as totalViews, " +
"COUNT(DISTINCT dv.viewerIp) as uniqueIps, " +
"COUNT(DISTINCT dv.viewerId) as uniqueUsers, " +
"MAX(dv.createdAt) as lastViewDate, " +
"MIN(dv.createdAt) as firstViewDate " +
"FROM DockView dv " +
"WHERE dv.fileId IN :fileIds " +
"GROUP BY dv.fileId")
List<Object[]> findViewsStatsByFileIds(@Param("fileIds") List<String> fileIds);
void deleteAllByFileId(String fileId);
void deleteAllByCreatedAtBefore(LocalDateTime date);
List<DockView> findAllByFileIdAndCreatedAtBetween(
String fileId,
LocalDateTime startDate,
LocalDateTime endDate
);
boolean existsByFileIdAndViewerIp(String fileId, String viewerIp);
List<DockView> findTop10ByFileIdOrderByCreatedAtDesc(String fileId);
}
@@ -3,8 +3,10 @@ package ru.soune.nocopy.repository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.entity.file.FileAppeal;
import ru.soune.nocopy.entity.file.AppealStatus;
import java.util.List;
@@ -20,9 +22,20 @@ public interface FileAppealRepository extends JpaRepository<FileAppeal, String>
Page<FileAppeal> findByUserId(Long userId, Pageable pageable);
@Query("SELECT fa FROM FileAppeal fa LEFT JOIN FETCH fa.file WHERE fa.userId = :userId")
Page<FileAppeal> findByUserIdWithFile(@Param("userId") Long userId, Pageable pageable);
@Query("SELECT fa FROM FileAppeal fa WHERE fa.status = :status ORDER BY fa.createdAt ASC")
Page<FileAppeal> findPendingAppeals(@Param("status") AppealStatus status, Pageable pageable);
boolean existsByFileIdAndStatusIn(String fileId, List<AppealStatus> statuses);
@Modifying
@Transactional
@Query("DELETE FROM FileAppeal a WHERE a.fileId IN :fileIds")
void deleteAllByFileIdIn(@Param("fileIds") List<String> fileIds);
@Query("SELECT fa FROM FileAppeal fa JOIN FETCH fa.file")
Page<FileAppeal> findAllWithFile(Pageable pageable);
}
@@ -3,9 +3,11 @@ package ru.soune.nocopy.repository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.dto.statistic.UserFilesStatisticResponse;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus;
@@ -46,6 +48,10 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
List<FileEntity> searchByFileNameAndStatusIn(@Param("userId") Long userId, @Param("keyword") String keyword,
List<FileStatus> statuses);
@Query("SELECT f FROM FileEntity f WHERE f.status = :status")
List<FileEntity> searchFileEntityByStatus(@Param("status") FileStatus status);
@@ -70,6 +76,13 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
Page<FileEntity> findByStatusIn(List<FileStatus> statuses, Pageable pageable);
@Query("SELECT f FROM FileEntity f WHERE f.status IN :statuses")
Page<FileEntity> findByStatusInAndSorted(@Param("statuses") List<String> statuses, Pageable pageable);
@Query("SELECT f FROM FileEntity f JOIN FileAppeal fa ON fa.fileId = f.id WHERE f.status IN :statuses")
Page<FileEntity> findByStatusInAndSortedWithAppeal(@Param("statuses") List<String> statuses, Pageable pageable);
List<FileEntity> findByUserIdAndStatusIn(Long userId, List<FileStatus> statuses);
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.status IN :statuses")
@@ -131,4 +144,9 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
ORDER BY file_count
""", nativeQuery = true)
List<Object[]> getProtectedFilesPerUserStats();
@Modifying
@Transactional
@Query("DELETE FROM FileEntity f WHERE f.id IN :ids")
void deleteAllByIdIn(@Param("ids") List<String> ids);
}
@@ -1,6 +1,8 @@
package ru.soune.nocopy.repository;
import jakarta.transaction.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
@@ -22,4 +24,16 @@ public interface FileMonitoringRepository extends JpaRepository<FileMonitoringEn
List<FileMonitoringEntity> findReadyForRun(@Param("now") LocalDateTime now);
List<FileMonitoringEntity> findByMonitoringTypeAndIsActiveTrue(MonitoringType type);
@Query("SELECT COUNT(m) FROM FileMonitoringEntity m " +
"WHERE m.userId IN :userIds " +
"AND m.monitoringType = :monitoringType " +
"AND m.isActive = true")
long countByUserIdsAndMonitoringType(@Param("userIds") List<Long> userIds,
@Param("monitoringType") MonitoringType monitoringType);
@Modifying
@Transactional
@Query("DELETE FROM FileMonitoringEntity f WHERE f.file.id IN :fileIds")
void deleteAllByFileIdIn(@Param("fileIds") List<String> fileIds);
}
@@ -1,7 +1,11 @@
package ru.soune.nocopy.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.entity.file.ImageHashEntity;
import java.util.List;
@@ -9,6 +13,10 @@ import java.util.List;
@Repository
public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
void deleteByFileId(String fileId);
List<ImageHashEntity> findByFileId(String fileId);
ImageHashEntity findByFileId(String fileId);
ImageHashEntity findByHash64HiAndHash64Lo(Long hash64Hi, Long hash64Lo);
@Modifying
@Transactional
@Query("DELETE FROM ImageHashEntity i WHERE i.file.id IN :fileIds")
void deleteAllByFileIdIn(@Param("fileIds") List<String> fileIds);
}
@@ -114,5 +114,29 @@ public interface ImageSimilarityRepository
List<SimilarImageProjection> findExactDuplicates(
@Param("hash64Hi") Long hash64_hi,
@Param("hash64Lo") Long hash64_lo);
@Query(value = """
SELECT
h.hash64_hi AS hash64Hi,
h.hash64_lo AS hash64Lo,
h.file_id AS fileId,
f.user_id AS userId,
f.original_file_name AS originalFileName,
f.file_size AS fileSize,
f.stored_file_name AS similarFileId,
f.support_id AS supportId,
f.created_at AS uploadDate,
f.file_extension AS extension,
f.protection_status AS protectionStatus
FROM image_hashes h
JOIN file_entities f ON f.id = h.file_id
WHERE h.hash64_hi = :hash64Hi
AND h.hash64_lo = :hash64Lo
AND (f.status = 'TEMP')
""",
nativeQuery = true)
List<SimilarImageProjection> findExactDuplicatesTemp(
@Param("hash64Hi") Long hash64_hi,
@Param("hash64Lo") Long hash64_lo);
}
@@ -10,7 +10,9 @@ import ru.soune.nocopy.entity.complaint.LawCase;
import ru.soune.nocopy.entity.complaint.LawCasePriority;
import ru.soune.nocopy.entity.complaint.LawCaseType;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
@Repository
public interface LawCaseRepository extends JpaRepository<LawCase, Long> {
@@ -42,4 +44,17 @@ public interface LawCaseRepository extends JpaRepository<LawCase, Long> {
@Query("SELECT COUNT(lc.id) FROM LawCase lc")
Long getTotalLawCasesCount();
@Query("SELECT COUNT(l) FROM LawCase l WHERE l.violationId IN :violationIds")
Long countLawCaseByViolationIds(@Param("violationIds") List<Long> violationIds);
@Query("SELECT COUNT(lc) FROM LawCase lc WHERE lc.user.Id = :userId " +
"AND lc.createdAt BETWEEN :startDate AND :endDate")
Long countLawCasesByUserAndDateRange(@Param("userId") Long userId, @Param("startDate") LocalDateTime startDate,
@Param("endDate") LocalDateTime endDate);
Optional<LawCase> getLawCaseByViolationIdAndType(Long violationId, LawCaseType type);
boolean existsByViolationId(Long violationId);
}
@@ -10,4 +10,6 @@ import java.util.List;
public interface ModerationFileRepository extends CrudRepository<ModerationPassportFile, Long> {
public List<ModerationPassportFile> findByStatus(String status);
public List<ModerationPassportFile> findByUserIdAndStatus(Long userId, String status);
}
@@ -1,6 +1,10 @@
package ru.soune.nocopy.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.entity.file.moderation.ModerationLog;
import java.util.List;
@@ -10,4 +14,11 @@ public interface ModerationLogRepository extends JpaRepository<ModerationLog, St
List<ModerationLog> findByFileIdOrderByCreatedAtDesc(String fileId);
List<ModerationLog> findByModeratorId(Long moderatorId);
List<ModerationLog> findByFileId(String fileId);
@Modifying
@Transactional
@Query("DELETE FROM ModerationLog m WHERE m.fileId IN :fileIds")
void deleteAllByFileIdIn(@Param("fileIds") List<String> fileIds);
}
@@ -15,6 +15,8 @@ public interface TariffInfoRepository extends JpaRepository<TariffInfo, String>
@Query("SELECT t FROM TariffInfo t WHERE t.autoRenewal = true AND t.endTariff <= :date")
List<TariffInfo> findForAutoRenewal(@Param("date") LocalDateTime date);
Boolean existsByTariffId(Long tariffId);
@Query("""
SELECT COUNT(u.Id)
FROM User u
@@ -1,10 +1,11 @@
package ru.soune.nocopy.repository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import ru.soune.nocopy.entity.tarif.Tariff;
import ru.soune.nocopy.entity.tarif.TariffTimeTerm;
import ru.soune.nocopy.entity.tarif.TariffType;
import java.util.List;
import java.util.Optional;
@@ -14,6 +15,7 @@ public interface TariffRepository extends JpaRepository<Tariff, Long> {
Optional<Tariff> findByType(String type);
List<Tariff> findAllByOrderByPriceAsc();
List<Tariff> findByTariffAccountType(String typeAccount);
Page<Tariff> findByTariffAccountType(String typeAccount, Pageable pageable);
List<Tariff> findByTariffAccountTypeAndTariffTerm(String typeAccount, TariffTimeTerm tariffTerm);
Tariff findByName(String name);
}
@@ -1,7 +1,10 @@
package ru.soune.nocopy.repository;
import jakarta.validation.constraints.Size;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import ru.soune.nocopy.entity.tarif.TariffInfo;
@@ -10,12 +13,17 @@ import ru.soune.nocopy.entity.user.User;
import java.util.List;
import java.util.Optional;
public interface UserRepository extends JpaRepository<User, Long> {
public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificationExecutor<User> {
User findByEmail(String email);
boolean existsByEmail(String email);
boolean existsByPhone(@Size(min = 11, max = 14) String phone);
List<User> findByCompanyId(String companyId);
long countByCompanyId(String companyId);
User findByPersonalTariffInfo(TariffInfo tariffInfo);
@Query("SELECT COUNT(u.Id) FROM User u")
@@ -45,4 +53,10 @@ public interface UserRepository extends JpaRepository<User, Long> {
@Query("SELECT u FROM User u WHERE u.personalTariffInfo.id = :tariffInfoId")
Optional<User> findByPersonalTariffInfoId(@Param("tariffInfoId") String tariffInfoId);
@Query("SELECT u.email FROM User u WHERE u.company.id = :company")
List<String> emailsByCompany(@Param("company") String company);
@Query("SELECT u FROM User u LEFT JOIN u.personalTariffInfo t")
Page<User> findAllWithTariff(Pageable pageable);
}
@@ -4,6 +4,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
@@ -15,7 +16,7 @@ import java.util.List;
import java.util.Optional;
@Repository
public interface ViolationRepository extends JpaRepository<Violation, Long> {
public interface ViolationRepository extends JpaRepository<Violation, Long>, JpaSpecificationExecutor<Violation> {
Page<Violation> findByFileEntity(FileEntity file, Pageable pageable);
@@ -42,6 +43,8 @@ public interface ViolationRepository extends JpaRepository<Violation, Long> {
List<Violation> findByFileEntityIn(List<FileEntity> files);
List<Violation> findByFileEntityInAndStatusNot(List<FileEntity> files, String excludeStatus);
Page<Violation> findByFileEntityIn(List<FileEntity> files, Pageable pageable);
Page<Violation> findByFileEntityInAndStatus(List<FileEntity> files, String status, Pageable pageable);
@@ -58,6 +61,19 @@ public interface ViolationRepository extends JpaRepository<Violation, Long> {
LocalDateTime startDate,
LocalDateTime endDate);
List<Violation> findByFileEntityInAndCreatedDateBetweenAndStatusNot(List<FileEntity> files,
LocalDateTime startDate,
LocalDateTime endDate, String excludeStatus);
Page<Violation> findByFileEntityInAndStatusNot(List<FileEntity> files, String excludeStatus, Pageable pageable);
Page<Violation> findByFileEntityInAndStatusNotAndStatus(List<FileEntity> files, String excludeStatus,
String includeStatus, Pageable pageable);
Page<Violation> findByFileEntityInAndStatusNotAndCreatedDateBetween(List<FileEntity> files, String excludeStatus,
LocalDateTime startDate, LocalDateTime endDate,
Pageable pageable);
@Query("SELECT COUNT(v) FROM Violation v WHERE v.fileEntity.id IN :fileIds")
long countByFileEntityIdIn(@Param("fileIds") List<String> fileIds);
@@ -1,5 +1,7 @@
package ru.soune.nocopy.scheduler;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
@@ -55,7 +57,11 @@ public class MonitoringScheduler {
Set<Long> usersForNotifications = groupingFilesMonitoring.keySet();
for (Long userId : usersForNotifications) {
notificationService.addNotification(NotificationType.MONITORING_RESULT, userId);
ObjectMapper mapper = new ObjectMapper();
ObjectNode context = mapper.createObjectNode();
context.put("message", "Monitoring files on monitoring");
notificationService.addNotification(NotificationType.MONITORING_RESULT, userId, context.toString());
}
}
}
@@ -99,7 +99,7 @@ public class FileSimilarityService {
}
public List<SimilarImageProjection> findDuplicatedByHash(Long hash64Hi, Long hash64Lo) {
List<SimilarImageProjection> duplicates = repository.findExactDuplicates(hash64Hi,hash64Lo);
List<SimilarImageProjection> duplicates = repository.findExactDuplicatesTemp(hash64Hi,hash64Lo);
if (duplicates.isEmpty()) {
return new ArrayList<>();
@@ -109,22 +109,24 @@ public class FileSimilarityService {
}
public void hasDuplicatesByHash(String path, String mimeType, Long userId) throws Exception {
FileEntity duplicateByHash = findDuplicateByHash(path, mimeType, userId);
FileEntity duplicateByHash = findDuplicateByHash(path, mimeType, userId, false);
if (duplicateByHash != null) {
throw new DuplicateImageException("Duplicate", duplicateByHash.getId(),
duplicateByHash.getUserId());
}
}
public FileEntity findDuplicateByHash(String path, String mimeType, Long userId) throws Exception {
String hash = calculateFileHash(path, false);
public FileEntity findDuplicateByHash(String path, String mimeType, Long userId, boolean cloud) throws Exception {
String hash = calculateFileHash(path, cloud);
User user = userRepository.findById(userId).orElseThrow();
Company company = user.getCompany();
List<Long> userIds = new ArrayList<>();
if (company != null) {
userIds.addAll(company.getUsers().stream().map(User::getId).toList());
userIds.addAll(company.getUsers().stream()
.map(User::getId)
.toList());
} else {
userIds.add(userId);
}
@@ -132,15 +134,10 @@ public class FileSimilarityService {
List<FileEntity> fileEntityList = fileEntityRepository.findByMimeTypeAndUserIds(mimeType, userIds);
for (FileEntity file : fileEntityList) {
// if (file.getProtectedFilePath() == null) continue;
// File existingFile = cloudStorageService.readFileFromStorageByPath(file.getFilePath());
// File newFile = new File(path);
// if (existingFile.length() == newFile.length()) {
if (calculateFileHash(file.getFilePath(), true).equals(hash)) {
if (!file.getStatus().name().equals(FileStatus.TEMP.name()) &&
calculateFileHash(file.getFilePath(), true).equals(hash)) {
return file;
}
// }
}
return null;
@@ -216,6 +213,7 @@ public class FileSimilarityService {
}
byte[] hashBytes = digest.digest();
return Base64.getEncoder().encodeToString(hashBytes);
}
@@ -26,24 +26,6 @@ public class ImageHashService {
private final CloudStorageService cloudStorageService;
// public Map<String, Long> calculateHash(Path imagePath) throws IOException {
//// File file = cloudStorageService.readFileFromStorageByPath(imagePath.toString());
// File file = imagePath.toFile();
// if (file == null) {
// file = cloudStorageService.readFileFromStorageByPath(imagePath.toString());
// }
//
// PHash pHash = PerceptualHashHelper.INSTANCE.generateDCTPerceptualHash(file);
//
// Long firstPart = pHash.getFirstPart();
// Long secondPart = pHash.getSecondPart();
// Map<String, Long> hash = Map.of(
// "hi", firstPart,
// "low", secondPart);
//
// return hash;
// }
public Map<String, Long> calculateHash(Path imagePath) throws IOException {
PHash pHash;
@@ -1,5 +1,7 @@
package ru.soune.nocopy.service.complaint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
@@ -24,7 +26,6 @@ import ru.soune.nocopy.service.violation.ViolationStatus;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
@Slf4j
@Service
@@ -62,6 +63,12 @@ public class ComplaintEntityService {
return mapToResponse(complaintRepository.save(complaint));
}
@Transactional(readOnly = true)
public Page<ComplaintResponse> getAllComplaintsByEmail(Pageable pageable, List<String> emails) {
return complaintRepository.getComplaintsByUserEmails(emails, pageable)
.map(this::mapToResponse);
}
@Transactional(readOnly = true)
public ComplaintResponse getComplaintById(Long id) {
return complaintRepository.findById(id)
@@ -75,20 +82,26 @@ public class ComplaintEntityService {
}
@Transactional(readOnly = true)
public List<ComplaintResponse> getComplaintsByViolationId(Long violationId) {
public ComplaintResponse getComplaintsByViolationId(Long violationId) {
if (!violationRepository.existsById(violationId)) {
throw new ViolationNotFoundException("Violation not found: " + violationId);
}
return complaintRepository.findByViolationId(violationId)
.stream()
.map(this::mapToResponse)
.collect(Collectors.toList());
return mapToResponse(complaintRepository.findByViolationId(violationId));
}
public ComplaintResponse updateComplaintStatus(Long id, ComplaintStatus status) {
ComplaintEntity complaint = complaintRepository.findById(id)
.orElseThrow(() -> new ComplaintNotFoundException("Complaint not found: " + id));
public List<ComplaintEntity> fetchComplaintByViolation(Long violationId) {
if (!violationRepository.existsById(violationId)) {
return null;
}
return complaintRepository.findByViolationIdAndStatuses(violationId, List.of(ComplaintStatus.CREATED.name(),
ComplaintStatus.SHOWED.name(), ComplaintStatus.IN_WORK.name()));
}
public ComplaintResponse updateComplaintStatus(ComplaintEntity complaint, ComplaintStatus status) {
complaint.setStatus(status);
return mapToResponse(complaintRepository.save(complaint));
}
@@ -106,8 +119,7 @@ public class ComplaintEntityService {
if (request.getStatus() != null) {
complaint.setStatus(ComplaintStatus.valueOf(request.getStatus()));
notificationService.addNotification(NotificationType.COMPLAINT_STATUS_CHANGED, complaint.getViolation()
.getFileEntity().getUserId(), request.getStatus());
addComplaintNotification(complaint, request);
}
return mapToResponse(complaintRepository.save(complaint));
@@ -121,16 +133,31 @@ public class ComplaintEntityService {
}
private ComplaintResponse mapToResponse(ComplaintEntity entity) {
Violation violation = entity.getViolation();
return ComplaintResponse.builder()
.id(entity.getId())
.status(entity.getStatus() != null ? entity.getStatus().name() : null)
.complaintText(entity.getComplaintText())
.email(entity.getEmail())
.violationId(entity.getViolation() != null ? entity.getViolation().getId() : null)
.violationId(violation != null ? violation.getId() : null)
.fileId(violation != null ? violation.getFileEntity().getId() : null)
.createdAt(entity.getCreatedAt() != null ? entity.getCreatedAt().format(DATE_FORMATTER) : null)
.updatedAt(entity.getUpdatedAt() != null ? entity.getUpdatedAt().format(DATE_FORMATTER) : null)
.notModerated(entity.getNot_moderated_file() != null ? entity.getNot_moderated_file() : null)
.build();
}
private void addComplaintNotification(ComplaintEntity complaint, ComplaintRequest request) {
ObjectMapper mapper = new ObjectMapper();
ObjectNode context = mapper.createObjectNode();
context.put("new_status", request.getStatus());
context.put("old_status", complaint.getStatus().name());
context.put("violation", complaint.getViolation().getId());
context.put("file", complaint.getViolation().getFileEntity().getOriginalFileName());
context.put("file_support_id", complaint.getViolation().getFileEntity().getSupportId());
notificationService.addNotification(NotificationType.COMPLAINT_STATUS_CHANGED, complaint.getViolation()
.getFileEntity().getUserId(), context.toString());
}
}
@@ -13,7 +13,7 @@ import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.repository.LawCaseRepository;
import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;
@Service
@RequiredArgsConstructor
@@ -51,6 +51,10 @@ public class LawCaseService {
return lawCaseRepository.save(lawCase);
}
public boolean lawCaseExistByViolationId(Long violationId) {
return lawCaseRepository.existsByViolationId(violationId);
}
public LawCase changePriority(Long id, LawCasePriority priority) {
LawCase lawCase = lawCaseRepository.findById(id).orElse(null);
if (lawCase == null) {
@@ -70,6 +74,13 @@ public class LawCaseService {
return lawCaseRepository.save(lawCase);
}
public LawCase fetchByViolationId(Long violationId) {
Optional<LawCase> lawCaseByViolationIdAndType =
lawCaseRepository.getLawCaseByViolationIdAndType(violationId, LawCaseType.ACTIVE);
return lawCaseByViolationIdAndType.orElse(null);
}
public Page<LawCase> getAllUserLawCases(Long userId, int pageSize, int pageNumber,
LawCaseType lawCaseType, String lawyer,
LawCasePriority lawCasePriority,
@@ -0,0 +1,242 @@
package ru.soune.nocopy.service.dockview;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.dto.docviewer.DocViewerRequest;
import ru.soune.nocopy.dto.docviewer.DockViewResponse;
import ru.soune.nocopy.dto.docviewer.DockViewStatsResponse;
import ru.soune.nocopy.entity.docviewer.DockView;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.repository.DockViewRepository;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.geo.GeoCountryService;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@Service
@Slf4j
@RequiredArgsConstructor
public class DockViewService {
private final DockViewRepository dockViewRepository;
private final GeoCountryService geoCountryService;
private final FileEntityRepository fileEntityRepository;
private final UserRepository userRepository;
@Transactional
public DockView createDockView(DocViewerRequest request, Long userId) {
DockView dockView = new DockView();
String geoEnName = geoCountryService.getCityByIp(request.getIp(), "en") + "/" +
geoCountryService.getCountryByIp(request.getIp(), "en");
String geoRuName = geoCountryService.getCityByIp(request.getIp(), "ru") + "/" +
geoCountryService.getCountryByIp(request.getIp(), "ru");
User user = userRepository.findById(userId).orElse(null);
FileEntity file = fileEntityRepository.findByFileId(request.getFileId());
dockView.setViewerId(userId);
dockView.setViewerIp(request.getIp() != null ? request.getIp() : "-");
dockView.setUserAgent(request.getUserAgent() != null ? request.getUserAgent() : "-");
dockView.setFileId(request.getFileId());
dockView.setCreatedAt(LocalDateTime.now());
dockView.setGeoNameEn(geoEnName);
dockView.setGeoNameRu(geoRuName);
dockView.setViewerName(user == null ? "guest" : user.getFullName());
dockView.setDocName(file.getOriginalFileName());
DockView saved = dockViewRepository.save(dockView);
log.info("Created dock view record: fileId={}, viewerId={}, ip={}",
saved.getFileId(), saved.getViewerId(), saved.getViewerIp());
return saved;
}
public DockViewStatsResponse getTotalStatsByFileIds(List<String> fileIds, String locale) {
List<Object[]> statsList = dockViewRepository.findTotalViewsStatsByFileIds(fileIds);
List<String> allViewerIps = dockViewRepository.findAllViewerIps(fileIds);
Map<String, Integer> uniqueGeoCount = geoCountryService.getUniqueGeoCount(allViewerIps, locale);
if (statsList.isEmpty()) {
return DockViewStatsResponse.builder()
.totalViews(0L)
.uniqueIps(0L)
.uniqueUsers(0L)
.firstViewDate(null)
.lastViewDate(null)
.build();
}
Object[] stats = statsList.get(0);
return DockViewStatsResponse.builder()
.totalViews((Long) stats[0])
.uniqueIps((Long) stats[1])
.uniqueUsers((Long) stats[2])
.documentsCount(fileIds.size())
.uniqueCityCount(uniqueGeoCount.get("uniqueCities"))
.uniqueCountryCount(uniqueGeoCount.get("uniqueCountries"))
.lastViewDate((LocalDateTime) stats[3])
.firstViewDate((LocalDateTime) stats[4])
.build();
}
public List<DockViewStatsResponse> getStatsByFileIds(List<String> fileIds) {
List<Object[]> statsList = dockViewRepository.findViewsStatsByFileIds(fileIds);
Map<String, Object[]> statsMap = statsList.stream()
.collect(Collectors.toMap(
stats -> (String) stats[0],
stats -> stats
));
return fileIds.stream()
.map(fileId -> {
Object[] stats = statsMap.get(fileId);
if (stats == null) {
return DockViewStatsResponse.builder()
.fileId(fileId)
.totalViews(0L)
.uniqueIps(0L)
.uniqueUsers(0L)
.firstViewDate(null)
.lastViewDate(null)
.build();
}
return DockViewStatsResponse.builder()
.fileId((String) stats[0])
.totalViews((Long) stats[1])
.uniqueIps((Long) stats[2])
.uniqueUsers((Long) stats[3])
.lastViewDate((LocalDateTime) stats[4])
.firstViewDate((LocalDateTime) stats[5])
.build();
})
.collect(Collectors.toList());
}
public DockViewStatsResponse getOpenLastHistory(int page, int size, String sortDirection, String sortBy,
List<String> fileIds, String locale) {
if (sortDirection == null || sortDirection.isEmpty()) {
sortDirection = "desc";
}
if (sortBy == null || sortBy.isEmpty()) {
sortBy = "createdAt";
}
if (page < 0) {
page = 0;
}
if (size < 1) {
size = 10;
}
Pageable pageable = PageRequest.of(page, size,
Sort.by(Sort.Direction.fromString(sortDirection), sortBy));
Page<DockView> dockViews = dockViewRepository.findAllByFileIds(fileIds, pageable);
if (dockViews.isEmpty()) {
return DockViewStatsResponse.builder()
.build();
}
List<DockViewResponse> history = new ArrayList<>();
for (DockView dockView: dockViews) {
locale = locale == null ? "en": locale;
String country = locale.equals("en") ? dockView.getGeoNameEn(): dockView.getGeoNameRu();
LocalDateTime createdAt = dockView.getCreatedAt();
DockViewResponse response = DockViewResponse.builder()
.country(country)
.viewDate(createdAt)
.document(dockView.getDocName())
.viewer(dockView.getViewerName())
.build();
history.add(response);
}
return DockViewStatsResponse.builder()
.history(history)
.pageNumber(dockViews.getNumber())
.pageSize(dockViews.getSize())
.totalPages(dockViews.getTotalPages())
.totalElements(dockViews.getTotalElements())
.build();
}
public DockViewStatsResponse getBasicStatsByFileId(String fileId) {
long totalViews = dockViewRepository.countByFileId(fileId);
long uniqueIps = dockViewRepository.countUniqueIpsByFileId(fileId);
return DockViewStatsResponse.builder()
.fileId(fileId)
.totalViews(totalViews)
.uniqueIps(uniqueIps)
.build();
}
public DockViewStatsResponse getAllFilesStatsPaginated(Pageable pageable) {
Page<Object[]> statsPage = dockViewRepository.findViewsStatsPaginated(pageable);
List<DockViewStatsResponse> statsList = statsPage.getContent().stream()
.map(row -> DockViewStatsResponse.builder()
.fileId((String) row[0])
.totalViews((Long) row[1])
.uniqueIps((Long) row[2])
.lastViewDate((LocalDateTime) row[3])
.build())
.collect(Collectors.toList());
return DockViewStatsResponse.builder()
.content(statsList)
.pageNumber(statsPage.getNumber())
.pageSize(statsPage.getSize())
.totalElements(statsPage.getTotalElements())
.totalPages(statsPage.getTotalPages())
.isLast(statsPage.isLast())
.isFirst(statsPage.isFirst())
.hasNext(statsPage.hasNext())
.hasPrevious(statsPage.hasPrevious())
.build();
}
public boolean hasViewedFromIp(String fileId, String ip) {
return dockViewRepository.existsByFileIdAndViewerIp(fileId, ip);
}
public Optional<LocalDateTime> getLastViewDate(String fileId) {
return dockViewRepository.findLastViewDateByFileId(fileId);
}
@Transactional
public void deleteAllViewsByFileId(String fileId) {
dockViewRepository.deleteAllByFileId(fileId);
log.info("Deleted all views for fileId: {}", fileId);
}
@Transactional
public void cleanOldViews() {
LocalDateTime thirtyDaysAgo = LocalDateTime.now().minusDays(30);
dockViewRepository.deleteAllByCreatedAtBefore(thirtyDaysAgo);
log.info("Cleaned views older than: {}", thirtyDaysAgo);
}
}
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.dto.file.FileEntityResponse;
import ru.soune.nocopy.dto.file.FileResponse;
import ru.soune.nocopy.entity.file.FileAppeal;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.ProtectionStatus;
@@ -16,11 +17,13 @@ import ru.soune.nocopy.entity.monitoring.FileMonitoringEntity;
import ru.soune.nocopy.entity.monitoring.MonitoringType;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.exception.FileEntityNotFoundException;
import ru.soune.nocopy.repository.FileAppealRepository;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.FileMonitoringRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
@@ -29,9 +32,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -47,6 +48,8 @@ public class FileEntityService {
private final CloudStorageService cloudStorageService;
private final FileAppealRepository fileAppealRepository;
@Value("${server.baseurl}")
private String baseUrl;
@@ -111,6 +114,24 @@ public class FileEntityService {
return allFiles;
}
public List<FileEntity> getAllUserFilesWithFileName(Long userId, String fileName, List<FileStatus> statuses) {
User user = userRepository.findById(userId).orElseThrow();
List<FileEntity> allFiles = new ArrayList<>();
if (user.getCompany() != null) {
for (Long uId : userRepository.findByCompanyId(user.getCompany().getId()).stream()
.map(User::getId)
.toList()) {
allFiles.addAll(fileEntityRepository.searchByFileNameAndStatusIn(uId, fileName, statuses));
}
} else {
allFiles = fileEntityRepository.searchByFileNameAndStatusIn(userId, fileName, statuses);
}
return allFiles;
}
@Transactional(readOnly = true)
public FileResponse getUserFiles(Long userId, Pageable pageable, int version) {
User user = userRepository.findById(userId).orElseThrow();
@@ -256,7 +277,7 @@ public class FileEntityService {
channel.force(true);
}
if (imageResizeService.isImage(extension)) {
if (fileEntity.getMimeType().equals("image")) {
imageResizeService.generateSizes(fileEntity, data);
}
@@ -369,6 +390,8 @@ public class FileEntityService {
name = fileName.substring(0, lastDotIndex);
}
List<Map<String, Object>> appeals = getFileAppeals(fileEntity.getId());
return FileEntityResponse.builder()
.id(fileEntity.getId())
.userId(fileEntity.getUserId())
@@ -398,6 +421,31 @@ public class FileEntityService {
.fileUploadDate(fileEntity.getCreatedAt())
.protectedFilePath(fileEntity.getProtectedFilePath())
.thumbnailFileUrl(baseUrl + "/api/files/protected/" + fileEntity.getId() + "/thumbnail")
.permissions(fileEntity.getPermissions())
.appealInfos(appeals)
.build();
}
private List<Map<String, Object>> getFileAppeals(String fileId) {
List<FileAppeal> appeals = fileAppealRepository.findByFileId(fileId);
if (appeals == null || appeals.isEmpty()) {
return Collections.emptyList();
}
return appeals.stream()
.map(appeal -> {
Map<String, Object> appealMap = new HashMap<>();
appealMap.put("id", appeal.getId());
appealMap.put("userId", appeal.getUserId());
appealMap.put("appealReason", appeal.getAppealReason());
appealMap.put("additionalInfo", appeal.getAdditionalInfo());
appealMap.put("status", appeal.getStatus() != null ? appeal.getStatus().name() : null);
appealMap.put("adminComment", appeal.getAdminComment());
appealMap.put("moderatorId", appeal.getModeratorId());
appealMap.put("createdAt", appeal.getCreatedAt());
appealMap.put("resolvedAt", appeal.getResolvedAt());
return appealMap;
})
.collect(Collectors.toList());
}
}
@@ -5,6 +5,10 @@ import ru.soune.nocopy.dto.file.UploadProgressResponse;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.FileUploadSession;
import ru.soune.nocopy.exception.DuplicateImageException;
import java.io.IOException;
import java.nio.file.Path;
public interface FileUploadService {
FileUploadSession initUpload(Long userId, String fileName,
@@ -22,4 +26,8 @@ public interface FileUploadService {
UploadProgressResponse getUploadProgress(String uploadId);
FileEntity completeFileProcessing(FileUploadSession session, FileStatus status);
public void checkForDuplicatesSynchronously(String filePath) throws IOException, DuplicateImageException;
public Path downloadImageFromUrl(String urlString) throws IOException;
}
@@ -25,24 +25,15 @@ public class ImageResizeService {
private final CloudStorageService cloudStorageService;
private static final int THUMBNAIL_SIZE = 150;
private static final int THUMBNAIL_SIZE = 100;
private static final int MEDIUM_SIZE = 600;
@Value("${file.storage.base-path}")
private String storagePath;
public boolean isImage(String extension) {
return extension != null && List.of("jpg", "jpeg", "png", "webp")
.contains(extension.toLowerCase());
}
@Transactional
public void generateSizes(FileEntity file, byte[] data) throws IOException {
if (!isImage(file.getFileExtension())) {
return;
}
try (ByteArrayInputStream bis = new ByteArrayInputStream(data)) {
BufferedImage original = ImageIO.read(bis);
@@ -86,17 +77,4 @@ public class ImageResizeService {
return filePath.toString();
}
public String getPath(FileEntity file, String size) {
if ("thumbnail".equals(size) && file.getThumbnailPath() != null) {
return file.getThumbnailPath();
}
if ("medium".equals(size) && file.getMediumPath() != null) {
return file.getMediumPath();
}
return file.getProtectedFilePath();
}
}
@@ -2,9 +2,11 @@ package ru.soune.nocopy.service.file;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.moderation.ModerationPassportFile;
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import ru.soune.nocopy.service.file.moderation.ModerationFileService;
import java.io.ByteArrayOutputStream;
@@ -24,13 +26,15 @@ import java.util.zip.ZipOutputStream;
public class ZipService {
private final ModerationFileService moderationFileService;
private final CloudStorageService cloudStorageService;
private static final int MAX_SIZE_MB = 20;
private static final int FIRST_PART = 1;
private static final int SECOND_PART = 2;
@Value("${yandex.cloud.bucket-cold}")
private String bucketCold;
public void createAndSplitZip(Long userId, List<FileEntity> files) throws IOException {
byte[] zipBytes = createZip(files);
String base64String = Base64.getEncoder().encodeToString(zipBytes);
@@ -39,37 +43,39 @@ public class ZipService {
}
public byte[] assembleZipFromSplitFiles(Long userId) throws IOException {
List<ModerationPassportFile> activeFiles = moderationFileService.getActiveFiles();
List<ModerationPassportFile> activeFiles = moderationFileService.getActiveFilesByUserId(userId);
String part1Content = null;
String part2Content = null;
String part1Key = null;
String part2Key = null;
for (ModerationPassportFile file : activeFiles) {
Path filePath = Paths.get(file.getPath());
String content = Files.readString(filePath);
if (file.getPart() == FIRST_PART) {
part1Content = content;
part1Key = file.getPath();
} else if (file.getPart() == SECOND_PART) {
part2Content = content;
part2Key = file.getPath();
}
}
if (part1Content == null || part2Content == null) {
if (part1Key == null || part2Key == null) {
throw new IOException("Missing part 1 or part 2 for user: " + userId);
}
String base64String = mergeBase64(part1Content, part2Content);
String part1Base64 = cloudStorageService.downloadPartFromBucket(bucketCold, part1Key);
String part2Base64 = cloudStorageService.downloadPartFromBucket(bucketCold, part2Key);
return Base64.getDecoder().decode(base64String);
String fullBase64 = part1Base64 + part2Base64;
log.debug("Part1 length: {}, Part2 length: {}, Combined length: {}",
part1Base64.length(), part2Base64.length(), fullBase64.length());
return Base64.getDecoder().decode(fullBase64);
}
private byte[] createZip(List<FileEntity> files) throws IOException {
private byte[] createZip(List<FileEntity> files) throws IOException {
long totalSize = files.stream()
.map(FileEntity::getFileSize)
.reduce(0L, Long::sum);
if (totalSize > MAX_SIZE_MB * 1024 * 1024) {
throw new IllegalArgumentException(
String.format("Total size %.2f MB exceeds %d MB limit",
@@ -79,8 +85,7 @@ public class ZipService {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (ZipOutputStream zos = new ZipOutputStream(baos)) {
for (FileEntity file: files) {
for (FileEntity file : files) {
String filePath = file.getFilePath();
String fileName = file.getStoredFileName();
@@ -98,18 +103,11 @@ public class ZipService {
}
private String[] splitBase64(String base64) {
StringBuilder part1 = new StringBuilder();
StringBuilder part2 = new StringBuilder();
for (int i = 0; i < base64.length(); i++) {
if (i % 2 == 0) {
part1.append(base64.charAt(i));
} else {
part2.append(base64.charAt(i));
}
}
return new String[]{part1.toString(), part2.toString()};
int half = base64.length() / 2;
return new String[]{
base64.substring(0, half),
base64.substring(half)
};
}
private void saveSplitFiles(Long userId, String part1, String part2) throws IOException {
@@ -120,27 +118,16 @@ public class ZipService {
Files.writeString(file1, part1);
Path file2 = userDir.resolve(userId + "___2.txt");
Files.writeString(file2, part2);
Map<Integer, String> files = Map.of(FIRST_PART, file1.toString(), SECOND_PART, file2.toString());
Map<String, String> cloudKeys = cloudStorageService.saveSplitPartsToColdStorage(userId, file1, file2);
Map<Integer, String> files = Map.of(
FIRST_PART, cloudKeys.get("part1"),
SECOND_PART, cloudKeys.get("part2"));
moderationFileService.addFiles(userId, files);
log.info("Saved split files: {} and {}", file1, file2);
log.info("Saved split files to cold storage for userId: {}, Base64 length: {}",
userId, part1.length() + part2.length());
}
private String mergeBase64(String part1, String part2) {
StringBuilder merged = new StringBuilder();
int maxLength = Math.max(part1.length(), part2.length());
for (int i = 0; i < maxLength; i++) {
if (i < part1.length()) {
merged.append(part1.charAt(i));
}
if (i < part2.length()) {
merged.append(part2.charAt(i));
}
}
return merged.toString();
}
}
}
@@ -23,8 +23,11 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Map;
import java.util.UUID;
@Service
@@ -49,6 +52,9 @@ public class CloudStorageService {
@Value("${yandex.cloud.bucket}")
private String bucket;
@Value("${yandex.cloud.bucket-cold}")
private String bucketCold;
public void saveFilesToStorage(String mimeType, String extension, String sendToCloudFilePath) {
AwsCredentials credentials = AwsBasicCredentials.create(key, secretKey);
S3Client s3Client = S3Client.builder()
@@ -77,6 +83,77 @@ public class CloudStorageService {
}
}
public Map<String, String> saveSplitPartsToColdStorage(Long userId, Path file1Path, Path file2Path) {
AwsCredentials credentials = AwsBasicCredentials.create(key, secretKey);
S3Client s3Client = S3Client.builder()
.httpClient(ApacheHttpClient.create())
.region(Region.of(region))
.endpointOverride(URI.create(s3endpoint))
.credentialsProvider(StaticCredentialsProvider.create(credentials))
.build();
String part1Key = uploadFileToBucket(s3Client, bucketCold, file1Path, userId, "1");
String part2Key = uploadFileToBucket(s3Client, bucketCold, file2Path, userId, "2");
try {
Files.deleteIfExists(file1Path);
Files.deleteIfExists(file2Path);
log.info("Deleted local split files for userId: {}", userId);
} catch (IOException e) {
log.error("Failed to delete local split files for userId: {}", userId, e);
}
return Map.of("part1", part1Key, "part2", part2Key);
}
public String downloadPartFromBucket(String bucket, String cloudKey) {
AwsCredentials credentials = AwsBasicCredentials.create(key, secretKey);
S3Client s3Client = S3Client.builder()
.httpClient(ApacheHttpClient.create())
.region(Region.of(region))
.endpointOverride(URI.create(s3endpoint))
.credentialsProvider(StaticCredentialsProvider.create(credentials))
.build();
try {
GetObjectRequest getObjectRequest = GetObjectRequest.builder()
.bucket(bucket)
.key(cloudKey)
.build();
ResponseBytes<GetObjectResponse> objectBytes = s3Client.getObjectAsBytes(getObjectRequest);
String content = new String(objectBytes.asByteArray(), StandardCharsets.UTF_8);
log.info("Downloaded from cold bucket, key: {}, size: {} chars", cloudKey, content.length());
return content;
} catch (Exception e) {
log.error("Failed to download from cold bucket, key: {}", cloudKey, e);
throw new RuntimeException("Failed to download file from cold storage", e);
}
}
private String uploadFileToBucket(S3Client s3Client, String bucket, Path filePath, Long userId, String partSuffix) {
String cloudKey = String.format("passport/%d/part_%s.txt", userId, partSuffix);
try {
byte[] bytes = Files.readAllBytes(filePath);
PutObjectRequest putObjectRequest = PutObjectRequest.builder()
.bucket(bucket)
.key(cloudKey)
.contentType("text/plain")
.build();
s3Client.putObject(putObjectRequest, RequestBody.fromBytes(bytes));
log.info("Uploaded part {} to cold bucket, key: {}", partSuffix, cloudKey);
return cloudKey;
} catch (IOException e) {
log.error("Failed to read file for upload: {}", filePath, e);
throw new RuntimeException("Failed to upload split part to cold storage", e);
}
}
public File readFileFromStorageByPath(String filePath) throws IOException {
GetObjectRequest objectRequest = GetObjectRequest.builder()
.bucket(bucket)
@@ -99,8 +176,6 @@ public class CloudStorageService {
s3Client.getObject(objectRequest, tempFile.toPath());
tempFile.deleteOnExit();
return tempFile;
}
@@ -121,6 +196,7 @@ public class CloudStorageService {
try {
ResponseBytes<GetObjectResponse> responseBytes = s3Client.getObjectAsBytes(objectRequest);
return responseBytes.asByteArray();
} catch (Exception e) {
log.error("Failed to read file from S3: {}", filePath, e);
@@ -1,18 +1,18 @@
package ru.soune.nocopy.service.file.impl;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.vrt.NoCopyFileService;
import com.vrt.fileprotection.FileProtector;
import com.vrt.fileprotection.NoCopyCheckResult;
import com.vrt.fileprotection.audio.AudioCheckResult;
import com.vrt.fileprotection.documents.DocumentCheckResult;
import jakarta.annotation.PostConstruct;
import jakarta.persistence.EntityManager;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -30,7 +30,6 @@ import ru.soune.nocopy.service.cost.CostService;
import ru.soune.nocopy.service.file.FileEntityService;
import ru.soune.nocopy.service.file.FileUploadService;
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import ru.soune.nocopy.service.tariff.TariffConstants;
import ru.soune.nocopy.service.file.moderation.ModerationFileService;
import ru.soune.nocopy.service.notification.NotificationService;
import ru.soune.nocopy.service.register.AuthService;
@@ -38,6 +37,10 @@ import ru.soune.nocopy.service.tariff.TariffInfoService;
import ru.soune.nocopy.util.FileUtil;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
import java.net.URL;
import java.nio.file.*;
import java.nio.file.attribute.PosixFilePermission;
import java.security.MessageDigest;
@@ -391,7 +394,6 @@ public class FileUploadServiceImpl implements FileUploadService {
session.getUserId());
File file = new File(finalFilePath);
// File file = cloudStorageService.readFileFromStorageByPath(finalFilePath);
if (session.getFileType().startsWith("audio") && !isWavFile(file)) {
session.setStatus(UploadStatus.FAILED);
@@ -447,7 +449,16 @@ public class FileUploadServiceImpl implements FileUploadService {
tariffInfoService.writeOffTokens(session.getUserId(), costService.protectFileCost(fileType),
OperationType.FILE_UPLOAD);
notificationService.addNotification(NotificationType.FILE_ADDED_TO_SYSTEM, session.getUserId());
ObjectMapper mapper = new ObjectMapper();
ObjectNode context = mapper.createObjectNode();
context.put("status", status.name());
context.put("file_name", fileEntity.getOriginalFileName());
context.put("file_id", fileEntity.getId());
context.put("support_id", fileEntity.getSupportId());
notificationService.addNotification(NotificationType.FILE_ADDED_TO_SYSTEM, session.getUserId(),
context.toString());
}
if (status != FileStatus.TEMP) {
@@ -585,8 +596,8 @@ public class FileUploadServiceImpl implements FileUploadService {
return finalFilePath.toString();
}
private void checkForDuplicatesSynchronously(String filePath)
throws IOException , DuplicateImageException {
@Override
public void checkForDuplicatesSynchronously(String filePath) throws IOException , DuplicateImageException {
Path path = Paths.get(filePath);
Map<String, Long> hash = imageHashService.calculateHash(path);
@@ -600,6 +611,214 @@ public class FileUploadServiceImpl implements FileUploadService {
}
}
// public Path downloadImageFromUrl(String urlString) throws IOException {
// String[] urlVariants = buildUrlVariants(urlString);
//
// IOException lastException = null;
//
// for (String variantUrl : urlVariants) {
// try {
// Path result = attemptDownload(variantUrl);
// if (result != null) {
// log.info("Success download: {} -> {}", urlString, variantUrl);
// return result;
// }
// } catch (IOException e) {
// lastException = e;
// log.warn("Failed download {}: {}", variantUrl, e.getMessage());
// }
// }
//
// throw new IOException("Failed to download from all variants: " + urlString, lastException);
// }
//
// private String[] buildUrlVariants(String originalUrl) {
// List<String> variants = new ArrayList<>();
//
// variants.add(originalUrl);
//
// if (originalUrl.contains("i.ytimg.com") || originalUrl.contains("youtube.com")) {
// try {
// URL url = new URL(originalUrl);
// String path = url.getPath();
//
// if ("https".equals(url.getProtocol())) {
// variants.add("http://i.ytimg.com" + path);
// }
//
// String[][] alternativeHosts = {
// {"i.ytimg.com", "i3.ytimg.com"},
// {"i.ytimg.com", "img.youtube.com"},
// {"i.ytimg.com", "yt3.ggpht.com"}
// };
//
// for (String[] hosts : alternativeHosts) {
// if (originalUrl.contains(hosts[0])) {
// variants.add(originalUrl.replace(hosts[0], hosts[1]));
// variants.add("http://" + hosts[1] + path);
// }
// }
//
// } catch (MalformedURLException e) {
// log.warn("Not valid URL: {}", originalUrl);
// }
// }
//
// return variants.toArray(new String[0]);
// }
//
// private Path attemptDownload(String urlString) throws IOException {
// int maxRetries = 2;
// int connectTimeout = 10000;
// int readTimeout = 10000;
//
// IOException lastException = null;
//
// for (int attempt = 0; attempt < maxRetries; attempt++) {
// Path tempFile = null;
// HttpURLConnection connection = null;
//
// try {
// URL url = new URL(urlString);
//
// String extension = getFileExtension(url.getPath());
//
// tempFile = Files.createTempFile("upload_check_", extension);
//
// connection = (HttpURLConnection) url.openConnection();
// connection.setRequestProperty("User-Agent",
// "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36");
// connection.setConnectTimeout(connectTimeout);
// connection.setReadTimeout(readTimeout);
// connection.setInstanceFollowRedirects(true);
//
// int responseCode = connection.getResponseCode();
// log.debug("{} -> Response code: {} (попытка {})", urlString, responseCode, attempt + 1);
//
// if (responseCode != 200) {
// throw new IOException("Bad response code: " + responseCode);
// }
//
// try (InputStream in = connection.getInputStream()) {
// Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
// }
//
// long size = Files.size(tempFile);
// log.debug("Downloaded: {} -> size: {} byte", urlString, size);
//
// if (size == 0) {
// throw new IOException("Downloaded empty file");
// }
//
// return tempFile;
//
// } catch (SocketTimeoutException e) {
// lastException = e;
// log.warn("Timeout {} (try {}/{})", urlString, attempt + 1, maxRetries);
//
// connectTimeout *= 2;
// readTimeout *= 2;
//
// if (attempt < maxRetries - 1) {
// try {
// Thread.sleep(1000 * (attempt + 1));
// } catch (InterruptedException ie) {
// Thread.currentThread().interrupt();
// break;
// }
// }
//
// } catch (IOException e) {
// lastException = e;
// if (!(e instanceof SocketTimeoutException)) {
// break;
// }
//
// } finally {
// if (connection != null) {
// connection.disconnect();
// }
// }
//
// if (tempFile != null && Files.exists(tempFile)) {
// try {
// Files.deleteIfExists(tempFile);
// } catch (IOException e) {
// log.warn("Temp file not found: {}", tempFile);
// }
// }
// }
//
// throw new IOException("Not download " + maxRetries + " tries: " + urlString, lastException);
// }
//
// private String getFileExtension(String path) {
// String extension = ".tmp";
// int lastDot = path.lastIndexOf('.');
// if (lastDot > 0) {
// String ext = path.substring(lastDot).toLowerCase();
// if (ext.matches("\\.(jpg|jpeg|png|gif|bmp|webp)")) {
// extension = ext;
// }
// }
// return extension;
// }
public Path downloadImageFromUrl(String urlString) throws IOException {
if (urlString.startsWith("https://i.ytimg.com")) {
urlString = urlString.replace("https://", "http://");
log.info("Change blocked domen: {}", urlString);
}
URL url = new URL(urlString);
String extension = ".tmp";
String path = url.getPath();
int lastDot = path.lastIndexOf('.');
if (lastDot > 0) {
String ext = path.substring(lastDot).toLowerCase();
if (ext.matches("\\.(jpg|jpeg|png|gif|bmp|webp)")) {
extension = ext;
}
}
Path tempFile = Files.createTempFile("upload_check_", extension);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36");
connection.setConnectTimeout(10000);
connection.setReadTimeout(10000);
connection.setInstanceFollowRedirects(true);
try {
int responseCode = connection.getResponseCode();
System.out.println("Response code: " + responseCode);
if (responseCode != 200) {
throw new IOException("Bad response code: " + responseCode);
}
try (InputStream in = connection.getInputStream()) {
Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
}
long size = Files.size(tempFile);
System.out.println("File downloaded: " + tempFile + ", size: " + size + " bytes");
if (size == 0) {
throw new IOException("Downloaded empty file");
}
return tempFile;
} catch (Exception e) {
Files.deleteIfExists(tempFile);
throw new IOException("Failed to download: " + urlString, e);
} finally {
connection.disconnect();
}
}
private UploadProgressResponse handleExistingChunk(FileUploadSession session,
Integer chunkNumber,
MultipartFile chunkFile,
@@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import ru.soune.nocopy.entity.file.moderation.ModerationPassportFile;
import ru.soune.nocopy.repository.ModerationFileRepository;
import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import ru.soune.nocopy.service.user.moderation.UserVerificationService;
import java.util.List;
@@ -17,6 +18,8 @@ public class ModerationFileService {
private final UserVerificationService userVerificationService;
private final CloudStorageService cloudStorageService;
public void addFiles(Long userId, Map<Integer, String> files) {
List<ModerationPassportFile> moderationFileRepositoryByStatus =
moderationFileRepository.findByStatus(ModerationFileStatus.ACTIVE.getName());
@@ -44,6 +47,10 @@ public class ModerationFileService {
return moderationFileRepository.findByStatus(ModerationFileStatus.ACTIVE.getName());
}
public List<ModerationPassportFile> getActiveFilesByUserId(Long userId) {
return moderationFileRepository.findByUserIdAndStatus(userId, ModerationFileStatus.ACTIVE.getName());
}
private void disActiveDocuments(List<ModerationPassportFile> moderationFileRepositoryByStatus) {
for (ModerationPassportFile moderationFile : moderationFileRepositoryByStatus) {
moderationFile.setStatus(ModerationFileStatus.NOT_ACTIVE.getName());
@@ -1,5 +1,7 @@
package ru.soune.nocopy.service.file.moderation;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -89,7 +91,14 @@ public class ModerationService {
}
}
notificationService.addNotification(NotificationType.FILE_MODERATION_EVENT, file.getUserId());
ObjectMapper mapper = new ObjectMapper();
ObjectNode context = mapper.createObjectNode();
context.put("file_name", file.getOriginalFileName());
context.put("old_status", file.getStatus().name());
context.put("new_status", request.getNewStatus().name());
context.put("comment", request.getComment());
notificationService.addNotification(NotificationType.FILE_MODERATION_EVENT, file.getUserId(), context.toString());
}
/**
@@ -123,7 +132,7 @@ public class ModerationService {
FileAppeal saved = fileAppealRepository.save(appeal);
return convertToResponse(saved);
return convertToResponse(saved, file.getOriginalFileName());
}
/**
@@ -198,12 +207,7 @@ public class ModerationService {
.currentStatus(file.getStatus())
.uploadDate(file.getCreatedAt())
.hasActiveAppeal(activeAppeal != null)
.activeAppeal(activeAppeal != null ?
AppealInfo.builder()
.appealId(activeAppeal.getId())
.status(activeAppeal.getStatus().name())
.createdAt(activeAppeal.getCreatedAt())
.build() : null)
.activeAppeal(activeAppeal)
.build();
}
@@ -219,17 +223,49 @@ public class ModerationService {
);
}
/**
* Получение апелляций пользователя
*/
@Transactional(readOnly = true)
public Page<FileEntity> getFilesForModeration(int page, int size, String sortDirection, String sortBy,
List<String> statuses, Boolean isAppeal) {
if (sortDirection == null || sortDirection.isEmpty()) {
sortDirection = "desc";
}
if (sortBy == null || sortBy.isEmpty()) {
sortBy = "createdAt";
}
Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.fromString(sortDirection), sortBy));
return isAppeal != null ? fileEntityRepository.findByStatusInAndSortedWithAppeal(statuses, pageable):
fileEntityRepository.findByStatusInAndSorted(statuses, pageable);
}
@Transactional(readOnly = true)
public Page<AppealResponse> getUserAppeals(Long userId, int page, int size) {
Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
return fileAppealRepository.findByUserId(userId, pageable)
return fileAppealRepository.findByUserIdWithFile(userId, pageable)
.map(this::convertToResponse);
}
private AppealResponse convertToResponse(FileAppeal appeal) {
@Transactional(readOnly = true)
public Page<AppealResponse> getAllAppeals(int page, int size, String sortDirection, String sortBy) {
if (sortDirection == null || sortDirection.isEmpty()) {
sortDirection = "desc";
}
if (sortBy == null || sortBy.isEmpty()) {
sortBy = "createdAt";
}
Pageable pageable = PageRequest.of(page, size,
Sort.by(Sort.Direction.fromString(sortDirection), sortBy));
return fileAppealRepository.findAllWithFile(pageable)
.map(this::convertToResponse);
}
public AppealResponse convertToResponse(FileAppeal appeal) {
return AppealResponse.builder()
.appealId(appeal.getId())
.fileId(appeal.getFileId())
@@ -237,6 +273,21 @@ public class ModerationService {
.additionalInfo(appeal.getAdditionalInfo())
.status(appeal.getStatus().name())
.adminComment(appeal.getAdminComment())
.fileName(appeal.getFile().getOriginalFileName())
.createdAt(appeal.getCreatedAt())
.resolvedAt(appeal.getResolvedAt())
.build();
}
private AppealResponse convertToResponse(FileAppeal appeal,String fileName) {
return AppealResponse.builder()
.appealId(appeal.getId())
.fileId(appeal.getFileId())
.appealReason(appeal.getAppealReason())
.additionalInfo(appeal.getAdditionalInfo())
.status(appeal.getStatus().name())
.adminComment(appeal.getAdminComment())
.fileName(fileName)
.createdAt(appeal.getCreatedAt())
.resolvedAt(appeal.getResolvedAt())
.build();

Some files were not shown because too many files have changed in this diff Show More