Updated the update company API

This commit is contained in:
rajesh
2026-03-12 16:30:22 +05:30
parent 00080d6a6c
commit bdb7b7d885

View File

@@ -250,15 +250,26 @@ public class CompanyDao {
setIfUpdated(companyEntity::getCountry, companyEntity::setCountry, companyRequest.getCountry());
setIfUpdated(companyEntity::getNumberOfEmployees, companyEntity::setNumberOfEmployees, companyRequest.getNumberOfEmployees());
setIfUpdated(companyEntity::getAnnualRevenue, companyEntity::setAnnualRevenue, companyRequest.getAnnualRevenue());
//
// if(StringUtils.isNotBlank(companyRequest.getVatNumber())) {
// CompanyEntity existingCompany = companyRepository.findByVatNumberAndHubId(companyRequest.getVatNumber(), userEntity.getHub().getId());
// if(existingCompany!=null){
// throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.VATNUMBER_ALREADY_EXISTS));
// }
// companyEntity.setVatNumber(companyRequest.getVatNumber());
//
// }
// Same VAT logic as updateCompanyVatNumber: run VAT check, set validVat, json, and codiceAteco when vatNumber is provided
if (StringUtils.isNotBlank(companyRequest.getVatNumber())) {
Long hubId = userEntity.getHub().getId();
CompanyEntity existingCompany = companyRepository.findByVatNumberAndHubId(companyRequest.getVatNumber(), hubId);
if (existingCompany != null) {
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);
log.info("Company updated and saved. companyId: {}", companyEntity.getId());