From 347aef48a2ef70860ffc7cdbb506fede12967814 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 16 Dec 2022 16:51:34 +0300 Subject: [PATCH] ActionType fix --- .../request/cud/schedule/ClearingCalendarNewAction.java | 1 + .../request/cud/schedule/ClearingCalendarUpdateAction.java | 1 + .../controller/request/cud/schedule/PlannerNewAction.java | 1 + .../request/cud/schedule/PlannerTemplateNewAction.java | 2 ++ .../request/cud/schedule/PlannerTemplateUpdateAction.java | 1 + .../controller/request/cud/schedule/PlannerUpdateAction.java | 1 + .../ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java | 2 ++ 7 files changed, 9 insertions(+) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarNewAction.java index eec5e9e5c..6d17ee7de 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarNewAction.java @@ -40,6 +40,7 @@ public class ClearingCalendarNewAction implements IAction { return plannerNewRequest; } + @ApiModelProperty(hidden = true) @Override public ActionType getActionType() { return ActionType.NEW; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java index 244d4b522..2cb2a797b 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java @@ -3,6 +3,7 @@ package ru.spcex.clearing.backendapi.controller.request.cud.schedule; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.backendapi.domain.actions.IAction; import ru.spcex.clearing.backendapi.errors.BackEndError; import ru.spcex.clearing.platform.messaging.domain.ActionType; @@ -36,6 +37,7 @@ public class PlannerTemplateNewAction implements IAction, WithI return plannerUpdateRequest; } + @ApiModelProperty(hidden = true) @Override public ActionType getActionType() { return ActionType.UPDATE; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java index a5d1334bf..1f21495fd 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java @@ -59,10 +59,12 @@ public class OperatorImpl implements IOperator { } private void throwValidate(String destination, IAction iAction) { + //простая валидация - которую можно запилить прямо внутри класса (наличие полей, отношения между датами etc.) Collection validationErrors = iAction.validate(); if (validationErrors.size() > 0) { throw new ActionValidationException(validationErrors); } + //валидация требующая IMDG поиска других сущностей и т.д. IValidator validator = validation.getValidator(destination, iAction); if (validator != null) { validator.tillFirstError().ifPresent(enumMessage -> {