Updated message in evaluation API

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -574,7 +574,7 @@ public class GepafinConstant {
     public static final String CREATE_NDG="CHECK_OR_CREATE_NDG_CODE";
     public static final String NDG_NOT_FOUND="ndg.not.found";
     public static final String EMAIL_PEC_REQUIRED="email.pec.cannot.null";
-
+    public static final String USER_REQUEST_COMPLETED="user.request.completed";
 }
 
 

src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java

@@ -1946,12 +1946,15 @@ public class ApplicationEvaluationDao {
                 application.setStatus(newStatus.getValue());
                 log.info("Application status updated to {} for applicationId: {}", newStatus, application.getId());
                 emailNotificationDao.sendMailForApplicationTechnicalEvaluationRejected(application,hub,existingEntity);
+                application.setDateRejected(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
+                emailSendResponse = emailDao.buildEmailSendResponseFromRequest(request);
+                responses = List.of(emailSendResponse);
+                if (!Boolean.TRUE.equals(emailSendResponse.getIsEmailSend())) {
+                    saveEmailSendResponseToEvaluation(emailSendResponse, existingEntity);
+                }
             }
                 application = applicationRepository.save(application);
 
-            /** This code is responsible for adding a version history log for the "Update Application" operation. **/
-            loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEntity).newData(application).build());
-
             ApplicationEvaluationEntity oldApplicationEvaluation = Utils.getClonedEntityForData(existingEntity);
             AssignedApplicationsEntity oldAssignedApplication = Utils.getClonedEntityForData(assignedApplicationsEntity);
 
@@ -1961,7 +1964,7 @@ public class ApplicationEvaluationDao {
                 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())) {
+            if (application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.TECHNICAL_EVALUATION_REJECTED.getValue())) {
                 existingEntity.setStatus(ApplicationEvaluationStatusTypeEnum.CLOSE.getValue());
                 existingEntity.setClosingDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
                 assignedApplicationsEntity.setStatus(AssignedApplicationEnum.CLOSE.getValue());
@@ -1976,7 +1979,7 @@ public class ApplicationEvaluationDao {
             entity = applicationEvaluationRepository.save(existingEntity);
             assignedApplicationsRepository.save(assignedApplicationsEntity);
 
-            if (application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue())) {
+            if (application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.TECHNICAL_EVALUATION_REJECTED.getValue())) {
 
                 /** This code is responsible for adding a version history log for the "Update Application Evaluation" operation. **/
                 loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluation).newData(entity).build());
@@ -2006,6 +2009,9 @@ public class ApplicationEvaluationDao {
                 notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_RESULT);
             }
 
+            /** This code is responsible for adding a version history log for the "Update Application" operation. **/
+            loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEntity).newData(application).build());
+
             Map<String, String> placeHolders = new HashMap<>();
             placeHolders.put("{{call_name}}", application.getCall().getName());
             String protocolNumber=application.getProtocol().getExternalProtocolNumber();

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java

@@ -46,7 +46,7 @@ public class ApplicationEvaluationApiController implements ApplicationEvaluation
                 request, evaluationRequest, assignedApplicationsId);
 
         return ResponseEntity.status(HttpStatus.CREATED)
-                .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_CREATED_SUCCESSFULLY)));
+                .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.USER_REQUEST_COMPLETED)));
     }
 
 

src/main/resources/message_en.properties

@@ -410,3 +410,4 @@ no.email.log.msg = No failed emails found for given userActionId.
 user.action.id.not.found = User Action id not found.
 ndg.not.found=NDG not found.
 email.pec.cannot.null=Email pec is required.
+user.request.completed=User request completed successfully.

src/main/resources/message_it.properties

@@ -401,3 +401,4 @@ no.email.log.msg = Nessuna email trovata per userActionId specificato.
 user.action.id.not.found = ID azione utente non trovato.
 ndg.not.found=NDG non trovato.
 email.pec.cannot.null=L'indirizzo email pec è obbligatorio.
+user.request.completed=Richiesta utente completata con successo.