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; } 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/