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

http://jira.mfd.msk:8088/browse/CLS-268

Browse source 
Поправил валидацию.
This commit is contained in:
psemenkov 2023-05-10 15:03:40 +03:00
parent 3d56c0fc63
commit 05e879112a
6 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ClearingCalendarValidationConfig.java
View file

@ -43,6 +43,7 @@ public class ClearingCalendarValidationConfig {
IMDGDistributedNames.Map_Company,
Company.class,
ValidationError.CompanyNotFound,
false,
company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive),
DictionaryPresentRule.instance("dayStatus",
ClearingCalendarNewRequest::getDayStatus,
@ -74,6 +75,7 @@ public class ClearingCalendarValidationConfig {
IMDGDistributedNames.Map_Company,
Company.class,
ValidationError.CompanyNotFound,
false,
company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive),
DictionaryPresentRule.instance("dayStatus",
ClearingCalendarUpdateRequest::getDayStatus,

6
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerTemplateValidationConfig.java
View file

@ -45,7 +45,9 @@ public class PlannerTemplateValidationConfig {
IMDGDistributedNames.Map_TaskDictionary,
TaskDictionary.class),
TimeNotBeforeRule.instance("taskTime",
PlannerTemplateNewRequest::getTaskTime),
PlannerTemplateNewRequest::getTaskTime,
true,
false),
DictionaryPresentRule.instance("taskStatus",
PlannerTemplateNewRequest::getTaskStatus,
IMDGDistributedNames.Map_TaskStatusDictionary,
@ -55,6 +57,7 @@ public class PlannerTemplateValidationConfig {
IMDGDistributedNames.Map_Company,
Company.class,
ValidationError.CompanyNotFound,
false,
company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive),
IdPresentRule.instance("securityId",
PlannerTemplateNewRequest::getSecurityId,
@ -90,6 +93,7 @@ public class PlannerTemplateValidationConfig {
false),
TimeNotBeforeRule.instance("taskTime",
PlannerTemplateUpdateRequest::getTaskTime,
false,
false),
DictionaryPresentRule.instance("taskStatus",
PlannerTemplateUpdateRequest::getTaskStatus,

1
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java
View file

@ -62,6 +62,7 @@ public class PlannerValidationConfig {
IMDGDistributedNames.Map_Company,
Company.class,
ValidationError.CompanyNotFound,
false,
company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive),
IdPresentRule.instance("securityId",
PlannerNewRequest::getSecurityId,

2
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/validation/rules/common/EnumPresentRule.java
View file

@ -55,6 +55,6 @@ public record EnumPresentRule<R, E extends IEnumKey>(String fieldName,
for (E enumValue : enumValues) {
if (enumValue.getKey().equals(enumCode)) return empty();
}
return of(ValidationError.WrongEnumValue, fieldName);
return of(ValidationError.WrongDictionaryValue, fieldName);
}
}

4
clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/AbstractServiceTest.java
View file

@ -19,7 +19,7 @@ import ru.clearing.platform.dictionary.TaskStatusDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.scheduler.config.ErrorResolverConfig;
import ru.spcex.clearing.scheduler.config.PlannerQueueConfig;
import ru.spcex.clearing.scheduler.config.SchedulerTestConfig;
import ru.spcex.clearing.scheduler.config.SchedulerServiceConfig;
import ru.spcex.clearing.scheduler.config.validation.ClearingCalendarValidationConfig;
import ru.spcex.clearing.scheduler.config.validation.PlannerTemplateValidationConfig;
import ru.spcex.clearing.scheduler.config.validation.PlannerValidationConfig;
@ -60,7 +60,7 @@ import static ru.spcex.platform.enumeration.Market.mkrs;
LauncherService.class,
ErrorResolverConfig.class,
PlannerQueueConfig.class,
SchedulerTestConfig.class,
SchedulerServiceConfig.class,
ImdgTestConfig.class,
KafkaTestConfig.class})
public abstract class AbstractServiceTest {

2
clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/validation/EnumPresentRuleTest.java
View file

@ -85,7 +85,7 @@ class EnumPresentRuleTest extends AbstractServiceTest {
setter.accept(record, "BAD_VALUE");
enumMessages = strictValidator.validateAll();
assertEquals(1, enumMessages.size());
assertEquals(ValidationError.WrongEnumValue, enumMessages.iterator().next().getSubject());
assertEquals(ValidationError.WrongDictionaryValue, enumMessages.iterator().next().getSubject());
}
}