From c8ce9acee8d0530e0f03821a88828674d1aa3fdb Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 6 Nov 2025 12:26:11 +0530 Subject: [PATCH 1/3] Added contract object in evaluation API --- .../tendermanagement/dao/ApplicationEvaluationDao.java | 7 +++++++ .../model/response/ApplicationEvaluationFormResponse.java | 2 ++ .../model/response/ApplicationEvaluationResponse.java | 1 + 3 files changed, 10 insertions(+) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 430e28da..121cd15e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -157,6 +157,9 @@ public class ApplicationEvaluationDao { @Autowired private ApplicationSignedDocumentRepository applicationSignedDocumentRepository; + @Autowired + private ApplicationContractDao applicationContractDao; + private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) { ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity(); @@ -1193,6 +1196,8 @@ public class ApplicationEvaluationDao { ApplicationEvaluationResponse applicationEvaluationResponse = convertToResponse(entity); applicationEvaluationResponse.setSignedDocument(getApplicationSignedDocument(entity)); applicationEvaluationResponse.setEmailSendResponse(entity.getEmailSendResponse()); + ApplicationContractResponse applicationContractResponse=applicationContractDao.getContractByApplicationId(applicationID); + applicationEvaluationResponse.setContract(applicationContractResponse); return applicationEvaluationResponse; } public List prepareEvaluationDocumentBeanList(ApplicationEvaluationEntity entity) { @@ -2423,6 +2428,8 @@ public class ApplicationEvaluationDao { response.setCompanyCodiceAteco(company.getCodiceAteco()); response.setSignedDocument(getApplicationSignedDocument(evaluationEntity)); response.setEmailSendResponse(evaluationEntity.getEmailSendResponse()); + ApplicationContractResponse applicationContractResponse=applicationContractDao.getContractByApplicationId(evaluationEntity.getApplicationId()); + response.setContract(applicationContractResponse); return response; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java index 84cf4989..2e18339a 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java @@ -50,5 +50,7 @@ public class ApplicationEvaluationFormResponse { private String companyCodiceAteco; private List emailSendResponse; private ApplicationSignedDocumentResponse signedDocument; + private ApplicationContractResponse contract; + } 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 33b58062..742edae9 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java @@ -52,5 +52,6 @@ public class ApplicationEvaluationResponse { private List emailSendResponse; private List rejectedDocument; private ApplicationSignedDocumentResponse signedDocument; + private ApplicationContractResponse contract; } From 3f28d83f5bb8f1fa3d678ca227fc827a3233a77a Mon Sep 17 00:00:00 2001 From: rajesh Date: Mon, 10 Nov 2025 14:22:08 +0530 Subject: [PATCH 2/3] Updated credentials --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f2db0c1e..7fffc70b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -27,8 +27,8 @@ springdoc.swagger-ui.tagsSorter=alpha call.id=10 #aws configuration -aws.access.key.id=AKIAVWDQWCUENKE7QGXP -aws.secret.access.key=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 +aws.access.key.id=AKIAVWDQWCUEFJP3T6OP +aws.secret.access.key=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 aws.s3.region=eu-west-1 aws.s3.bucket.name=mementoresources aws.s3.url = https://mementoresources.s3.eu-west-1.amazonaws.com/ From f6d2583b77ce95e5267ef7fbda52a3e0f296e32c Mon Sep 17 00:00:00 2001 From: rajesh Date: Mon, 10 Nov 2025 17:21:01 +0530 Subject: [PATCH 3/3] Updated code --- .../tendermanagement/repositories/EmailLogRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java index 0d6a2202..3a021127 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java @@ -25,7 +25,7 @@ public interface EmailLogRepository extends JpaRepository { ); @Query(value = """ - SELECT DISTINCT ON (user_action_id) * FROM email_log WHERE send_status = 'PENDING' AND is_deleted = false AND email_service_type = 'PEC_SERVICE' """, nativeQuery = true) + SELECT DISTINCT ON (user_action_id) * FROM gepafin_schema.email_log WHERE send_status = 'PENDING' AND is_deleted = false """, nativeQuery = true) List findPendingPECEmailLogs();