From 389edf3b5596d5c682d11f9a710fb274c2445cd5 Mon Sep 17 00:00:00 2001 From: rajeshkhore Date: Thu, 5 Dec 2024 21:42:51 +0530 Subject: [PATCH 01/35] Added application protocol in amendement template --- .../gepafin/tendermanagement/dao/EmailNotificationDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java index 4bf99110..42eb2ee0 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java @@ -152,9 +152,9 @@ public class EmailNotificationDao { ApplicationEntity applicationEntity = applicationService.validateApplication(applicationAmendmentRequestEntity.getApplicationId()); Map bodyPlaceholders = new HashMap<>(); bodyPlaceholders.put("{{call_name}}", applicationEntity.getCall().getName()); - bodyPlaceholders.put("{{protocol_number}}", applicationAmendmentRequestEntity.getProtocol().getProtocolNumber().toString()); - bodyPlaceholders.put("{{protocol_date}}", DateTimeUtil.formatLocalDateTime(applicationAmendmentRequestEntity.getProtocol().getCreatedDate(), GepafinConstant.DD_MM_YYYY)); - bodyPlaceholders.put("{{protocol_time}}", DateTimeUtil.parseLocalTimeToString(applicationAmendmentRequestEntity.getProtocol().getTime(), GepafinConstant.HH_MM_SS)); + bodyPlaceholders.put("{{protocol_number}}", applicationEntity.getProtocol().getProtocolNumber().toString()); + bodyPlaceholders.put("{{protocol_date}}", DateTimeUtil.formatLocalDateTime(applicationEntity.getProtocol().getCreatedDate(), GepafinConstant.DD_MM_YYYY)); + bodyPlaceholders.put("{{protocol_time}}", DateTimeUtil.parseLocalTimeToString(applicationEntity.getProtocol().getTime(), GepafinConstant.HH_MM_SS)); bodyPlaceholders.put("{{response_days}}", applicationAmendmentRequestEntity.getResponseDays().toString()); try { From 58e01f006c8694c82c2894d9f218cccf5456c744 Mon Sep 17 00:00:00 2001 From: nisha Date: Thu, 5 Dec 2024 21:12:30 +0530 Subject: [PATCH 02/35] updated code for company delegation --- .../constants/GepafinConstant.java | 1 + .../tendermanagement/dao/DelegationDao.java | 33 ++++++++++++++++--- .../service/CompanyService.java | 2 +- .../service/impl/CompanyServiceImpl.java | 5 ++- .../web/rest/api/CompanyApi.java | 5 +-- .../rest/api/impl/CompanyApiController.java | 7 ++-- src/main/resources/message_en.properties | 2 ++ src/main/resources/message_it.properties | 1 + 8 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index dbf39e8f..d60b0da7 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -305,5 +305,6 @@ public class GepafinConstant { public static final String USER_ID = "userId"; public static final String LOGIN_ATTEMPT_ID = "loginAttemptId"; public static final String USER_ACTION_ID = "userActionId"; + public static final String ATLEAST_ONE_ID_REQUIRED="atleast.one.id.required"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java index f5006e2f..17920473 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java @@ -5,13 +5,14 @@ import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import java.util.function.Function; import net.gepafin.tendermanagement.entities.*; import net.gepafin.tendermanagement.enums.DocOtherSourceTypeEnum; +import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository; import net.gepafin.tendermanagement.repositories.UserWithCompanyRepository; +import net.gepafin.tendermanagement.service.ApplicationService; import net.gepafin.tendermanagement.service.CompanyService; import net.gepafin.tendermanagement.enums.VersionActionTypeEnum; import net.gepafin.tendermanagement.model.request.VersionHistoryRequest; @@ -82,6 +83,12 @@ public class DelegationDao { @Autowired private HttpServletRequest request; + @Autowired + private ApplicationService applicationService; + + @Autowired + private ApplicationEvaluationRepository applicationEvaluationRepository; + public ByteArrayOutputStream generateDocument(Map placeholders, String templateName) { try { String s3Folder = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.TEMPLATE, 0L, 0L,0L); @@ -257,10 +264,28 @@ public class DelegationDao { } } - public CompanyDelegationResponse getCompanyDelegation(UserEntity userEntity, Long companyId) { - UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(userEntity.getId(),companyId); + public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId, Long applicationId) { + if(companyId==null && applicationId==null){ + throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.ATLEAST_ONE_ID_REQUIRED)); + } + if(validator.checkIsPreInstructor()) { + ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElseThrow(()-> + throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_NOT_FOUND, companyId)); + + validator.validateUserWithCompany(); + } else { + validator.validateUserWithCompany(); + } + + Long userId=userEntity.getId(); + if(applicationId != null) { + ApplicationEntity application = applicationService.validateApplication(applicationId); + userId=application.getUserId(); + companyId=application.getCompanyId(); + } + UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(userId,companyId); UserCompanyDelegationEntity userCompanyDelegationEntity = userCompanyDelegationRepository - .findByUserIdAndUserWithCompanyIdAndStatus(userEntity.getId(), userWithCompanyEntity.getId(), + .findByUserIdAndUserWithCompanyIdAndStatus(userId, userWithCompanyEntity.getId(), UserCompanyDelegationStatusEnum.ACTIVE.getValue()); companyDao.getUserWithCompany(userEntity.getId(), companyId); if(userCompanyDelegationEntity == null) { diff --git a/src/main/java/net/gepafin/tendermanagement/service/CompanyService.java b/src/main/java/net/gepafin/tendermanagement/service/CompanyService.java index 2896419a..a1120587 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/CompanyService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/CompanyService.java @@ -38,7 +38,7 @@ public interface CompanyService { CompanyDelegationResponse uploadCompanyDelegation(HttpServletRequest request, Long companyId, MultipartFile file); - CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId); + CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId,Long applicationId); void deleteCompanyDelegation(HttpServletRequest request, Long companyId); UserWithCompanyEntity getUserWithCompanyEntity(Long userId,Long companyId); 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 3f5e326f..2bddb1cf 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java @@ -110,9 +110,8 @@ public class CompanyServiceImpl implements CompanyService { @Override @Transactional - public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId) { - UserEntity userEntity =validator.validateUser(request); - return delegationDao.getCompanyDelegation(userEntity, companyId); + public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId,Long applicationId) { + return delegationDao.getCompanyDelegation(request, companyId,applicationId); } @Override @Transactional(rollbackFor = Exception.class) 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 bc016334..baf1671e 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 @@ -128,9 +128,10 @@ public interface CompanyApi { @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) })) }) - @GetMapping(value = "{companyId}/delegation", produces = { "application/json" }) + @GetMapping(value = "delegation", produces = { "application/json" }) ResponseEntity> getCompanyDelegation(HttpServletRequest request, - @Parameter(description = "The company id", required = true) @PathVariable("companyId") Long companyId); + @Parameter(description = "The company ID") @RequestParam(value = "companyId", required = false) Long companyId, + @Parameter(description = "The application ID") @RequestParam(value = "applicationId", required = false) Long applicationId); @Operation(summary = "Api to delete company delegation", responses = { @ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { 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 ef73e985..127edbe1 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 @@ -8,6 +8,7 @@ import net.gepafin.tendermanagement.enums.UserActionContextEnum; import net.gepafin.tendermanagement.enums.UserActionLogsEnum; import net.gepafin.tendermanagement.model.request.UserActionRequest; import net.gepafin.tendermanagement.util.LoggingUtil; +import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -152,13 +153,13 @@ public class CompanyApiController implements CompanyApi{ @Override public ResponseEntity> getCompanyDelegation(HttpServletRequest request, - Long companyId) { + Long companyId,Long applicationId) { log.info("get company delegation with companyId: {}", companyId); /** This code is responsible for creating user action logs for the "Get company delegation" operation. **/ loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW).actionContext(UserActionContextEnum.GET_COMPANY_DELEGATION).build()); - - CompanyDelegationResponse companyDelegationResponse = companyService.getCompanyDelegation(request, companyId); + + CompanyDelegationResponse companyDelegationResponse = companyService.getCompanyDelegation(request, companyId,applicationId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(companyDelegationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.DELEGATION_FETCH_SUCCESS))); } diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index d6aa4578..68d7a49b 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -313,3 +313,5 @@ company.id.required.for.preferred.call=Company ID is required when requesting on response.days.not.null=Response days should not be null and greater than zero. application.cannot.approved.or.rejected=Application cannot be approved and rejected because amendment is active. + +atleast.one.id.required=At least one of companyId or applicationId must be provided \ No newline at end of file diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 051ed432..30ffc1ac 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -307,3 +307,4 @@ user.must.be.associated.with.company.to.create.application=Devi essere associato company.id.required.for.preferred.call=ID azienda obbligatorio quando si richiedono solo chiamate preferite. response.days.not.null=I giorni di risposta non devono essere nulli e maggiori di zero. application.cannot.approved.or.rejected=La domanda non può essere approvata o rifiutata perché l'emendamento è attivo. +atleast.one.id.required=Almeno uno tra companyId o applicationId deve essere fornito. \ No newline at end of file From f229cbc77d5061c96859b0e1e6c79b236d8acdd8 Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 5 Dec 2024 22:12:24 +0530 Subject: [PATCH 03/35] updated code for get company delegation --- .../tendermanagement/dao/ApplicationDao.java | 12 ++++- .../dao/ApplicationEvaluationDao.java | 7 +++ .../tendermanagement/dao/DelegationDao.java | 46 ++++++++++--------- .../service/ApplicationEvaluationService.java | 2 + .../ApplicationEvaluationServiceImpl.java | 5 ++ 5 files changed, 49 insertions(+), 23 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index e3726e41..1240aa90 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -14,6 +14,7 @@ import net.gepafin.tendermanagement.model.request.VersionHistoryRequest; import net.gepafin.tendermanagement.model.response.*; import net.gepafin.tendermanagement.repositories.*; import net.gepafin.tendermanagement.service.AmazonS3Service; +import net.gepafin.tendermanagement.service.ApplicationEvaluationService; import net.gepafin.tendermanagement.service.CallService; import net.gepafin.tendermanagement.service.CompanyService; import net.gepafin.tendermanagement.service.DocumentService; @@ -159,7 +160,7 @@ public class ApplicationDao { private HttpServletRequest request; @Autowired - private TokenProvider tokenProvider; + private ApplicationEvaluationService applicationEvaluationService; public ApplicationResponseBean createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long formId, Long applicationId) { FormEntity formEntity = formService.validateForm(formId); @@ -1110,7 +1111,14 @@ public class ApplicationDao { public ApplicationSignedDocumentResponse getSignedDocument(HttpServletRequest request, Long applicationId) { ApplicationEntity applicationEntity = validateApplication(applicationId); - validator.validateUserWithCompany(request, applicationEntity.getCompanyId()); +// validator.validateUserWithCompany(request, applicationEntity.getCompanyId()); + + if (validator.checkIsPreInstructor()) { + ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluationByApplicationId(applicationId); + validator.validatePreInstructor(request, applicationEvaluationEntity.getUserId()); + } else { + validator.validateUserId(request, applicationEntity.getUserId()); + } ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository .findByApplicationIdAndStatus(applicationId, ApplicationSignedDocumentStatusEnum.ACTIVE.getValue()); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 7c25401b..b8fc0b35 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -1396,5 +1396,12 @@ public class ApplicationEvaluationDao { } return null; } + + public ApplicationEvaluationEntity validateApplicationEvaluationByApplicationId(Long applicationId) { + return applicationEvaluationRepository + .findByApplicationIdAndIsDeletedFalse(applicationId) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_NOT_FOUND))); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java index 17920473..670f9444 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java @@ -34,6 +34,7 @@ import net.gepafin.tendermanagement.model.response.UserResponseBean; import net.gepafin.tendermanagement.repositories.DocumentRepository; import net.gepafin.tendermanagement.repositories.UserCompanyDelegationRepository; import net.gepafin.tendermanagement.service.AmazonS3Service; +import net.gepafin.tendermanagement.service.ApplicationEvaluationService; import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.util.Utils; @@ -87,7 +88,7 @@ public class DelegationDao { private ApplicationService applicationService; @Autowired - private ApplicationEvaluationRepository applicationEvaluationRepository; + private ApplicationEvaluationService applicationEvaluationService; public ByteArrayOutputStream generateDocument(Map placeholders, String templateName) { try { @@ -265,29 +266,11 @@ public class DelegationDao { } public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId, Long applicationId) { - if(companyId==null && applicationId==null){ - throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.ATLEAST_ONE_ID_REQUIRED)); - } - if(validator.checkIsPreInstructor()) { - ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElseThrow(()-> - throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_NOT_FOUND, companyId)); - - validator.validateUserWithCompany(); - } else { - validator.validateUserWithCompany(); - } - Long userId=userEntity.getId(); - if(applicationId != null) { - ApplicationEntity application = applicationService.validateApplication(applicationId); - userId=application.getUserId(); - companyId=application.getCompanyId(); - } - UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(userId,companyId); + UserWithCompanyEntity userWithCompanyEntity= validateUserAndGetUserWithCompany(request, companyId, applicationId); UserCompanyDelegationEntity userCompanyDelegationEntity = userCompanyDelegationRepository - .findByUserIdAndUserWithCompanyIdAndStatus(userId, userWithCompanyEntity.getId(), + .findByUserIdAndUserWithCompanyIdAndStatus(userWithCompanyEntity.getUserId(), userWithCompanyEntity.getId(), UserCompanyDelegationStatusEnum.ACTIVE.getValue()); - companyDao.getUserWithCompany(userEntity.getId(), companyId); if(userCompanyDelegationEntity == null) { throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.DELEGATION_NOT_FOUND)); @@ -295,6 +278,27 @@ public class DelegationDao { return convertUserCompanyDelegationToCompanyDelegationResponse(userCompanyDelegationEntity); } + private UserWithCompanyEntity validateUserAndGetUserWithCompany(HttpServletRequest request, Long companyId, + Long applicationId) { + Long userId = null; + if (companyId == null && applicationId == null) { + throw new CustomValidationException(Status.BAD_REQUEST, + Translator.toLocale(GepafinConstant.ATLEAST_ONE_ID_REQUIRED)); + } + if (applicationId != null) { + ApplicationEntity application = applicationService.validateApplication(applicationId); + userId = application.getUserId(); + companyId = application.getCompanyId(); + } + if (validator.checkIsPreInstructor()) { + ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluationByApplicationId(applicationId); + validator.validatePreInstructor(request, applicationEvaluationEntity.getUserId()); + } else if (validator.checkIsBeneficiary()) { + userId = validator.validateUser(request).getId(); + } + return companyService.getUserWithCompany(userId, companyId); + } + public void deleteCompanyDelegation(UserEntity userEntity, Long companyId) { UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(userEntity.getId(),companyId); UserCompanyDelegationEntity userCompanyDelegationEntity = userCompanyDelegationRepository diff --git a/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java b/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java index c9f72e6a..c7bde2db 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java @@ -16,4 +16,6 @@ public interface ApplicationEvaluationService { ApplicationEvaluationResponse getApplicationEvaluationByApplicationId(HttpServletRequest request,Long applicationId,Long assignedApplicationId); ApplicationEvaluationEntity validateApplicationEvaluation(Long applicationEvaluationId); + + ApplicationEvaluationEntity validateApplicationEvaluationByApplicationId(Long applicationId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java index 30cdaf80..0a6feb1f 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java @@ -93,4 +93,9 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe public ApplicationEvaluationEntity validateApplicationEvaluation(Long applicationEvaluationId) { return applicationEvaluationDao.validateApplicationEvaluation(applicationEvaluationId); } + + @Override + public ApplicationEvaluationEntity validateApplicationEvaluationByApplicationId(Long applicationId) { + return applicationEvaluationDao.validateApplicationEvaluationByApplicationId(applicationId); + } } From d8b5b318dd84e95fcb94e10ab6ad378361ac1290 Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 6 Dec 2024 12:49:07 +0530 Subject: [PATCH 04/35] Done ticket GEPAFINBE-122 --- .../dao/ApplicationEvaluationDao.java | 143 +++++++++++------- .../ApplicationEvaluationResponse.java | 2 + .../service/impl/AmazonS3ServiceImpl.java | 9 +- 3 files changed, 99 insertions(+), 55 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index b8fc0b35..43440acb 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -12,10 +12,7 @@ import net.gepafin.tendermanagement.enums.*; import net.gepafin.tendermanagement.model.request.*; import net.gepafin.tendermanagement.model.response.*; import net.gepafin.tendermanagement.repositories.*; -import net.gepafin.tendermanagement.service.ApplicationService; -import net.gepafin.tendermanagement.service.AssignedApplicationsService; -import net.gepafin.tendermanagement.service.CallService; -import net.gepafin.tendermanagement.service.UserService; +import net.gepafin.tendermanagement.service.*; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.util.LoggingUtil; import net.gepafin.tendermanagement.util.Utils; @@ -93,6 +90,9 @@ public class ApplicationEvaluationDao { @Autowired private HttpServletRequest request; + @Autowired + private CompanyService companyService; + private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) { ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity(); @@ -156,28 +156,32 @@ public class ApplicationEvaluationDao { private void setCriteriaResponses(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response, List evaluationCriterias) { List criteriaResponsesFromEntity = entity.getCriteria() != null ? - Utils.convertJsonToList(entity.getCriteria(), new TypeReference>() { - }) : + Utils.convertJsonToList(entity.getCriteria(), new TypeReference>() {}) : new ArrayList<>(); - List criteriaResponsesFromDB = getCriteriaResponse(entity.getApplicationId()); addMissingCriteriaResponses(criteriaResponsesFromEntity, criteriaResponsesFromDB, entity.getApplicationId()); - criteriaResponsesFromEntity.forEach(criteriaResponse -> { - EvaluationCriteriaEntity matchingEvaluationCriteria = evaluationCriterias.stream() - .filter(evaluationCriteria -> evaluationCriteria.getId().equals(criteriaResponse.getId())).findFirst().orElse(null); - if (matchingEvaluationCriteria != null) { - criteriaResponse.setLabel(matchingEvaluationCriteria.getLookupData().getValue()); - criteriaResponse.setMaxScore(matchingEvaluationCriteria.getScore()); - - List mappedFields = getMappedFieldsForCriteria(matchingEvaluationCriteria.getId(), entity.getApplicationId()); - criteriaResponse.setCriteriaMappedFields(mappedFields); - } - }); + criteriaResponsesFromEntity = criteriaResponsesFromEntity.stream() + .filter(criteriaResponse -> { + EvaluationCriteriaEntity matchingEvaluationCriteria = evaluationCriterias.stream() + .filter(evaluationCriteria -> evaluationCriteria.getId().equals(criteriaResponse.getId())) // Find matching criteria by ID + .findFirst() + .orElse(null); + if (matchingEvaluationCriteria != null) { + criteriaResponse.setLabel(matchingEvaluationCriteria.getLookupData().getValue()); + criteriaResponse.setMaxScore(matchingEvaluationCriteria.getScore()); + List mappedFields = getMappedFieldsForCriteria(matchingEvaluationCriteria.getId(), entity.getApplicationId()); + criteriaResponse.setCriteriaMappedFields(mappedFields); + return true; + } + return false; + }) + .collect(Collectors.toList()); response.setCriteria(criteriaResponsesFromEntity); } + private void addMissingCriteriaResponses(List criteriaResponsesFromEntity, List criteriaResponsesFromDB, Long applicationId) { Set existingCriteriaIds = criteriaResponsesFromEntity.stream().map(CriteriaResponse::getId).collect(Collectors.toSet()); @@ -299,27 +303,30 @@ public class ApplicationEvaluationDao { private void setChecklistResponses(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response, List checklistEntities) { - List checklistResponsesFromEntity = entity.getChecklist() != null ? - Utils.convertJsonToList(entity.getChecklist(), new TypeReference>() { - }) : + Utils.convertJsonToList(entity.getChecklist(), new TypeReference>() {}) : new ArrayList<>(); - List checklistResponsesFromDB = getChecklistResponse(entity.getApplicationId()); addMissingChecklistResponses(checklistResponsesFromEntity, checklistResponsesFromDB); - checklistResponsesFromEntity.forEach(checklistResponse -> { - CallTargetAudienceChecklistEntity matchingChecklist = checklistEntities.stream().filter(checklistEntity -> checklistEntity.getId().equals(checklistResponse.getId())) - .findFirst().orElse(null); - - if (matchingChecklist != null) { - checklistResponse.setLabel(matchingChecklist.getLookupData().getValue()); - } - }); + checklistResponsesFromEntity = checklistResponsesFromEntity.stream() + .filter(checklistResponse -> { + CallTargetAudienceChecklistEntity matchingChecklist = checklistEntities.stream() + .filter(checklistEntity -> checklistEntity.getId().equals(checklistResponse.getId())) // Find matching checklist by ID + .findFirst() + .orElse(null); + if (matchingChecklist != null) { + checklistResponse.setLabel(matchingChecklist.getLookupData().getValue()); + return true; + } + return false; + }) + .collect(Collectors.toList()); response.setChecklist(checklistResponsesFromEntity); } + private void addMissingChecklistResponses(List checklistResponsesFromEntity, List checklistResponsesFromDB) { Set existingChecklistIds = checklistResponsesFromEntity.stream().map(ChecklistResponse::getId).collect(Collectors.toSet()); @@ -333,26 +340,31 @@ public class ApplicationEvaluationDao { private void setFieldResponses(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response, List applicationFormEntities) { - List fieldResponsesFromEntity = entity.getFile() != null ? Utils.convertJsonToList(entity.getFile(), new TypeReference>() { - }) : new ArrayList<>(); + List fieldResponsesFromEntity = entity.getFile() != null ? Utils.convertJsonToList(entity.getFile(), new TypeReference>() {}) : new ArrayList<>(); List fieldResponsesFromDB = getFieldResponses(entity.getApplicationId()); addMissingFieldResponses(fieldResponsesFromEntity, fieldResponsesFromDB); Set processedFieldIds = new HashSet<>(); + List validFieldResponses = new ArrayList<>(); fieldResponsesFromEntity.forEach(fieldResponse -> { if (processedFieldIds.contains(fieldResponse.getId())) { return; } + final Boolean[] allDocumentsDeleted = {true}; + List documentResponseBeans = new ArrayList<>(); + applicationFormEntities.forEach(applicationForm -> { FormEntity formEntity = applicationForm.getForm(); if (formEntity != null) { -// List contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class); + // Convert the form to a list of content response beans List contentResponseBeans = formDao.convertFormEntityToFormResponseBean(formEntity).getContent(); contentResponseBeans.forEach(contentResponseBean -> { + // Check if this is a file upload field that matches the current field response if ("fileupload".equals(contentResponseBean.getName()) && contentResponseBean.getId().equals(fieldResponse.getId())) { String label = null; + // Set the label if available if (contentResponseBean.getSettings() != null) { for (SettingResponseBean setting : contentResponseBean.getSettings()) { if ("label".equals(setting.getName())) { @@ -371,36 +383,43 @@ public class ApplicationEvaluationDao { ApplicationFormFieldEntity formField = optionalFormField.get(); if (formField.getFieldValue() != null) { String[] documentIds = formField.getFieldValue().split(","); - List documentResponseBeans = new ArrayList<>(); for (String docId : documentIds) { - if (Boolean.FALSE.equals(docId.isEmpty())){ + if (!docId.trim().isEmpty()) { Long documentId = Long.valueOf(docId.trim()); + documentRepository.findByIdAndNotDeleted(documentId).ifPresent(documentEntity -> { - DocumentResponseBean responseBean = new DocumentResponseBean(); - responseBean.setId(documentEntity.getId()); - responseBean.setName(documentEntity.getFileName()); - responseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType())); - responseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource())); - responseBean.setSourceId(documentEntity.getSourceId()); - responseBean.setFilePath(documentEntity.getFilePath()); - responseBean.setCreatedDate(documentEntity.getCreatedDate()); - responseBean.setUpdatedDate(documentEntity.getUpdatedDate()); - documentResponseBeans.add(responseBean); + if (documentEntity != null && !documentEntity.getIsDeleted()) { + DocumentResponseBean responseBean = new DocumentResponseBean(); + responseBean.setId(documentEntity.getId()); + responseBean.setName(documentEntity.getFileName()); + responseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType())); + responseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource())); + responseBean.setSourceId(documentEntity.getSourceId()); + responseBean.setFilePath(documentEntity.getFilePath()); + responseBean.setCreatedDate(documentEntity.getCreatedDate()); + responseBean.setUpdatedDate(documentEntity.getUpdatedDate()); + documentResponseBeans.add(responseBean); + allDocumentsDeleted[0] = false; + } }); } } - - fieldResponse.setFileDetail(documentResponseBeans); } } - processedFieldIds.add(fieldResponse.getId()); } }); } }); + + if (Boolean.FALSE.equals(allDocumentsDeleted[0]) && Boolean.FALSE.equals(documentResponseBeans.isEmpty())) { + fieldResponse.setFileDetail(documentResponseBeans); + validFieldResponses.add(fieldResponse); + } + + processedFieldIds.add(fieldResponse.getId()); }); - response.setFiles(fieldResponsesFromEntity); + response.setFiles(validFieldResponses); } private void addMissingFieldResponses(List fieldResponsesFromEntity, List fieldResponsesFromDB) { @@ -417,6 +436,9 @@ public class ApplicationEvaluationDao { private void setApplicationDetails(ApplicationEvaluationResponse response, ApplicationEvaluationEntity entity) { ApplicationEntity application = applicationService.validateApplication(entity.getApplicationId() != null ? entity.getApplicationId() : null); + AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository + .findByApplicationIdAndIsDeletedFalse(entity.getApplicationId()).orElse(null); + UserEntity user = userService.validateUser(application.getUserId()); CallEntity call = callRepository.findCallEntityByApplicationId(entity.getApplicationId()); @@ -426,12 +448,21 @@ public class ApplicationEvaluationDao { String beneficiary = String.join(" ", firstName, lastName).trim(); response.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(application.getStatus())); response.setBeneficiary(beneficiary); + response.setSubmissionDate(application.getSubmissionDate()); response.setMinScore(call.getThreshold() != null ? call.getThreshold() : null); response.setCallName(application.getCall().getName() != null ? application.getCall().getName() : null); response.setProtocolNumber((application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null) ? application.getProtocol().getProtocolNumber() : null); - response.setSubmissionDate(application.getSubmissionDate() != null ? application.getSubmissionDate() : null); + if (assignedApplications != null) { + response.setAssignedAt(assignedApplications.getAssignedAt()); + } + response.setEvaluationEndDate(entity.getEndDate()); + LocalDateTime callEndDate = application.getCall().getEndDate(); response.setCallEndDate(callEndDate); + if (application.getCompanyId() != null) { + CompanyEntity company = companyService.validateCompany(application.getCompanyId()); + response.setCompanyName(company.getCompanyName()); + } } @@ -961,16 +992,24 @@ public class ApplicationEvaluationDao { private void setApplicationDetails(ApplicationEvaluationResponse response, Long applicationId, UserEntity user) { ApplicationEntity application = applicationService.validateApplication(applicationId); + AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository + .findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null); userService.validateUser(application.getUserId()); String firstName = user.getFirstName() != null ? user.getFirstName() : ""; String lastName = user.getLastName() != null ? user.getLastName() : ""; String beneficiary = String.join(" ", firstName, lastName).trim(); response.setBeneficiary(beneficiary); - + response.setSubmissionDate(application.getSubmissionDate()); response.setCallName(application.getCall().getName() != null ? application.getCall().getName() : null); response.setProtocolNumber((application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null) ? application.getProtocol().getProtocolNumber() : null); - response.setSubmissionDate(application.getSubmissionDate() != null ? application.getSubmissionDate() : null); + if (assignedApplications != null) { + response.setAssignedAt(assignedApplications.getAssignedAt()); + } + if (application.getCompanyId() != null) { + CompanyEntity company = companyService.validateCompany(application.getCompanyId()); + response.setCompanyName(company.getCompanyName()); + } } private Optional findFormFieldValue(Long applicationId, String formFieldId) { diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java index 8d144e50..3e5c3834 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java @@ -30,4 +30,6 @@ public class ApplicationEvaluationResponse { private LocalDateTime submissionDate; private LocalDateTime evaluationEndDate; private LocalDateTime callEndDate; + private String companyName; + private LocalDateTime assignedAt; } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java index 3ff04c70..3af50f6c 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java @@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.io.InputStream; +import java.net.URL; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -87,9 +88,11 @@ public class AmazonS3ServiceImpl implements AmazonS3Service { if(Boolean.FALSE.equals(isTestProfileActivated())) { amazonS3.putObject(bucketName, path, inputStream, objectMetadata); } - path =s3Url + s3Folder +"/"+ fileName; - log.info("File '{}' uploaded successfully to Amazon S3 with URL: {}", fileName, path); - return path; + //getting actual encoded s3 file path + URL amazonS3Url = amazonS3.getUrl(bucketName, path); + String fileUrl = amazonS3Url.toString(); + log.info("File '{}' uploaded successfully to Amazon S3 with URL: {}", fileName, fileUrl); + return fileUrl; } @Override From 88eaa8f9b185a4bc7a7bb9127f378b1c854aa7bc Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 6 Dec 2024 15:35:47 +0530 Subject: [PATCH 05/35] Updated code --- .../tendermanagement/dao/ApplicationEvaluationDao.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 43440acb..72ba3ad2 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -443,8 +443,8 @@ public class ApplicationEvaluationDao { CallEntity call = callRepository.findCallEntityByApplicationId(entity.getApplicationId()); - String firstName = user.getFirstName() != null ? user.getFirstName() : ""; - String lastName = user.getLastName() != null ? user.getLastName() : ""; + String firstName = user.getBeneficiary().getFirstName() != null ? user.getBeneficiary().getFirstName() : ""; + String lastName = user.getBeneficiary().getLastName() != null ? user.getBeneficiary().getLastName() : ""; String beneficiary = String.join(" ", firstName, lastName).trim(); response.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(application.getStatus())); response.setBeneficiary(beneficiary); @@ -995,8 +995,9 @@ public class ApplicationEvaluationDao { AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository .findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null); userService.validateUser(application.getUserId()); - String firstName = user.getFirstName() != null ? user.getFirstName() : ""; - String lastName = user.getLastName() != null ? user.getLastName() : ""; + + String firstName = user.getBeneficiary().getFirstName() != null ? user.getBeneficiary().getFirstName() : ""; + String lastName = user.getBeneficiary().getLastName() != null ? user.getBeneficiary().getLastName() : ""; String beneficiary = String.join(" ", firstName, lastName).trim(); response.setBeneficiary(beneficiary); From 88aed061cc1e0e6c4e180d27b053d86b59cf8c82 Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 6 Dec 2024 22:17:02 +0530 Subject: [PATCH 06/35] Fixed s3 download issue --- .../service/impl/AmazonS3ServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java index 3af50f6c..8221117a 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java @@ -30,6 +30,8 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -118,12 +120,15 @@ public class AmazonS3ServiceImpl implements AmazonS3Service { public InputStream getFile(String s3Folder, String filePath) { try { String fileName = Utils.extractFileName(filePath); - String path = s3Folder + "/" + fileName; + // Decode the file name to handle special characters like '+' correctly + String decodedFileName = URLDecoder.decode(fileName, StandardCharsets.UTF_8.toString()); + + String path = s3Folder + "/" + decodedFileName; GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, path); S3Object s3Object = amazonS3.getObject(getObjectRequest); log.info("File fetched successfully from Amazon S3: {}", fileName); return s3Object.getObjectContent(); - } catch (AmazonS3Exception e) { + } catch (Exception e) { log.error("Error occurred while getting file from Amazon S3: {}", e); throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.GET_ERROR_S3)); From 3937fb76f1b044e89a80c724c0ba1be406fd5f6f Mon Sep 17 00:00:00 2001 From: nisha Date: Thu, 12 Dec 2024 11:42:51 +0530 Subject: [PATCH 07/35] Code for amendment module --- .../constants/GepafinConstant.java | 1 + .../dao/ApplicationAmendmentRequestDao.java | 73 +++++++++++++++++-- .../tendermanagement/dao/ApplicationDao.java | 2 +- .../dao/ApplicationEvaluationDao.java | 2 +- .../tendermanagement/dao/ProtocolDao.java | 8 +- .../ApplicationAmendmentRequestEntity.java | 3 + .../entities/ProtocolEntity.java | 3 + .../enums/ProtocolTypeEnum.java | 24 ++++++ .../model/request/AmendmentFieldRequest.java | 13 ++++ .../request/ApplicationAmendmentRequest.java | 1 + .../ApplicationAmendmentRequestBean.java | 1 + .../response/AmendmentDocumentResponse.java | 12 +++ .../ApplicationAmendmentRequestResponse.java | 1 + .../db/changelog/db.changelog-1.0.0.xml | 9 ++- src/main/resources/message_en.properties | 1 + src/main/resources/message_it.properties | 1 + 16 files changed, 145 insertions(+), 10 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/enums/ProtocolTypeEnum.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 14d82b91..42a9cd41 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -341,5 +341,6 @@ public class GepafinConstant { public static final String POLLING_THREAD_NAME = "Ndg-Polling-Thread-"; public static final String DOCUMENT_UPLOADING_IN_PROGRESS = "document.uploading.is.in.progress"; public static final String ASYNC_DOCUMENT_UPLOAD_NAME = "AsyncDocumentUpload-"; + public static final String All_DOCUMENT_CHECKED_AND_ONE_CHECKLIST_CHECKED="all.document.checked.and.one.checklist.checked"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 41d43b1e..72f540f7 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -105,12 +105,33 @@ public class ApplicationAmendmentRequestDao { @Autowired private AssignedApplicationsDao assignedApplicationsDao; + @Autowired + private ApplicationEvaluationDao applicationEvaluationDao; + public ApplicationAmendmentRequestResponse getApplicationDataForAmendment(Long applicationEvaluationId) { log.info("Fetching the application data for the Amendment process {}", applicationEvaluationId); ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId); Long applicationId = applicationEvaluationEntity.getApplicationId(); - ApplicationEntity application = applicationService.validateApplication(applicationId); + List evaluationFileRequests=new ArrayList<>(); + List checklistRequests=new ArrayList<>(); + ApplicationEntity application = applicationService.validateApplication(applicationId); + String file=applicationEvaluationEntity.getFile(); + String checkList=applicationEvaluationEntity.getChecklist(); + if(file != null){ + evaluationFileRequests=Utils.convertJsonStringToList(file,FieldRequest.class); + } + Boolean allValid = evaluationFileRequests.stream() + .anyMatch(fieldRequest -> fieldRequest.getValid() == null); + if(checkList != null) { + checklistRequests=Utils.convertJsonStringToList(checkList,ChecklistRequest.class); + } + boolean resultCheckList = checklistRequests.stream() + .anyMatch(checklistRequest -> Boolean.TRUE.equals(checklistRequest.getValid())) ? false : true; + + if(Boolean.TRUE.equals(allValid) || Boolean.TRUE.equals(resultCheckList)){ + throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.All_DOCUMENT_CHECKED_AND_ONE_CHECKLIST_CHECKED)); + } // Set common application-level details String callName = application.getCall().getName(); Long protocolNumber = (application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null) @@ -135,11 +156,18 @@ public class ApplicationAmendmentRequestDao { List forms = applicationFormRepository.findByApplicationId(applicationId); List allFormFields = new ArrayList<>(); - + Map fieldRequestMap = evaluationFileRequests.stream() + .collect(Collectors.toMap(FieldRequest::getId, fieldRequest -> fieldRequest)); for (ApplicationFormEntity form : forms) { String content = form.getForm().getContent(); List> result = filterByName(content, "fileupload"); - allFormFields.addAll(getIdAndLabelFromResult(result)); + List amendmentFormFieldResponses= getIdAndLabelFromResult(result); + amendmentFormFieldResponses.removeIf(amendmentFormFieldResponse -> { + FieldRequest matchingRequest = fieldRequestMap.get(amendmentFormFieldResponse.getFieldId()); + // Remove if no matching FieldRequest exists or if valid is true + return matchingRequest == null || Boolean.TRUE.equals(matchingRequest.getValid()); + }); + allFormFields.addAll(amendmentFormFieldResponses); } response.setFormFields(allFormFields); @@ -243,6 +271,9 @@ public class ApplicationAmendmentRequestDao { String formFieldsJson = Utils.convertObjectToJson(formFieldRequestBean); applicationAmendmentRequestEntity.setFormFields(formFieldsJson); } + if(Boolean.FALSE.equals(applicationAmendmentRequest.getAmendmentDocument().isEmpty())) { + setAmendmentDocuments(applicationAmendmentRequest.getAmendmentDocument(), applicationAmendmentRequestEntity); + } List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(applicationEvaluationEntity.getId()); // Ensure startDate and initialDays are not null to avoid NullPointerException if (amendmentRequest !=null && amendmentRequest.isEmpty() && applicationEvaluationEntity.getStartDate() != null && applicationEvaluationEntity.getInitialDays() != null ) { @@ -261,7 +292,7 @@ public class ApplicationAmendmentRequestDao { Long protocolNumber = protocolDao.getProtocolNumber(userEntity.getHub()); ProtocolEntity protocolEntity = protocolDao.createProtocolEntity( applicationEvaluationEntity.getAssignedApplicationsEntity().getApplication(), protocolNumber, - userEntity.getHub().getId()); + userEntity.getHub().getId(),false); applicationAmendmentRequestEntity.setProtocol(protocolEntity); ApplicationAmendmentRequestEntity applicationAmendment = saveApplicationAmendmentRequestEntity(applicationAmendmentRequestEntity, null, VersionActionTypeEnum.INSERT); String evaluationStatusType = applicationEvaluationEntity.getStatus(); @@ -302,6 +333,16 @@ public class ApplicationAmendmentRequestDao { return applicationAmendment; } + private void setAmendmentDocuments(List amendmentFieldRequest, ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity) { + amendmentFieldRequest.stream().forEach(amendmentData->{ + String fieldValue=amendmentData.getFileValue(); + if(fieldValue!=null){ + documentService.validateDocument(Long.valueOf(fieldValue)); + } + }); + applicationAmendmentRequestEntity.setAmendmentDocument(Utils.convertListToJsonString(amendmentFieldRequest)); + } + public ApplicationAmendmentRequestEntity saveApplicationAmendmentRequestEntity(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity,ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity,VersionActionTypeEnum actionTypeEnum) { ApplicationAmendmentRequestEntity applicationAmendmentRequest = applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); @@ -320,12 +361,31 @@ public class ApplicationAmendmentRequestDao { List amendmentFormFields = Utils.convertJsonStringToList( applicationAmendmentRequestEntity.getFormFields(), AmendmentFormField.class); Map formFieldEntityMap = getApplicationFormFieldEntityMap(applicationAmendmentRequestEntity, amendmentFormFields); - + List amendmentFieldRequests = Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(),AmendmentFieldRequest.class); + if (amendmentFieldRequests != null) { + List amendmentDocumentResponses = amendmentFieldRequests.stream() + .map(this::createAmendmentDocumentResponse) + .toList(); + response.setAmendmentDocuments(amendmentDocumentResponses); + } processFormFields(amendmentFormFields, fieldIdToLabelMap, formFieldEntityMap, response); return response; } + private AmendmentDocumentResponse createAmendmentDocumentResponse(AmendmentFieldRequest amendmentFieldRequest) { + AmendmentDocumentResponse amendmentDocumentResponse = new AmendmentDocumentResponse(); + amendmentDocumentResponse.setFieldId(amendmentFieldRequest.getFieldId()); + amendmentDocumentResponse.setNameValue(amendmentFieldRequest.getNameValue()); + amendmentDocumentResponse.setIsValid(amendmentFieldRequest.getIsValid()); + + DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue())); + DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity); + amendmentDocumentResponse.setFileValue(responseBean); + + return amendmentDocumentResponse; + } + private ApplicationAmendmentRequestResponse initializeBasicResponse(ApplicationAmendmentRequestEntity entity) { ApplicationAmendmentRequestResponse response = new ApplicationAmendmentRequestResponse(); response.setId(entity.getId()); @@ -519,6 +579,7 @@ public class ApplicationAmendmentRequestDao { } existingApplicationAmendment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); + setAmendmentDocuments(updateRequest.getAmendmentDocuments(),existingApplicationAmendment); ApplicationAmendmentRequestEntity updatedApplicationAmendment = saveApplicationAmendmentRequestEntity(existingApplicationAmendment,oldApplicationAmendmentEntity,VersionActionTypeEnum.UPDATE); ApplicationAmendmentRequestResponse response = convertEntityToResponse(updatedApplicationAmendment); log.info("Application Amendment updated successfully: {}", response); @@ -585,7 +646,7 @@ public class ApplicationAmendmentRequestDao { String fieldId) { AmendmentFormField amendmentFormField = amendmentFormFieldMap.get(fieldId); if (amendmentFormField == null) { - throw new CustomValidationException(Status.BAD_REQUEST, GepafinConstant.APPLICATION_FORM_FIELD_NOT_FOUND); + throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_FORM_FIELD_NOT_FOUND)); } return amendmentFormField; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index dbccf3b3..203b4f3c 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -813,7 +813,7 @@ public class ApplicationDao { if (status.equals(ApplicationStatusTypeEnum.SUBMIT) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.READY.getValue()))) { callService.validatePublishedCall(applicationEntity.getCall().getId(), userEntity.getHub().getId()); Long protocolNumber = protocolDao.getProtocolNumber(userEntity.getHub()); - ProtocolEntity protocolEntity = protocolDao.createProtocolEntity(applicationEntity, protocolNumber, userEntity.getHub().getId()); + ProtocolEntity protocolEntity = protocolDao.createProtocolEntity(applicationEntity, protocolNumber, userEntity.getHub().getId(),true); applicationEntity.setProtocol(protocolEntity); applicationEntity.setStatus(ApplicationStatusTypeEnum.SUBMIT.getValue()); applicationEntity.setSubmissionDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 924999f2..11562a11 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -894,7 +894,7 @@ public class ApplicationEvaluationDao { } - private DocumentResponseBean createDocumentResponseBean(DocumentEntity documentEntity) { + public DocumentResponseBean createDocumentResponseBean(DocumentEntity documentEntity) { DocumentResponseBean responseBean = new DocumentResponseBean(); responseBean.setId(documentEntity.getId()); responseBean.setName(documentEntity.getFileName()); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ProtocolDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ProtocolDao.java index a7606c9a..4601ef8c 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ProtocolDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ProtocolDao.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import java.time.LocalTime; import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.enums.ProtocolTypeEnum; import net.gepafin.tendermanagement.enums.VersionActionTypeEnum; import net.gepafin.tendermanagement.model.request.VersionHistoryRequest; import net.gepafin.tendermanagement.util.LoggingUtil; @@ -42,7 +43,7 @@ public class ProtocolDao { return (maxProtocolNumber != null) ? maxProtocolNumber + 1 : startNumber; } - public ProtocolEntity createProtocolEntity(ApplicationEntity applicationEntity,Long protocolNumber, Long hubId){ + public ProtocolEntity createProtocolEntity(ApplicationEntity applicationEntity,Long protocolNumber, Long hubId,Boolean isForApplication){ ProtocolEntity protocolEntity=new ProtocolEntity(); protocolEntity.setCall(applicationEntity.getCall().getId()); LocalDateTime utcDateTime = DateTimeUtil.DateServerToUTC(LocalDateTime.now()); @@ -51,6 +52,11 @@ public class ProtocolDao { protocolEntity.setTime(LocalTime.now()); protocolEntity.setApplicationId(applicationEntity.getId()); protocolEntity.setHubId(hubId); + if(Boolean.TRUE.equals(isForApplication)){ + protocolEntity.setType(ProtocolTypeEnum.INPUT.getValue()); + }else { + protocolEntity.setType(ProtocolTypeEnum.OUTPUT.getValue()); + } protocolRepository.save(protocolEntity); /** This code is responsible for adding a version history log for "create protocol" operation. **/ diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java index 4b3fe79c..8a8701a1 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java @@ -50,4 +50,7 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity { @Column(name = "end_date") private LocalDateTime endDate; + @Column(name = "amendment_document") + private String amendmentDocument; + } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java index ad57c1ee..47dc5065 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java @@ -28,4 +28,7 @@ public class ProtocolEntity extends BaseEntity { @Column(name="HUB_ID") private Long hubId; + @Column(name = "type") + private String type; + } diff --git a/src/main/java/net/gepafin/tendermanagement/enums/ProtocolTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/ProtocolTypeEnum.java new file mode 100644 index 00000000..f890fb42 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/enums/ProtocolTypeEnum.java @@ -0,0 +1,24 @@ +package net.gepafin.tendermanagement.enums; + +import com.fasterxml.jackson.annotation.JsonValue; + +public enum ProtocolTypeEnum { + INPUT("INPUT"), + OUTPUT("OUTPUT"); + + private String value; + + ProtocolTypeEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java new file mode 100644 index 00000000..99de2df0 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java @@ -0,0 +1,13 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class AmendmentFieldRequest { + + private String fieldId; + private String nameValue; + private String fileValue; + private Boolean isValid = false; + +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequest.java index ade4c676..97e74446 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequest.java @@ -11,4 +11,5 @@ public class ApplicationAmendmentRequest { private Long responseDays; private Boolean isSendNotification; private Boolean isSendEmail; + private List amendmentDocument; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java index 94141ef0..6973254d 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java @@ -8,4 +8,5 @@ import lombok.Data; public class ApplicationAmendmentRequestBean { private String note; private List applicationFormFields; + private List amendmentDocuments; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java new file mode 100644 index 00000000..7fb1b220 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java @@ -0,0 +1,12 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; + +@Data +public class AmendmentDocumentResponse { + + private String fieldId; + private String nameValue; + private DocumentResponseBean fileValue; + private Boolean isValid = false; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java index 5523098e..0f77f602 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java @@ -21,6 +21,7 @@ public class ApplicationAmendmentRequestResponse { private String beneficiaryName; private List formFields; private List applicationFormFields; + private List amendmentDocuments; private Long applicationId; private Long applicationEvaluationId; private LocalDateTime evaluationEndDate; diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index eb77049e..607b22b3 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -1991,5 +1991,12 @@ - + + + + + + + + diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index 24150081..974162f9 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -335,3 +335,4 @@ upload.document.is.only.for.gepafin = Document cant be uploaded, this is only av appointment.created.successfully = Appointment created successfully. error.try.again = Service call error while performing the operation. Please try again. document.uploading.is.in.progress = Document uploading is in progress. +all.document.checked.and.one.checklist.checked=All document should be checked and at least one checklist should be checked. \ No newline at end of file diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 084fe6aa..97390d1d 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -325,3 +325,4 @@ upload.document.is.only.for.gepafin = Il documento non pu? essere caricato, ques appointment.created.successfully = Appuntamento creato con successo. error.try.again = Errore di chiamata di servizio durante l'esecuzione dell'operazione. Riprovare. document.uploading.is.in.progress = Il documento è in fase di caricamento. +all.document.checked.and.one.checklist.checked=Tutti i documenti devono essere controllati e almeno una checklist deve essere controllata. \ No newline at end of file From e97b12e1f703157506c9bfc5cbae10d087e8c1aa Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 12 Dec 2024 14:47:30 +0530 Subject: [PATCH 08/35] Done changes related to evaluation document --- .../tendermanagement/dao/ApplicationDao.java | 6 +- .../dao/ApplicationEvaluationDao.java | 145 +++++++++++++++--- .../gepafin/tendermanagement/dao/CallDao.java | 2 +- .../tendermanagement/dao/DelegationDao.java | 2 +- .../tendermanagement/dao/DocumentDao.java | 45 ++++-- .../tendermanagement/dao/S3PathConfig.java | 4 +- .../entities/ApplicationEvaluationEntity.java | 4 + .../entities/DocumentEntity.java | 3 + .../enums/DocOtherSourceTypeEnum.java | 1 + .../enums/DocumentSourceTypeEnum.java | 2 +- .../enums/UserActionContextEnum.java | 1 + .../request/EvaluationDocumentRequest.java | 15 ++ .../ApplicationEvaluationResponse.java | 1 + .../response/EvaluationDocumentResponse.java | 12 ++ ...ApplicationAmendmentRequestRepository.java | 2 +- .../ApplicationEvaluationRepository.java | 7 + .../repositories/ApplicationRepository.java | 2 +- .../service/ApplicationEvaluationService.java | 6 +- .../service/DocumentService.java | 2 +- .../ApplicationEvaluationServiceImpl.java | 44 ++---- .../service/impl/DocumentServiceImpl.java | 11 +- .../impl/S3ReUploadMigrationService.java | 22 ++- .../UserSignedAndDelegationServiceImpl.java | 2 +- .../tendermanagement/util/Validator.java | 2 +- .../rest/api/ApplicationEvaluationApi.java | 20 ++- .../ApplicationEvaluationApiController.java | 15 +- .../rest/api/impl/DocumentApiController.java | 2 +- .../db/changelog/db.changelog-1.0.0.xml | 28 ++++ 28 files changed, 316 insertions(+), 92 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/EvaluationDocumentRequest.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index dbccf3b3..a1af4ab8 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -1080,7 +1080,7 @@ public class ApplicationDao { } private String generateS3PathForDelegation(Long callId, Long applicationId) { try { - return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, callId, applicationId,0L); + return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, callId, applicationId,0L,0L); } catch (IllegalArgumentException e) { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.S3_PATH_GENERATION_ERROR_MSG)); } @@ -1244,7 +1244,7 @@ public class ApplicationDao { try (ByteArrayOutputStream zipOutputStream = new ByteArrayOutputStream(); ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) { - String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.APPLICATION, applicationEntity.getCall().getId(), applicationId,0L); + String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.APPLICATION, applicationEntity.getCall().getId(), applicationId,0L,0L); for (DocumentEntity document : documents) { String fileName = Utils.extractFileName(document.getFilePath()); @@ -1252,7 +1252,7 @@ public class ApplicationDao { } if (signedDocument != null) { - String signedDocS3Folder = s3PathConfig.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, applicationEntity.getCall().getId(), applicationId,0L); + String signedDocS3Folder = s3PathConfig.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, applicationEntity.getCall().getId(), applicationId,0L,0L); String signedDocFileName = signedDocument.getFileName(); addDocumentToZip(zos, signedDocS3Folder, signedDocument.getFilePath(), signedDocFileName); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index a14e7f62..31dad3f2 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -1,8 +1,8 @@ package net.gepafin.tendermanagement.dao; +import com.amazonaws.services.dynamodbv2.xspec.L; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.config.Translator; @@ -16,6 +16,7 @@ import net.gepafin.tendermanagement.service.*; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.util.LoggingUtil; import net.gepafin.tendermanagement.util.Utils; +import net.gepafin.tendermanagement.util.Validator; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; @@ -27,7 +28,6 @@ import java.util.*; import java.util.stream.Collectors; import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; -import static org.apache.commons.lang3.StringUtils.isNumeric; @Component public class ApplicationEvaluationDao { @@ -93,6 +93,12 @@ public class ApplicationEvaluationDao { @Autowired private CompanyService companyService; + @Autowired + private Validator validator; + + @Autowired + private DocumentService documentService; + private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) { ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity(); @@ -132,11 +138,42 @@ public class ApplicationEvaluationDao { setCriteriaResponses(entity, response, evaluationCriterias); setChecklistResponses(entity, response, checklistEntities); setFieldResponses(entity, response, applicationFormEntities); - + List allDocs = prepareEvaluationDocumentBeanList(entity); + setEvaluationDocResponse(response, allDocs); setApplicationDetails(response, entity); return response; } + private void setEvaluationDocResponse(ApplicationEvaluationResponse response, List docRequest) { + List evaluationDocResponses = new ArrayList<>(); + + for (EvaluationDocumentRequest doc : docRequest) { + EvaluationDocumentResponse evaluationDocResponse = new EvaluationDocumentResponse(); + if (doc.getFileValue() != null) { + Long fileId = Long.valueOf(doc.getFileValue().toString()); + documentRepository.findByIdAndNotDeleted(fileId).ifPresent(documentEntity -> { + DocumentResponseBean documentResponseBean = new DocumentResponseBean(); + documentResponseBean.setId(documentEntity.getId()); + documentResponseBean.setName(documentEntity.getFileName()); + documentResponseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType())); + documentResponseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource())); + documentResponseBean.setSourceId(documentEntity.getSourceId()); + documentResponseBean.setFilePath(documentEntity.getFilePath()); + documentResponseBean.setCreatedDate(documentEntity.getCreatedDate()); + documentResponseBean.setUpdatedDate(documentEntity.getUpdatedDate()); + evaluationDocResponse.setFileValue(documentResponseBean); + evaluationDocResponse.setNameValue(doc.getNameValue()); + evaluationDocResponse.setValid(doc.getValid()); + evaluationDocResponse.setFieldId(doc.getFieldId()); + }); + } + if (evaluationDocResponse.getFileValue() == null) { + continue; + } + evaluationDocResponses.add(evaluationDocResponse); + } + response.setEvaluationDocument(evaluationDocResponses); + } private void populateBasicDetails(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response) { @@ -483,9 +520,9 @@ public class ApplicationEvaluationDao { if (existingEntityOptional.isPresent()) { entity = existingEntityOptional.get(); oldApplicationEvaluation = Utils.getClonedEntityForData(entity); - entity.setCriteria(Utils.convertObjectToJson(filterNonNullCriteria(processCriteria(entity, req)))); - entity.setChecklist(Utils.convertObjectToJson(filterNonNullChecklist(processChecklist(entity, req)))); - entity.setFile(Utils.convertObjectToJson(filterNonNullFields(processField(entity, req)))); + entity.setCriteria(Utils.convertObjectToJson(processCriteria(entity, req))); + entity.setChecklist(Utils.convertObjectToJson(processChecklist(entity, req))); + entity.setFile(Utils.convertObjectToJson(processField(entity, req))); entity.setIsDeleted(false); setIfUpdated(entity::getNote, entity::setNote, req.getNote()); setIfUpdated(entity::getMotivation, entity::setMotivation, req.getMotivation()); @@ -510,22 +547,6 @@ public class ApplicationEvaluationDao { } } - - private List filterNonNullChecklist(List checklistRequests) { - - return checklistRequests.stream().filter(request -> request.getValid() != null).collect(Collectors.toList()); - } - - private List filterNonNullCriteria(List criteriaRequests) { - - return criteriaRequests.stream().filter(request -> request.getScore() != null && request.getValid() != null).collect(Collectors.toList()); - } - - private List filterNonNullFields(List fieldRequests) { - - return fieldRequests.stream().filter(request -> request.getValid() != null).collect(Collectors.toList()); - } - private List processCriteria(ApplicationEvaluationEntity entity, ApplicationEvaluationRequest req) { List incomingCriteriaList = Optional.ofNullable(req.getCriteria()).orElse(new ArrayList<>()); @@ -645,11 +666,52 @@ public class ApplicationEvaluationDao { return entityOptional.get(); } + public void validatePreinstructor(HttpServletRequest request,Long applicationId,Long assignedApplicationId){ + if (applicationId == null && assignedApplicationId == null) { + throw new CustomValidationException( + Status.BAD_REQUEST, + Translator.toLocale(GepafinConstant.EITHER_APPLICATION_OR_ASSIGNED_APPLICATION_ID_REQUIRED_MSG) + ); + } + Optional assignedApplicationsOptional = + assignedApplicationsRepository.findByApplicationIdOrIdAndIsDeletedFalse(applicationId,assignedApplicationId); - public ApplicationEvaluationResponse getApplicationEvaluationByApplicationId(UserEntity user, Long applicationId, Long assignedApplicationId) { + if (assignedApplicationId != null) { + assignedApplicationsOptional = assignedApplicationsOptional.filter(a -> a.getId().equals(assignedApplicationId)); + } + AssignedApplicationsEntity assignedApplications = assignedApplicationsOptional + .orElseThrow(() -> new CustomValidationException( + Status.BAD_REQUEST, + Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_WITH_ID_MSG) + )); + if (applicationId == null) { + applicationId = assignedApplications.getApplication().getId(); + } + validator.validatePreInstructor(request, assignedApplications.getUserId()); + } + public ApplicationEvaluationResponse getApplicationEvaluationByApplicationId(HttpServletRequest request, UserEntity user, Long applicationID, Long assignedApplicationID) { + Long applicationId; + Long assignedApplicationId; + validatePreinstructor(request, applicationID, assignedApplicationID); + if (applicationID == null && assignedApplicationID != null) { + assignedApplicationId = assignedApplicationID; + Optional assignedApplicationsOptional = + assignedApplicationsRepository.findByIdAndIsDeletedFalse(assignedApplicationId); + + applicationId = assignedApplicationsOptional.map(a -> a.getApplication().getId()).orElse(null); + } else { + applicationId = applicationID; + if (assignedApplicationID == null && applicationID != null) { + Optional assignedApplicationsOptional = + assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId); + + assignedApplicationId = assignedApplicationsOptional.map(AssignedApplicationsEntity::getId).orElse(null); + } else { + assignedApplicationId = assignedApplicationID; + } + } applicationService.validateApplication(applicationId); - Optional entityOptional; if (applicationId != null && assignedApplicationId != null) { @@ -661,11 +723,19 @@ public class ApplicationEvaluationDao { } else { entityOptional = applicationEvaluationRepository.findFirstByIsDeletedFalseOrderByCreatedDateDesc(); } - return entityOptional.map(this::convertToResponse) + return entityOptional.map(this::convertToResponse) .orElseGet(() -> { return getEvaluationResponseByApplicationid(user, applicationId, assignedApplicationId); }); } + private List prepareEvaluationDocumentBeanList(ApplicationEvaluationEntity entity) { + List docRequest = new ArrayList<>(); + + if (entity != null && entity.getEvaluationDocument() != null) { + docRequest = Utils.convertJsonToList(entity.getEvaluationDocument(), new TypeReference>() {}); + } + return docRequest; + } public ApplicationEvaluationResponse getEvaluationResponseByApplicationid(UserEntity user, Long applicationId, Long assignedApplicationId) { @@ -1447,5 +1517,30 @@ public class ApplicationEvaluationDao { .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_NOT_FOUND))); } + public ApplicationEvaluationResponse updateApplicationEvaluation( + Long assignedApplicationId, + List docRequest) { + Optional entityOptional=applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(assignedApplicationId); + ApplicationEvaluationEntity applicationEvaluationEntity =null; + if(entityOptional.isPresent()) { + applicationEvaluationEntity = entityOptional.get(); + if (docRequest != null) { +// String existingEvaluationDocJson = applicationEvaluationEntity.getEvaluationDocument(); + List existingDocs = new ArrayList<>(); + + for (EvaluationDocumentRequest doc : docRequest) { + if (doc.getFileValue() != null) { + Long fileId = Long.valueOf(doc.getFileValue()); + documentService.validateDocument(fileId); + existingDocs.add(doc); + } + } + String updatedEvaluationDocJson = Utils.convertObjectToJson(existingDocs); + applicationEvaluationEntity.setEvaluationDocument(updatedEvaluationDocJson); + } + } + ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(applicationEvaluationEntity); + return convertToResponse(savedEntity); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 9b3b12a5..5f5e0f22 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -130,7 +130,7 @@ public class CallDao { ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) { for (DocumentEntity document : documents) { - String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.CALL, callId, 0L,0L); + String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.CALL, callId, 0L,0L,0L); try (InputStream fileInputStream = amazonS3Service.getFile(s3Folder, document.getFilePath())) { String fileName = Utils.extractFileName(document.getFilePath()); ZipEntry zipEntry = new ZipEntry(fileName); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java index 670f9444..b31c12bf 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java @@ -92,7 +92,7 @@ public class DelegationDao { public ByteArrayOutputStream generateDocument(Map placeholders, String templateName) { try { - String s3Folder = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.TEMPLATE, 0L, 0L,0L); + String s3Folder = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.TEMPLATE, 0L, 0L,0L,0L); InputStream templateStream = amazonS3Service.getFile(s3Folder ,templateName); XWPFDocument doc = loadTemplate(templateStream); replacePlaceholders(doc, placeholders); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java index b23e4785..b642b1c7 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.enums.*; import net.gepafin.tendermanagement.model.request.VersionHistoryRequest; +import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository; import net.gepafin.tendermanagement.repositories.ApplicationRepository; import net.gepafin.tendermanagement.util.LoggingUtil; import net.gepafin.tendermanagement.util.Utils; @@ -54,7 +55,7 @@ public class DocumentDao { private S3PathConfig s3ConfigBean; @Autowired - private ApplicationRepository applicationFormRepository; + private ApplicationRepository applicationRepository; @Autowired ApplicationService applicationService; @@ -64,6 +65,8 @@ public class DocumentDao { @Autowired ApplicationAmendmentRequestRepository applicationAmendmentRequestRepository; + @Autowired + private ApplicationEvaluationRepository applicationEvaluationRepository; @Value("${aws.s3.bucket.name}") private String bucketName; @@ -77,7 +80,7 @@ public class DocumentDao { // @Value("${aws.s3.url.folder}") // private String s3Folder; - public List uploadFiles(List files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType) { + public List uploadFiles(Long userId,List files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType) { List documentEntities = new ArrayList<>(); Long source = resolveSourceId(sourceId, sourceType); @@ -91,6 +94,7 @@ public class DocumentDao { documentEntity.setType(fileType.getValue()); documentEntity.setFilePath(uploadFileOnAmazonS3Response.getFilePath()); documentEntity.setIsDeleted(false); + documentEntity.setUploadedBy(userId); documentEntities.add(documentEntity); } } @@ -137,18 +141,24 @@ public class DocumentDao { Long applicationId = 0L; Long amendmentId = 0L; + Long evaluationId = 0L; Long callId = sourceId; if (type == DocumentSourceTypeEnum.APPLICATION) { applicationId = sourceId; - callId = applicationFormRepository.findCallIdById(applicationId); + callId = applicationRepository.findCallIdById(applicationId); } else if (type == DocumentSourceTypeEnum.AMENDMENT) { amendmentId = sourceId; ApplicationEntity applicationEntity = applicationAmendmentRequestRepository.findApplicationByAmendmentId(amendmentId); applicationId = applicationEntity.getId(); callId = applicationEntity.getCall().getId(); + }else if (type == DocumentSourceTypeEnum.EVALUATION) { + evaluationId = sourceId; + ApplicationEntity applicationEntity = applicationEvaluationRepository.findApplicationByEvaluationId(evaluationId); + applicationId = applicationEntity.getId(); + callId = applicationEntity.getCall().getId(); } try { - String s3Path = generateS3Path(type, callId, applicationId, amendmentId); + String s3Path = generateS3Path(type, callId, applicationId, amendmentId, evaluationId); log.info("Generated S3 path {}", s3Path); return amazonS3Service.uploadFileOnAmazonS3(s3Path, file); } catch (Exception e) { @@ -156,9 +166,9 @@ public class DocumentDao { } } - public String generateS3Path(DocumentSourceTypeEnum typeOfDocument, Long callId, Long applicationId, Long amendmentId) { + public String generateS3Path(DocumentSourceTypeEnum typeOfDocument, Long callId, Long applicationId, Long amendmentId,Long evaluationId) { try { - return s3ConfigBean.generateDocumentPath(typeOfDocument, callId, applicationId, amendmentId); + return s3ConfigBean.generateDocumentPath(typeOfDocument, callId, applicationId, amendmentId,evaluationId); } catch (IllegalArgumentException e) { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.S3_PATH_GENERATION_ERROR_MSG)); } @@ -188,6 +198,7 @@ public class DocumentDao { Long callId = null; Long applicationId = null; Long amendmentId = null; + Long evaluationId = null; if (DocumentSourceTypeEnum.CALL.getValue().equalsIgnoreCase(documentEntity.getSource())) { callId = documentEntity.getSourceId(); @@ -201,9 +212,14 @@ public class DocumentDao { ApplicationEntity applicationEntity = applicationAmendmentRequestRepository.findApplicationByAmendmentId(amendmentId); applicationId = applicationEntity.getId(); callId = applicationEntity.getCall().getId(); + } else if(DocumentSourceTypeEnum.EVALUATION.getValue().equalsIgnoreCase(documentEntity.getSource())){ + evaluationId = documentEntity.getSourceId(); + ApplicationEntity applicationEntity = applicationEvaluationRepository.findApplicationByEvaluationId(evaluationId); + applicationId = applicationEntity.getId(); + callId = applicationEntity.getCall().getId(); } - deleteFileFromS3(documentEntity, callId, applicationId,amendmentId); + deleteFileFromS3(documentEntity, callId, applicationId,amendmentId,evaluationId); } @@ -241,8 +257,9 @@ public class DocumentDao { Long callId=null; Long applicationId=null; Long amendmentId=null; + Long evaluationId=null; if (type.equals(DocumentSourceTypeEnum.APPLICATION)) { - callId = applicationFormRepository.findCallIdById(id); + callId = applicationRepository.findCallIdById(id); applicationId = id; } else if(type.equals(DocumentSourceTypeEnum.AMENDMENT)){ @@ -250,12 +267,18 @@ public class DocumentDao { ApplicationEntity applicationEntity = applicationAmendmentRequestRepository.findApplicationByAmendmentId(amendmentId); applicationId = applicationEntity.getId(); callId = applicationEntity.getCall().getId(); + }else if(type.equals(DocumentSourceTypeEnum.EVALUATION)){ + evaluationId = id; + ApplicationEntity applicationEntity = applicationEvaluationRepository.findApplicationByEvaluationId(evaluationId); + applicationId = applicationEntity.getId(); + callId = applicationEntity.getCall().getId(); } + else { callId = id; applicationId = 0L; } - String s3Path = generateS3Path(type, callId, applicationId,amendmentId); + String s3Path = generateS3Path(type, callId, applicationId,amendmentId,evaluationId); log.info("Generated S3 path {}", s3Path); return amazonS3Service.uploadFileOnAmazonS3(s3Path, file); } catch (Exception e) { @@ -267,12 +290,12 @@ public class DocumentDao { return callDao.convertToDocumentResponseBean(documentEntity); } - public void deleteFileFromS3(DocumentEntity documentEntity, Long callId, Long applicationId,Long amendmentId) { + public void deleteFileFromS3(DocumentEntity documentEntity, Long callId, Long applicationId,Long amendmentId,Long evaluationId) { try { DocumentEntity oldDocumentEntity = Utils.getClonedEntityForData(documentEntity); String oldS3Path = documentEntity.getFilePath(); - String newS3Path = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.valueOf("DELETED_" + documentEntity.getSource().toUpperCase()), callId, applicationId,amendmentId); + String newS3Path = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.valueOf("DELETED_" + documentEntity.getSource().toUpperCase()), callId, applicationId,amendmentId,evaluationId); UploadFileOnAmazonS3Response response = amazonS3Service.moveFile(documentEntity.getFileName(), oldS3Path, newS3Path); documentEntity.setFileName(response.getFileName()); documentEntity.setFilePath(response.getFilePath()); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java b/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java index 1db01f11..98413207 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java @@ -13,12 +13,12 @@ public class S3PathConfig { @Autowired S3ConfigRepository s3ConfigRepository; - public String generateDocumentPath(DocumentSourceTypeEnum type, Long callId, Long applicationId,Long amendmentId) { + public String generateDocumentPath(DocumentSourceTypeEnum type, Long callId, Long applicationId,Long amendmentId,Long evaluationId) { S3ConfigEntity config = getDocumentPath(type); return config.getParentFolder() + "/" + buildS3Path(config.getPath(), callId, applicationId,amendmentId); } - public String generateDocumentPathForOther(DocOtherSourceTypeEnum type, Long callId, Long applicationId,Long amendmentId) { + public String generateDocumentPathForOther(DocOtherSourceTypeEnum type, Long callId, Long applicationId,Long amendmentId,Long evaluationId) { S3ConfigEntity config = getDocumentPathForOther(type); return config.getParentFolder() + "/" + buildS3Path(config.getPath(), callId, applicationId,amendmentId); diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java index e33881b1..45a8c842 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java @@ -22,6 +22,9 @@ public class ApplicationEvaluationEntity extends BaseEntity{ @Column(name = "checklist") private String checklist; + @Column(name = "EVALUATION_DOCUMENT") + private String evaluationDocument; + @Column(name = "file") private String file; @@ -58,4 +61,5 @@ public class ApplicationEvaluationEntity extends BaseEntity{ @Column(name = "STOP_DATE_TIME") private LocalDateTime stopDateTime; + } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java index d15a65e6..08bfd623 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java @@ -32,4 +32,7 @@ public class DocumentEntity extends BaseEntity{ @Column(name="DOCUMENT_ATTACHMENT_ID") private String documentAttachmentId; + @Column(name="uploaded_by") + private Long uploadedBy; + } diff --git a/src/main/java/net/gepafin/tendermanagement/enums/DocOtherSourceTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/DocOtherSourceTypeEnum.java index 556a9949..05b42e3b 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/DocOtherSourceTypeEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/DocOtherSourceTypeEnum.java @@ -6,6 +6,7 @@ public enum DocOtherSourceTypeEnum { TEMPLATE("TEMPLATE"), DELETED_USER_DELEGATION("DELETED_USER_DELEGATION"), DELETED_APPLICATION("DELETED_APPLICATION"), + DELETED_EVALUATION("DELETED_EVALUATION"), DELETED_CALL("DELETED_CALL"), DELETED_AMENDMENT("DELETED_AMENDMENT"); diff --git a/src/main/java/net/gepafin/tendermanagement/enums/DocumentSourceTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/DocumentSourceTypeEnum.java index 7ac28ac7..e2b121e7 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/DocumentSourceTypeEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/DocumentSourceTypeEnum.java @@ -4,7 +4,7 @@ public enum DocumentSourceTypeEnum { CALL("CALL"), APPLICATION("APPLICATION"), - + EVALUATION("EVALUATION"), AMENDMENT("AMENDMENT"); private String value; diff --git a/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java index 94fabe89..6f518462 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java @@ -136,6 +136,7 @@ public enum UserActionContextEnum { UPDATE_EVALUATION_CRITERIA("UPDATE_EVALUATION_CRITERIA"), DELETE_EVALUATION_CRITERIA("DELETE_EVALUATION_CRITERIA"), CREATE_EVALUATION_CRITERIA("CREATE_EVALUATION_CRITERIA"), + UPLOAD_EVALUATION_DOC("UPLOAD_EVALUATION_DOC"), /** communication action context **/ ADD_COMMENT_TO_AMENDMENT_REQUEST("ADD_COMMENT_TO_AMENDMENT_REQUEST"), diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationDocumentRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationDocumentRequest.java new file mode 100644 index 00000000..79aed45c --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationDocumentRequest.java @@ -0,0 +1,15 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class EvaluationDocumentRequest { + + private String fieldId; + + private String nameValue; + + private String fileValue; + + private Boolean valid; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java index ca3eaa71..a3d32624 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java @@ -21,6 +21,7 @@ public class ApplicationEvaluationResponse { private List criteria; private List checklist; private List files; + private List evaluationDocument; private LocalDateTime createdDate; private LocalDateTime updatedDate; private String beneficiary; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java new file mode 100644 index 00000000..aea34514 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java @@ -0,0 +1,12 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; + +@Data +public class EvaluationDocumentResponse { + private String fieldId; + private String nameValue; + private Boolean valid; + private DocumentResponseBean fileValue ; + +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java index 4a2e3252..ecb6b83d 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java @@ -44,7 +44,7 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository findFirstByIsDeletedFalseOrderByCreatedDateDesc(); boolean existsByApplicationIdAndIsDeletedFalse(Long applicationId); + @Query("SELECT app " + + "FROM ApplicationEntity app " + + "WHERE app.id = (SELECT aar.applicationId " + + "FROM ApplicationEvaluationEntity aar " + + "WHERE aar.id = :evaluationId AND aar.isDeleted = false)") + ApplicationEntity findApplicationByEvaluationId(Long evaluationId); @Query("SELECT a FROM ApplicationEvaluationEntity a WHERE a.isDeleted = false AND a.endDate < :currentDate") List findAllByIsDeletedFalseAndEndDateBefore(@Param("currentDate") LocalDateTime currentDate); diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java index 8877fbc7..db645f95 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java @@ -42,6 +42,6 @@ public interface ApplicationRepository extends JpaRepository applicationEvaluationDocRequest); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/DocumentService.java b/src/main/java/net/gepafin/tendermanagement/service/DocumentService.java index 6012a273..c777f004 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/DocumentService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/DocumentService.java @@ -11,7 +11,7 @@ import java.util.List; public interface DocumentService { - public List uploadFile(List files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType); + public List uploadFile(HttpServletRequest request,List files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType); public void deleteFile(Long documentId); diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java index 0a6feb1f..503f1513 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java @@ -1,29 +1,24 @@ package net.gepafin.tendermanagement.service.impl; import jakarta.servlet.http.HttpServletRequest; -import net.gepafin.tendermanagement.config.Translator; -import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.dao.ApplicationEvaluationDao; import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity; import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity; import net.gepafin.tendermanagement.entities.UserEntity; -import net.gepafin.tendermanagement.enums.ApplicationStatusForEvaluation; import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.request.EvaluationDocumentRequest; import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse; import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository; import net.gepafin.tendermanagement.service.ApplicationEvaluationService; import net.gepafin.tendermanagement.service.AssignedApplicationsService; import net.gepafin.tendermanagement.util.Validator; -import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; -import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; -import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; +import java.util.List; @Service public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationService { @@ -36,6 +31,9 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe private AssignedApplicationsService assignedApplicationsService; @Autowired private AssignedApplicationsRepository assignedApplicationsRepository; + @Autowired + private ApplicationEvaluationService applicationEvaluationService; + @Override @Transactional(rollbackFor = Exception.class) public ApplicationEvaluationResponse createOrUpdateApplicationEvaluation( @@ -54,31 +52,12 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe @Transactional(readOnly = true) public ApplicationEvaluationResponse getApplicationEvaluationByApplicationId( HttpServletRequest request, Long applicationId, Long assignedApplicationId) { - - if (applicationId == null && assignedApplicationId == null) { - throw new CustomValidationException( - Status.BAD_REQUEST, - Translator.toLocale(GepafinConstant.EITHER_APPLICATION_OR_ASSIGNED_APPLICATION_ID_REQUIRED_MSG) - ); - } UserEntity preInstructor = validator.validateUser(request); - Optional assignedApplicationsOptional = - assignedApplicationsRepository.findByApplicationIdOrIdAndIsDeletedFalse(applicationId,assignedApplicationId); - - if (assignedApplicationId != null) { - assignedApplicationsOptional = assignedApplicationsOptional.filter(a -> a.getId().equals(assignedApplicationId)); - } - AssignedApplicationsEntity assignedApplications = assignedApplicationsOptional - .orElseThrow(() -> new CustomValidationException( - Status.BAD_REQUEST, - Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_WITH_ID_MSG) - )); - validator.validatePreInstructor(request, assignedApplications.getUserId()); - return applicationEvaluationDao.getApplicationEvaluationByApplicationId( + request, preInstructor, - assignedApplications.getApplication().getId(), - assignedApplications.getId() + applicationId, + assignedApplicationId ); } @@ -98,4 +77,11 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe public ApplicationEvaluationEntity validateApplicationEvaluationByApplicationId(Long applicationId) { return applicationEvaluationDao.validateApplicationEvaluationByApplicationId(applicationId); } + + @Override + public ApplicationEvaluationResponse updateApplicationEvaluation(HttpServletRequest request, Long assignedApplicationId, List evaluationDocRequest) { + AssignedApplicationsEntity assignedApplication =assignedApplicationsService.validateAssignedApplication(assignedApplicationId); + validator.validatePreInstructor(request, assignedApplication.getUserId()); + return applicationEvaluationDao.updateApplicationEvaluation(assignedApplicationId,evaluationDocRequest); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java index 505d0da1..d7a46aa6 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java @@ -1,14 +1,17 @@ package net.gepafin.tendermanagement.service.impl; import java.util.List; +import java.util.Map; import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.dao.DocumentDao; import net.gepafin.tendermanagement.entities.DocumentEntity; +import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; import net.gepafin.tendermanagement.enums.DocumentTypeEnum; import net.gepafin.tendermanagement.model.response.DocumentResponseBean; import net.gepafin.tendermanagement.service.DocumentService; +import net.gepafin.tendermanagement.util.Validator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -22,9 +25,13 @@ public class DocumentServiceImpl implements DocumentService { @Autowired private DocumentDao documentDao; + @Autowired + private Validator validator; @Override - public List uploadFile(List files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType) { - return documentDao.uploadFiles(files,sourceId,sourceType,fileType); + public List uploadFile(HttpServletRequest request,List files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType) { + Map userInfo = validator.getUserInfoFromToken(request); + Long userId = validator.getUserId(userInfo); + return documentDao.uploadFiles(userId,files,sourceId,sourceType,fileType); } @Override public void deleteFile(Long documentId) { diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java b/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java index 23b8fd59..156a8fd8 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java @@ -12,10 +12,7 @@ import net.gepafin.tendermanagement.dao.S3PathConfig; import net.gepafin.tendermanagement.entities.ApplicationEntity; import net.gepafin.tendermanagement.entities.DocumentEntity; import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; -import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository; -import net.gepafin.tendermanagement.repositories.ApplicationRepository; -import net.gepafin.tendermanagement.repositories.ApplicationSignedDocumentRepository; -import net.gepafin.tendermanagement.repositories.DocumentRepository; +import net.gepafin.tendermanagement.repositories.*; import net.gepafin.tendermanagement.service.AmazonS3Service; import net.gepafin.tendermanagement.service.ApplicationService; import org.springframework.beans.factory.annotation.Autowired; @@ -73,6 +70,9 @@ public class S3ReUploadMigrationService { @Autowired private ApplicationAmendmentRequestRepository applicationAmendmentRequestRepository; + @Autowired + private ApplicationEvaluationRepository applicationEvaluationRepository; + @Autowired private DocumentDao documentDao; @@ -107,7 +107,7 @@ public class S3ReUploadMigrationService { Long callId = null; Long applicationId = null; Long amendmentId = null; - + Long evaluationId = null; if (DocumentSourceTypeEnum.CALL.getValue().equalsIgnoreCase(document.getSource())) { callId = document.getSourceId(); } else if (DocumentSourceTypeEnum.APPLICATION.getValue().equalsIgnoreCase(document.getSource())) { @@ -120,9 +120,15 @@ public class S3ReUploadMigrationService { ApplicationEntity applicationEntity = applicationAmendmentRequestRepository.findApplicationByAmendmentId(amendmentId); applicationId = applicationEntity.getId(); callId = applicationEntity.getCall().getId(); + } else if(DocumentSourceTypeEnum.EVALUATION.getValue().equalsIgnoreCase(document.getSource())){ + evaluationId = document.getSourceId(); + ApplicationEntity applicationEntity = applicationEvaluationRepository.findApplicationByEvaluationId(evaluationId); + applicationId = applicationEntity.getId(); + callId = applicationEntity.getCall().getId(); } - documentDao.deleteFileFromS3(document,callId,applicationId,amendmentId); + + documentDao.deleteFileFromS3(document,callId,applicationId,amendmentId,evaluationId); processDocuments++; } catch (Exception e) { @@ -213,10 +219,10 @@ public class S3ReUploadMigrationService { Long callId; if (sourceType.equals(DocumentSourceTypeEnum.CALL)) { - return s3ConfigBean.generateDocumentPath(sourceType, document.getSourceId(), 0L,0L); + return s3ConfigBean.generateDocumentPath(sourceType, document.getSourceId(), 0L,0L,0L); } else { callId = applicationRepository.findCallIdById(document.getSourceId()); - return s3ConfigBean.generateDocumentPath(sourceType, callId, document.getSourceId(),0L); + return s3ConfigBean.generateDocumentPath(sourceType, callId, document.getSourceId(),0L,0L); } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java index d5bd4c3c..3d5ecc6c 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java @@ -139,7 +139,7 @@ public class UserSignedAndDelegationServiceImpl { private String generateNewS3PathForDelegationDoc() { - return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_DELEGATION, 0L, 0L,0L); + return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_DELEGATION, 0L, 0L,0L,0l); } private String generateNewS3PathForUserSignedDoc(ApplicationSignedDocumentEntity document) { diff --git a/src/main/java/net/gepafin/tendermanagement/util/Validator.java b/src/main/java/net/gepafin/tendermanagement/util/Validator.java index e0814305..82bc2d79 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Validator.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Validator.java @@ -105,7 +105,7 @@ public class Validator { } } - private Long getUserId(Map userInfo) { + public Long getUserId(Map userInfo) { return Long.parseLong(userInfo.get("userId").toString()); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java index bc17e345..07321792 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java @@ -7,8 +7,8 @@ import io.swagger.v3.oas.annotations.media.ExampleObject; import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; -import net.gepafin.tendermanagement.enums.ApplicationStatusForEvaluation; import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.request.EvaluationDocumentRequest; import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; @@ -16,6 +16,8 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.List; + public interface ApplicationEvaluationApi { @Operation(summary = "API to create or update ApplicationEvaluation", @@ -53,5 +55,21 @@ public interface ApplicationEvaluationApi { ResponseEntity> deleteApplicationEvaluation(HttpServletRequest request, @Parameter( required = true) @PathVariable("id") Long id); + @Operation(summary = "Api to upload Documents for evaluation", + 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) })) + }) + @PutMapping(value = "/assignedApplicationId/{id}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity> updateApplicationEvaluation(HttpServletRequest request, + @Parameter(description = "The AssignedApplication id", required = true) @PathVariable("id") Long id, + @Parameter(description = "Application Evaluation request object", required = true) @Valid @RequestBody List applicationEvaluationDocRequest); + + } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java index be177bf9..403e826a 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java @@ -3,12 +3,13 @@ package net.gepafin.tendermanagement.web.rest.api.impl; import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; -import net.gepafin.tendermanagement.enums.ApplicationStatusForEvaluation; import net.gepafin.tendermanagement.enums.UserActionContextEnum; import net.gepafin.tendermanagement.enums.UserActionLogsEnum; import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.request.EvaluationDocumentRequest; import net.gepafin.tendermanagement.model.request.UserActionRequest; import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse; +import net.gepafin.tendermanagement.model.response.EvaluationDocumentResponse; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.service.ApplicationEvaluationService; import net.gepafin.tendermanagement.util.LoggingUtil; @@ -20,6 +21,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("${openapi.gepafin.base-path:/v1/applicationEvaluation}") public class ApplicationEvaluationApiController implements ApplicationEvaluationApi { @@ -79,5 +82,15 @@ public class ApplicationEvaluationApiController implements ApplicationEvaluation return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_DELETED_SUCCESSFULLY))); } + @Override + public ResponseEntity> updateApplicationEvaluation(HttpServletRequest request, Long id, List applicationEvaluationDocRequest) { + /** This code is responsible for "Upload Evaluation Document" operation. **/ + loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE) + .actionContext(UserActionContextEnum.UPLOAD_EVALUATION_DOC).build()); + + ApplicationEvaluationResponse updateApplicationEvaluationResponse = applicationEvaluationService.updateApplicationEvaluation(request, id, applicationEvaluationDocRequest); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new Response<>(updateApplicationEvaluationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_AMENDMENT_UPDATE_SUCCESSFULLY_MSG))); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DocumentApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DocumentApiController.java index 9d42ab53..123a4620 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DocumentApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DocumentApiController.java @@ -47,7 +47,7 @@ DocumentApiController implements DocumentApi { /** This code is responsible for creating user action logs for the "upload document for call or application" operation. **/ loggingUtil.logUserAction(UserActionRequest.builder().request(httpServletRequest).actionType(UserActionLogsEnum.UPLOAD).actionContext(userActionContext).build()); - List responseBeans = documentService.uploadFile(files, sourceId, sourceType, fileType); + List responseBeans = documentService.uploadFile(httpServletRequest,files, sourceId, sourceType, fileType); return ResponseEntity.status(HttpStatus.CREATED) .body(new Response>(responseBeans, Status.SUCCESS, Translator.toLocale(GepafinConstant.FILES_UPLOADED_MSG))); } catch (CustomValidationException ex) { diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index eb77049e..da446f6c 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -1991,5 +1991,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1747d76d7f3e4a6382e354e82730dd237c3b2a7b Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 12 Dec 2024 15:52:02 +0530 Subject: [PATCH 09/35] Updated code --- .../tendermanagement/dao/ApplicationDao.java | 6 ++-- .../dao/ApplicationEvaluationDao.java | 28 ++++++++++--------- .../gepafin/tendermanagement/dao/CallDao.java | 2 +- .../tendermanagement/dao/DelegationDao.java | 2 +- .../tendermanagement/dao/DocumentDao.java | 16 +++++------ .../tendermanagement/dao/S3PathConfig.java | 4 +-- .../impl/S3ReUploadMigrationService.java | 6 ++-- .../UserSignedAndDelegationServiceImpl.java | 2 +- 8 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index c545f55b..203b4f3c 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -1080,7 +1080,7 @@ public class ApplicationDao { } private String generateS3PathForDelegation(Long callId, Long applicationId) { try { - return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, callId, applicationId,0L,0L); + return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, callId, applicationId,0L); } catch (IllegalArgumentException e) { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.S3_PATH_GENERATION_ERROR_MSG)); } @@ -1244,7 +1244,7 @@ public class ApplicationDao { try (ByteArrayOutputStream zipOutputStream = new ByteArrayOutputStream(); ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) { - String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.APPLICATION, applicationEntity.getCall().getId(), applicationId,0L,0L); + String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.APPLICATION, applicationEntity.getCall().getId(), applicationId,0L); for (DocumentEntity document : documents) { String fileName = Utils.extractFileName(document.getFilePath()); @@ -1252,7 +1252,7 @@ public class ApplicationDao { } if (signedDocument != null) { - String signedDocS3Folder = s3PathConfig.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, applicationEntity.getCall().getId(), applicationId,0L,0L); + String signedDocS3Folder = s3PathConfig.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, applicationEntity.getCall().getId(), applicationId,0L); String signedDocFileName = signedDocument.getFileName(); addDocumentToZip(zos, signedDocS3Folder, signedDocument.getFilePath(), signedDocFileName); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index e88d4d94..9d9c0627 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -1528,24 +1528,26 @@ public class ApplicationEvaluationDao { List docRequest) { Optional entityOptional=applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(assignedApplicationId); ApplicationEvaluationEntity applicationEvaluationEntity =null; - if(entityOptional.isPresent()) { - applicationEvaluationEntity = entityOptional.get(); - if (docRequest != null) { -// String existingEvaluationDocJson = applicationEvaluationEntity.getEvaluationDocument(); - List existingDocs = new ArrayList<>(); + ApplicationEvaluationEntity oldApplicationEvaluation = Utils.getClonedEntityForData(entityOptional.get()); + applicationEvaluationEntity = entityOptional.get(); - for (EvaluationDocumentRequest doc : docRequest) { - if (doc.getFileValue() != null) { - Long fileId = Long.valueOf(doc.getFileValue()); - documentService.validateDocument(fileId); - existingDocs.add(doc); - } + if (docRequest != null) { + List existingDocs = new ArrayList<>(); + + for (EvaluationDocumentRequest doc : docRequest) { + if (doc.getFileValue() != null) { + Long fileId = Long.valueOf(doc.getFileValue()); + documentService.validateDocument(fileId); + existingDocs.add(doc); } - String updatedEvaluationDocJson = Utils.convertObjectToJson(existingDocs); - applicationEvaluationEntity.setEvaluationDocument(updatedEvaluationDocJson); } + String updatedEvaluationDocJson = Utils.convertObjectToJson(existingDocs); + applicationEvaluationEntity.setEvaluationDocument(updatedEvaluationDocJson); } ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(applicationEvaluationEntity); + + /** This code is responsible for adding a version history log for the "Upload Document in Application Evaluation" operation. **/ + loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluation).newData(savedEntity).build()); return convertToResponse(savedEntity); } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 5f5e0f22..9b3b12a5 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -130,7 +130,7 @@ public class CallDao { ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) { for (DocumentEntity document : documents) { - String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.CALL, callId, 0L,0L,0L); + String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.CALL, callId, 0L,0L); try (InputStream fileInputStream = amazonS3Service.getFile(s3Folder, document.getFilePath())) { String fileName = Utils.extractFileName(document.getFilePath()); ZipEntry zipEntry = new ZipEntry(fileName); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java index b31c12bf..670f9444 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java @@ -92,7 +92,7 @@ public class DelegationDao { public ByteArrayOutputStream generateDocument(Map placeholders, String templateName) { try { - String s3Folder = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.TEMPLATE, 0L, 0L,0L,0L); + String s3Folder = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.TEMPLATE, 0L, 0L,0L); InputStream templateStream = amazonS3Service.getFile(s3Folder ,templateName); XWPFDocument doc = loadTemplate(templateStream); replacePlaceholders(doc, placeholders); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java index b642b1c7..bf229f19 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java @@ -65,6 +65,7 @@ public class DocumentDao { @Autowired ApplicationAmendmentRequestRepository applicationAmendmentRequestRepository; + @Autowired private ApplicationEvaluationRepository applicationEvaluationRepository; @@ -158,7 +159,7 @@ public class DocumentDao { callId = applicationEntity.getCall().getId(); } try { - String s3Path = generateS3Path(type, callId, applicationId, amendmentId, evaluationId); + String s3Path = generateS3Path(type, callId, applicationId, amendmentId); log.info("Generated S3 path {}", s3Path); return amazonS3Service.uploadFileOnAmazonS3(s3Path, file); } catch (Exception e) { @@ -166,9 +167,9 @@ public class DocumentDao { } } - public String generateS3Path(DocumentSourceTypeEnum typeOfDocument, Long callId, Long applicationId, Long amendmentId,Long evaluationId) { + public String generateS3Path(DocumentSourceTypeEnum typeOfDocument, Long callId, Long applicationId, Long amendmentId) { try { - return s3ConfigBean.generateDocumentPath(typeOfDocument, callId, applicationId, amendmentId,evaluationId); + return s3ConfigBean.generateDocumentPath(typeOfDocument, callId, applicationId, amendmentId); } catch (IllegalArgumentException e) { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.S3_PATH_GENERATION_ERROR_MSG)); } @@ -218,8 +219,7 @@ public class DocumentDao { applicationId = applicationEntity.getId(); callId = applicationEntity.getCall().getId(); } - - deleteFileFromS3(documentEntity, callId, applicationId,amendmentId,evaluationId); + deleteFileFromS3(documentEntity, callId, applicationId,amendmentId); } @@ -278,7 +278,7 @@ public class DocumentDao { callId = id; applicationId = 0L; } - String s3Path = generateS3Path(type, callId, applicationId,amendmentId,evaluationId); + String s3Path = generateS3Path(type, callId, applicationId,amendmentId); log.info("Generated S3 path {}", s3Path); return amazonS3Service.uploadFileOnAmazonS3(s3Path, file); } catch (Exception e) { @@ -290,12 +290,12 @@ public class DocumentDao { return callDao.convertToDocumentResponseBean(documentEntity); } - public void deleteFileFromS3(DocumentEntity documentEntity, Long callId, Long applicationId,Long amendmentId,Long evaluationId) { + public void deleteFileFromS3(DocumentEntity documentEntity, Long callId, Long applicationId,Long amendmentId) { try { DocumentEntity oldDocumentEntity = Utils.getClonedEntityForData(documentEntity); String oldS3Path = documentEntity.getFilePath(); - String newS3Path = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.valueOf("DELETED_" + documentEntity.getSource().toUpperCase()), callId, applicationId,amendmentId,evaluationId); + String newS3Path = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.valueOf("DELETED_" + documentEntity.getSource().toUpperCase()), callId, applicationId,amendmentId); UploadFileOnAmazonS3Response response = amazonS3Service.moveFile(documentEntity.getFileName(), oldS3Path, newS3Path); documentEntity.setFileName(response.getFileName()); documentEntity.setFilePath(response.getFilePath()); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java b/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java index 98413207..1db01f11 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java @@ -13,12 +13,12 @@ public class S3PathConfig { @Autowired S3ConfigRepository s3ConfigRepository; - public String generateDocumentPath(DocumentSourceTypeEnum type, Long callId, Long applicationId,Long amendmentId,Long evaluationId) { + public String generateDocumentPath(DocumentSourceTypeEnum type, Long callId, Long applicationId,Long amendmentId) { S3ConfigEntity config = getDocumentPath(type); return config.getParentFolder() + "/" + buildS3Path(config.getPath(), callId, applicationId,amendmentId); } - public String generateDocumentPathForOther(DocOtherSourceTypeEnum type, Long callId, Long applicationId,Long amendmentId,Long evaluationId) { + public String generateDocumentPathForOther(DocOtherSourceTypeEnum type, Long callId, Long applicationId,Long amendmentId) { S3ConfigEntity config = getDocumentPathForOther(type); return config.getParentFolder() + "/" + buildS3Path(config.getPath(), callId, applicationId,amendmentId); diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java b/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java index 156a8fd8..dac565e7 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java @@ -128,7 +128,7 @@ public class S3ReUploadMigrationService { } - documentDao.deleteFileFromS3(document,callId,applicationId,amendmentId,evaluationId); + documentDao.deleteFileFromS3(document,callId,applicationId,amendmentId); processDocuments++; } catch (Exception e) { @@ -219,10 +219,10 @@ public class S3ReUploadMigrationService { Long callId; if (sourceType.equals(DocumentSourceTypeEnum.CALL)) { - return s3ConfigBean.generateDocumentPath(sourceType, document.getSourceId(), 0L,0L,0L); + return s3ConfigBean.generateDocumentPath(sourceType, document.getSourceId(), 0L,0L); } else { callId = applicationRepository.findCallIdById(document.getSourceId()); - return s3ConfigBean.generateDocumentPath(sourceType, callId, document.getSourceId(),0L,0L); + return s3ConfigBean.generateDocumentPath(sourceType, callId, document.getSourceId(),0L); } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java index 3d5ecc6c..d5bd4c3c 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java @@ -139,7 +139,7 @@ public class UserSignedAndDelegationServiceImpl { private String generateNewS3PathForDelegationDoc() { - return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_DELEGATION, 0L, 0L,0L,0l); + return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_DELEGATION, 0L, 0L,0L); } private String generateNewS3PathForUserSignedDoc(ApplicationSignedDocumentEntity document) { From eb5075488e12e8d3d3085c7b3c90263d0afdf4d5 Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 11:39:46 +0530 Subject: [PATCH 10/35] Updated code for evaluation response --- .../dao/ApplicationAmendmentRequestDao.java | 33 +-- .../dao/ApplicationEvaluationDao.java | 189 +++++++++++++++++- .../request/AmendmentDetailsRequest.java | 17 ++ .../model/request/AmendmentFormField.java | 6 +- .../request/AmendmentFormFieldRequest.java | 13 ++ .../ApplicationAmendmentRequestBean.java | 2 +- .../request/ApplicationEvaluationRequest.java | 1 + .../AmendmentDocumentResponseBean.java | 15 ++ .../ApplicationEvaluationResponse.java | 1 + 9 files changed, 254 insertions(+), 23 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 72f540f7..d762ae3e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -265,6 +265,7 @@ public class ApplicationAmendmentRequestDao { AmendmentFormField formField = new AmendmentFormField(); formField.setFieldId(amendmentFormFieldRequest.getFieldId()); formField.setFieldValue(null); + formField.setLabel(amendmentFormFieldRequest.getLabel()); return formField; }) .collect(Collectors.toList()); @@ -373,7 +374,7 @@ public class ApplicationAmendmentRequestDao { return response; } - private AmendmentDocumentResponse createAmendmentDocumentResponse(AmendmentFieldRequest amendmentFieldRequest) { + public AmendmentDocumentResponse createAmendmentDocumentResponse(AmendmentFieldRequest amendmentFieldRequest) { AmendmentDocumentResponse amendmentDocumentResponse = new AmendmentDocumentResponse(); amendmentDocumentResponse.setFieldId(amendmentFieldRequest.getFieldId()); amendmentDocumentResponse.setNameValue(amendmentFieldRequest.getNameValue()); @@ -571,8 +572,8 @@ public class ApplicationAmendmentRequestDao { if(updateRequest.getApplicationFormFields() != null) { updateRequest.getApplicationFormFields().stream().forEach(applicationFormFieldRequest->{ AmendmentFormField amendmentFormField = getAmendmentFormField(amendmentFormFieldMap,applicationFormFieldRequest.getFieldId()); - ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId()); - updateApplicationFormField(applicationFormFieldEntity,applicationFormFieldRequest, amendmentFormField); +// ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId()); +// updateApplicationFormField(applicationFormFieldEntity,applicationFormFieldRequest, amendmentFormField); updateFormField(applicationFormFieldRequest, amendmentFormField); }); existingApplicationAmendment.setFormFields(Utils.convertListToJsonString(amendmentFormFieldMap.values().stream().toList())); @@ -652,7 +653,7 @@ public class ApplicationAmendmentRequestDao { } - private void updateFormField(ApplicationFormFieldRequestBean applicationFormFieldRequest, + private void updateFormField(AmendmentFormFieldRequest applicationFormFieldRequest, AmendmentFormField amendmentFormField) { List requestedDocumentIds = extractIds(applicationFormFieldRequest.getFieldValue()); List existingDocumentIds = extractIds(amendmentFormField.getFieldValue()); @@ -661,7 +662,8 @@ public class ApplicationAmendmentRequestDao { if (!existingDocumentIds.isEmpty()) { existingDocumentIds.forEach(this::softDeleteDocument); amendmentFormField.setFieldValue(null); - setIsUploadedBy(amendmentFormField); + amendmentFormField.setIsValid(applicationFormFieldRequest.getIsValid()); +// setIsUploadedBy(amendmentFormField); } return; } @@ -675,11 +677,12 @@ public class ApplicationAmendmentRequestDao { if (!newFieldValue.equals(amendmentFormField.getFieldValue())) { amendmentFormField.setFieldValue(newFieldValue); - setIsUploadedBy(amendmentFormField); + amendmentFormField.setIsValid(applicationFormFieldRequest.getIsValid()); +// setIsUploadedBy(amendmentFormField); } } - private List extractIds(Object fieldValue) { + public List extractIds(Object fieldValue) { if (fieldValue instanceof String && !StringUtils.isEmpty((String) fieldValue)) { return Arrays.stream(((String) fieldValue).split(",")) .map(Long::valueOf) @@ -690,14 +693,14 @@ public class ApplicationAmendmentRequestDao { - private void setIsUploadedBy(AmendmentFormField amendmentFormField) { - if(validator.checkIsBeneficiary()) { - amendmentFormField.setIsUploadedBy(AmendmentFormField.AmendmentIsUploadedByEnum.BENEFICIARY.getValue()); - }else { - amendmentFormField.setIsUploadedBy(AmendmentFormField.AmendmentIsUploadedByEnum.PRE_INSTRUCTOR.getValue()); - } - - } +// private void setIsUploadedBy(AmendmentFormField amendmentFormField) { +// if(validator.checkIsBeneficiary()) { +// amendmentFormField.setIsUploadedBy(AmendmentFormField.AmendmentIsUploadedByEnum.BENEFICIARY.getValue()); +// }else { +// amendmentFormField.setIsUploadedBy(AmendmentFormField.AmendmentIsUploadedByEnum.PRE_INSTRUCTOR.getValue()); +// } +// +// } // private void updateApplicationFormFields(ApplicationAmendmentRequestEntity applicationAmendment, ApplicationFormFieldRequestBean updatedFormField) { diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 9d9c0627..7845a565 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -1,6 +1,5 @@ package net.gepafin.tendermanagement.dao; -import com.amazonaws.services.dynamodbv2.xspec.L; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -99,6 +98,9 @@ public class ApplicationEvaluationDao { @Autowired private DocumentService documentService; + @Autowired + private ApplicationAmendmentRequestDao applicationAmendmentRequestDao; + private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) { ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity(); @@ -134,6 +136,7 @@ public class ApplicationEvaluationDao { List checklistEntities = callTargetAudienceChecklistRepository .findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.CHECKLIST.getValue()); List applicationFormEntities = applicationFormRepository.findByApplicationId(entity.getApplicationId()); + setAmendmentDetails(entity,response); setCriteriaResponses(entity, response, evaluationCriterias); setChecklistResponses(entity, response, checklistEntities); @@ -144,6 +147,46 @@ public class ApplicationEvaluationDao { return response; } + + private void setAmendmentDetails(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response) { + List amendmentRequests=applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(entity.getId()); + List amendmentDocumentResponseBeans=new ArrayList<>(); + for(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity:amendmentRequests){ + AmendmentDocumentResponseBean amendmentDocumentResponseBean=new AmendmentDocumentResponseBean(); + amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId()); + String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument(); + String formField=applicationAmendmentRequestEntity.getFormFields(); + if (amendmentDocument != null) { + List amendmentFieldRequests=Utils.convertJsonStringToList(amendmentDocument,AmendmentFieldRequest.class); + List amendmentDocumentResponses = amendmentFieldRequests.stream() + .map(applicationAmendmentRequestDao::createAmendmentDocumentResponse) + .toList(); + amendmentDocumentResponseBean.setAmendmentDocuments(amendmentDocumentResponses); + } + List amendmentFormFields=Utils.convertJsonStringToList(formField,AmendmentFormField.class); + amendmentDocumentResponseBean.setFormFieldDocuments(setFormFieldDocuments(amendmentFormFields)); + amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean); + } + response.setAmendmentDetails(amendmentDocumentResponseBeans); + } + + private List setFormFieldDocuments(List amendmentFormFields) { + List fieldResponses=new ArrayList<>(); + for (AmendmentFormField amendmentFormField: amendmentFormFields){ + FieldResponse fieldResponse=new FieldResponse(); + fieldResponse.setId(amendmentFormField.getFieldId()); + fieldResponse.setLabel(amendmentFormField.getLabel()); + fieldResponse.setValid(amendmentFormField.getIsValid()); + List fileIds=applicationAmendmentRequestDao.extractIds(amendmentFormField.getFieldValue()); + List documentResponseBeans = fileIds.stream() + .map(fileId -> createDocumentResponseBean(documentService.validateDocument(fileId))) // Create DocumentResponseBean for each fileId + .collect(Collectors.toList()); // Collect all into a List + fieldResponse.setFileDetail(documentResponseBeans); + fieldResponses.add(fieldResponse); + } + return fieldResponses; + } + private void setEvaluationDocResponse(ApplicationEvaluationResponse response, List docRequest) { List evaluationDocResponses = new ArrayList<>(); @@ -534,6 +577,15 @@ public class ApplicationEvaluationDao { actionType = VersionActionTypeEnum.INSERT; } ApplicationStatusForEvaluation status = req.getApplicationStatus(); + // Fetch all amendment request entities associated with the evaluation ID + List applicationAmendmentRequestEntities = + applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(entity.getId()); + +// Fetch amendment details from the request + List amendmentDetailsRequests = req.getAmendmentDetails(); + + updateAmendmentDocumentsAndFormFields(applicationAmendmentRequestEntities, amendmentDetailsRequests); + ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(entity); @@ -549,6 +601,132 @@ public class ApplicationEvaluationDao { } } + private void updateAmendmentDocumentsAndFormFields(List applicationAmendmentRequestEntities, List amendmentFormFields) { + // Iterate through amendment request entities + for (ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity : applicationAmendmentRequestEntities) { + // Process form fields if present + if (applicationAmendmentRequestEntity.getFormFields() != null) { + // Parse existing form fields from JSON + List existingFormFields = + Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getFormFields(), AmendmentFormFieldRequest.class); + + // Prepare a new list to hold updated form fields + List updatedFormFields = new ArrayList<>(); + + // Map amendment details for quick lookup by amendment ID + Map> amendmentDetailsMap = amendmentFormFields.stream() + .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) + .collect(Collectors.toMap(AmendmentDetailsRequest::getAmendmentId, AmendmentDetailsRequest::getFormFieldDocuments)); + + // Get corresponding amendment documents for the current entity + List amendmentDocuments = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); + if (amendmentDocuments != null) { + // Update existing form fields with new values + for (AmendmentFormFieldRequest existingField : existingFormFields) { + for (AmendmentFormFieldRequest newField : amendmentDocuments) { + if (existingField.getFieldId().equals(newField.getFieldId())) { + // Update fields if there are changes + Utils.setIfUpdated(existingField::getIsValid, existingField::setIsValid, newField.getIsValid()); + Utils.setIfUpdated(existingField::getFieldValue, existingField::setFieldValue, newField.getFieldValue()); + + updatedFormFields.add(existingField); + break; // Move to the next existing field + } + } + } + + // Convert updated form fields back to JSON and save to the database + applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(updatedFormFields)); + applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); + } + } + + // Process amendment documents if present + if (applicationAmendmentRequestEntity.getAmendmentDocument() != null) { + // Parse existing amendment fields from JSON + List existingAmendmentFields = + Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(), AmendmentFieldRequest.class); + + // Prepare a new list to hold updated amendment fields + List updatedAmendmentFields = new ArrayList<>(); + + // Map amendment details for quick lookup by amendment ID + Map> amendmentDetailsMap = amendmentFormFields.stream() + .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) + .collect(Collectors.toMap(AmendmentDetailsRequest::getAmendmentId, AmendmentDetailsRequest::getAmendmentDocuments)); + + // Get corresponding amendment documents for the current entity + List amendmentDocuments = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); + if (amendmentDocuments != null) { + // Update existing amendment fields with new values + for (AmendmentFieldRequest existingField : existingAmendmentFields) { + for (AmendmentFieldRequest newField : amendmentDocuments) { + if (existingField.getFieldId().equals(newField.getFieldId())) { + // Update fields if there are changes + Utils.setIfUpdated(existingField::getIsValid, existingField::setIsValid, newField.getIsValid()); + Utils.setIfUpdated(existingField::getFileValue, existingField::setFileValue, newField.getFileValue()); + Utils.setIfUpdated(existingField::getNameValue, existingField::setNameValue, newField.getNameValue()); + + updatedAmendmentFields.add(existingField); + break; // Move to the next existing field + } + } + } + + // Convert updated fields back to JSON and save to the database + applicationAmendmentRequestEntity.setAmendmentDocument(Utils.convertListToJsonString(updatedAmendmentFields)); + applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); + } + } + } + } + +// private void updateAmendmentDocuments(List applicationAmendmentRequestEntities, List amendmentFormFields) { +// for (ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity : applicationAmendmentRequestEntities) { +// // Skip if there are no amendment documents +// if (applicationAmendmentRequestEntity.getAmendmentDocument() == null) { +// continue; +// } +// +// // Parse existing amendment fields from JSON +// List existingAmendmentFields = +// Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(), AmendmentFieldRequest.class); +// +// // Prepare a new list to hold updated amendment fields +// List updatedAmendmentFields = new ArrayList<>(); +// +// // Map amendment details for quick lookup by amendment ID +// Map> amendmentDetailsMap = amendmentFormFields.stream() +// .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) +// .collect(Collectors.toMap(AmendmentDetailsRequest::getAmendmentId, AmendmentDetailsRequest::getAmendmentDocuments)); +// +// // Get corresponding amendment documents for the current entity +// List amendmentDocuments = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); +// if (amendmentDocuments == null) { +// continue; +// } +// +// // Update existing amendment fields with new values +// for (AmendmentFieldRequest existingField : existingAmendmentFields) { +// for (AmendmentFieldRequest newField : amendmentDocuments) { +// if (existingField.getFieldId().equals(newField.getFieldId())) { +// // Update fields if there are changes +// Utils.setIfUpdated(existingField::getIsValid, existingField::setIsValid, newField.getIsValid()); +// Utils.setIfUpdated(existingField::getFileValue, existingField::setFileValue, newField.getFileValue()); +// Utils.setIfUpdated(existingField::getNameValue, existingField::setNameValue, newField.getNameValue()); +// +// updatedAmendmentFields.add(existingField); +// break; // Move to the next existing field +// } +// } +// } +// +// // Convert updated fields back to JSON and save to the database +// applicationAmendmentRequestEntity.setAmendmentDocument(Utils.convertListToJsonString(updatedAmendmentFields)); +// applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); +// } +// } + private List processCriteria(ApplicationEvaluationEntity entity, ApplicationEvaluationRequest req) { List incomingCriteriaList = Optional.ofNullable(req.getCriteria()).orElse(new ArrayList<>()); @@ -1483,6 +1661,10 @@ public class ApplicationEvaluationDao { ApplicationEvaluationEntity oldApplicationEvaluation = Utils.getClonedEntityForData(existingEntity); AssignedApplicationsEntity oldAssignedApplication = Utils.getClonedEntityForData(assignedApplicationsEntity); + List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(existingEntity.getId(),ApplicationAmendmentRequestEnum.AWAITING.getValue()); + if(amendmentRequest !=null && Boolean.FALSE.equals(amendmentRequest.isEmpty())){ + throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_CANNOT_APPROVED_OR_REJECTED)); + } String statusType = application.getStatus(); if (application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue())) { existingEntity.setStatus(ApplicationEvaluationStatusTypeEnum.CLOSE.getValue()); @@ -1501,11 +1683,6 @@ public class ApplicationEvaluationDao { } - List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(existingEntity.getId(),ApplicationAmendmentRequestEnum.AWAITING.getValue()); - if(amendmentRequest !=null && Boolean.FALSE.equals(amendmentRequest.isEmpty())){ - throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_CANNOT_APPROVED_OR_REJECTED)); - } - if (Boolean.TRUE.equals(statusType.equals((ApplicationStatusTypeEnum.APPROVED.getValue())))) { emailNotificationDao.sendAdmissibilityNotificationEmailForApprovedApplication(application); } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java new file mode 100644 index 00000000..691a5a20 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java @@ -0,0 +1,17 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; +import net.gepafin.tendermanagement.model.response.AmendmentDocumentResponse; +import net.gepafin.tendermanagement.model.response.FieldResponse; + +import java.util.List; + +@Data +public class AmendmentDetailsRequest { + + Long amendmentId; + + List amendmentDocuments; + + List formFieldDocuments; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java index 95f158c3..0eaee1f3 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java @@ -9,9 +9,13 @@ public class AmendmentFormField { private String fieldId; + private String label; + private String fieldValue; - private String isUploadedBy; + private Boolean isValid; + + public enum AmendmentIsUploadedByEnum { diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java new file mode 100644 index 00000000..ed0d99db --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java @@ -0,0 +1,13 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class AmendmentFormFieldRequest { + + private String fieldId; + + private Object fieldValue; + + private Boolean isValid; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java index 6973254d..96f96f42 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java @@ -7,6 +7,6 @@ import lombok.Data; @Data public class ApplicationAmendmentRequestBean { private String note; - private List applicationFormFields; + private List applicationFormFields; private List amendmentDocuments; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java index df29c1d8..21b4a5ba 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java @@ -10,6 +10,7 @@ public class ApplicationEvaluationRequest { private List criteria; private List checklist; private List files; + private List amendmentDetails; private String note; private ApplicationStatusForEvaluation applicationStatus; private String motivation; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java new file mode 100644 index 00000000..4a2f2597 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java @@ -0,0 +1,15 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; + +import java.util.List; + +@Data +public class AmendmentDocumentResponseBean { + + Long amendmentId; + + List amendmentDocuments; + + List formFieldDocuments; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java index a3d32624..b890b327 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java @@ -22,6 +22,7 @@ public class ApplicationEvaluationResponse { private List checklist; private List files; private List evaluationDocument; + private List amendmentDetails; private LocalDateTime createdDate; private LocalDateTime updatedDate; private String beneficiary; From 0bdc5f6fce54bdac50b6f04b3a6b85fcbfa8b666 Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 13:48:46 +0530 Subject: [PATCH 11/35] Updated code --- .../dao/ApplicationAmendmentRequestDao.java | 2 +- .../tendermanagement/dao/ApplicationEvaluationDao.java | 3 ++- .../net/gepafin/tendermanagement/dao/DocumentDao.java | 8 ++++++++ .../tendermanagement/enums/UserActionContextEnum.java | 4 ++++ .../web/rest/api/ApplicationEvaluationApi.java | 4 ++-- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index d762ae3e..cb9f39e8 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -272,7 +272,7 @@ public class ApplicationAmendmentRequestDao { String formFieldsJson = Utils.convertObjectToJson(formFieldRequestBean); applicationAmendmentRequestEntity.setFormFields(formFieldsJson); } - if(Boolean.FALSE.equals(applicationAmendmentRequest.getAmendmentDocument().isEmpty())) { + if(applicationAmendmentRequest.getAmendmentDocument()!=null || Boolean.FALSE.equals(applicationAmendmentRequest.getAmendmentDocument().isEmpty())) { setAmendmentDocuments(applicationAmendmentRequest.getAmendmentDocument(), applicationAmendmentRequestEntity); } List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(applicationEvaluationEntity.getId()); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 7845a565..bd08434e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -582,10 +582,11 @@ public class ApplicationEvaluationDao { applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(entity.getId()); // Fetch amendment details from the request + if(req.getAmendmentDetails()!=null) { List amendmentDetailsRequests = req.getAmendmentDetails(); updateAmendmentDocumentsAndFormFields(applicationAmendmentRequestEntities, amendmentDetailsRequests); - +} ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(entity); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java index bf229f19..e1dbe853 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java @@ -121,6 +121,14 @@ public class DocumentDao { userActionContext = UserActionContextEnum.UPLOAD_APPLICATION_DOCUMENT; } else if (fileType.equals(DocumentTypeEnum.IMAGES) && sourceType.equals(DocumentSourceTypeEnum.APPLICATION)) { userActionContext = UserActionContextEnum.UPLOAD_APPLICATION_IMAGES; + }else if (fileType.equals(DocumentTypeEnum.DOCUMENT) && sourceType.equals(DocumentSourceTypeEnum.AMENDMENT)) { + userActionContext = UserActionContextEnum.UPLOAD_AMENDMENT_DOCUMENT; + } else if (fileType.equals(DocumentTypeEnum.IMAGES) && sourceType.equals(DocumentSourceTypeEnum.AMENDMENT)) { + userActionContext = UserActionContextEnum.UPLOAD_AMENDMENT_IMAGES; + }else if (fileType.equals(DocumentTypeEnum.DOCUMENT) && sourceType.equals(DocumentSourceTypeEnum.EVALUATION)) { + userActionContext = UserActionContextEnum.UPLOAD_EVALUATION_DOCUMENT; + } else if (fileType.equals(DocumentTypeEnum.IMAGES) && sourceType.equals(DocumentSourceTypeEnum.EVALUATION)) { + userActionContext = UserActionContextEnum.UPLOAD_EVALUATION_IMAGES; } return userActionContext; diff --git a/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java index 6f518462..20f917fe 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java @@ -118,6 +118,10 @@ public enum UserActionContextEnum { UPDATE_DOCUMENT("UPDATE_DOCUEMENT"), UPDATE_IMAGES("UPDATE_IMAGES"), GET_DOCUMENT("GET_DOCUMENT"), + UPLOAD_AMENDMENT_DOCUMENT("UPLOAD_AMENDMENT_DOCUMENT"), + UPLOAD_AMENDMENT_IMAGES("UPLOAD_AMENDMENT_IMAGES"), + UPLOAD_EVALUATION_DOCUMENT("UPLOAD_EVALUATION_DOCUMENT"), + UPLOAD_EVALUATION_IMAGES("UPLOAD_EVALUATION_IMAGES"), /** Assigned flow context **/ CREATE_UPDATE_FLOW("CREATE_UPDATE_FLOW"), diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java index 07321792..1255f3df 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java @@ -65,9 +65,9 @@ public interface ApplicationEvaluationApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) - @PutMapping(value = "/assignedApplicationId/{id}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @PutMapping(value = "/assignedApplication/{assignedApplicationId}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) ResponseEntity> updateApplicationEvaluation(HttpServletRequest request, - @Parameter(description = "The AssignedApplication id", required = true) @PathVariable("id") Long id, + @Parameter(description = "The AssignedApplication id", required = true) @PathVariable("assignedApplicationId") Long assignedApplicationId, @Parameter(description = "Application Evaluation request object", required = true) @Valid @RequestBody List applicationEvaluationDocRequest); From f6a6c6398ac84dfe9337c7e53c5288e5342b71bf Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 13 Dec 2024 15:11:24 +0530 Subject: [PATCH 12/35] Updated application evaluation code --- .../dao/ApplicationEvaluationDao.java | 4 +++- .../request/ApplicationEvaluationRequest.java | 1 + .../service/ApplicationEvaluationService.java | 1 - .../impl/ApplicationEvaluationServiceImpl.java | 6 ------ .../web/rest/api/ApplicationEvaluationApi.java | 16 ---------------- .../impl/ApplicationEvaluationApiController.java | 10 ---------- 6 files changed, 4 insertions(+), 34 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index bd08434e..62323d65 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -580,7 +580,9 @@ public class ApplicationEvaluationDao { // Fetch all amendment request entities associated with the evaluation ID List applicationAmendmentRequestEntities = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(entity.getId()); - + if(req.getEvaluationDocument()!=null) { + updateApplicationEvaluation(assignedApplicationId, req.getEvaluationDocument()); + } // Fetch amendment details from the request if(req.getAmendmentDetails()!=null) { List amendmentDetailsRequests = req.getAmendmentDetails(); diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java index 21b4a5ba..6616c288 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java @@ -10,6 +10,7 @@ public class ApplicationEvaluationRequest { private List criteria; private List checklist; private List files; + private List evaluationDocument; private List amendmentDetails; private String note; private ApplicationStatusForEvaluation applicationStatus; diff --git a/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java b/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java index 5bdf5c14..454030af 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java @@ -21,5 +21,4 @@ public interface ApplicationEvaluationService { ApplicationEvaluationEntity validateApplicationEvaluationByApplicationId(Long applicationId); - ApplicationEvaluationResponse updateApplicationEvaluation(HttpServletRequest request , Long assignedApplicationId, List applicationEvaluationDocRequest); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java index 503f1513..3dd9035f 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java @@ -78,10 +78,4 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe return applicationEvaluationDao.validateApplicationEvaluationByApplicationId(applicationId); } - @Override - public ApplicationEvaluationResponse updateApplicationEvaluation(HttpServletRequest request, Long assignedApplicationId, List evaluationDocRequest) { - AssignedApplicationsEntity assignedApplication =assignedApplicationsService.validateAssignedApplication(assignedApplicationId); - validator.validatePreInstructor(request, assignedApplication.getUserId()); - return applicationEvaluationDao.updateApplicationEvaluation(assignedApplicationId,evaluationDocRequest); - } } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java index 1255f3df..9d168955 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java @@ -55,21 +55,5 @@ public interface ApplicationEvaluationApi { ResponseEntity> deleteApplicationEvaluation(HttpServletRequest request, @Parameter( required = true) @PathVariable("id") Long id); - @Operation(summary = "Api to upload Documents for evaluation", - 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) })) - }) - @PutMapping(value = "/assignedApplication/{assignedApplicationId}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - ResponseEntity> updateApplicationEvaluation(HttpServletRequest request, - @Parameter(description = "The AssignedApplication id", required = true) @PathVariable("assignedApplicationId") Long assignedApplicationId, - @Parameter(description = "Application Evaluation request object", required = true) @Valid @RequestBody List applicationEvaluationDocRequest); - - } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java index 403e826a..b299ecc2 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java @@ -82,15 +82,5 @@ public class ApplicationEvaluationApiController implements ApplicationEvaluation return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_DELETED_SUCCESSFULLY))); } - @Override - public ResponseEntity> updateApplicationEvaluation(HttpServletRequest request, Long id, List applicationEvaluationDocRequest) { - /** This code is responsible for "Upload Evaluation Document" operation. **/ - loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE) - .actionContext(UserActionContextEnum.UPLOAD_EVALUATION_DOC).build()); - - ApplicationEvaluationResponse updateApplicationEvaluationResponse = applicationEvaluationService.updateApplicationEvaluation(request, id, applicationEvaluationDocRequest); - return ResponseEntity.status(HttpStatus.CREATED) - .body(new Response<>(updateApplicationEvaluationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_AMENDMENT_UPDATE_SUCCESSFULLY_MSG))); - } } From 8606e224567b5cec5f87657a88be42d2b3bc5bd6 Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 15:17:16 +0530 Subject: [PATCH 13/35] Updated code for amendment docs --- .../dao/ApplicationAmendmentRequestDao.java | 8 +++----- .../model/request/ApplicationAmendmentRequest.java | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index cb9f39e8..10d08e53 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -272,9 +272,6 @@ public class ApplicationAmendmentRequestDao { String formFieldsJson = Utils.convertObjectToJson(formFieldRequestBean); applicationAmendmentRequestEntity.setFormFields(formFieldsJson); } - if(applicationAmendmentRequest.getAmendmentDocument()!=null || Boolean.FALSE.equals(applicationAmendmentRequest.getAmendmentDocument().isEmpty())) { - setAmendmentDocuments(applicationAmendmentRequest.getAmendmentDocument(), applicationAmendmentRequestEntity); - } List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(applicationEvaluationEntity.getId()); // Ensure startDate and initialDays are not null to avoid NullPointerException if (amendmentRequest !=null && amendmentRequest.isEmpty() && applicationEvaluationEntity.getStartDate() != null && applicationEvaluationEntity.getInitialDays() != null ) { @@ -579,8 +576,9 @@ public class ApplicationAmendmentRequestDao { existingApplicationAmendment.setFormFields(Utils.convertListToJsonString(amendmentFormFieldMap.values().stream().toList())); } existingApplicationAmendment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); - - setAmendmentDocuments(updateRequest.getAmendmentDocuments(),existingApplicationAmendment); + if(updateRequest.getAmendmentDocuments()!=null && Boolean.FALSE.equals(updateRequest.getAmendmentDocuments().isEmpty())) { + setAmendmentDocuments(updateRequest.getAmendmentDocuments(), existingApplicationAmendment); + } ApplicationAmendmentRequestEntity updatedApplicationAmendment = saveApplicationAmendmentRequestEntity(existingApplicationAmendment,oldApplicationAmendmentEntity,VersionActionTypeEnum.UPDATE); ApplicationAmendmentRequestResponse response = convertEntityToResponse(updatedApplicationAmendment); log.info("Application Amendment updated successfully: {}", response); diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequest.java index 97e74446..ade4c676 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequest.java @@ -11,5 +11,4 @@ public class ApplicationAmendmentRequest { private Long responseDays; private Boolean isSendNotification; private Boolean isSendEmail; - private List amendmentDocument; } From 01421778bce1e74fd084bb616dbeb78433145b6d Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 13 Dec 2024 15:35:04 +0530 Subject: [PATCH 14/35] Updated code --- .../tendermanagement/dao/ApplicationEvaluationDao.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 62323d65..694d196b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -565,9 +565,15 @@ public class ApplicationEvaluationDao { if (existingEntityOptional.isPresent()) { entity = existingEntityOptional.get(); oldApplicationEvaluation = Utils.getClonedEntityForData(entity); + if(req.getCriteria()!=null) { entity.setCriteria(Utils.convertObjectToJson(processCriteria(entity, req))); + } + if(req.getChecklist()!=null) { entity.setChecklist(Utils.convertObjectToJson(processChecklist(entity, req))); + } + if(req.getFiles()!=null) { entity.setFile(Utils.convertObjectToJson(processField(entity, req))); + } entity.setIsDeleted(false); setIfUpdated(entity::getNote, entity::setNote, req.getNote()); setIfUpdated(entity::getMotivation, entity::setMotivation, req.getMotivation()); From d6a2521a576db19ff7886855d832891707944127 Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 15:47:11 +0530 Subject: [PATCH 15/35] Updated code --- .../dao/ApplicationAmendmentRequestDao.java | 6 +++--- .../dao/ApplicationEvaluationDao.java | 13 ++++++++----- .../model/request/AmendmentFieldRequest.java | 2 +- .../model/request/AmendmentFormField.java | 2 +- .../model/request/AmendmentFormFieldRequest.java | 2 +- .../model/response/AmendmentDocumentResponse.java | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 10d08e53..24a9a72f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -375,7 +375,7 @@ public class ApplicationAmendmentRequestDao { AmendmentDocumentResponse amendmentDocumentResponse = new AmendmentDocumentResponse(); amendmentDocumentResponse.setFieldId(amendmentFieldRequest.getFieldId()); amendmentDocumentResponse.setNameValue(amendmentFieldRequest.getNameValue()); - amendmentDocumentResponse.setIsValid(amendmentFieldRequest.getIsValid()); + amendmentDocumentResponse.setValid(amendmentFieldRequest.getValid()); DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue())); DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity); @@ -660,7 +660,7 @@ public class ApplicationAmendmentRequestDao { if (!existingDocumentIds.isEmpty()) { existingDocumentIds.forEach(this::softDeleteDocument); amendmentFormField.setFieldValue(null); - amendmentFormField.setIsValid(applicationFormFieldRequest.getIsValid()); + amendmentFormField.setValid(applicationFormFieldRequest.getValid()); // setIsUploadedBy(amendmentFormField); } return; @@ -675,7 +675,7 @@ public class ApplicationAmendmentRequestDao { if (!newFieldValue.equals(amendmentFormField.getFieldValue())) { amendmentFormField.setFieldValue(newFieldValue); - amendmentFormField.setIsValid(applicationFormFieldRequest.getIsValid()); + amendmentFormField.setValid(applicationFormFieldRequest.getValid()); // setIsUploadedBy(amendmentFormField); } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 62323d65..99b6079e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -176,7 +176,7 @@ public class ApplicationEvaluationDao { FieldResponse fieldResponse=new FieldResponse(); fieldResponse.setId(amendmentFormField.getFieldId()); fieldResponse.setLabel(amendmentFormField.getLabel()); - fieldResponse.setValid(amendmentFormField.getIsValid()); + fieldResponse.setValid(amendmentFormField.getValid()); List fileIds=applicationAmendmentRequestDao.extractIds(amendmentFormField.getFieldValue()); List documentResponseBeans = fileIds.stream() .map(fileId -> createDocumentResponseBean(documentService.validateDocument(fileId))) // Create DocumentResponseBean for each fileId @@ -619,8 +619,11 @@ public class ApplicationEvaluationDao { // Map amendment details for quick lookup by amendment ID Map> amendmentDetailsMap = amendmentFormFields.stream() .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) - .collect(Collectors.toMap(AmendmentDetailsRequest::getAmendmentId, AmendmentDetailsRequest::getFormFieldDocuments)); - + .filter(details -> details.getFormFieldDocuments() != null) // Null check for getFormFieldDocuments + .collect(Collectors.toMap( + AmendmentDetailsRequest::getAmendmentId, + AmendmentDetailsRequest::getFormFieldDocuments + )); // Get corresponding amendment documents for the current entity List amendmentDocuments = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); if (amendmentDocuments != null) { @@ -629,7 +632,7 @@ public class ApplicationEvaluationDao { for (AmendmentFormFieldRequest newField : amendmentDocuments) { if (existingField.getFieldId().equals(newField.getFieldId())) { // Update fields if there are changes - Utils.setIfUpdated(existingField::getIsValid, existingField::setIsValid, newField.getIsValid()); + Utils.setIfUpdated(existingField::getValid, existingField::setValid, newField.getValid()); Utils.setIfUpdated(existingField::getFieldValue, existingField::setFieldValue, newField.getFieldValue()); updatedFormFields.add(existingField); @@ -666,7 +669,7 @@ public class ApplicationEvaluationDao { for (AmendmentFieldRequest newField : amendmentDocuments) { if (existingField.getFieldId().equals(newField.getFieldId())) { // Update fields if there are changes - Utils.setIfUpdated(existingField::getIsValid, existingField::setIsValid, newField.getIsValid()); + Utils.setIfUpdated(existingField::getValid, existingField::setValid, newField.getValid()); Utils.setIfUpdated(existingField::getFileValue, existingField::setFileValue, newField.getFileValue()); Utils.setIfUpdated(existingField::getNameValue, existingField::setNameValue, newField.getNameValue()); diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java index 99de2df0..b7efa539 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java @@ -8,6 +8,6 @@ public class AmendmentFieldRequest { private String fieldId; private String nameValue; private String fileValue; - private Boolean isValid = false; + private Boolean valid = false; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java index 0eaee1f3..35b3521a 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java @@ -13,7 +13,7 @@ public class AmendmentFormField { private String fieldValue; - private Boolean isValid; + private Boolean valid; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java index ed0d99db..d144b283 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java @@ -9,5 +9,5 @@ public class AmendmentFormFieldRequest { private Object fieldValue; - private Boolean isValid; + private Boolean valid; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java index 7fb1b220..528b3492 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java @@ -8,5 +8,5 @@ public class AmendmentDocumentResponse { private String fieldId; private String nameValue; private DocumentResponseBean fileValue; - private Boolean isValid = false; + private Boolean valid = false; } From 709d40e032e935a398f102371e2e5a1713c7259d Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 17:48:02 +0530 Subject: [PATCH 16/35] Updated code for file detail in amendment --- .../dao/ApplicationAmendmentRequestDao.java | 10 ++++++---- .../model/response/AmendmentDocumentResponse.java | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 24a9a72f..5ef0044c 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -376,10 +376,12 @@ public class ApplicationAmendmentRequestDao { amendmentDocumentResponse.setFieldId(amendmentFieldRequest.getFieldId()); amendmentDocumentResponse.setNameValue(amendmentFieldRequest.getNameValue()); amendmentDocumentResponse.setValid(amendmentFieldRequest.getValid()); - - DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue())); - DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity); - amendmentDocumentResponse.setFileValue(responseBean); + amendmentDocumentResponse.setFileValue(null); + if(amendmentFieldRequest.getFileValue()!=null) { + DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue())); + DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity); + amendmentDocumentResponse.setFileValue(List.of(responseBean)); + } return amendmentDocumentResponse; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java index 528b3492..45680a64 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java @@ -2,11 +2,13 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; +import java.util.List; + @Data public class AmendmentDocumentResponse { private String fieldId; private String nameValue; - private DocumentResponseBean fileValue; + private List fileValue; private Boolean valid = false; } From 7ad6e6c2cccd096afe23aaf590ff72f8c4997ff2 Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 17:54:42 +0530 Subject: [PATCH 17/35] Updated code --- .../tendermanagement/dao/ApplicationEvaluationDao.java | 3 ++- .../model/response/EvaluationDocumentResponse.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 5a181400..db0ddcbc 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -204,7 +204,8 @@ public class ApplicationEvaluationDao { documentResponseBean.setFilePath(documentEntity.getFilePath()); documentResponseBean.setCreatedDate(documentEntity.getCreatedDate()); documentResponseBean.setUpdatedDate(documentEntity.getUpdatedDate()); - evaluationDocResponse.setFileValue(documentResponseBean); + documentResponseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId()); + evaluationDocResponse.setFileValue(List.of(documentResponseBean)); evaluationDocResponse.setNameValue(doc.getNameValue()); evaluationDocResponse.setValid(doc.getValid()); evaluationDocResponse.setFieldId(doc.getFieldId()); diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java index aea34514..94a4d881 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java @@ -2,11 +2,13 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; +import java.util.List; + @Data public class EvaluationDocumentResponse { private String fieldId; private String nameValue; private Boolean valid; - private DocumentResponseBean fileValue ; + private List fileValue ; } From ee70279eec1792b7259d9f8eae385209f19e8ed4 Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 20:18:40 +0530 Subject: [PATCH 18/35] Updated code --- .../dao/ApplicationAmendmentRequestDao.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 5ef0044c..3ac34c8e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -355,12 +355,14 @@ public class ApplicationAmendmentRequestDao { List forms = applicationFormRepository.findByApplicationId(applicationAmendmentRequestEntity.getApplicationId()); Map fieldIdToLabelMap = extractFieldIdToLabelMap(forms); - + List amendmentFieldRequests= new ArrayList<>(); List amendmentFormFields = Utils.convertJsonStringToList( applicationAmendmentRequestEntity.getFormFields(), AmendmentFormField.class); Map formFieldEntityMap = getApplicationFormFieldEntityMap(applicationAmendmentRequestEntity, amendmentFormFields); - List amendmentFieldRequests = Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(),AmendmentFieldRequest.class); - if (amendmentFieldRequests != null) { + if(applicationAmendmentRequestEntity.getAmendmentDocument() !=null ){ + amendmentFieldRequests = Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(),AmendmentFieldRequest.class); + } + if (amendmentFieldRequests != null) { List amendmentDocumentResponses = amendmentFieldRequests.stream() .map(this::createAmendmentDocumentResponse) .toList(); From f0c28c434977434b093c4164c646c7bf03c9c4a0 Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 20:34:51 +0530 Subject: [PATCH 19/35] Updated code --- .../gepafin/tendermanagement/dao/ApplicationEvaluationDao.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index db0ddcbc..9d7a6daa 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -19,6 +19,7 @@ import net.gepafin.tendermanagement.util.Validator; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -156,7 +157,7 @@ public class ApplicationEvaluationDao { amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId()); String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument(); String formField=applicationAmendmentRequestEntity.getFormFields(); - if (amendmentDocument != null) { + if (Boolean.FALSE.equals(StringUtils.isEmpty(amendmentDocument))) { List amendmentFieldRequests=Utils.convertJsonStringToList(amendmentDocument,AmendmentFieldRequest.class); List amendmentDocumentResponses = amendmentFieldRequests.stream() .map(applicationAmendmentRequestDao::createAmendmentDocumentResponse) From d7302e6f4ed65a62dfa13f082b7ff514bf2464dc Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 14 Dec 2024 12:11:10 +0530 Subject: [PATCH 20/35] Fixed application form issue --- .../tendermanagement/dao/ApplicationDao.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 203b4f3c..8cbf5d64 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -455,8 +455,9 @@ public class ApplicationDao { if (applicationFormFieldEntities == null || applicationFormFieldEntities.isEmpty()) { applicationFormFieldEntity.setApplicationForm(applicationFormEntity); } else { + applicationFormFieldEntity.setApplicationForm(applicationFormEntity); for (ApplicationFormFieldEntity applicationFormFieldEntity1 : applicationFormFieldEntities) { - if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId())) { + if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) { applicationFormFieldEntity = applicationFormFieldEntity1; oldApplicationFormFieldData = Utils.getClonedEntityForData(applicationFormFieldEntity); if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm())) { @@ -464,8 +465,6 @@ public class ApplicationDao { } actionType = VersionActionTypeEnum.UPDATE; break; - } else { - applicationFormFieldEntity.setApplicationForm(applicationFormEntity); } } } @@ -495,7 +494,30 @@ public class ApplicationDao { return applicationFormField; } - void updateDocumentDeletionStatus(ApplicationFormFieldEntity applicationFormFieldEntity, ApplicationFormFieldRequestBean applicationFormFieldRequestBean, FormEntity formEntity, List newDocumentIds, + private Boolean checkIfRequestFieldIsDifferent(ApplicationFormFieldEntity applicationFormFieldEntity, + ApplicationFormFieldRequestBean applicationFormFieldRequestBean) { + + // Retrieve the field values from both objects + String entityFieldValue = applicationFormFieldEntity.getFieldValue(); + Object requestFieldValue = applicationFormFieldRequestBean.getFieldValue(); + + // Check if both are null + if (entityFieldValue == null && requestFieldValue == null) { + return false; // No difference if both are null + } + + // Compare values + Boolean check = !Objects.equals(entityFieldValue, requestFieldValue); + + // Additional comparison if both are non-null + if (Boolean.TRUE.equals(check) && entityFieldValue != null && requestFieldValue != null) { + check = !entityFieldValue.equals(requestFieldValue.toString()); + } + + return check; + } + + void updateDocumentDeletionStatus(ApplicationFormFieldEntity applicationFormFieldEntity, ApplicationFormFieldRequestBean applicationFormFieldRequestBean, FormEntity formEntity, List newDocumentIds, List preInstructorDocumentId,boolean isPreInstructor) { if (newDocumentIds == null) { newDocumentIds = Collections.emptyList(); From d7c656f39ee1b6f496fcf079f393092f0b3ef938 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 14 Dec 2024 12:40:40 +0530 Subject: [PATCH 21/35] updated code --- .../net/gepafin/tendermanagement/dao/ApplicationDao.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 8cbf5d64..3b1a11b3 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -455,16 +455,17 @@ public class ApplicationDao { if (applicationFormFieldEntities == null || applicationFormFieldEntities.isEmpty()) { applicationFormFieldEntity.setApplicationForm(applicationFormEntity); } else { - applicationFormFieldEntity.setApplicationForm(applicationFormEntity); for (ApplicationFormFieldEntity applicationFormFieldEntity1 : applicationFormFieldEntities) { - if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) { + if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId())) { applicationFormFieldEntity = applicationFormFieldEntity1; oldApplicationFormFieldData = Utils.getClonedEntityForData(applicationFormFieldEntity); - if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm())) { + if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) { validateRequiredFields(applicationFormEntity.getForm(), applicationFormEntity.getApplication(), applicationFormFieldRequestBean.getFieldId()); } actionType = VersionActionTypeEnum.UPDATE; break; + } else { + applicationFormFieldEntity.setApplicationForm(applicationFormEntity); } } } From 1b4b4fa3ccf51349774f694a83960a1db103a80f Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 14 Dec 2024 12:11:10 +0530 Subject: [PATCH 22/35] Fixed application form issue --- .../tendermanagement/dao/ApplicationDao.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 1240aa90..8803d46d 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -455,8 +455,9 @@ public class ApplicationDao { if (applicationFormFieldEntities == null || applicationFormFieldEntities.isEmpty()) { applicationFormFieldEntity.setApplicationForm(applicationFormEntity); } else { + applicationFormFieldEntity.setApplicationForm(applicationFormEntity); for (ApplicationFormFieldEntity applicationFormFieldEntity1 : applicationFormFieldEntities) { - if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId())) { + if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) { applicationFormFieldEntity = applicationFormFieldEntity1; oldApplicationFormFieldData = Utils.getClonedEntityForData(applicationFormFieldEntity); if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm())) { @@ -464,8 +465,6 @@ public class ApplicationDao { } actionType = VersionActionTypeEnum.UPDATE; break; - } else { - applicationFormFieldEntity.setApplicationForm(applicationFormEntity); } } } @@ -495,7 +494,30 @@ public class ApplicationDao { return applicationFormField; } - void updateDocumentDeletionStatus(ApplicationFormFieldEntity applicationFormFieldEntity, ApplicationFormFieldRequestBean applicationFormFieldRequestBean, FormEntity formEntity, List newDocumentIds, + private Boolean checkIfRequestFieldIsDifferent(ApplicationFormFieldEntity applicationFormFieldEntity, + ApplicationFormFieldRequestBean applicationFormFieldRequestBean) { + + // Retrieve the field values from both objects + String entityFieldValue = applicationFormFieldEntity.getFieldValue(); + Object requestFieldValue = applicationFormFieldRequestBean.getFieldValue(); + + // Check if both are null + if (entityFieldValue == null && requestFieldValue == null) { + return false; // No difference if both are null + } + + // Compare values + Boolean check = !Objects.equals(entityFieldValue, requestFieldValue); + + // Additional comparison if both are non-null + if (Boolean.TRUE.equals(check) && entityFieldValue != null && requestFieldValue != null) { + check = !entityFieldValue.equals(requestFieldValue.toString()); + } + + return check; + } + + void updateDocumentDeletionStatus(ApplicationFormFieldEntity applicationFormFieldEntity, ApplicationFormFieldRequestBean applicationFormFieldRequestBean, FormEntity formEntity, List newDocumentIds, List preInstructorDocumentId,boolean isPreInstructor) { if (newDocumentIds == null) { newDocumentIds = Collections.emptyList(); From 23760300950fcda8f82fe5d0e96d348ef96d95b2 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 14 Dec 2024 12:40:40 +0530 Subject: [PATCH 23/35] updated code --- .../net/gepafin/tendermanagement/dao/ApplicationDao.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 8803d46d..0feafec8 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -455,16 +455,17 @@ public class ApplicationDao { if (applicationFormFieldEntities == null || applicationFormFieldEntities.isEmpty()) { applicationFormFieldEntity.setApplicationForm(applicationFormEntity); } else { - applicationFormFieldEntity.setApplicationForm(applicationFormEntity); for (ApplicationFormFieldEntity applicationFormFieldEntity1 : applicationFormFieldEntities) { - if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) { + if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId())) { applicationFormFieldEntity = applicationFormFieldEntity1; oldApplicationFormFieldData = Utils.getClonedEntityForData(applicationFormFieldEntity); - if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm())) { + if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) { validateRequiredFields(applicationFormEntity.getForm(), applicationFormEntity.getApplication(), applicationFormFieldRequestBean.getFieldId()); } actionType = VersionActionTypeEnum.UPDATE; break; + } else { + applicationFormFieldEntity.setApplicationForm(applicationFormEntity); } } } From 94086428e8b4f9a13d0a56eaa86322dce552996d Mon Sep 17 00:00:00 2001 From: nisha Date: Mon, 16 Dec 2024 14:46:34 +0530 Subject: [PATCH 24/35] Disable auto email sending --- .../scheduler/ApplicationAmendmentScheduler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java index a3112a1c..56cb3663 100644 --- a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java +++ b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java @@ -85,7 +85,7 @@ public class ApplicationAmendmentScheduler { /** This code is responsible for adding a version history log for the "Update Application Amendment" operation. **/ loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAmendmentRequestEntity).newData(request).build()); - emailNotificationDao.sendApplicationFailureNotificationEmail(request); +// emailNotificationDao.sendApplicationFailureNotificationEmail(request); log.info("Updated status to CLOSED for ApplicationAmendmentRequest with ID: {}", request.getId()); } catch (Exception e) { log.error("Error expiring ApplicationAmendmentRequest with ID {}: {}", request.getId(), e.getMessage(), From e083ed39378fb1891d1562a7631bcad4b4bdae8b Mon Sep 17 00:00:00 2001 From: nisha Date: Mon, 16 Dec 2024 14:46:34 +0530 Subject: [PATCH 25/35] Disable auto email sending --- .../scheduler/ApplicationAmendmentScheduler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java index a3112a1c..56cb3663 100644 --- a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java +++ b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java @@ -85,7 +85,7 @@ public class ApplicationAmendmentScheduler { /** This code is responsible for adding a version history log for the "Update Application Amendment" operation. **/ loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAmendmentRequestEntity).newData(request).build()); - emailNotificationDao.sendApplicationFailureNotificationEmail(request); +// emailNotificationDao.sendApplicationFailureNotificationEmail(request); log.info("Updated status to CLOSED for ApplicationAmendmentRequest with ID: {}", request.getId()); } catch (Exception e) { log.error("Error expiring ApplicationAmendmentRequest with ID {}: {}", request.getId(), e.getMessage(), From 47f67975c17f2e13ed59bc4e23a042e0c81faa04 Mon Sep 17 00:00:00 2001 From: rajesh Date: Wed, 18 Dec 2024 15:58:17 +0530 Subject: [PATCH 26/35] Amendment document changes --- .../dao/ApplicationAmendmentRequestDao.java | 103 +++++++++++++----- .../dao/ApplicationEvaluationDao.java | 99 ++++++++++++----- .../request/AmendmentDetailsRequest.java | 6 +- .../ApplicationAmendmentRequestBean.java | 3 +- .../AmendmentDetailsResponseBean.java | 12 ++ .../response/AmendmentDocumentResponse.java | 14 --- .../AmendmentDocumentResponseBean.java | 6 +- .../ApplicationAmendmentRequestResponse.java | 4 +- 8 files changed, 167 insertions(+), 80 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDetailsResponseBean.java delete mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 3ac34c8e..f44a0257 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -108,6 +108,9 @@ public class ApplicationAmendmentRequestDao { @Autowired private ApplicationEvaluationDao applicationEvaluationDao; + @Autowired + private DocumentRepository documentRepository; + public ApplicationAmendmentRequestResponse getApplicationDataForAmendment(Long applicationEvaluationId) { log.info("Fetching the application data for the Amendment process {}", applicationEvaluationId); ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId); @@ -330,15 +333,24 @@ public class ApplicationAmendmentRequestDao { return applicationAmendment; } + private void setAmendmentDocuments(String amendmentNotes, String amendmentFieldRequest, + ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity) { + AmendmentDetailsResponseBean amendmentDetails = new AmendmentDetailsResponseBean(); + if (amendmentFieldRequest != null && !amendmentFieldRequest.trim().isEmpty()) { + String[] documentIds = amendmentFieldRequest.split(","); + String validDocumentIds = Arrays.stream(documentIds) + .map(String::trim) + .filter(id -> !id.isEmpty()) + .collect(Collectors.joining(",")); - private void setAmendmentDocuments(List amendmentFieldRequest, ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity) { - amendmentFieldRequest.stream().forEach(amendmentData->{ - String fieldValue=amendmentData.getFileValue(); - if(fieldValue!=null){ - documentService.validateDocument(Long.valueOf(fieldValue)); - } - }); - applicationAmendmentRequestEntity.setAmendmentDocument(Utils.convertListToJsonString(amendmentFieldRequest)); + amendmentDetails.setAmendmentDocuments(validDocumentIds); + } + if (amendmentNotes != null && !amendmentNotes.trim().isEmpty()) { + amendmentDetails.setAmendmentNotes(amendmentNotes.trim()); + } + amendmentDetails.setValid(null); + String amendmentDetailsJson = Utils.convertListToJsonString(Collections.singletonList(amendmentDetails)); + applicationAmendmentRequestEntity.setAmendmentDocument(amendmentDetailsJson); } public ApplicationAmendmentRequestEntity saveApplicationAmendmentRequestEntity(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity,ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity,VersionActionTypeEnum actionTypeEnum) { @@ -355,39 +367,70 @@ public class ApplicationAmendmentRequestDao { List forms = applicationFormRepository.findByApplicationId(applicationAmendmentRequestEntity.getApplicationId()); Map fieldIdToLabelMap = extractFieldIdToLabelMap(forms); - List amendmentFieldRequests= new ArrayList<>(); +// List amendmentFieldRequests= new ArrayList<>(); List amendmentFormFields = Utils.convertJsonStringToList( applicationAmendmentRequestEntity.getFormFields(), AmendmentFormField.class); Map formFieldEntityMap = getApplicationFormFieldEntityMap(applicationAmendmentRequestEntity, amendmentFormFields); - if(applicationAmendmentRequestEntity.getAmendmentDocument() !=null ){ - amendmentFieldRequests = Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(),AmendmentFieldRequest.class); - } - if (amendmentFieldRequests != null) { - List amendmentDocumentResponses = amendmentFieldRequests.stream() - .map(this::createAmendmentDocumentResponse) - .toList(); - response.setAmendmentDocuments(amendmentDocumentResponses); + if (applicationAmendmentRequestEntity.getAmendmentDocument() != null) { + + List amendmentDetailsList = + Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(), + AmendmentDetailsResponseBean.class); + List documentResponseBeans = new ArrayList<>(); + for (AmendmentDetailsResponseBean amendmentDetails:amendmentDetailsList) { + if (amendmentDetails.getAmendmentDocuments()!=null) { + // Extract the comma-separated document IDs as a string + String documentIdsString = amendmentDetails.getAmendmentDocuments(); + + if (documentIdsString != null && !documentIdsString.trim().isEmpty()) { + // Split the comma-separated values and process them + List documentIds = Arrays.stream(documentIdsString.split(",")) + .map(String::trim) + .filter(id -> !id.isEmpty()) + .collect(Collectors.toList()); + + documentResponseBeans.addAll( + documentIds.stream() + .map(id -> { + try { + return createDocumentResponseBean(id); // Convert to Long + } catch (NumberFormatException e) { + // Handle invalid document IDs gracefully + return null; + } + }) + .filter(Objects::nonNull) // Skip null responses + .collect(Collectors.toList()) + ); + response.setAmendmentNotes(amendmentDetails.getAmendmentNotes()); + response.setValid(amendmentDetails.getValid()!=null?amendmentDetails.getValid():null); + } + } + + } + + response.setAmendmentDocuments(documentResponseBeans); + + } + + processFormFields(amendmentFormFields, fieldIdToLabelMap, formFieldEntityMap, response); return response; } - public AmendmentDocumentResponse createAmendmentDocumentResponse(AmendmentFieldRequest amendmentFieldRequest) { - AmendmentDocumentResponse amendmentDocumentResponse = new AmendmentDocumentResponse(); - amendmentDocumentResponse.setFieldId(amendmentFieldRequest.getFieldId()); - amendmentDocumentResponse.setNameValue(amendmentFieldRequest.getNameValue()); - amendmentDocumentResponse.setValid(amendmentFieldRequest.getValid()); - amendmentDocumentResponse.setFileValue(null); - if(amendmentFieldRequest.getFileValue()!=null) { - DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue())); - DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity); - amendmentDocumentResponse.setFileValue(List.of(responseBean)); - } + public DocumentResponseBean createDocumentResponseBean(String documentId) { - return amendmentDocumentResponse; + if (!StringUtils.isEmpty(documentId)) { + Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(documentId)); + if(documentEntity.isPresent()){ + return applicationEvaluationDao.createDocumentResponseBean(documentEntity.get()); + }} + return null; } + private ApplicationAmendmentRequestResponse initializeBasicResponse(ApplicationAmendmentRequestEntity entity) { ApplicationAmendmentRequestResponse response = new ApplicationAmendmentRequestResponse(); response.setId(entity.getId()); @@ -581,7 +624,7 @@ public class ApplicationAmendmentRequestDao { } existingApplicationAmendment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); if(updateRequest.getAmendmentDocuments()!=null && Boolean.FALSE.equals(updateRequest.getAmendmentDocuments().isEmpty())) { - setAmendmentDocuments(updateRequest.getAmendmentDocuments(), existingApplicationAmendment); + setAmendmentDocuments(updateRequest.getAmendmentNotes(),updateRequest.getAmendmentDocuments(), existingApplicationAmendment); } ApplicationAmendmentRequestEntity updatedApplicationAmendment = saveApplicationAmendmentRequestEntity(existingApplicationAmendment,oldApplicationAmendmentEntity,VersionActionTypeEnum.UPDATE); ApplicationAmendmentRequestResponse response = convertEntityToResponse(updatedApplicationAmendment); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 9d7a6daa..244c30fa 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -157,12 +157,21 @@ public class ApplicationEvaluationDao { amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId()); String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument(); String formField=applicationAmendmentRequestEntity.getFormFields(); - if (Boolean.FALSE.equals(StringUtils.isEmpty(amendmentDocument))) { - List amendmentFieldRequests=Utils.convertJsonStringToList(amendmentDocument,AmendmentFieldRequest.class); - List amendmentDocumentResponses = amendmentFieldRequests.stream() - .map(applicationAmendmentRequestDao::createAmendmentDocumentResponse) - .toList(); - amendmentDocumentResponseBean.setAmendmentDocuments(amendmentDocumentResponses); + List amendmentDetailsList = Utils.convertJsonStringToList(amendmentDocument, AmendmentDetailsResponseBean.class); + if (amendmentDetailsList != null && !amendmentDetailsList.isEmpty()) { + AmendmentDetailsResponseBean amendmentDetails = amendmentDetailsList.get(0); + if (amendmentDetails.getAmendmentDocuments() != null) { + List documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(",")) + .map(String::trim) + .filter(id -> !id.isEmpty()) + .map(documentId -> applicationAmendmentRequestDao.createDocumentResponseBean(documentId)) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + amendmentDocumentResponseBean.setAmendmentDocuments(documentResponseBeans); + } + amendmentDocumentResponseBean.setAmendmentNotes(amendmentDetails.getAmendmentNotes()); + amendmentDocumentResponseBean.setValid(amendmentDetails.getValid()); } List amendmentFormFields=Utils.convertJsonStringToList(formField,AmendmentFormField.class); amendmentDocumentResponseBean.setFormFieldDocuments(setFormFieldDocuments(amendmentFormFields)); @@ -657,39 +666,69 @@ public class ApplicationEvaluationDao { // Process amendment documents if present if (applicationAmendmentRequestEntity.getAmendmentDocument() != null) { - // Parse existing amendment fields from JSON - List existingAmendmentFields = - Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(), AmendmentFieldRequest.class); + String existingDocumentIds = applicationAmendmentRequestEntity.getAmendmentDocument(); - // Prepare a new list to hold updated amendment fields - List updatedAmendmentFields = new ArrayList<>(); + // Split comma-separated document IDs into a list + List existingDocumentIdList = Arrays.stream(existingDocumentIds.split(",")) + .map(String::trim) + .filter(id -> !id.isEmpty()) + .collect(Collectors.toList()); - // Map amendment details for quick lookup by amendment ID - Map> amendmentDetailsMap = amendmentFormFields.stream() + List updatedDocumentIdList = new ArrayList<>(); + Map amendmentDetailsMap = amendmentFormFields.stream() .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) - .collect(Collectors.toMap(AmendmentDetailsRequest::getAmendmentId, AmendmentDetailsRequest::getAmendmentDocuments)); + .collect(Collectors.toMap( + AmendmentDetailsRequest::getAmendmentId, + AmendmentDetailsRequest::getAmendmentDocuments + )); - // Get corresponding amendment documents for the current entity - List amendmentDocuments = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); - if (amendmentDocuments != null) { - // Update existing amendment fields with new values - for (AmendmentFieldRequest existingField : existingAmendmentFields) { - for (AmendmentFieldRequest newField : amendmentDocuments) { - if (existingField.getFieldId().equals(newField.getFieldId())) { - // Update fields if there are changes - Utils.setIfUpdated(existingField::getValid, existingField::setValid, newField.getValid()); - Utils.setIfUpdated(existingField::getFileValue, existingField::setFileValue, newField.getFileValue()); - Utils.setIfUpdated(existingField::getNameValue, existingField::setNameValue, newField.getNameValue()); + String amendmentDocumentIds = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); + if (amendmentDocumentIds != null) { + // Split and validate new document IDs + List newDocumentIdList = Arrays.stream(amendmentDocumentIds.split(",")) + .map(String::trim) + .filter(id -> !id.isEmpty()) + .collect(Collectors.toList()); - updatedAmendmentFields.add(existingField); - break; // Move to the next existing field + for (String existingId : existingDocumentIdList) { + for (String newId : newDocumentIdList) { + if (existingId.equals(newId)) { + Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(newId)); + if(documentEntity.isPresent()) { + updatedDocumentIdList.add(newId); + break; + } } } } - // Convert updated fields back to JSON and save to the database - applicationAmendmentRequestEntity.setAmendmentDocument(Utils.convertListToJsonString(updatedAmendmentFields)); - applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); + // Add any new IDs not in the existing list + for (String newId : newDocumentIdList) { + if (!existingDocumentIdList.contains(newId)) { + Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(newId)); + if(documentEntity.isPresent()) { + updatedDocumentIdList.add(newId); + } + } + } + String updatedDocumentIds = String.join(",", updatedDocumentIdList); + + // Create the AmendmentDetailsResponseBean for structured data + AmendmentDetailsResponseBean amendmentDetails = new AmendmentDetailsResponseBean(); + amendmentDetails.setAmendmentDocuments(updatedDocumentIds); + AmendmentDetailsRequest amendmentDetailsRequest = amendmentFormFields.stream() + .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) + .findFirst() + .orElse(null); + + if (amendmentDetailsRequest != null) { + amendmentDetails.setValid(amendmentDetailsRequest.getValid()); + } else { + amendmentDetails.setValid(false); + } + String amendmentDetailsJson = Utils.convertListToJsonString(Collections.singletonList(amendmentDetails)); + applicationAmendmentRequestEntity.setAmendmentDocument(amendmentDetailsJson); + applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); } } } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java index 691a5a20..dd44d257 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java @@ -1,8 +1,6 @@ package net.gepafin.tendermanagement.model.request; import lombok.Data; -import net.gepafin.tendermanagement.model.response.AmendmentDocumentResponse; -import net.gepafin.tendermanagement.model.response.FieldResponse; import java.util.List; @@ -11,7 +9,9 @@ public class AmendmentDetailsRequest { Long amendmentId; - List amendmentDocuments; + String amendmentDocuments; + + Boolean valid; List formFieldDocuments; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java index 96f96f42..7ab254d8 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java @@ -8,5 +8,6 @@ import lombok.Data; public class ApplicationAmendmentRequestBean { private String note; private List applicationFormFields; - private List amendmentDocuments; + private String amendmentDocuments; + private String amendmentNotes; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDetailsResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDetailsResponseBean.java new file mode 100644 index 00000000..eb9ee866 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDetailsResponseBean.java @@ -0,0 +1,12 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; + +import java.util.List; +@Data +public class AmendmentDetailsResponseBean { + private String amendmentDocuments; + private String amendmentNotes; + private Boolean valid; + +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java deleted file mode 100644 index 45680a64..00000000 --- a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.gepafin.tendermanagement.model.response; - -import lombok.Data; - -import java.util.List; - -@Data -public class AmendmentDocumentResponse { - - private String fieldId; - private String nameValue; - private List fileValue; - private Boolean valid = false; -} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java index 4a2f2597..96a88086 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java @@ -9,7 +9,11 @@ public class AmendmentDocumentResponseBean { Long amendmentId; - List amendmentDocuments; + List amendmentDocuments; + + Boolean valid; + + String amendmentNotes; List formFieldDocuments; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java index 0f77f602..01390777 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java @@ -21,7 +21,9 @@ public class ApplicationAmendmentRequestResponse { private String beneficiaryName; private List formFields; private List applicationFormFields; - private List amendmentDocuments; + private List amendmentDocuments; + private String amendmentNotes; + private Boolean valid; private Long applicationId; private Long applicationEvaluationId; private LocalDateTime evaluationEndDate; From 9c0acfb831f68b75e0a5e1d8f2c370ef58482bed Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 19 Dec 2024 17:02:23 +0530 Subject: [PATCH 27/35] Changes in application evaluation --- .../dao/ApplicationAmendmentRequestDao.java | 20 +- .../dao/ApplicationEvaluationDao.java | 316 ++++++++++-------- .../request/AmendmentDetailsRequest.java | 8 +- .../request/AmendmentFormFieldRequest.java | 4 + .../AmendmentDocumentResponseBean.java | 14 +- .../gepafin/tendermanagement/util/Utils.java | 22 ++ 6 files changed, 228 insertions(+), 156 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index f44a0257..9345b0da 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -349,7 +349,7 @@ public class ApplicationAmendmentRequestDao { amendmentDetails.setAmendmentNotes(amendmentNotes.trim()); } amendmentDetails.setValid(null); - String amendmentDetailsJson = Utils.convertListToJsonString(Collections.singletonList(amendmentDetails)); + String amendmentDetailsJson = Utils.convertObjectToString(amendmentDetails); applicationAmendmentRequestEntity.setAmendmentDocument(amendmentDetailsJson); } @@ -373,12 +373,13 @@ public class ApplicationAmendmentRequestDao { Map formFieldEntityMap = getApplicationFormFieldEntityMap(applicationAmendmentRequestEntity, amendmentFormFields); if (applicationAmendmentRequestEntity.getAmendmentDocument() != null) { - List amendmentDetailsList = - Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(), - AmendmentDetailsResponseBean.class); - List documentResponseBeans = new ArrayList<>(); - for (AmendmentDetailsResponseBean amendmentDetails:amendmentDetailsList) { - if (amendmentDetails.getAmendmentDocuments()!=null) { +// List amendmentDetailsList = +// Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(), +// AmendmentDetailsResponseBean.class); + AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(applicationAmendmentRequestEntity.getAmendmentDocument() ,AmendmentDetailsResponseBean.class); + if(amendmentDetails!=null) { + List documentResponseBeans = new ArrayList<>(); + if (amendmentDetails.getAmendmentDocuments() != null) { // Extract the comma-separated document IDs as a string String documentIdsString = amendmentDetails.getAmendmentDocuments(); @@ -403,13 +404,12 @@ public class ApplicationAmendmentRequestDao { .collect(Collectors.toList()) ); response.setAmendmentNotes(amendmentDetails.getAmendmentNotes()); - response.setValid(amendmentDetails.getValid()!=null?amendmentDetails.getValid():null); + response.setValid(amendmentDetails.getValid()); } } - + response.setAmendmentDocuments(documentResponseBeans); } - response.setAmendmentDocuments(documentResponseBeans); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 244c30fa..0666930b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -22,9 +22,11 @@ import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; @@ -157,9 +159,8 @@ public class ApplicationEvaluationDao { amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId()); String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument(); String formField=applicationAmendmentRequestEntity.getFormFields(); - List amendmentDetailsList = Utils.convertJsonStringToList(amendmentDocument, AmendmentDetailsResponseBean.class); - if (amendmentDetailsList != null && !amendmentDetailsList.isEmpty()) { - AmendmentDetailsResponseBean amendmentDetails = amendmentDetailsList.get(0); + AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(amendmentDocument, AmendmentDetailsResponseBean.class); + if (amendmentDetails != null) { if (amendmentDetails.getAmendmentDocuments() != null) { List documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(",")) .map(String::trim) @@ -168,33 +169,39 @@ public class ApplicationEvaluationDao { .filter(Objects::nonNull) .collect(Collectors.toList()); - amendmentDocumentResponseBean.setAmendmentDocuments(documentResponseBeans); + amendmentDocumentResponseBean.setFileDetail(documentResponseBeans); } - amendmentDocumentResponseBean.setAmendmentNotes(amendmentDetails.getAmendmentNotes()); + amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes()); amendmentDocumentResponseBean.setValid(amendmentDetails.getValid()); } - List amendmentFormFields=Utils.convertJsonStringToList(formField,AmendmentFormField.class); - amendmentDocumentResponseBean.setFormFieldDocuments(setFormFieldDocuments(amendmentFormFields)); - amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean); - } - response.setAmendmentDetails(amendmentDocumentResponseBeans); - } + List amendmentFormFields = Utils.convertJsonStringToList(formField, AmendmentFormField.class); + if (amendmentFormFields != null) { + for (AmendmentFormField amendmentFormField : amendmentFormFields) { + // Skip fields with null or empty fieldValue + if (StringUtils.isEmpty(amendmentFormField.getFieldValue())) { + continue; + } - private List setFormFieldDocuments(List amendmentFormFields) { - List fieldResponses=new ArrayList<>(); - for (AmendmentFormField amendmentFormField: amendmentFormFields){ - FieldResponse fieldResponse=new FieldResponse(); - fieldResponse.setId(amendmentFormField.getFieldId()); - fieldResponse.setLabel(amendmentFormField.getLabel()); - fieldResponse.setValid(amendmentFormField.getValid()); - List fileIds=applicationAmendmentRequestDao.extractIds(amendmentFormField.getFieldValue()); - List documentResponseBeans = fileIds.stream() - .map(fileId -> createDocumentResponseBean(documentService.validateDocument(fileId))) // Create DocumentResponseBean for each fileId - .collect(Collectors.toList()); // Collect all into a List - fieldResponse.setFileDetail(documentResponseBeans); - fieldResponses.add(fieldResponse); + AmendmentDocumentResponseBean formFieldResponseBean = new AmendmentDocumentResponseBean(); + formFieldResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId()); + formFieldResponseBean.setFieldId(amendmentFormField.getFieldId()); + formFieldResponseBean.setLabel(amendmentFormField.getLabel()); + formFieldResponseBean.setValid(amendmentFormField.getValid()); + + List fileIds = applicationAmendmentRequestDao.extractIds(amendmentFormField.getFieldValue()); + List documentResponseBeans = fileIds.stream() + .map(fileId -> createDocumentResponseBean(documentService.validateDocument(fileId))) + .collect(Collectors.toList()); + + formFieldResponseBean.setFileDetail(documentResponseBeans); + amendmentDocumentResponseBeans.add(formFieldResponseBean); + } + } + + amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean); } - return fieldResponses; + + response.setAmendmentDetails(amendmentDocumentResponseBeans); } private void setEvaluationDocResponse(ApplicationEvaluationResponse response, List docRequest) { @@ -623,117 +630,162 @@ public class ApplicationEvaluationDao { private void updateAmendmentDocumentsAndFormFields(List applicationAmendmentRequestEntities, List amendmentFormFields) { // Iterate through amendment request entities - for (ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity : applicationAmendmentRequestEntities) { - // Process form fields if present - if (applicationAmendmentRequestEntity.getFormFields() != null) { - // Parse existing form fields from JSON - List existingFormFields = - Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getFormFields(), AmendmentFormFieldRequest.class); - // Prepare a new list to hold updated form fields - List updatedFormFields = new ArrayList<>(); +// + Map> amendmentFormFieldsMap = amendmentFormFields.stream().collect(Collectors.groupingBy(AmendmentDetailsRequest::getAmendmentId,HashMap::new,Collectors.toCollection(ArrayList::new))); +// amendmentFormFields.forEach(data->{ +// ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = applicationAmendmentRequestMap.get(data.getAmendmentId()); +// if (data.getFieldId().contains("amend_")){ +// updateAmendmentDocument(applicationAmendmentRequestEntity, data); +// } +// }); + applicationAmendmentRequestEntities.forEach(applicationAmendmentRequestEntity->{ + updateAmendment(applicationAmendmentRequestEntity, amendmentFormFieldsMap.get(applicationAmendmentRequestEntity.getId())); + }); + applicationAmendmentRequestRepository.saveAll(applicationAmendmentRequestEntities); - // Map amendment details for quick lookup by amendment ID - Map> amendmentDetailsMap = amendmentFormFields.stream() - .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) - .filter(details -> details.getFormFieldDocuments() != null) // Null check for getFormFieldDocuments - .collect(Collectors.toMap( - AmendmentDetailsRequest::getAmendmentId, - AmendmentDetailsRequest::getFormFieldDocuments - )); - // Get corresponding amendment documents for the current entity - List amendmentDocuments = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); - if (amendmentDocuments != null) { - // Update existing form fields with new values - for (AmendmentFormFieldRequest existingField : existingFormFields) { - for (AmendmentFormFieldRequest newField : amendmentDocuments) { - if (existingField.getFieldId().equals(newField.getFieldId())) { - // Update fields if there are changes - Utils.setIfUpdated(existingField::getValid, existingField::setValid, newField.getValid()); - Utils.setIfUpdated(existingField::getFieldValue, existingField::setFieldValue, newField.getFieldValue()); - updatedFormFields.add(existingField); - break; // Move to the next existing field - } - } - } - - // Convert updated form fields back to JSON and save to the database - applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(updatedFormFields)); - applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); - } - } - - // Process amendment documents if present - if (applicationAmendmentRequestEntity.getAmendmentDocument() != null) { - String existingDocumentIds = applicationAmendmentRequestEntity.getAmendmentDocument(); - - // Split comma-separated document IDs into a list - List existingDocumentIdList = Arrays.stream(existingDocumentIds.split(",")) - .map(String::trim) - .filter(id -> !id.isEmpty()) - .collect(Collectors.toList()); - - List updatedDocumentIdList = new ArrayList<>(); - Map amendmentDetailsMap = amendmentFormFields.stream() - .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) - .collect(Collectors.toMap( - AmendmentDetailsRequest::getAmendmentId, - AmendmentDetailsRequest::getAmendmentDocuments - )); - - String amendmentDocumentIds = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); - if (amendmentDocumentIds != null) { - // Split and validate new document IDs - List newDocumentIdList = Arrays.stream(amendmentDocumentIds.split(",")) - .map(String::trim) - .filter(id -> !id.isEmpty()) - .collect(Collectors.toList()); - - for (String existingId : existingDocumentIdList) { - for (String newId : newDocumentIdList) { - if (existingId.equals(newId)) { - Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(newId)); - if(documentEntity.isPresent()) { - updatedDocumentIdList.add(newId); - break; - } - } - } - } - - // Add any new IDs not in the existing list - for (String newId : newDocumentIdList) { - if (!existingDocumentIdList.contains(newId)) { - Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(newId)); - if(documentEntity.isPresent()) { - updatedDocumentIdList.add(newId); - } - } - } - String updatedDocumentIds = String.join(",", updatedDocumentIdList); - - // Create the AmendmentDetailsResponseBean for structured data - AmendmentDetailsResponseBean amendmentDetails = new AmendmentDetailsResponseBean(); - amendmentDetails.setAmendmentDocuments(updatedDocumentIds); - AmendmentDetailsRequest amendmentDetailsRequest = amendmentFormFields.stream() - .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) - .findFirst() - .orElse(null); - - if (amendmentDetailsRequest != null) { - amendmentDetails.setValid(amendmentDetailsRequest.getValid()); - } else { - amendmentDetails.setValid(false); - } - String amendmentDetailsJson = Utils.convertListToJsonString(Collections.singletonList(amendmentDetails)); - applicationAmendmentRequestEntity.setAmendmentDocument(amendmentDetailsJson); - applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); - } - } - } +// for (ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity : applicationAmendmentRequestEntities) { +// // Process form fields if present +// if (applicationAmendmentRequestEntity.getFormFields() != null) { +// // Parse existing form fields from JSON +// List existingFormFields = +// Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getFormFields(), AmendmentFormFieldRequest.class); +// +// // Prepare a new list to hold updated form fields +// List updatedFormFields = new ArrayList<>(); +// +// // Map amendment details for quick lookup by amendment ID +// Map amendmentDetailsMap = amendmentFormFields.stream() +// .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) +// .filter(details -> details.getFieldValue() != null) // Null check for getFormFieldDocuments +// .collect(Collectors.toMap( +// AmendmentDetailsRequest::getAmendmentId, +// AmendmentDetailsRequest::getFieldValue +// )); +// // Get corresponding amendment documents for the current entity +// List amendmentDocuments = (List) amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); +// if (amendmentDocuments != null) { +// // Update existing form fields with new values +// for (AmendmentFormFieldRequest existingField : existingFormFields) { +// for (AmendmentFormFieldRequest newField : amendmentDocuments) { +// if (existingField.getFieldId().equals(newField.getFieldId())) { +// // Update fields if there are changes +// Utils.setIfUpdated(existingField::getValid, existingField::setValid, newField.getValid()); +// Utils.setIfUpdated(existingField::getFieldValue, existingField::setFieldValue, newField.getFieldValue()); +// +// updatedFormFields.add(existingField); +// break; // Move to the next existing field +// } +// } +// } +// +// // Convert updated form fields back to JSON and save to the database +// applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(updatedFormFields)); +// applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); +// } +// } +// +// // Process amendment documents if present +// if (applicationAmendmentRequestEntity.getAmendmentDocument() != null) { +// String existingDocumentIds = applicationAmendmentRequestEntity.getAmendmentDocument(); +// +// // Split comma-separated document IDs into a list +// List existingDocumentIdList = Arrays.stream(existingDocumentIds.split(",")) +// .map(String::trim) +// .filter(id -> !id.isEmpty()) +// .collect(Collectors.toList()); +// +// List updatedDocumentIdList = new ArrayList<>(); +// Map amendmentDetailsMap = amendmentFormFields.stream() +// .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) +// .collect(Collectors.toMap( +// AmendmentDetailsRequest::getAmendmentId, +// AmendmentDetailsRequest::getFieldValue +// )); +// +// String amendmentDocumentIds = (String) amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId()); +// if (amendmentDocumentIds != null) { +// // Split and validate new document IDs +// List newDocumentIdList = Arrays.stream(amendmentDocumentIds.split(",")) +// .map(String::trim) +// .filter(id -> !id.isEmpty()) +// .collect(Collectors.toList()); +// +// for (String existingId : existingDocumentIdList) { +// for (String newId : newDocumentIdList) { +// if (existingId.equals(newId)) { +// Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(newId)); +// if(documentEntity.isPresent()) { +// updatedDocumentIdList.add(newId); +// break; +// } +// } +// } +// } +// +// // Add any new IDs not in the existing list +// for (String newId : newDocumentIdList) { +// if (!existingDocumentIdList.contains(newId)) { +// Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(newId)); +// if(documentEntity.isPresent()) { +// updatedDocumentIdList.add(newId); +// } +// } +// } +// String updatedDocumentIds = String.join(",", updatedDocumentIdList); +// +// // Create the AmendmentDetailsResponseBean for structured data +// AmendmentDetailsResponseBean amendmentDetails = new AmendmentDetailsResponseBean(); +// amendmentDetails.setAmendmentDocuments(updatedDocumentIds); +// AmendmentDetailsRequest amendmentDetailsRequest = amendmentFormFields.stream() +// .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId())) +// .findFirst() +// .orElse(null); +// +// if (amendmentDetailsRequest != null) { +// amendmentDetails.setValid(amendmentDetailsRequest.getValid()); +// } else { +// amendmentDetails.setValid(false); +// } +// String amendmentDetailsJson = Utils.convertListToJsonString(Collections.singletonList(amendmentDetails)); +// applicationAmendmentRequestEntity.setAmendmentDocument(amendmentDetailsJson); +// applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity); +// } +// } +// } } + private void updateAmendment(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity, List amendmentDetailsRequestList) { + if (CollectionUtils.isEmpty(amendmentDetailsRequestList)) { + return; + } + Map formFieldsMap = null; + List formFieldList = Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getFormFields(), AmendmentFormField.class); + if(Boolean.FALSE.equals(CollectionUtils.isEmpty(formFieldList))){ + formFieldsMap = formFieldList.stream().collect(Collectors.toMap(AmendmentFormField::getFieldId, Function.identity())); + } + updateAmendmentData(applicationAmendmentRequestEntity, amendmentDetailsRequestList, formFieldsMap); + + } + + private static void updateAmendmentData(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity, List amendmentDetailsRequestList, Map formFieldsMap) { + amendmentDetailsRequestList.forEach(amendmentDetailsRequest -> { + if (amendmentDetailsRequest.getFieldId().contains("amend_")) { + AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(applicationAmendmentRequestEntity.getAmendmentDocument(), AmendmentDetailsResponseBean.class); + if(amendmentDetails!=null) { + amendmentDetails.setValid(amendmentDetailsRequest.getValid()); + applicationAmendmentRequestEntity.setAmendmentDocument(Utils.convertObjectToString(amendmentDetails)); + } + } else if(Boolean.FALSE.equals(CollectionUtils.isEmpty(formFieldsMap))){ + AmendmentFormField amendmentFormField = formFieldsMap.get(amendmentDetailsRequest.getFieldId()); + amendmentFormField.setValid(amendmentDetailsRequest.getValid()); + } + }); + applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(formFieldsMap.values().stream().toList())); + } + + // private void updateAmendmentDocuments(List applicationAmendmentRequestEntities, List amendmentFormFields) { // for (ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity : applicationAmendmentRequestEntities) { // // Skip if there are no amendment documents @@ -1066,7 +1118,7 @@ public class ApplicationEvaluationDao { if (!mappedFieldMap.containsKey(formFieldId)) { // CriteriaMappedField mappedField = new CriteriaMappedField(); CriteriaMappedField mappedField = populateMappedField(formFieldId, criteriaFormField, applicationForm, applicationId); - if(mappedField != null) { + if(mappedField != null) { mappedFieldMap.put(formFieldId, mappedField); } } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java index dd44d257..b0dc2adb 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java @@ -7,11 +7,9 @@ import java.util.List; @Data public class AmendmentDetailsRequest { - Long amendmentId; + private String fieldId; - String amendmentDocuments; + private Long amendmentId; - Boolean valid; - - List formFieldDocuments; + private Boolean valid; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java index d144b283..3376d76c 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java @@ -1,8 +1,12 @@ package net.gepafin.tendermanagement.model.request; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@AllArgsConstructor +@NoArgsConstructor public class AmendmentFormFieldRequest { private String fieldId; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java index 96a88086..21fc1a09 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java @@ -7,13 +7,9 @@ import java.util.List; @Data public class AmendmentDocumentResponseBean { - Long amendmentId; - - List amendmentDocuments; - - Boolean valid; - - String amendmentNotes; - - List formFieldDocuments; + private Long amendmentId; + private String fieldId; + private String label; + private Boolean valid; + private List fileDetail ; } diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java index e93c8ed9..7d5b6344 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java @@ -669,4 +669,26 @@ public class Utils { } return null; } + + // Method to convert a JSON string to an object of type T + public static T convertStringToObject(String jsonString, Class clazz) { + try { + return mapper.readValue(jsonString, clazz); + } catch (Exception e) { + e.printStackTrace(); + // Handle the exception appropriately (e.g., throw a custom exception) + return null; + } + } + + // Method to convert an object of type T to a JSON string + public static String convertObjectToString(T object) { + try { + return mapper.writeValueAsString(object); + } catch (Exception e) { + e.printStackTrace(); + // Handle the exception appropriately (e.g., throw a custom exception) + return null; + } + } } \ No newline at end of file From c615bbe6170ba227243b79786a81f98b50c2dbab Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 19 Dec 2024 17:32:23 +0530 Subject: [PATCH 28/35] Fixed null check issue --- .../tendermanagement/dao/ApplicationEvaluationDao.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 0666930b..3e53021e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -171,8 +171,10 @@ public class ApplicationEvaluationDao { amendmentDocumentResponseBean.setFileDetail(documentResponseBeans); } + amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId()); amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes()); amendmentDocumentResponseBean.setValid(amendmentDetails.getValid()); + amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean); } List amendmentFormFields = Utils.convertJsonStringToList(formField, AmendmentFormField.class); if (amendmentFormFields != null) { @@ -197,8 +199,6 @@ public class ApplicationEvaluationDao { amendmentDocumentResponseBeans.add(formFieldResponseBean); } } - - amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean); } response.setAmendmentDetails(amendmentDocumentResponseBeans); From 21b21b26f924e66da2cb1aae03aa67290582c5d4 Mon Sep 17 00:00:00 2001 From: harish Date: Thu, 19 Dec 2024 19:10:21 +0530 Subject: [PATCH 29/35] updated code for archive document --- .../net/gepafin/tendermanagement/dao/AppointmentDao.java | 3 ++- .../web/rest/api/impl/AppointmentController.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java index 1b644d6e..f1fb2b8f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java @@ -771,8 +771,9 @@ public class AppointmentDao { log.info("Async document upload completed for documentId: {}", documentId); } }); + return null; // Return an immediate response indicating the process is in progress - throw new CustomValidationException(Status.SUCCESS, Translator.toLocale(GepafinConstant.DOCUMENT_UPLOADING_IN_PROGRESS)); +// throw new CustomValidationException(Status.SUCCESS, Translator.toLocale(GepafinConstant.DOCUMENT_UPLOADING_IN_PROGRESS)); } private void uploadDocumentToExternalSystemSync(Long documentId, UploadDocToExternalSystemRequest docToExternalSystemRequest) { diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AppointmentController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AppointmentController.java index ca55e55f..9264aa3a 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AppointmentController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AppointmentController.java @@ -69,8 +69,13 @@ public class AppointmentController implements AppointmentApi { UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPLOAD).actionContext(UserActionContextEnum.UPLOAD_DOCUMENT_TO_EXTERNAL_SYSTEM).build()); DocumentUploadResponse documentUploadResponse = appointmentService.uploadDocToExternalSystem(request, documentId, docToExternalSystemRequest); + + String message = GepafinConstant.DOCUMENT_UPLOADED_SUCCESSFULLY_TO_EXTERNAL_SYSTEM; + if(documentUploadResponse == null) { + message = GepafinConstant.DOCUMENT_UPLOADING_IN_PROGRESS; + } return ResponseEntity.status(HttpStatus.OK) - .body(new Response<>(documentUploadResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.DOCUMENT_UPLOADED_SUCCESSFULLY_TO_EXTERNAL_SYSTEM))); + .body(new Response<>(documentUploadResponse, Status.SUCCESS, Translator.toLocale(message))); } } From c306cc7585666152bac04effb993d8637109145a Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 19 Dec 2024 20:24:37 +0530 Subject: [PATCH 30/35] New role introduced --- .../enums/RoleStatusEnum.java | 3 +- .../tendermanagement/util/Validator.java | 29 +++++++++++++-- .../web/rest/api/AssignedApplicationsApi.java | 2 +- .../db/changelog/db.changelog-1.0.0.xml | 36 +++++++++++++++++++ 4 files changed, 65 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java index 3659856d..31d3e9b8 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java @@ -7,7 +7,8 @@ public enum RoleStatusEnum { ROLE_BENEFICIARY("ROLE_BENEFICIARY"), ROLE_SUPER_ADMIN("ROLE_SUPER_ADMIN"), ROLE_PRE_INSTRUCTOR("ROLE_PRE_INSTRUCTOR"), - ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR"); + ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR"), + ROLE_INSTRUCTOR_MANAGER("ROLE_INSTRUCTOR_MANAGER"); private String value; diff --git a/src/main/java/net/gepafin/tendermanagement/util/Validator.java b/src/main/java/net/gepafin/tendermanagement/util/Validator.java index 82bc2d79..4e3335a6 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Validator.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Validator.java @@ -90,6 +90,8 @@ public class Validator { validateHubId(request, companyEntity.getHub().getId()); if (checkIsSuperAdmin()) { return companyEntity; + } else if (checkIsInstructorManager()) { + return companyEntity; } Map userInfo = tokenProvider.getUserInfoAndUserIdFromToken(request); companyService.validateUserWithCompny(getUserId(userInfo), companyId); @@ -127,8 +129,11 @@ public class Validator { UserEntity requestedUser = userService.validateUser(userId); validateHubId(request, requestedUser.getHub().getId()); - if (Boolean.FALSE.equals(user.getRoleEntity().getRoleType().equals(RoleStatusEnum.ROLE_SUPER_ADMIN.getValue())) - && Boolean.FALSE.equals(user.getId().equals(userId))) { +// if (Boolean.FALSE.equals(user.getRoleEntity().getRoleType().equals(RoleStatusEnum.ROLE_SUPER_ADMIN.getValue())) +// && Boolean.FALSE.equals(user.getId().equals(userId))) + if (checkIsSuperAdmin() || checkIsInstructorManager()) { + + } else if(Boolean.FALSE.equals(user.getId().equals(userId))) { throw new ForbiddenAccessException(Status.FORBIDDEN, Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); } @@ -164,6 +169,11 @@ public class Validator { validateHubId(request, preInstructorUser.getHub().getId()); } return preInstructorUser; + } else if (checkIsInstructorManager()) { + if (preInstructorUserId != null) { + validateHubId(request, preInstructorUser.getHub().getId()); + } + return preInstructorUser; } else if (checkIsPreInstructor()) { return validateUserId(request, preInstructorUserId); } else { @@ -171,5 +181,18 @@ public class Validator { Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); } } - + + public Boolean checkIsInstructorManager() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication != null && authentication.isAuthenticated()) { + // Check if the user has the ROLE_INSTRUCTOR_MANAGER authority + for (GrantedAuthority authority : authentication.getAuthorities()) { + if (RoleStatusEnum.ROLE_INSTRUCTOR_MANAGER.getValue().equals(authority.getAuthority())) { + return true; + } + } + } + return false; + } } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java index 1cfbb5c9..3910132c 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java @@ -32,7 +32,7 @@ public interface AssignedApplicationsApi { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @PostMapping(value = "/application/{applicationId}") - @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") + @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')|| hasRole('ROLE_INSTRUCTOR_MANAGER')") public ResponseEntity> createAssignedApplications( HttpServletRequest request, @Parameter(description = "ID of the application", required = true) @PathVariable Long applicationId, diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 2ffe005a..6eee497f 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -2029,4 +2029,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f3d7914cc4cbd23064e0dc02e4b92612d966de34 Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 20 Dec 2024 16:12:32 +0530 Subject: [PATCH 31/35] Updated amendment process --- .../dao/ApplicationAmendmentRequestDao.java | 22 +++++++++++++------ .../dao/ApplicationEvaluationDao.java | 4 +++- ...ApplicationAmendmentRequestRepository.java | 4 ++-- ...pplicationAmendmentRequestServiceImpl.java | 7 ------ 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 9345b0da..2937da2c 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -604,6 +604,20 @@ public class ApplicationAmendmentRequestDao { log.info("Updating application amendement with ID: {}", id); ApplicationAmendmentRequestEntity existingApplicationAmendment = validateApplicationAmendmentRequest(id); + Boolean isBeneficiary=false; + if (Boolean.FALSE.equals(validator.checkIsBeneficiary())) { + validator.validatePreInstructor(request, existingApplicationAmendment.getApplicationEvaluationEntity().getUserId()); + isBeneficiary=false; + } else { + validator.validateUserId(request, existingApplicationAmendment.getApplicationEvaluationEntity().getAssignedApplicationsEntity().getApplication().getUserId()); + isBeneficiary=true; + } + if(Boolean.TRUE.equals(isBeneficiary) && existingApplicationAmendment.getStatus().equals(ApplicationAmendmentRequestEnum.RESPONSE_RECEIVED.getValue())){ + throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); + } + if(Boolean.FALSE.equals(isBeneficiary) && existingApplicationAmendment.getStatus().equals(ApplicationAmendmentRequestEnum.AWAITING.getValue())){ + throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); + } ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(existingApplicationAmendment); setIfUpdated(existingApplicationAmendment::getNote, existingApplicationAmendment::setNote, updateRequest.getNote()); @@ -1053,7 +1067,7 @@ public class ApplicationAmendmentRequestDao { log.info("Updating application amendment with status: {}", id); ApplicationAmendmentRequestEntity existingApplicationAmendment = validateApplicationAmendmentRequest(id); ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(existingApplicationAmendment); - if (Boolean.TRUE.equals(existingApplicationAmendment.getStatus().equals(ApplicationAmendmentRequestEnum.AWAITING.getValue())) || Boolean.TRUE.equals(statusTypeEnum.equals(ApplicationAmendmentRequestEnum.RESPONSE_RECEIVED))) { + if (Boolean.TRUE.equals(existingApplicationAmendment.getStatus().equals(ApplicationAmendmentRequestEnum.AWAITING.getValue())) && Boolean.TRUE.equals(statusTypeEnum.equals(ApplicationAmendmentRequestEnum.RESPONSE_RECEIVED))) { existingApplicationAmendment.setStatus(ApplicationAmendmentRequestEnum.RESPONSE_RECEIVED.getValue()); existingApplicationAmendment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); applicationAmendmentRequestRepository.save(existingApplicationAmendment); @@ -1137,12 +1151,6 @@ public class ApplicationAmendmentRequestDao { } - public List getApplicationAmendmentRequestEntitiesByApplicationEvaluationId(Long applicationEvaluationId){ - List applicationAmendmentRequestEntities=new ArrayList<>(); - applicationAmendmentRequestEntities=applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(applicationEvaluationId,ApplicationAmendmentRequestEnum.CLOSE.getValue()); - return applicationAmendmentRequestEntities; - } - private void softDeleteDocument(Long documentId) { documentService.deleteFile(documentId); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 3e53021e..e85136af 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -640,7 +640,9 @@ public class ApplicationEvaluationDao { // } // }); applicationAmendmentRequestEntities.forEach(applicationAmendmentRequestEntity->{ + ApplicationAmendmentRequestEntity oldEntity = Utils.getClonedEntityForData(applicationAmendmentRequestEntity); updateAmendment(applicationAmendmentRequestEntity, amendmentFormFieldsMap.get(applicationAmendmentRequestEntity.getId())); + loggingUtil.addVersionHistory(VersionHistoryRequest.builder().actionType(VersionActionTypeEnum.UPDATE).oldData(oldEntity).newData(applicationAmendmentRequestEntity).build()); }); applicationAmendmentRequestRepository.saveAll(applicationAmendmentRequestEntities); @@ -1766,7 +1768,7 @@ public class ApplicationEvaluationDao { ApplicationEvaluationEntity oldApplicationEvaluation = Utils.getClonedEntityForData(existingEntity); AssignedApplicationsEntity oldAssignedApplication = Utils.getClonedEntityForData(assignedApplicationsEntity); - List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(existingEntity.getId(),ApplicationAmendmentRequestEnum.AWAITING.getValue()); + List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(existingEntity.getId(),List.of(ApplicationAmendmentRequestEnum.AWAITING.getValue(),ApplicationAmendmentRequestEnum.RESPONSE_RECEIVED.getValue())); if(amendmentRequest !=null && Boolean.FALSE.equals(amendmentRequest.isEmpty())){ throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_CANNOT_APPROVED_OR_REJECTED)); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java index ecb6b83d..68133efb 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java @@ -52,8 +52,8 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(Long id, String status); + "AND amr.status IN (:statuses)") + List findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(Long id, List statuses); @Query("SELECT a FROM ApplicationAmendmentRequestEntity a " + "WHERE a.isDeleted = false " + diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java index 7329c5c3..e2615a71 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java @@ -91,13 +91,6 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm @Override @Transactional(rollbackFor = Exception.class) public ApplicationAmendmentRequestResponse updateApplicationAmendment(HttpServletRequest request, Long id, ApplicationAmendmentRequestBean applicationAmendmentRequestBean) { - ApplicationAmendmentRequestEntity amendment = applicationAmendmentRequestDao.validateApplicationAmendmentRequest(id); - - if (Boolean.FALSE.equals(validator.checkIsBeneficiary())) { - validator.validatePreInstructor(request, amendment.getApplicationEvaluationEntity().getUserId()); - } else { - validator.validateUserId(request, amendment.getApplicationEvaluationEntity().getAssignedApplicationsEntity().getApplication().getUserId()); - } return applicationAmendmentRequestDao.updateApplicationAmendment(id,applicationAmendmentRequestBean); } From 1a578e2727583476127a3637ef2e83418f16899e Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 20 Dec 2024 16:32:09 +0530 Subject: [PATCH 32/35] Modified the API parameter of get all users --- .../net/gepafin/tendermanagement/dao/UserDao.java | 14 ++++++++------ .../repositories/UserRepository.java | 2 +- .../tendermanagement/service/UserService.java | 2 +- .../service/impl/UserServiceImpl.java | 4 ++-- .../tendermanagement/web/rest/api/UserApi.java | 4 ++-- .../web/rest/api/impl/UserApiController.java | 6 +++--- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java index da5c6f07..7e35957b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java @@ -448,12 +448,14 @@ public class UserDao { return authService.validateNewUserToken(token); } - public List getAllUsers(UserEntity user, Long roleId) { + public List getAllUsers(UserEntity user, List roleIds) { List users; - if (roleId != null) { - log.info("Fetching users by role ID: {}", roleId); - RoleEntity roleEntity=roleService.validateRole(roleId); - users = userRepository.findByRoleEntityIdAndHubId(roleEntity.getId(), user.getHub().getId()); + if (roleIds != null) { + log.info("Fetching users by role ID: {}", roleIds); + List roleEntities = roleIds.stream() + .map(roleService::validateRole) // Assuming `validateRole` takes an ID and returns a RoleEntity + .collect(Collectors.toList()); + users = userRepository.findByRoleEntityIdInAndHubId(roleIds, user.getHub().getId()); } else { log.info("Fetching all users"); users = userRepository.findByHubId(user.getHub().getId()); @@ -462,7 +464,7 @@ public class UserDao { .map(this::convertUserEntityToUserResponse) .collect(Collectors.toList()); - log.info("Total users found with role ID {}: {}", roleId, userResponseBeans.size()); + log.info("Total users found with role ID {}: {}", roleIds, userResponseBeans.size()); return userResponseBeans; } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java index 47ab16b8..d9a9577a 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java @@ -16,7 +16,7 @@ public interface UserRepository extends JpaRepository { boolean existsByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubUuid); - List findByRoleEntityIdAndHubId(Long roleId, Long hubId); + List findByRoleEntityIdInAndHubId(List roleIds, Long hubId); List findByHubId(Long hubId); diff --git a/src/main/java/net/gepafin/tendermanagement/service/UserService.java b/src/main/java/net/gepafin/tendermanagement/service/UserService.java index 21109a5e..4808b00e 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/UserService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/UserService.java @@ -45,6 +45,6 @@ public interface UserService { UserEntity getUserByBeneficiaryId(Long beneficiaryId); public UserEntity getUserEntityById(Long userId); - List getAllUsers(HttpServletRequest request, Long roleId); + List getAllUsers(HttpServletRequest request, List roleIds); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java index 9f95b830..c38b2c8c 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java @@ -126,8 +126,8 @@ public class UserServiceImpl implements UserService { } @Override @Transactional(readOnly = true) - public List getAllUsers(HttpServletRequest request, Long roleId) { + public List getAllUsers(HttpServletRequest request, List roleIds) { UserEntity user=validator.validateUser(request); - return userDao.getAllUsers(user, roleId); + return userDao.getAllUsers(user, roleIds); } } \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java index c7b8e530..86122344 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java @@ -234,9 +234,9 @@ public interface UserApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))}) @RequestMapping(value = "", produces = {"application/json"}, method = RequestMethod.GET) - @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") + @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')|| hasRole('ROLE_INSTRUCTOR_MANAGER')") ResponseEntity>> getAllUsers(HttpServletRequest request, - @Parameter( required = false)@RequestParam(value ="roleId", required = false) Long roleId); + @Parameter( required = false)@RequestParam(value ="roleIds", required = false) List roleIds); @RequestMapping("favicon.ico") diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java index 7ff12c2a..22232b57 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java @@ -216,14 +216,14 @@ public class UserApiController implements UserApi { } @Override - public ResponseEntity>> getAllUsers(HttpServletRequest request, Long roleId) { + public ResponseEntity>> getAllUsers(HttpServletRequest request, List roleIds) { - log.info("Get all Users by Role ID - Role ID: {}", roleId); + log.info("Get all Users by Role ID - Role ID: {}", roleIds); /** This code is responsible for creating user action logs for the "Get all users by role" operation. **/ loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW).actionContext(UserActionContextEnum.GET_ALL_USERS_BY_ROLE).build()); - List users = userService.getAllUsers(request, roleId); + List users = userService.getAllUsers(request, roleIds); return ResponseEntity.status(HttpStatus.OK).body(new Response<>(users, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_USERS_SUCCESS_MSG))); } From fb21bdb150b93f4334cb5cedf36706ca54b0a361 Mon Sep 17 00:00:00 2001 From: nisha Date: Mon, 23 Dec 2024 15:23:19 +0530 Subject: [PATCH 33/35] Commented check from already exists application --- .../tendermanagement/dao/ApplicationDao.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 3b1a11b3..45a69384 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -804,18 +804,18 @@ public class ApplicationDao { UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(userEntity.getId(),companyEntity.getId()); // call = callService.validatePublishedCall(call.getId()); - checkIfApplicationExists(call, userWithCompanyEntity, userEntity); +// checkIfApplicationExists(call, userWithCompanyEntity, userEntity); ApplicationEntity applicationEntity = createApplicationEntity(userEntity, call, userWithCompanyEntity); applicationEntity.setComments(applicationRequest.getComments()); applicationEntity = saveApplicationEntity(applicationEntity); return getApplicationResponse(applicationEntity); } - public void checkIfApplicationExists(CallEntity call, UserWithCompanyEntity userWithCompanyEntity, UserEntity userEntity){ - Optional applicationEntity=applicationRepository.findByUserIdAndUserWithCompanyIdAndCallIdAndIsDeletedFalse(userEntity.getId(), userWithCompanyEntity.getId(),call.getId()); - if(applicationEntity.isPresent()){ - throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_EXISTS)); - } - } +// public void checkIfApplicationExists(CallEntity call, UserWithCompanyEntity userWithCompanyEntity, UserEntity userEntity){ +// Optional applicationEntity=applicationRepository.findByUserIdAndUserWithCompanyIdAndCallIdAndIsDeletedFalse(userEntity.getId(), userWithCompanyEntity.getId(),call.getId()); +// if(applicationEntity.isPresent()){ +// throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_EXISTS)); +// } +// } public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status) { From b71282b85068c42d09697a440f3ca1336a86ab20 Mon Sep 17 00:00:00 2001 From: rajesh Date: Mon, 23 Dec 2024 18:51:26 +0530 Subject: [PATCH 34/35] Done ticket GEPAFINBE-123 --- .../tendermanagement/dao/AssignedApplicationsDao.java | 7 +++++-- .../request/UpdateAssignedApplicationRequest.java | 10 ++++++++++ .../service/AssignedApplicationsService.java | 3 ++- .../service/impl/AssignedApplicationsServiceImpl.java | 3 ++- .../web/rest/api/AssignedApplicationsApi.java | 7 ++++--- .../rest/api/impl/AssignedApplicationsController.java | 3 ++- 6 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/UpdateAssignedApplicationRequest.java diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java index e820297d..cc281df7 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java @@ -15,6 +15,7 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum; import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; import net.gepafin.tendermanagement.enums.VersionActionTypeEnum; import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest; +import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest; import net.gepafin.tendermanagement.model.request.VersionHistoryRequest; import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse; import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository; @@ -226,7 +227,7 @@ public class AssignedApplicationsDao { public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, - Long id, AssignedApplicationsRequest updateRequest) { + Long id, UpdateAssignedApplicationRequest updateRequest) { UserEntity updatedByUser = validator.validateUser(request); log.info("Updating assigned application with ID: {}", id); AssignedApplicationsEntity existingAssignment = validateAssignedApplication(id); @@ -237,7 +238,9 @@ public class AssignedApplicationsDao { setIfUpdated(existingAssignment::getNote, existingAssignment::setNote, updateRequest.getNote()); setIfUpdated(existingAssignment::getStatus, existingAssignment::setStatus, updateRequest.getStatus().name()); setIfUpdated(existingAssignment::getAssignedBy, existingAssignment::setAssignedBy, updatedByUser.getId()); - + setIfUpdated(existingAssignment::getUserId, existingAssignment::setUserId, updateRequest.getUserId()); + Optional entityOptional = applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(id); + entityOptional.ifPresent(applicationEvaluationEntity -> setIfUpdated(applicationEvaluationEntity::getUserId, applicationEvaluationEntity::setUserId, updateRequest.getUserId())); existingAssignment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); AssignedApplicationsEntity updatedAssignment = saveAssignedApplication(existingAssignment, oldAssignedApplicationEntity, VersionActionTypeEnum.UPDATE); diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateAssignedApplicationRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateAssignedApplicationRequest.java new file mode 100644 index 00000000..ac9a176b --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateAssignedApplicationRequest.java @@ -0,0 +1,10 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; +import net.gepafin.tendermanagement.enums.AssignedApplicationEnum; +@Data +public class UpdateAssignedApplicationRequest { + private String note; + private AssignedApplicationEnum status; + private Long userId; +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java b/src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java index f1670687..1a73c674 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java @@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.service; import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity; import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest; +import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest; import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse; import java.util.List; @@ -15,7 +16,7 @@ public interface AssignedApplicationsService { void deleteApplication(HttpServletRequest request, Long id); List getAllAssignedApplications(HttpServletRequest request, Long userId); - AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, AssignedApplicationsRequest assignedApplicationsRequest); + AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, UpdateAssignedApplicationRequest assignedApplicationsRequest); AssignedApplicationsResponse getAssignedApplicationById(HttpServletRequest request, Long id); AssignedApplicationsEntity validateAssignedApplication(Long assignedApplicationId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java index 154e342a..c820d929 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java @@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.dao.AssignedApplicationsDao; import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity; import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest; +import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest; import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse; import net.gepafin.tendermanagement.service.AssignedApplicationsService; import net.gepafin.tendermanagement.util.Validator; @@ -45,7 +46,7 @@ public class AssignedApplicationsServiceImpl implements AssignedApplicationsServ @Override @Transactional(rollbackFor = Exception.class) - public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, AssignedApplicationsRequest updatedAssignedApplicationRequest) { + public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, UpdateAssignedApplicationRequest updatedAssignedApplicationRequest) { return assignedApplicationsDao.updateAssignedApplication(request, id, updatedAssignedApplicationRequest); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java index 3910132c..144a20f4 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest; +import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest; import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; @@ -50,7 +51,7 @@ public interface AssignedApplicationsApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @DeleteMapping(value = "/{id}") - @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") + @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')|| hasRole('ROLE_INSTRUCTOR_MANAGER')") ResponseEntity> deleteAssignedApplication(HttpServletRequest request, @Parameter(description = "The assigned application id", required = true) @PathVariable("id") Long id); @@ -78,10 +79,10 @@ public interface AssignedApplicationsApi { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @PutMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") + @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')|| hasRole('ROLE_INSTRUCTOR_MANAGER')") public ResponseEntity> updateAssignedApplication(HttpServletRequest request, @Parameter(description = "The Assigned Application id", required = true) @PathVariable("id") Long id, - @Parameter(description = "Assigned Application request object", required = true) @Valid @RequestBody AssignedApplicationsRequest assignedApplicationsRequest); + @Parameter(description = "Assigned Application request object", required = true) @Valid @RequestBody UpdateAssignedApplicationRequest assignedApplicationsRequest); @Operation(summary = "Api to get an assigned application by id", responses = { diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java index 7f22337a..78cc47dd 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java @@ -7,6 +7,7 @@ import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.enums.UserActionContextEnum; import net.gepafin.tendermanagement.enums.UserActionLogsEnum; import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest; +import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest; import net.gepafin.tendermanagement.model.request.UserActionRequest; import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse; import net.gepafin.tendermanagement.model.util.Response; @@ -66,7 +67,7 @@ public class AssignedApplicationsController implements AssignedApplicationsApi { } @Override - public ResponseEntity> updateAssignedApplication(HttpServletRequest request, Long id, AssignedApplicationsRequest updateAssignedApplicationRequest) { + public ResponseEntity> updateAssignedApplication(HttpServletRequest request, Long id, UpdateAssignedApplicationRequest updateAssignedApplicationRequest) { log.info("Update Assigned Application"); /** This code is responsible for "Updating Assigned Applications details" operation. **/ loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE) From 549478b610df211656d6abd7740bbcfba9300e0b Mon Sep 17 00:00:00 2001 From: nisha Date: Tue, 24 Dec 2024 18:20:53 +0530 Subject: [PATCH 35/35] Amendment Scheduler updates --- .../dao/ApplicationEvaluationDao.java | 1 + .../entities/ApplicationEvaluationEntity.java | 3 + .../ApplicationAmendmentScheduler.java | 75 ++++++++++++++++--- .../db/changelog/db.changelog-1.0.0.xml | 5 ++ 4 files changed, 72 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 50fdb16d..aad85864 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -1775,6 +1775,7 @@ public class ApplicationEvaluationDao { String statusType = application.getStatus(); if (application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue())) { existingEntity.setStatus(ApplicationEvaluationStatusTypeEnum.CLOSE.getValue()); + existingEntity.setClosingDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); assignedApplicationsEntity.setStatus(AssignedApplicationEnum.CLOSE.getValue()); } entity = applicationEvaluationRepository.save(existingEntity); diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java index 45a8c842..15e3d3d7 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java @@ -62,4 +62,7 @@ public class ApplicationEvaluationEntity extends BaseEntity{ @Column(name = "STOP_DATE_TIME") private LocalDateTime stopDateTime; + @Column(name = "CLOSING_DATE") + private LocalDateTime closingDate; + } diff --git a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java index 56cb3663..b9d63acd 100644 --- a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java +++ b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java @@ -6,24 +6,24 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import net.gepafin.tendermanagement.entities.ApplicationEntity; +import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity; +import net.gepafin.tendermanagement.enums.*; +import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository; +import net.gepafin.tendermanagement.repositories.ApplicationRepository; +import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository; +import net.gepafin.tendermanagement.service.ApplicationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; + import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.dao.ApplicationAmendmentRequestDao; -import net.gepafin.tendermanagement.dao.EmailNotificationDao; import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity; import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity; -import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum; -import net.gepafin.tendermanagement.enums.UserActionContextEnum; -import net.gepafin.tendermanagement.enums.UserActionLogsEnum; -import net.gepafin.tendermanagement.enums.VersionActionTypeEnum; import net.gepafin.tendermanagement.model.request.UserActionRequest; import net.gepafin.tendermanagement.model.request.VersionHistoryRequest; import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository; @@ -40,8 +40,6 @@ public class ApplicationAmendmentScheduler { @Autowired private ApplicationAmendmentRequestRepository applicationAmendmentRepository; - @Autowired - private EmailNotificationDao emailNotificationDao; @Autowired private ApplicationAmendmentRequestDao applicationAmendmentRequestDao; @@ -49,6 +47,18 @@ public class ApplicationAmendmentScheduler { @Autowired private LoggingUtil loggingUtil; + @Autowired + private AssignedApplicationsRepository assignedApplicationsRepository; + + @Autowired + private ApplicationService applicationService; + + @Autowired + private ApplicationRepository applicationRepository; + + @Autowired + private ApplicationEvaluationRepository applicationEvaluationRepository; + private static final Logger log = LoggerFactory.getLogger(ApplicationAmendmentScheduler.class); @Scheduled(cron = "0 0 1 * * ?") @@ -79,14 +89,14 @@ public class ApplicationAmendmentScheduler { amendmentRequests.forEach(request -> { try { ApplicationAmendmentRequestEntity oldAmendmentRequestEntity = Utils.getClonedEntityForData(request); - request.setStatus(ApplicationAmendmentRequestEnum.CLOSE.getValue()); + request.setStatus(ApplicationAmendmentRequestEnum.EXPIRED.getValue()); request = applicationAmendmentRepository.save(request); /** This code is responsible for adding a version history log for the "Update Application Amendment" operation. **/ loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAmendmentRequestEntity).newData(request).build()); // emailNotificationDao.sendApplicationFailureNotificationEmail(request); - log.info("Updated status to CLOSED for ApplicationAmendmentRequest with ID: {}", request.getId()); + log.info("Updated status to EXPIRED for ApplicationAmendmentRequest with ID: {}", request.getId()); } catch (Exception e) { log.error("Error expiring ApplicationAmendmentRequest with ID {}: {}", request.getId(), e.getMessage(), e); @@ -104,6 +114,16 @@ public class ApplicationAmendmentScheduler { evaluationsWithoutActiveAmendmentList.forEach(evaluation -> { try { applicationAmendmentRequestDao.calculateEndDateAndSuspensionDays(evaluation); + + updateEvaluationStatus(evaluation); + + // Update AssignedApplicationsEntity status + updateAssignedApplicationStatus(evaluation.getAssignedApplicationsEntity()); + + // Update ApplicationEntity status + updateApplicationStatus(evaluation.getAssignedApplicationsEntity().getApplication()); + + log.info("Updated EndDate and suspension days for ApplicationEvaluation with ID: {}", evaluation.getId()); } catch (Exception e) { @@ -119,4 +139,35 @@ public class ApplicationAmendmentScheduler { } + public void updateAssignedApplicationStatus(AssignedApplicationsEntity assignedApplicationsEntity){ + AssignedApplicationsEntity oldAssignedApplicationEntity = Utils.getClonedEntityForData(assignedApplicationsEntity); + assignedApplicationsEntity.setStatus(AssignedApplicationEnum.OPEN.getValue()); + assignedApplicationsRepository.save(assignedApplicationsEntity); + log.info("Updated status to OPEN for Assigned Application with ID: {}", assignedApplicationsEntity.getId()); + + /** This code is responsible for adding a version history log for the "Update Assigned Application status" operation. **/ + loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAssignedApplicationEntity).newData(assignedApplicationsEntity).build()); + + } + + public void updateApplicationStatus(ApplicationEntity applicationEntity){ + ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(applicationEntity); + applicationEntity.setStatus(ApplicationStatusTypeEnum.EVALUATION.getValue()); + applicationRepository.save(applicationEntity); + log.info("Updated status to EVALUATION for Application with ID: {}",applicationEntity.getId()); + + /** This code is responsible for adding a version history log for the "Update Application Status" operation. **/ + loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEntity).newData(applicationEntity).build()); + + } + public void updateEvaluationStatus(ApplicationEvaluationEntity applicationEvaluationEntity){ + ApplicationEvaluationEntity oldApplicationEvaluationEntity = Utils.getClonedEntityForData(applicationEvaluationEntity); + applicationEvaluationEntity.setStatus(ApplicationEvaluationStatusTypeEnum.OPEN.getValue()); + applicationEvaluationRepository.save(applicationEvaluationEntity); + log.info("Updated status to OPEN for ApplicationEvaluation with ID: {}", applicationEvaluationEntity.getId()); + + /** This code is responsible for adding a version history log for the "Update Application Status" operation. **/ + loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluationEntity).newData(applicationEvaluationEntity).build()); + + } } diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 6eee497f..90ab3ca8 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -2064,5 +2064,10 @@ + + + + +