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

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<ApplicationAmendmentRequestEntity> applicationAmendmentRequestEntities =
                 applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(entity.getId());
-
+        if(req.getEvaluationDocument()!=null) {
+            updateApplicationEvaluation(assignedApplicationId, req.getEvaluationDocument());
+        }
 // Fetch amendment details from the request
         if(req.getAmendmentDetails()!=null) {
         List<AmendmentDetailsRequest> amendmentDetailsRequests = req.getAmendmentDetails();

src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java

@@ -10,6 +10,7 @@ public class ApplicationEvaluationRequest {
     private List<CriteriaRequest> criteria;
     private List<ChecklistRequest> checklist;
     private List<FieldRequest> files;
+    private List<EvaluationDocumentRequest> evaluationDocument;
     private List<AmendmentDetailsRequest> amendmentDetails;
     private String note;
     private ApplicationStatusForEvaluation applicationStatus;

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<EvaluationDocumentRequest> applicationEvaluationDocRequest);
 }

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<EvaluationDocumentRequest> evaluationDocRequest) {
-        AssignedApplicationsEntity assignedApplication =assignedApplicationsService.validateAssignedApplication(assignedApplicationId);
-        validator.validatePreInstructor(request, assignedApplication.getUserId());
-        return applicationEvaluationDao.updateApplicationEvaluation(assignedApplicationId,evaluationDocRequest);
-    }
 }

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

@@ -55,21 +55,5 @@ public interface ApplicationEvaluationApi {
     ResponseEntity<Response<Void>> 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<Response<ApplicationEvaluationResponse>> 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<EvaluationDocumentRequest> applicationEvaluationDocRequest);
-
-
 
 }

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<Response<ApplicationEvaluationResponse>> updateApplicationEvaluation(HttpServletRequest request, Long id, List<EvaluationDocumentRequest> 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)));
-    }
 }