diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java index 0c347b70c..efe225cd3 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java @@ -26,6 +26,7 @@ import java.util.stream.Collectors; @Service public class ClearingCalendarService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); + private final ImdgProvider imdgProvider; private final Imdg clearingCalendarMap; private final IRequestValidator newRequestValidator = IRequestValidator.CLEARING_CALENDAR_NEW_REQUEST; private final IRequestValidator updateRequestValidator = IRequestValidator.CLEARING_CALENDAR_UPDATE_REQUEST; @@ -36,6 +37,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.clearingCalendarMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingCalendar, ClearingCalendar.class); + this.imdgProvider = imdgProvider; } @Override @@ -55,7 +57,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi private void newClearingCalendar(BaseRequest userRequest) { ClearingCalendarNewRequest req = userRequest.getRequestPayload(); log.debug("ClearingCalendarNewRequest received"); - List errors = newRequestValidator.validate(req); + List errors = newRequestValidator.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; ClearingCalendar clearingCalendar = new ClearingCalendar(); Instant created = Instant.now(); @@ -70,7 +72,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi private void updateClearingCalendar(BaseRequest userRequest) { ClearingCalendarUpdateRequest req = userRequest.getRequestPayload(); log.debug("ClearingCalendarUpdateRequest received"); - List errors = updateRequestValidator.validate(req); + List errors = updateRequestValidator.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; Instant updated = Instant.now(); ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId()); @@ -84,7 +86,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi private void deleteClearingCalendar(BaseRequest userRequest) { CommonDeleteRequest req = userRequest.getRequestPayload(); - List errors = deleteRequestValidator.validate(req); + List errors = deleteRequestValidator.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; log.debug("CommonDeleteRequest received id = {}", req.getId()); ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId()); diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java index 53dc8a791..343e57b85 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java @@ -25,6 +25,7 @@ import java.util.List; @Service public class PlannerService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); + private final ImdgProvider imdgProvider; private final Imdg plannerMap; private final IRequestValidator plannerNewRequest = IRequestValidator.PLANNER_NEW_REQUEST; private final IRequestValidator plannerUpdateRequest = IRequestValidator.PLANNER_UPDATE_REQUEST; @@ -35,6 +36,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.plannerMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Planner, Planner.class); + this.imdgProvider = imdgProvider; } @Override @@ -54,7 +56,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { private void newScheduler(BaseRequest userRequest) { PlannerNewRequest req = userRequest.getRequestPayload(); log.debug("PlannerNewRequest received"); - List errors = plannerNewRequest.validate(req); + List errors = plannerNewRequest.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; Planner planner = new Planner(); planner.setCreated(Instant.now()); @@ -72,7 +74,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { private void updateScheduler(BaseRequest userRequest) { PlannerUpdateRequest req = userRequest.getRequestPayload(); log.debug("PlannerUpdateRequest received id = {}", req.getId()); - List errors = plannerUpdateRequest.validate(req); + List errors = plannerUpdateRequest.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; Planner planner = plannerMap.getSingleObjectByID(req.getId()); planner.setUpdated(Instant.now()); @@ -89,7 +91,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { private void deleteScheduler(BaseRequest userRequest) { CommonDeleteRequest req = userRequest.getRequestPayload(); log.debug("CommonDeleteRequest received id = {}", req.getId()); - List errors = deleteRequestValidator.validate(req); + List errors = deleteRequestValidator.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; Planner planner = plannerMap.getSingleObjectByID(req.getId()); plannerMap.delete(planner); diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java index 0d9d12b33..d1eec0d90 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java @@ -26,6 +26,7 @@ import java.util.List; public class PlannerTemplateService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); private final Imdg plannerTemplateMap; + private final ImdgProvider imdgProvider; private final IRequestValidator plannerTemplateNewRequest = IRequestValidator.PLANNER_TEMPLATE_NEW_REQUEST; private final IRequestValidator plannerTemplateUpdateRequest = IRequestValidator.PLANNER_TEMPLATE_UPDATE_REQUEST; private final IRequestValidator deleteRequestValidator = IRequestValidator.COMMON_DELETE_REQUEST; @@ -35,6 +36,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.plannerTemplateMap = imdgProvider.getImdg(IMDGDistributedNames.Map_PlannerTemplate, PlannerTemplate.class); + this.imdgProvider = imdgProvider; } @Override @@ -54,7 +56,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin private void newTimetable(BaseRequest userRequest) { PlannerTemplateNewRequest req = userRequest.getRequestPayload(); log.debug("PlannerTemplateNewRequest received"); - List errors = plannerTemplateNewRequest.validate(req); + List errors = plannerTemplateNewRequest.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; PlannerTemplate plannerTemplate = new PlannerTemplate(); Instant created = Instant.now(); @@ -72,7 +74,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin PlannerTemplateUpdateRequest req = userRequest.getRequestPayload(); log.debug("PlannerTemplateUpdateRequest received"); PlannerTemplate plannerTemplate = plannerTemplateMap.getSingleObjectByID(req.getId()); - List errors = plannerTemplateUpdateRequest.validate(req); + List errors = plannerTemplateUpdateRequest.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; Instant updated = Instant.now(); plannerTemplate.setUpdated(updated); @@ -88,7 +90,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin private void deleteTimetable(BaseRequest userRequest) { CommonDeleteRequest req = userRequest.getRequestPayload(); log.debug("CommonDeleteRequest received id = {}", req.getId()); - List errors = deleteRequestValidator.validate(req); + List errors = deleteRequestValidator.validate(req, imdgProvider); if (IRequestValidator.checkErrorList(errors, log)) return; PlannerTemplate plannerTemplate = plannerTemplateMap.getSingleObjectByID(req.getId()); plannerTemplateMap.delete(plannerTemplate);