Updated the update company API
This commit is contained in:
@@ -250,15 +250,26 @@ public class CompanyDao {
|
|||||||
setIfUpdated(companyEntity::getCountry, companyEntity::setCountry, companyRequest.getCountry());
|
setIfUpdated(companyEntity::getCountry, companyEntity::setCountry, companyRequest.getCountry());
|
||||||
setIfUpdated(companyEntity::getNumberOfEmployees, companyEntity::setNumberOfEmployees, companyRequest.getNumberOfEmployees());
|
setIfUpdated(companyEntity::getNumberOfEmployees, companyEntity::setNumberOfEmployees, companyRequest.getNumberOfEmployees());
|
||||||
setIfUpdated(companyEntity::getAnnualRevenue, companyEntity::setAnnualRevenue, companyRequest.getAnnualRevenue());
|
setIfUpdated(companyEntity::getAnnualRevenue, companyEntity::setAnnualRevenue, companyRequest.getAnnualRevenue());
|
||||||
//
|
|
||||||
// if(StringUtils.isNotBlank(companyRequest.getVatNumber())) {
|
// Same VAT logic as updateCompanyVatNumber: run VAT check, set validVat, json, and codiceAteco when vatNumber is provided
|
||||||
// CompanyEntity existingCompany = companyRepository.findByVatNumberAndHubId(companyRequest.getVatNumber(), userEntity.getHub().getId());
|
if (StringUtils.isNotBlank(companyRequest.getVatNumber())) {
|
||||||
// if(existingCompany!=null){
|
Long hubId = userEntity.getHub().getId();
|
||||||
// throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.VATNUMBER_ALREADY_EXISTS));
|
CompanyEntity existingCompany = companyRepository.findByVatNumberAndHubId(companyRequest.getVatNumber(), hubId);
|
||||||
// }
|
if (existingCompany != null) {
|
||||||
// companyEntity.setVatNumber(companyRequest.getVatNumber());
|
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.VATNUMBER_ALREADY_EXISTS));
|
||||||
//
|
}
|
||||||
// }
|
VatCheckResponseBean vatCheckResponseBean = vatCheckDao.checkVatNumber(companyRequest.getVatNumber(), hubId);
|
||||||
|
Boolean validVat = Boolean.FALSE;
|
||||||
|
if (vatCheckResponseBean != null && Boolean.TRUE.equals(vatCheckResponseBean.getValid())) {
|
||||||
|
validVat = Boolean.TRUE;
|
||||||
|
}
|
||||||
|
companyEntity.setVatNumber(companyRequest.getVatNumber());
|
||||||
|
companyEntity.setValidVat(validVat);
|
||||||
|
if (vatCheckResponseBean != null && vatCheckResponseBean.getVatCheckResponse() != null) {
|
||||||
|
companyEntity.setJson(Utils.convertMapIntoJsonString(vatCheckResponseBean.getVatCheckResponse()));
|
||||||
|
updateCodiceAtecoFieldWithNewJson(companyEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
companyRepository.save(companyEntity);
|
companyRepository.save(companyEntity);
|
||||||
log.info("Company updated and saved. companyId: {}", companyEntity.getId());
|
log.info("Company updated and saved. companyId: {}", companyEntity.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user