From e937f33aebd52f782a68049b49de932c431825fd Mon Sep 17 00:00:00 2001 From: Piyush Date: Wed, 5 Mar 2025 20:31:20 +0530 Subject: [PATCH] Done ticket GEPAFINBE-178 --- .../constants/GepafinConstant.java | 2 + .../tendermanagement/dao/CompanyDao.java | 138 ++++++++++++++++++ .../enums/UserActionContextEnum.java | 1 + .../model/request/LimitRequest.java | 8 + .../repositories/CompanyRepository.java | 10 ++ .../service/CompanyService.java | 3 + .../service/impl/CompanyServiceImpl.java | 7 + .../gepafin/tendermanagement/util/Utils.java | 8 + .../web/rest/api/CompanyApi.java | 14 ++ .../rest/api/impl/CompanyApiController.java | 13 ++ src/main/resources/message_en.properties | 2 + src/main/resources/message_it.properties | 2 + 12 files changed, 208 insertions(+) create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/LimitRequest.java diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index b04dab53..8cdf2848 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -484,6 +484,8 @@ public class GepafinConstant { public static final String USAGE="usage"; public static final String LIMIT="limit"; public static final String DATA="data"; + + public static final String INVALID_LIMIT = "error.invalid.limit"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java index 1f0446a0..ca9c2621 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java @@ -1,23 +1,33 @@ package net.gepafin.tendermanagement.dao; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.data.domain.Pageable; // Correct package + import java.util.EnumSet; import java.util.List; import java.util.Map; import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.log4j.Log4j2; import net.gepafin.tendermanagement.entities.*; import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; import net.gepafin.tendermanagement.enums.UserCompanyDelegationStatusEnum; +import net.gepafin.tendermanagement.model.request.LimitRequest; +import net.gepafin.tendermanagement.model.response.VatCheckResponseBean; import net.gepafin.tendermanagement.repositories.*; import net.gepafin.tendermanagement.service.CompanyService; import net.gepafin.tendermanagement.enums.VersionActionTypeEnum; import net.gepafin.tendermanagement.model.request.VersionHistoryRequest; import net.gepafin.tendermanagement.repositories.ApplicationRepository; import net.gepafin.tendermanagement.repositories.FaqRepository; +import net.gepafin.tendermanagement.service.feignClient.VatCheckService; import net.gepafin.tendermanagement.util.LoggingUtil; import net.gepafin.tendermanagement.web.rest.api.errors.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import net.gepafin.tendermanagement.config.Translator; @@ -27,9 +37,11 @@ import net.gepafin.tendermanagement.model.response.CompanyResponse; import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.Utils; +import static net.gepafin.tendermanagement.util.Utils.convertObjectToJsonString; import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; @Component +@Log4j2 public class CompanyDao { @Autowired @@ -60,6 +72,13 @@ public class CompanyDao { @Autowired private HttpServletRequest request; + + @Autowired + private VatCheckService vatCheckService; // Service to call VAT API + + + private static final String NOT_FOUND_JSON = "{\"data\": \"not found\"}"; + public CompanyResponse createCompany(UserEntity userEntity, CompanyRequest companyRequest) { CompanyEntity existingCompany = companyRepository.findByVatNumberAndHubId(companyRequest.getVatNumber(), userEntity.getHub().getId()); @@ -410,4 +429,123 @@ public class CompanyDao { VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.SOFT_DELETE).oldData(oldUserWithCompanyData).newData(existingRelation).build()); } + + + public void updateMissingVatCheckResponses(HttpServletRequest request, LimitRequest limitRequest) { + long limit = limitRequest.getLimit(); + + if (limit <= 0 || limit > 3000) { + log.error("Invalid limit: {}. Limit should be between 1 and 3000.", limit); + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.INVALID_LIMIT)); + } + + int successfulUpdates = 0; + int failedUpdates = 0; + int invalidVatNumbers = 0; + + Pageable pageable = PageRequest.of(0, (int) limit, Sort.by("id").ascending()); + Page companyPage = companyRepository.findCompaniesWithMissingVatCheck(pageable); + List companies = companyPage.getContent(); + + if (companies.isEmpty()) { + log.info("No companies found with missing VAT check responses."); + return; + } + + log.info("Processing {} companies with missing VAT check responses...", companies.size()); + + for (CompanyEntity company : companies) { + try { + log.info("Processing company ID: {} with VAT number: {}", company.getId(), company.getVatNumber()); + + VatCheckResponseBean vatResponse = companyService.checkVatNumber(request, company.getVatNumber()); + CompanyEntity oldCompanyData = Utils.getClonedEntityForData(company); + + if (vatResponse != null && vatResponse.getVatCheckResponse() != null) { + // Convert response to JSON and update the JSON field + String jsonResponse = Utils.convertMapIntoJsonString(vatResponse.getVatCheckResponse()); + company.setJson(jsonResponse); + log.info("Company ID {}: JSON field updated successfully.", company.getId()); + + // Extract and set codiceAteco field + updateCodiceAtecoField(company); + + successfulUpdates++; + } else { + company.setJson(NOT_FOUND_JSON); + invalidVatNumbers++; + log.warn("Company ID {}: Invalid or null VAT check response. JSON set to '{}'", company.getId(), NOT_FOUND_JSON); + } + + // Adding version history log + /** This code is responsible for adding a version history log for the "Update MissingVatCheckResponses" operation. **/ + loggingUtil.addVersionHistory( + VersionHistoryRequest.builder() + .request(request) + .actionType(VersionActionTypeEnum.UPDATE) + .oldData(oldCompanyData) + .newData(company) + .build()); + + } catch (Exception e) { + failedUpdates++; + log.error("Error updating VAT check response for company ID {}: {}", company.getId(), e.getMessage(), e); + } + } + + companyRepository.saveAll(companies); + + log.info("VAT check update completed. Limit: {} | Successful: {} | Invalid VAT numbers: {} | Failed: {}", + limit, successfulUpdates, invalidVatNumbers, failedUpdates); + } + + private void updateCodiceAtecoField(CompanyEntity company) { + Map vatCheckResponse = Utils.convertJsonStringToMap(company.getJson()); + + if (vatCheckResponse != null && vatCheckResponse.containsKey("data")) { + Object dataObj = vatCheckResponse.get("data"); + + if (dataObj instanceof Map) { + Map dataMap = (Map) dataObj; + log.info("Company ID {}: Available keys inside 'data' -> {}", company.getId(), dataMap.keySet()); + + if (dataMap.containsKey("dettaglio")) { + Object dettaglioObj = dataMap.get("dettaglio"); + + if (dettaglioObj instanceof Map) { + Map dettaglio = (Map) dettaglioObj; + + if (dettaglio.containsKey("codice_ateco")) { + Object codiceAtecoObj = dettaglio.get("codice_ateco"); + + if (codiceAtecoObj instanceof String) { + String codiceAteco = (String) codiceAtecoObj; + + if (codiceAteco != null && !codiceAteco.isEmpty()) { + company.setCodiceAteco(codiceAteco); + log.info("Company ID {}: codiceAteco updated to {}", company.getId(), codiceAteco); + } else { + log.warn("Company ID {}: codiceAteco is null or empty in the response.", company.getId()); + } + } else { + log.warn("Company ID {}: 'codice_ateco' is not a string, actual type: {}", company.getId(), codiceAtecoObj.getClass()); + } + } else { + log.warn("Company ID {}: 'dettaglio' does not contain 'codice_ateco' key.", company.getId()); + } + } else { + log.warn("Company ID {}: 'dettaglio' is not a Map, actual type: {}", company.getId(), dettaglioObj.getClass()); + } + } else { + log.warn("Company ID {}: 'dettaglio' section is missing inside 'data'!", company.getId()); + } + } else { + log.warn("Company ID {}: 'data' is not a Map, actual type: {}", company.getId(), dataObj.getClass()); + } + } else { + log.warn("Company ID {}: 'data' section missing in the JSON response.", company.getId()); + } + } + } diff --git a/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java index 64a43904..6b5b8ea4 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java @@ -65,6 +65,7 @@ public enum UserActionContextEnum { CHECK_COMPANY_VAT_NUMBER("CHECK_COMPANY_VAT_NUMBER"), GET_COMPANY_BY_USER("GET_COMPANY_BY_USER"), REMOVE_COMPANY_FROM_USER("REMOVE_COMPANY_FROM_USER"), + UPDATE_COMPANY_JSON("UPDATE_COMPANY_JSON"), /** LookUpData action context **/ CREATE_LOOKUP_DATA("CREATE_LOOKUP_DATA"), diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/LimitRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/LimitRequest.java new file mode 100644 index 00000000..6d360714 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/LimitRequest.java @@ -0,0 +1,8 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class LimitRequest { + private Long limit; +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java index b9395883..350b9b49 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java @@ -1,7 +1,10 @@ package net.gepafin.tendermanagement.repositories; +import org.springframework.data.domain.Pageable; + import java.util.List; +import org.springframework.data.domain.Page; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -21,5 +24,12 @@ public interface CompanyRepository extends JpaRepository { CompanyEntity findByVatNumberAndHubId(String vatNumber, Long hubId); + @Query(""" + SELECT c FROM CompanyEntity c + WHERE c.vatNumber IS NOT NULL + AND (c.json IS NULL OR c.json = '') +""") + Page findCompaniesWithMissingVatCheck(Pageable pageable); + } diff --git a/src/main/java/net/gepafin/tendermanagement/service/CompanyService.java b/src/main/java/net/gepafin/tendermanagement/service/CompanyService.java index da36cc15..ae752c04 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/CompanyService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/CompanyService.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import java.util.List; import java.util.Map; +import net.gepafin.tendermanagement.model.request.LimitRequest; import net.gepafin.tendermanagement.model.response.VatCheckResponseBean; import org.springframework.web.multipart.MultipartFile; @@ -45,4 +46,6 @@ public interface CompanyService { UserWithCompanyEntity getUserWithCompanyEntity(Long userId,Long companyId); void removeCompanyFromList(HttpServletRequest request, Long companyId); + void updateMissingVatCheckResponses(HttpServletRequest request, LimitRequest limitRequest); + } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java index 092c5102..1e77eddb 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import java.util.List; import java.util.Map; +import net.gepafin.tendermanagement.model.request.LimitRequest; import net.gepafin.tendermanagement.model.response.VatCheckResponseBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -130,4 +131,10 @@ public class CompanyServiceImpl implements CompanyService { UserEntity userEntity =validator.validateUser(request); companyDao.removeCompanyFromList(userEntity, companyId); } + + @Override + public void updateMissingVatCheckResponses(HttpServletRequest request, LimitRequest limitRequest) { + UserEntity userEntity =validator.validateUser(request); + companyDao.updateMissingVatCheckResponses(request, limitRequest); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java index 06abaaab..1838bd57 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java @@ -788,4 +788,12 @@ public class Utils { public static boolean isValidBoolean(String value) { return "true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value); } + public static Map convertJsonStringToMap(String jsonString) { + try { + return mapper.readValue(jsonString, Map.class); + } catch (Exception e) { + e.printStackTrace(); // Handle the exception + return null; + } + } } \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/CompanyApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/CompanyApi.java index 6384f4d7..fea29d0d 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/CompanyApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/CompanyApi.java @@ -3,9 +3,11 @@ package net.gepafin.tendermanagement.web.rest.api; import java.util.List; import java.util.Map; +import net.gepafin.tendermanagement.model.request.LimitRequest; import net.gepafin.tendermanagement.model.response.VatCheckResponseBean; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -155,4 +157,16 @@ public interface CompanyApi { ResponseEntity> removeCompanyFromList(HttpServletRequest request, @Parameter(description = "The company id", required = true) @PathVariable("companyId") Long companyId); + + @Operation(summary = "Api to update company with no data through script", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @PostMapping(value = "/updateCompanyJson", produces = { "application/json" }) + @PreAuthorize("hasRole('ROLE_SUPER_ADMIN') ") + ResponseEntity> updateMissingVatCheckResponses(HttpServletRequest request, + @Parameter(description = "Limit request object ", required = true) @RequestBody LimitRequest limitRequest); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CompanyApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CompanyApiController.java index 0bfb0e7a..64dee16b 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CompanyApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CompanyApiController.java @@ -6,6 +6,7 @@ import java.util.Map; import net.gepafin.tendermanagement.enums.UserActionContextEnum; import net.gepafin.tendermanagement.enums.UserActionLogsEnum; +import net.gepafin.tendermanagement.model.request.LimitRequest; import net.gepafin.tendermanagement.model.request.UserActionRequest; import net.gepafin.tendermanagement.model.response.VatCheckResponseBean; import net.gepafin.tendermanagement.util.LoggingUtil; @@ -188,4 +189,16 @@ public class CompanyApiController implements CompanyApi{ return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.COMPANY_DELETE_SUCCESS_MSG))); } + @Override + public ResponseEntity> updateMissingVatCheckResponses(HttpServletRequest request, LimitRequest limitRequest) { + log.info("Api to update company json field"); + + /** This code is responsible for creating user action logs for the "Update company json field" operation. **/ + loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE).actionContext(UserActionContextEnum.UPDATE_COMPANY_JSON).build()); + + companyService.updateMissingVatCheckResponses(request, limitRequest); + + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.COMPANY_UPDATED_SUCCESS_MSG))); + } } diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index 36970d79..d29c4a80 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -394,3 +394,5 @@ invalid.expiration.date = Invalid Expiration Date appointment.cannot.be.created = Appointment cannot be created because call doesn't have the template id. appointment.not.created = Appointment not created please try again. validation.failed.checklist=Validation failed for checklist. + +error.invalid.limit=Limit should be between 1 and 3000. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index ce2e539d..6aa57aa3 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -384,3 +384,5 @@ invalid.expiration.date = Data di scadenza non valida appointment.cannot.be.created = Impossibile creare l'appuntamento perch� la chiamata non ha l'ID del modello di appuntamento. appointment.not.created = Appuntamento non creato, riprova validation.failed.checklist=Convalida fallita per la checklist. + +error.invalid.limit=Il limite dovrebbe essere compreso tra 1 e 3000.