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

поправил заполнение id у запроса от gateway

Browse source
This commit is contained in:
etreschenkov 2023-06-21 12:08:00 +03:00
parent fa17164d81
commit 28006c3a33
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java
View file

@ -121,7 +121,15 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
try { try {
ActionType actionType = request.getActionType(); ActionType actionType = request.getActionType();
switch (actionType) { switch (actionType) {
case NEW -> create((CompanyNewRequest) request.getRequestPayload()); case NEW -> {
CompanyNewRequest companyNewRequest = (CompanyNewRequest) request.getRequestPayload();
IValidator validator = companyNewRequestValidator.apply(companyNewRequest);
Optional<EnumMessage> error = validator.tillFirstError();
if (error.isPresent()){
return new RequestInfoUpdate(request.getId(), Status.Error, error.get().toString());
}
create(companyNewRequest);
}
case UPDATE -> update((CompanyNewRequest) request.getRequestPayload()); case UPDATE -> update((CompanyNewRequest) request.getRequestPayload());
} }
} catch (ValidationException e) { } catch (ValidationException e) {
@ -132,12 +140,6 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
public synchronized Long create(CompanyNewRequest companyNewRequest) throws ValidationException { public synchronized Long create(CompanyNewRequest companyNewRequest) throws ValidationException {
log.debug("creating new company"); log.debug("creating new company");
IValidator validator = companyNewRequestValidator.apply(companyNewRequest);
Optional<EnumMessage> error = validator.tillFirstError();
if (error.isPresent()) {
throw new ValidationException(error.get());
}
Instant now = Instant.now(); Instant now = Instant.now();
Company company = new Company(); Company company = new Company();
company.setId(idSequence.nextId()); company.setId(idSequence.nextId());

28
clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java
View file

@ -120,7 +120,9 @@ public class MultiCompanyService
if (companyId == null) { if (companyId == null) {
companyId = companyService.create(req.getCompany()); companyId = companyService.create(req.getCompany());
log.debug("The companyId={}", companyId); log.debug("The companyId={}", companyId);
fillCompanyId(req, companyId);
} else { } else {
fillCompanyId(req, companyId);
companyService.update(req.getCompany()); companyService.update(req.getCompany());
} }
@ -144,20 +146,18 @@ public class MultiCompanyService
} }
} }
//todo по идее эта логика выполнена в companyService.create(req.getCompany()) for (CompanySymbolNewRequest partRequest : req.getCompanySymbols()) {
// for (CompanySymbolNewRequest partRequest : req.getCompanySymbols()) { CompanySymbols existSymbol = findCompanySymbols(partRequest);
// CompanySymbols existSymbol = findCompanySymbols(partRequest); if (existSymbol == null) {
// if (existSymbol == null) { log.trace("For company[{}] do new companySymbol", companyId);
// log.trace("For company[{}] do new companySymbol", companyId); Long id = companySymbolService.create(partRequest);
// Long id = companySymbolService.create(partRequest); } else {
// validateReply(companyId, "companySymbolNew", replyI); log.trace("For company[{}] do update companySymbol[{}]", companyId, existSymbol.getId());
// } else { CompanySymbolUpdateRequest partUpdateRequest = createUpdateRequest(existSymbol, partRequest);
// log.trace("For company[{}] do update companySymbol[{}]", companyId, existSymbol.getId()); replyI = companySymbolService.companySymbolUpdate(wrapRequest(baseRequest, partUpdateRequest, ActionType.UPDATE));
// CompanySymbolUpdateRequest partUpdateRequest = createUpdateRequest(existSymbol, partRequest); validateReply(companyId, "companySymbolUpdate", replyI);
// replyI = companySymbolService.companySymbolUpdate(wrapRequest(baseRequest, partUpdateRequest, ActionType.UPDATE)); }
// validateReply(companyId, "companySymbolUpdate", replyI); }
// }
// }
for (ContactNewRequest partRequest : req.getContacts()) { for (ContactNewRequest partRequest : req.getContacts()) {
Contact existContact = findContact(partRequest); Contact existContact = findContact(partRequest);
if (existContact == null) { if (existContact == null) {