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

ClearingCalendarServiceTest add validation test

Browse source
This commit is contained in:
akulikov 2023-01-18 15:48:39 +03:00
parent 39c3f92ec3
commit 209edc1a44
4 changed files with 8 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/error/ValidationError.java
View file

@ -24,6 +24,6 @@ public enum ValidationError implements IEnumId {
@Override @Override
public Long getId() { public Long getId() {
return null; return id;
} }
} }

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

@ -68,7 +68,10 @@ public record DictionaryPresentRule<R, D extends AbstractDictionary>(String fiel
ImdgPredicateBuilder imdgPredicateBuilder = dictImdg.predicateBuilder(); ImdgPredicateBuilder imdgPredicateBuilder = dictImdg.predicateBuilder();
ImdgPredicate imdgPredicate = imdgPredicateBuilder.equals("code", enumCode); ImdgPredicate imdgPredicate = imdgPredicateBuilder.equals("code", enumCode);
Collection<D> fromMap = dictImdg.getCollectionObjectsByPredicate(imdgPredicate); Collection<D> fromMap = dictImdg.getCollectionObjectsByPredicate(imdgPredicate);
assert fromMap.size() <= 1; if (fromMap.isEmpty()) {
return of(ValidationError.WrongDictionaryValue, fieldName);
}
assert fromMap.size() == 1;
D dictionaryFromMap = fromMap.iterator().next(); D dictionaryFromMap = fromMap.iterator().next();
if (dictionaryFromMap == null) { if (dictionaryFromMap == null) {
return of(ValidationError.WrongDictionaryValue, fieldName); return of(ValidationError.WrongDictionaryValue, fieldName);

4
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/service/ClearingCalendarServiceTest.java
View file

@ -107,9 +107,9 @@ class ClearingCalendarServiceTest {
ClearingCalendar clearingCalendar = new ClearingCalendar(); ClearingCalendar clearingCalendar = new ClearingCalendar();
Instant created = Instant.now(); Instant created = Instant.now();
clearingCalendar.setCreated(created); clearingCalendar.setCreated(created);
clearingCalendar.setClearingDate(LocalDate.now()); clearingCalendar.setClearingDate(LocalDate.now().plusDays(1));
clearingCalendar.setCompanyId(0L); clearingCalendar.setCompanyId(0L);
clearingCalendar.setDayStatus("STATUS"); clearingCalendar.setDayStatus(DayStatus.Workday.getKey());
ClearingCalendarNewRequest clearingCalendarNewRequest = new ClearingCalendarNewRequest(); ClearingCalendarNewRequest clearingCalendarNewRequest = new ClearingCalendarNewRequest();
clearingCalendarNewRequest.setClearingDate(clearingCalendar.getClearingDate()); clearingCalendarNewRequest.setClearingDate(clearingCalendar.getClearingDate());

2
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java
View file

@ -175,7 +175,7 @@ public class QueueConsumer implements AutoCloseable {
Optional<EnumMessage> validationError = validator.tillFirstError(); Optional<EnumMessage> validationError = validator.tillFirstError();
if (validationError.isPresent()) { if (validationError.isPresent()) {
String errorMsg = messageResolver.resolve(validationError.get()); String errorMsg = messageResolver.resolve(validationError.get());
log.error("cannot process {} id={}: {}", req.getClass().getSimpleName(), userRequest.getId(), errorMsg); log.error("validation error for {} error={}, id={}: {}", req.getClass().getSimpleName(), validationError.get().getSubject(), userRequest.getId(), errorMsg);
return new RequestInfoUpdate() return new RequestInfoUpdate()
.setId(userRequest.getId()) .setId(userRequest.getId())
.setStatus(Status.Error) .setStatus(Status.Error)