treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

validate from dictionaries (fix)

Browse source
This commit is contained in:
akulikov 2023-01-13 15:25:07 +03:00
parent f91e15f2a4
commit 0b1cc5639e
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
View file

@ -26,6 +26,7 @@ import java.util.stream.Collectors;
@Service @Service
public class ClearingCalendarService extends QueueConsumer implements InitializingBean { public class ClearingCalendarService extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private final ImdgProvider imdgProvider;
private final Imdg<ClearingCalendar> clearingCalendarMap; private final Imdg<ClearingCalendar> clearingCalendarMap;
private final IRequestValidator<ClearingCalendarNewRequest> newRequestValidator = IRequestValidator.CLEARING_CALENDAR_NEW_REQUEST; private final IRequestValidator<ClearingCalendarNewRequest> newRequestValidator = IRequestValidator.CLEARING_CALENDAR_NEW_REQUEST;
private final IRequestValidator<ClearingCalendarUpdateRequest> updateRequestValidator = IRequestValidator.CLEARING_CALENDAR_UPDATE_REQUEST; private final IRequestValidator<ClearingCalendarUpdateRequest> updateRequestValidator = IRequestValidator.CLEARING_CALENDAR_UPDATE_REQUEST;
@ -36,6 +37,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
ImdgProvider imdgProvider) { ImdgProvider imdgProvider) {
super(kafkaQueue, kafkaProducer); super(kafkaQueue, kafkaProducer);
this.clearingCalendarMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingCalendar, ClearingCalendar.class); this.clearingCalendarMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingCalendar, ClearingCalendar.class);
this.imdgProvider = imdgProvider;
} }
@Override @Override
@ -55,7 +57,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
private void newClearingCalendar(BaseRequest<ClearingCalendarNewRequest> userRequest) { private void newClearingCalendar(BaseRequest<ClearingCalendarNewRequest> userRequest) {
ClearingCalendarNewRequest req = userRequest.getRequestPayload(); ClearingCalendarNewRequest req = userRequest.getRequestPayload();
log.debug("ClearingCalendarNewRequest received"); log.debug("ClearingCalendarNewRequest received");
List<IRequestValidator.ValidationError> errors = newRequestValidator.validate(req); List<IRequestValidator.ValidationError> errors = newRequestValidator.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
ClearingCalendar clearingCalendar = new ClearingCalendar(); ClearingCalendar clearingCalendar = new ClearingCalendar();
Instant created = Instant.now(); Instant created = Instant.now();
@ -70,7 +72,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
private void updateClearingCalendar(BaseRequest<ClearingCalendarUpdateRequest> userRequest) { private void updateClearingCalendar(BaseRequest<ClearingCalendarUpdateRequest> userRequest) {
ClearingCalendarUpdateRequest req = userRequest.getRequestPayload(); ClearingCalendarUpdateRequest req = userRequest.getRequestPayload();
log.debug("ClearingCalendarUpdateRequest received"); log.debug("ClearingCalendarUpdateRequest received");
List<IRequestValidator.ValidationError> errors = updateRequestValidator.validate(req); List<IRequestValidator.ValidationError> errors = updateRequestValidator.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
Instant updated = Instant.now(); Instant updated = Instant.now();
ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId()); ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId());
@ -84,7 +86,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
private void deleteClearingCalendar(BaseRequest<CommonDeleteRequest> userRequest) { private void deleteClearingCalendar(BaseRequest<CommonDeleteRequest> userRequest) {
CommonDeleteRequest req = userRequest.getRequestPayload(); CommonDeleteRequest req = userRequest.getRequestPayload();
List<IRequestValidator.ValidationError> errors = deleteRequestValidator.validate(req); List<IRequestValidator.ValidationError> errors = deleteRequestValidator.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
log.debug("CommonDeleteRequest received id = {}", req.getId()); log.debug("CommonDeleteRequest received id = {}", req.getId());
ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId()); ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId());

8
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java
View file

@ -25,6 +25,7 @@ import java.util.List;
@Service @Service
public class PlannerService extends QueueConsumer implements InitializingBean { public class PlannerService extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private final ImdgProvider imdgProvider;
private final Imdg<Planner> plannerMap; private final Imdg<Planner> plannerMap;
private final IRequestValidator<PlannerNewRequest> plannerNewRequest = IRequestValidator.PLANNER_NEW_REQUEST; private final IRequestValidator<PlannerNewRequest> plannerNewRequest = IRequestValidator.PLANNER_NEW_REQUEST;
private final IRequestValidator<PlannerUpdateRequest> plannerUpdateRequest = IRequestValidator.PLANNER_UPDATE_REQUEST; private final IRequestValidator<PlannerUpdateRequest> plannerUpdateRequest = IRequestValidator.PLANNER_UPDATE_REQUEST;
@ -35,6 +36,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean {
ImdgProvider imdgProvider) { ImdgProvider imdgProvider) {
super(kafkaQueue, kafkaProducer); super(kafkaQueue, kafkaProducer);
this.plannerMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Planner, Planner.class); this.plannerMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Planner, Planner.class);
this.imdgProvider = imdgProvider;
} }
@Override @Override
@ -54,7 +56,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean {
private void newScheduler(BaseRequest<PlannerNewRequest> userRequest) { private void newScheduler(BaseRequest<PlannerNewRequest> userRequest) {
PlannerNewRequest req = userRequest.getRequestPayload(); PlannerNewRequest req = userRequest.getRequestPayload();
log.debug("PlannerNewRequest received"); log.debug("PlannerNewRequest received");
List<IRequestValidator.ValidationError> errors = plannerNewRequest.validate(req); List<IRequestValidator.ValidationError> errors = plannerNewRequest.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
Planner planner = new Planner(); Planner planner = new Planner();
planner.setCreated(Instant.now()); planner.setCreated(Instant.now());
@ -72,7 +74,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean {
private void updateScheduler(BaseRequest<PlannerUpdateRequest> userRequest) { private void updateScheduler(BaseRequest<PlannerUpdateRequest> userRequest) {
PlannerUpdateRequest req = userRequest.getRequestPayload(); PlannerUpdateRequest req = userRequest.getRequestPayload();
log.debug("PlannerUpdateRequest received id = {}", req.getId()); log.debug("PlannerUpdateRequest received id = {}", req.getId());
List<IRequestValidator.ValidationError> errors = plannerUpdateRequest.validate(req); List<IRequestValidator.ValidationError> errors = plannerUpdateRequest.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
Planner planner = plannerMap.getSingleObjectByID(req.getId()); Planner planner = plannerMap.getSingleObjectByID(req.getId());
planner.setUpdated(Instant.now()); planner.setUpdated(Instant.now());
@ -89,7 +91,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean {
private void deleteScheduler(BaseRequest<CommonDeleteRequest> userRequest) { private void deleteScheduler(BaseRequest<CommonDeleteRequest> userRequest) {
CommonDeleteRequest req = userRequest.getRequestPayload(); CommonDeleteRequest req = userRequest.getRequestPayload();
log.debug("CommonDeleteRequest received id = {}", req.getId()); log.debug("CommonDeleteRequest received id = {}", req.getId());
List<IRequestValidator.ValidationError> errors = deleteRequestValidator.validate(req); List<IRequestValidator.ValidationError> errors = deleteRequestValidator.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
Planner planner = plannerMap.getSingleObjectByID(req.getId()); Planner planner = plannerMap.getSingleObjectByID(req.getId());
plannerMap.delete(planner); plannerMap.delete(planner);

8
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java
View file

@ -26,6 +26,7 @@ import java.util.List;
public class PlannerTemplateService extends QueueConsumer implements InitializingBean { public class PlannerTemplateService extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private final Imdg<PlannerTemplate> plannerTemplateMap; private final Imdg<PlannerTemplate> plannerTemplateMap;
private final ImdgProvider imdgProvider;
private final IRequestValidator<PlannerTemplateNewRequest> plannerTemplateNewRequest = IRequestValidator.PLANNER_TEMPLATE_NEW_REQUEST; private final IRequestValidator<PlannerTemplateNewRequest> plannerTemplateNewRequest = IRequestValidator.PLANNER_TEMPLATE_NEW_REQUEST;
private final IRequestValidator<PlannerTemplateUpdateRequest> plannerTemplateUpdateRequest = IRequestValidator.PLANNER_TEMPLATE_UPDATE_REQUEST; private final IRequestValidator<PlannerTemplateUpdateRequest> plannerTemplateUpdateRequest = IRequestValidator.PLANNER_TEMPLATE_UPDATE_REQUEST;
private final IRequestValidator<CommonDeleteRequest> deleteRequestValidator = IRequestValidator.COMMON_DELETE_REQUEST; private final IRequestValidator<CommonDeleteRequest> deleteRequestValidator = IRequestValidator.COMMON_DELETE_REQUEST;
@ -35,6 +36,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
ImdgProvider imdgProvider) { ImdgProvider imdgProvider) {
super(kafkaQueue, kafkaProducer); super(kafkaQueue, kafkaProducer);
this.plannerTemplateMap = imdgProvider.getImdg(IMDGDistributedNames.Map_PlannerTemplate, PlannerTemplate.class); this.plannerTemplateMap = imdgProvider.getImdg(IMDGDistributedNames.Map_PlannerTemplate, PlannerTemplate.class);
this.imdgProvider = imdgProvider;
} }
@Override @Override
@ -54,7 +56,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
private void newTimetable(BaseRequest<PlannerTemplateNewRequest> userRequest) { private void newTimetable(BaseRequest<PlannerTemplateNewRequest> userRequest) {
PlannerTemplateNewRequest req = userRequest.getRequestPayload(); PlannerTemplateNewRequest req = userRequest.getRequestPayload();
log.debug("PlannerTemplateNewRequest received"); log.debug("PlannerTemplateNewRequest received");
List<IRequestValidator.ValidationError> errors = plannerTemplateNewRequest.validate(req); List<IRequestValidator.ValidationError> errors = plannerTemplateNewRequest.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
PlannerTemplate plannerTemplate = new PlannerTemplate(); PlannerTemplate plannerTemplate = new PlannerTemplate();
Instant created = Instant.now(); Instant created = Instant.now();
@ -72,7 +74,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
PlannerTemplateUpdateRequest req = userRequest.getRequestPayload(); PlannerTemplateUpdateRequest req = userRequest.getRequestPayload();
log.debug("PlannerTemplateUpdateRequest received"); log.debug("PlannerTemplateUpdateRequest received");
PlannerTemplate plannerTemplate = plannerTemplateMap.getSingleObjectByID(req.getId()); PlannerTemplate plannerTemplate = plannerTemplateMap.getSingleObjectByID(req.getId());
List<IRequestValidator.ValidationError> errors = plannerTemplateUpdateRequest.validate(req); List<IRequestValidator.ValidationError> errors = plannerTemplateUpdateRequest.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
Instant updated = Instant.now(); Instant updated = Instant.now();
plannerTemplate.setUpdated(updated); plannerTemplate.setUpdated(updated);
@ -88,7 +90,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
private void deleteTimetable(BaseRequest<CommonDeleteRequest> userRequest) { private void deleteTimetable(BaseRequest<CommonDeleteRequest> userRequest) {
CommonDeleteRequest req = userRequest.getRequestPayload(); CommonDeleteRequest req = userRequest.getRequestPayload();
log.debug("CommonDeleteRequest received id = {}", req.getId()); log.debug("CommonDeleteRequest received id = {}", req.getId());
List<IRequestValidator.ValidationError> errors = deleteRequestValidator.validate(req); List<IRequestValidator.ValidationError> errors = deleteRequestValidator.validate(req, imdgProvider);
if (IRequestValidator.checkErrorList(errors, log)) return; if (IRequestValidator.checkErrorList(errors, log)) return;
PlannerTemplate plannerTemplate = plannerTemplateMap.getSingleObjectByID(req.getId()); PlannerTemplate plannerTemplate = plannerTemplateMap.getSingleObjectByID(req.getId());
plannerTemplateMap.delete(plannerTemplate); plannerTemplateMap.delete(plannerTemplate);