Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop

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

@@ -890,25 +890,27 @@ public class ApplicationEvaluationDao {
         return applicationEvaluationRepository.save(applicationEvaluationEntityData);
     }
 
-    public ApplicationEvaluationResponse updateApplicationEvaluationStatus(ApplicationEntity application, AssignedApplicationsEntity assignedApplicationsEntity) {
+    public ApplicationEvaluationResponse updateApplicationEvaluationStatus(ApplicationEntity application, AssignedApplicationsEntity assignedApplicationsEntity, AssignedEvaluationStatus newStatus) {
         Optional<ApplicationEvaluationEntity> existingEntityOptional = applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(assignedApplicationsEntity.getId());
         ApplicationEvaluationEntity entity = null;
 
         if (existingEntityOptional.isPresent()) {
             ApplicationEvaluationEntity existingEntity = existingEntityOptional.get();
-            if (Boolean.TRUE.equals(
+            application.setStatus(newStatus.getValue());
-                    application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) ||
+            application = applicationRepository.save(application);
-                            application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue())
+            if (application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) ||
-            )) {
+                    application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue())) {
                 existingEntity.setStatus(ApplicationEvaluationStatusTypeEnum.CLOSE.getValue());
                 assignedApplicationsEntity.setStatus(AssignedApplicationEnum.CLOSE.getValue());
-            }   entity = applicationEvaluationRepository.save(existingEntity);
-         assignedApplicationsEntity=assignedApplicationsRepository.save(assignedApplicationsEntity);
-          
-            return convertToResponse(entity);}return null;
-        
-
-
             }
+            entity = applicationEvaluationRepository.save(existingEntity);
+            assignedApplicationsEntity = assignedApplicationsRepository.save(assignedApplicationsEntity);
+
+            return convertToResponse(entity);
+        }
+        return null;
+    }
+
+
 }
 

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

@@ -474,7 +474,7 @@ public class PdfDao {
                                 .collect(Collectors.toList());
                         fieldValue = names;
                     }
-                } else if (name.equals("checkboxes")) {
+                } else if (name.equals("checkboxes") && fieldValue instanceof List<?>) {
                     List<String> check = (List<String>) fieldValue;
                     List<SettingResponseBean> settingResponseBeans = content.getSettings();
                     List<String> matchedLabels = new ArrayList<>();

src/main/java/net/gepafin/tendermanagement/enums/AssignedEvaluationStatus.java

@@ -0,0 +1,19 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum AssignedEvaluationStatus {
+    APPROVED("APPROVED"),
+    REJECTED("REJECTED");
+
+    private String value;
+
+    AssignedEvaluationStatus(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+}

src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.service;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedEvaluationStatus;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
 
@@ -14,7 +15,7 @@ public interface ApplicationEvaluationService {
     void deleteApplicationEvaluation(HttpServletRequest request,Long id);
 
     List<ApplicationEvaluationResponse> getApplicationEvaluationByApplicationId(HttpServletRequest request,Long applicationId,Long assignedApplicationId);
-    ApplicationEvaluationResponse updateApplicationEvaluationStatus(HttpServletRequest request, Long assignedApplicationId);
+    ApplicationEvaluationResponse updateApplicationEvaluationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedEvaluationStatus status);
 
 
     ApplicationEvaluationEntity validateApplicationEvaluation(Long applicationEvaluationId);

src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java

@@ -9,6 +9,7 @@ import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedEvaluationStatus;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
 
@@ -106,11 +107,11 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ApplicationEvaluationResponse updateApplicationEvaluationStatus(HttpServletRequest request, Long assignedApplicationId) {
+    public ApplicationEvaluationResponse updateApplicationEvaluationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedEvaluationStatus status) {
         AssignedApplicationsEntity assignedApplication = assignedApplicationsRepository.findByIdAndIsDeletedFalse(assignedApplicationId).orElseThrow(()->
                 new ResourceNotFoundException(Status.NOT_FOUND,Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_MSG)));
         validator.validatePreInstructor(request,assignedApplication.getUserId());
-        return applicationEvaluationDao.updateApplicationEvaluationStatus(assignedApplication.getApplication(),assignedApplication);
+        return applicationEvaluationDao.updateApplicationEvaluationStatus(assignedApplication.getApplication(),assignedApplication,status);
 
     }
 

src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java

@@ -9,6 +9,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedEvaluationStatus;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.request.UpdateApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
@@ -74,6 +75,7 @@ public interface ApplicationEvaluationApi {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
     @PutMapping(value = "/{assignedApplicationId}/status",  produces = MediaType.APPLICATION_JSON_VALUE)
     ResponseEntity<Response<ApplicationEvaluationResponse>> updateApplicationEvaluationStatus(HttpServletRequest request,
-                                                                                              @Parameter( required = true) @PathVariable("assignedApplicationId") Long assignedApplicationId);
+                                                                                              @Parameter( required = true) @PathVariable("assignedApplicationId") Long assignedApplicationId,
+                                                                                              @Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) AssignedEvaluationStatus status);
 
 }

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

@@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedEvaluationStatus;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.request.UpdateApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
@@ -57,8 +58,8 @@ public class ApplicationEvaluationApiController implements ApplicationEvaluation
     }
 
     @Override
-    public ResponseEntity<Response<ApplicationEvaluationResponse>> updateApplicationEvaluationStatus(HttpServletRequest request, Long assignedApplicationId) {
+    public ResponseEntity<Response<ApplicationEvaluationResponse>> updateApplicationEvaluationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedEvaluationStatus status) {
-        ApplicationEvaluationResponse applicationEvaluationResponse = applicationEvaluationService.updateApplicationEvaluationStatus(request, assignedApplicationId);
+        ApplicationEvaluationResponse applicationEvaluationResponse = applicationEvaluationService.updateApplicationEvaluationStatus(request, assignedApplicationId,status);
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new Response<>(applicationEvaluationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_STATUS_UPDATED_SUCCESSFULLY)));
     }