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

SDF01 проверка curr_code RUR/RUB

Browse source
This commit is contained in:
ialbert 2023-08-04 16:26:07 +03:00
parent b10d6bb0c3
commit edb00e4608
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java
View file

@ -202,7 +202,7 @@ public class ValidationConfig {
Sdf01NewValidationRule.CompanyPresent, Sdf01NewValidationRule.CompanyPresent,
Sdf01NewValidationRule.AccountType, Sdf01NewValidationRule.AccountType,
Sdf01NewValidationRule.AccountPresent, Sdf01NewValidationRule.AccountPresent,
Sdf01NewValidationRule.CurrencyCode, Sdf01NewValidationRule.CurrencyCodeCheck,
Sdf01NewValidationRule.DatIsCurrentDt Sdf01NewValidationRule.DatIsCurrentDt
); );
}; };

5
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java
View file

@ -7,6 +7,7 @@ import ru.spcex.clearing.error.ClearingError;
import ru.spcex.clearing.error.ClearingErrorInternal; import ru.spcex.clearing.error.ClearingErrorInternal;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.platform.enumeration.AccType; import ru.spcex.platform.enumeration.AccType;
import ru.spcex.platform.enumeration.CurrencyCode;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.imdg.validation.ImdgValidationContext;
import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.enumeration.EnumMessage;
@ -59,11 +60,11 @@ public enum Sdf01NewValidationRule implements IValidationRule<ImdgValidationCont
context.storeObject(ValidationStored.Sdf01Account, acc); context.storeObject(ValidationStored.Sdf01Account, acc);
return empty(); return empty();
} }
}, CurrencyCode() { }, CurrencyCodeCheck() {
@Override @Override
public Optional<EnumMessage> validate(ImdgValidationContext<SDf01> context) { public Optional<EnumMessage> validate(ImdgValidationContext<SDf01> context) {
SDf01 sdf01 = context.getValidatedObject(); SDf01 sdf01 = context.getValidatedObject();
if (!ru.spcex.platform.enumeration.CurrencyCode.RUR.equalsByKey(sdf01.getCurr_code())) { if (!IEnumKey.contains(sdf01.getCurr_code(), CurrencyCode.class)) {
return of(ClearingError.CurrencyNotFound, sdf01.getCurr_code()); return of(ClearingError.CurrencyNotFound, sdf01.getCurr_code());
} }
return empty(); return empty();

2
platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java
View file

@ -34,7 +34,7 @@ public interface IEnumKey extends Serializable {
* Проверяет что среди всех Enum данного класса, присутствует элемент с данным id * Проверяет что среди всех Enum данного класса, присутствует элемент с данным id
* id может быть null * id может быть null
*/ */
static <T extends Enum<T> & IEnumKey> boolean contains(Class<T> enumClass, String key) { static <T extends Enum<T> & IEnumKey> boolean contains(String key, Class<T> enumClass) {
for (T e : enumClass.getEnumConstants()) { for (T e : enumClass.getEnumConstants()) {
if (Objects.equals(key, e.getKey())) if (Objects.equals(key, e.getKey()))
return true; return true;