unit session section -> MULT
This commit is contained in:
parent
add844bd76
commit
960a19c4cc
1 changed files with 17 additions and 19 deletions
|
|
@ -2,14 +2,12 @@ package ru.spcex.clearing.service.validation;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Supplier;
|
|
||||||
import ru.clearing.classes.statics.data.account.Account;
|
import ru.clearing.classes.statics.data.account.Account;
|
||||||
import ru.clearing.classes.statics.data.company.Company;
|
import ru.clearing.classes.statics.data.company.Company;
|
||||||
import ru.clearing.classes.statics.data.company.relation.Relation;
|
import ru.clearing.classes.statics.data.company.relation.Relation;
|
||||||
import ru.clearing.classes.statics.data.misc.Session;
|
import ru.clearing.classes.statics.data.misc.Session;
|
||||||
import ru.clearing.classes.statics.data.registry.Registry;
|
import ru.clearing.classes.statics.data.registry.Registry;
|
||||||
import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
|
import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
|
||||||
import ru.clearing.platform.dictionary.SectionDictionary;
|
|
||||||
import ru.spcex.clearing.error.ClearingError;
|
import ru.spcex.clearing.error.ClearingError;
|
||||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||||
import ru.spcex.platform.enumeration.ServiceStatus;
|
import ru.spcex.platform.enumeration.ServiceStatus;
|
||||||
|
|
@ -25,23 +23,23 @@ public enum RegistryStep3ValidationRule implements IValidationRule<ImdgValidatio
|
||||||
@Override
|
@Override
|
||||||
public Optional<EnumMessage> validate(ImdgValidationContext<Registry> context) {
|
public Optional<EnumMessage> validate(ImdgValidationContext<Registry> context) {
|
||||||
Registry validatedObject = context.getValidatedObject();
|
Registry validatedObject = context.getValidatedObject();
|
||||||
Supplier<String> sectionFind = () -> {
|
// Supplier<String> sectionFind = () -> {
|
||||||
Imdg<Session> sessionImdg = context.obtainMap(IMDGDistributedNames.Map_Session, Session.class);
|
// Imdg<Session> sessionImdg = context.obtainMap(IMDGDistributedNames.Map_Session, Session.class);
|
||||||
Imdg<SectionDictionary> sectionDictionaryImdg = context.obtainMap(IMDGDistributedNames.Map_SectionDictionary, SectionDictionary.class);
|
// Imdg<SectionDictionary> sectionDictionaryImdg = context.obtainMap(IMDGDistributedNames.Map_SectionDictionary, SectionDictionary.class);
|
||||||
Session session = sessionImdg.getSingleObjectByID(validatedObject.getSessionId());
|
// Session session = sessionImdg.getSingleObjectByID(validatedObject.getSessionId());
|
||||||
if (session == null) {
|
// if (session == null) {
|
||||||
return "null";
|
// return "null";
|
||||||
} else {
|
// } else {
|
||||||
SectionDictionary section = sectionDictionaryImdg.getFirstObjectBySQL("code ='" + session.getSection() + "'");
|
// SectionDictionary section = sectionDictionaryImdg.getFirstObjectBySQL("code ='" + session.getSection() + "'");
|
||||||
if (section == null) {
|
// if (section == null) {
|
||||||
return "null";
|
// return "null";
|
||||||
} else {
|
// } else {
|
||||||
return section.getName();
|
// return section.getName();
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
};
|
// };
|
||||||
if (validatedObject.getCompanyId() == null) {
|
if (validatedObject.getCompanyId() == null) {
|
||||||
return of(ClearingError.ClearingUnavailableForCompany, sectionFind.get());
|
return of(ClearingError.ClearingUnavailableForCompany, validatedObject.getSection());
|
||||||
}
|
}
|
||||||
Imdg<Relation> relationImdg = context.obtainMap(IMDGDistributedNames.Map_Relation, Relation.class);
|
Imdg<Relation> relationImdg = context.obtainMap(IMDGDistributedNames.Map_Relation, Relation.class);
|
||||||
Imdg<Session> sessionImdg = context.obtainMap(IMDGDistributedNames.Map_Session, Session.class);
|
Imdg<Session> sessionImdg = context.obtainMap(IMDGDistributedNames.Map_Session, Session.class);
|
||||||
|
|
@ -50,7 +48,7 @@ public enum RegistryStep3ValidationRule implements IValidationRule<ImdgValidatio
|
||||||
"consumerId", validatedObject.getCompanyId(),
|
"consumerId", validatedObject.getCompanyId(),
|
||||||
"service", validatedObject.getSection()));
|
"service", validatedObject.getSection()));
|
||||||
if (relation == null || (!ServiceStatus.Active.equalsByKey(relation.getServiceStatus()) && !ServiceStatus.Reopened.equalsByKey(relation.getServiceStatus()))) {
|
if (relation == null || (!ServiceStatus.Active.equalsByKey(relation.getServiceStatus()) && !ServiceStatus.Reopened.equalsByKey(relation.getServiceStatus()))) {
|
||||||
return of(ClearingError.ClearingUnavailableForCompany, sectionFind.get(), validatedObject.getCompanyId());
|
return of(ClearingError.ClearingUnavailableForCompany, validatedObject.getSection(), validatedObject.getCompanyId());
|
||||||
}
|
}
|
||||||
context.storeObject(RegistryValidationStored.Relation, relation);
|
context.storeObject(RegistryValidationStored.Relation, relation);
|
||||||
return empty();
|
return empty();
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue