Resolved conflicts

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

@@ -1,4 +1,5 @@
 package net.gepafin.tendermanagement.dao;
+
 import jakarta.persistence.criteria.Predicate;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.config.Translator;
@@ -6,11 +7,14 @@ import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.ApplicationEntity;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.CompanyEntity;
+import net.gepafin.tendermanagement.entities.FaqEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
+import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
+import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.repositories.ApplicationRepository;
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
@@ -18,6 +22,8 @@ import net.gepafin.tendermanagement.service.ApplicationService;
 import net.gepafin.tendermanagement.service.CompanyService;
 import net.gepafin.tendermanagement.service.UserService;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
+import net.gepafin.tendermanagement.util.LoggingUtil;
+import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.util.Validator;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
@@ -47,20 +53,27 @@ public class AssignedApplicationsDao {
 
     @Autowired
     private UserService userService;
-    
+
     @Autowired
     private Validator validator;
+
     @Autowired
     private ApplicationEvaluationDao applicationEvaluationDao;
     
     @Autowired
     private CompanyService companyService;
 
-    public AssignedApplicationsResponse createAssignedApplications(Long applicationId, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest){
-        log.info("Assigning application to pre-Instructor with details: {}", applicationId,userId);
+    @Autowired
+    private LoggingUtil loggingUtil;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    public AssignedApplicationsResponse createAssignedApplications(Long applicationId, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest) {
+        log.info("Assigning application to pre-Instructor with details: {}", applicationId, userId);
 
         AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null);
-        if(assignedApplications!=null){
+        if (assignedApplications != null) {
             throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_ASSIGNED));
         }
         ApplicationEntity application = applicationService.validateApplication(applicationId);
@@ -72,8 +85,13 @@ public class AssignedApplicationsDao {
                     Translator.toLocale(GepafinConstant.INVALID_APPLICATION_STATUS)
             );
         }
+        ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(application);
         application.setStatus(ApplicationStatusTypeEnum.EVALUATION.getValue());
         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());
+
         UserEntity user = userService.validateUser(userId);
         AssignedApplicationsEntity assignment = createAssignmentEntity(application, user.getId(), assignedByUser, assignedApplicationsRequest);
         AssignedApplicationsResponse assignApplicationToInstructorResponse = convertEntityToResponse(assignment);
@@ -82,28 +100,34 @@ public class AssignedApplicationsDao {
         return assignApplicationToInstructorResponse;
     }
 
-    public AssignedApplicationsEntity createAssignmentEntity(ApplicationEntity application, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest){
-        AssignedApplicationsEntity assignApplication= new AssignedApplicationsEntity();
+    public AssignedApplicationsEntity createAssignmentEntity(ApplicationEntity application, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest) {
+        AssignedApplicationsEntity assignApplication = new AssignedApplicationsEntity();
         assignApplication.setApplication(application);
         assignApplication.setAssignedBy(assignedByUser.getId());
         assignApplication.setUserId(userId);
         assignApplication.setStatus(AssignedApplicationEnum.OPEN.getValue());
-        if(assignedApplicationsRequest.getStatus() != null) {
-        	 assignApplication.setStatus(assignedApplicationsRequest.getStatus().getValue());
+        if (assignedApplicationsRequest.getStatus() != null) {
+            assignApplication.setStatus(assignedApplicationsRequest.getStatus().getValue());
         }
         assignApplication.setNote(assignedApplicationsRequest.getNote());
         assignApplication.setIsDeleted(false);
         assignApplication.setAssignedAt(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
-        AssignedApplicationsEntity assignedApplicationsEntity = saveAssignedApplication(assignApplication);
+
+        AssignedApplicationsEntity assignedApplicationsEntity = saveAssignedApplication(assignApplication, null, VersionActionTypeEnum.INSERT);
         return assignedApplicationsEntity;
 
     }
-    public AssignedApplicationsEntity saveAssignedApplication(AssignedApplicationsEntity assignedApplicationsEntity){
-        AssignedApplicationsEntity assignedApplication= assignedApplicationsRepository.save(assignedApplicationsEntity);
+
+    public AssignedApplicationsEntity saveAssignedApplication(AssignedApplicationsEntity assignedApplicationsEntity, AssignedApplicationsEntity oldAssignedApplicationEntity, VersionActionTypeEnum actionTypeEnum) {
+        AssignedApplicationsEntity assignedApplication = assignedApplicationsRepository.save(assignedApplicationsEntity);
+
+        /** This code is responsible for adding a version history log for the "Create Application" operation. **/
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionTypeEnum).oldData(oldAssignedApplicationEntity).newData(assignedApplication).build());
+
         return assignedApplication;
     }
 
-    public AssignedApplicationsResponse convertEntityToResponse(AssignedApplicationsEntity assignedApplications){
+    public AssignedApplicationsResponse convertEntityToResponse(AssignedApplicationsEntity assignedApplications) {
         AssignedApplicationsResponse assignedApplicationsResponse = new AssignedApplicationsResponse();
         assignedApplicationsResponse.setId(assignedApplications.getId());
         assignedApplicationsResponse.setApplicationId(assignedApplications.getApplication().getId());
@@ -146,18 +170,19 @@ public class AssignedApplicationsDao {
         return assignedApplicationsResponse;
     }
 
-    public AssignedApplicationsEntity validateAssignedApplication(Long id){
-        AssignedApplicationsEntity assignedApplication = assignedApplicationsRepository.findByIdAndIsDeletedFalse(id).orElseThrow(()->
-            new ResourceNotFoundException(Status.NOT_FOUND,Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_MSG)));
-           return assignedApplication;
+    public AssignedApplicationsEntity validateAssignedApplication(Long id) {
+        AssignedApplicationsEntity assignedApplication = assignedApplicationsRepository.findByIdAndIsDeletedFalse(id).orElseThrow(() ->
+                new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_MSG)));
+        return assignedApplication;
     }
 
     public void deleteById(HttpServletRequest request, Long id) {
         log.info("Deleting assigned application with ID: {}", id);
-        AssignedApplicationsEntity assignedApplicationsEntity= validateAssignedApplication(id);
+        AssignedApplicationsEntity assignedApplicationsEntity = validateAssignedApplication(id);
         validator.validatePreInstructor(request, assignedApplicationsEntity.getUserId());
+        AssignedApplicationsEntity oldAssignedApplicationEntity = Utils.getClonedEntityForData(assignedApplicationsEntity);
         assignedApplicationsEntity.setIsDeleted(true);
-        assignedApplicationsEntity= saveAssignedApplication(assignedApplicationsEntity);
+        assignedApplicationsEntity = saveAssignedApplication(assignedApplicationsEntity, oldAssignedApplicationEntity, VersionActionTypeEnum.SOFT_DELETE);
         log.info("Assigned Application deleted with ID: {}", id);
     }
 
@@ -192,18 +217,21 @@ public class AssignedApplicationsDao {
 
 
     public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request,
-            Long id, AssignedApplicationsRequest updateRequest) {
-    	UserEntity updatedByUser = validator.validateUser(request); 
+                                                                  Long id, AssignedApplicationsRequest updateRequest) {
+        UserEntity updatedByUser = validator.validateUser(request);
         log.info("Updating assigned application with ID: {}", id);
         AssignedApplicationsEntity existingAssignment = validateAssignedApplication(id);
         validator.validatePreInstructor(request, existingAssignment.getUserId());
+
+        AssignedApplicationsEntity oldAssignedApplicationEntity = Utils.getClonedEntityForData(existingAssignment);
+
         setIfUpdated(existingAssignment::getNote, existingAssignment::setNote, updateRequest.getNote());
         setIfUpdated(existingAssignment::getStatus, existingAssignment::setStatus, updateRequest.getStatus().name());
         setIfUpdated(existingAssignment::getAssignedBy, existingAssignment::setAssignedBy, updatedByUser.getId());
 
         existingAssignment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
 
-        AssignedApplicationsEntity updatedAssignment = saveAssignedApplication(existingAssignment);
+        AssignedApplicationsEntity updatedAssignment = saveAssignedApplication(existingAssignment, oldAssignedApplicationEntity, VersionActionTypeEnum.UPDATE);
         AssignedApplicationsResponse response = convertEntityToResponse(updatedAssignment);
         log.info("Assigned application updated successfully: {}", response);
         return response;