diff --git a/src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java b/src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java index cd8e2fa..23a657b 100644 --- a/src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java +++ b/src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java @@ -87,7 +87,6 @@ public class HandlerConfig { StatisticIncomeHandler statisticIncomeHandler, MonitoringStatisticHandler monitoringStatisticHandler, FileInteranlInfoHandler fileInfo, - FileInternalControlHandler fileInternalControlHandler, UserInfoHandler userInfoHandler ) { @@ -104,7 +103,6 @@ public class HandlerConfig { map.put(30027, monitoringStatisticHandler); map.put(30029, statisticComplaintHandler); map.put(40001, fileInfo); - map.put(40002, fileInternalControlHandler); return map; } @@ -112,12 +110,14 @@ public class HandlerConfig { @Bean public Map internalControlHandler( ControlComplaintHandler controlComplaintHandler, + FileInternalControlHandler fileInternalControlHandler, UserInfoHandler userInfoHandler ) { Map map = new HashMap<>(); map.put(30014, userInfoHandler); map.put(30030, controlComplaintHandler); + map.put(40002, fileInternalControlHandler); return map; } diff --git a/src/main/java/ru/soune/nocopy/handler/FileInternalControlHandler.java b/src/main/java/ru/soune/nocopy/handler/FileInternalControlHandler.java index e019e3b..77293a3 100644 --- a/src/main/java/ru/soune/nocopy/handler/FileInternalControlHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/FileInternalControlHandler.java @@ -113,18 +113,18 @@ public class FileInternalControlHandler implements RequestHandler { return new BaseResponse(request.getMsgId(), MessageCode.ACCESS_DENIED.getCode(), "Admin access required", - Map.of("file_id", fileRequest.getFileId())); + Map.of("appealId", fileRequest.getAppealId())); } catch (IllegalStateException e) { return new BaseResponse(request.getMsgId(), MessageCode.INVALID_FIELD.getCode(), e.getMessage(), - Map.of("file_id", fileRequest.getFileId())); + Map.of("appealId", fileRequest.getFileId())); } catch (Exception e) { log.error("Error reviewing appeal", e); return new BaseResponse(request.getMsgId(), MessageCode.INVALID_FIELD.getCode(), "Failed to review appeal: " + e.getMessage(), - Map.of("file_id", fileRequest.getFileId())); + Map.of("appealId", fileRequest.getAppealId())); } }