Resolved conflicts

2025-01-29 15:20:04 +05:30
parent c2da8bee21 58a7247f70
commit 16e151eb3a
31 changed files with 379 additions and 66 deletions
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -592,7 +592,7 @@ public class ApplicationAmendmentRequestDao {
        return response;
    }

-    public List<ApplicationAmendmentRequestResponse> getAllApplicationAmendmentRequest(HttpServletRequest request, Long userId) {
+    public List<GetAllAmendmentResponseBean> getAllApplicationAmendmentRequest(HttpServletRequest request, Long userId) {
        if (validator.checkIsPreInstructor() && userId == null) {
            throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.USER_ID_NOT_NULL_MSG));
        }
@@ -604,7 +604,7 @@ public class ApplicationAmendmentRequestDao {
                applicationAmendmentRequestRepository.findAll(spec);

        return applicationAmendmentRequestEntities.stream()
-                .map(entity -> convertEntityToResponse(entity, false))
+                .map(this::initializeGetAllBasicResponse)
                .collect(Collectors.toList());
    }

@@ -1178,6 +1178,37 @@ public class ApplicationAmendmentRequestDao {
        return applicationEvaluation;


+    }
+
+    private GetAllAmendmentResponseBean initializeGetAllBasicResponse(ApplicationAmendmentRequestEntity entity) {
+        GetAllAmendmentResponseBean response = new GetAllAmendmentResponseBean();
+        ApplicationEntity applicationEntity = entity.getApplicationEvaluationEntity().getAssignedApplicationsEntity().getApplication();
+        response.setId(entity.getId());
+        response.setApplicationId(entity.getApplicationId());
+        response.setApplicationEvaluationId(entity.getApplicationEvaluationEntity().getId());
+        response.setNote(entity.getNote());
+        response.setStatus(ApplicationAmendmentRequestEnum.valueOf(entity.getStatus()));
+        response.setResponseDays(entity.getResponseDays());
+        response.setInternalNote(entity.getInternalNote());
+
+        LocalDateTime startDate = entity.getStartDate();
+        response.setStartDate(startDate);
+        response.setExpirationDate(entity.getEndDate());
+        response.setEvaluationEndDate(entity.getApplicationEvaluationEntity().getEndDate());
+        response.setIsSendEmail(entity.getIsEmail());
+        response.setIsSendNotification(entity.getIsNotification());
+
+        ApplicationEntity application = applicationService.validateApplication(entity.getApplicationId());
+        response.setCallEmail(application.getCall().getEmail());
+        response.setCallName(application.getCall().getName());
+
+        UserEntity userEntity = userService.validateUser(application.getUserId());
+        response.setBeneficiaryName(buildBeneficiaryName(userEntity));
+        CompanyEntity company = companyService.validateCompany(application.getCompanyId());
+        response.setCompanyName(company.getCompanyName());
+        Long protocolNumber = entity.getProtocol() != null ? entity.getProtocol().getProtocolNumber() : null;
+        response.setProtocolNumber(protocolNumber);
+        return response;
    }
 	private void softDeleteDocument(Long documentId) {
 		documentService.deleteFile(documentId);
--- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
@@ -4,19 +4,13 @@ import jakarta.persistence.criteria.Predicate;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
-import net.gepafin.tendermanagement.entities.ApplicationEntity;
-import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
-import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
-import net.gepafin.tendermanagement.entities.CompanyEntity;
-import net.gepafin.tendermanagement.entities.UserEntity;
-import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
-import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
-import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
+import net.gepafin.tendermanagement.entities.*;
+import net.gepafin.tendermanagement.enums.*;
 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.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
+import net.gepafin.tendermanagement.model.response.ApplicationResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
 import net.gepafin.tendermanagement.repositories.ApplicationRepository;
@@ -37,6 +31,7 @@ import org.springframework.stereotype.Component;

 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;

@@ -120,6 +115,7 @@ public class AssignedApplicationsDao {
 		setIfUpdated(assignedApplication::getAssignedBy, assignedApplication::setAssignedBy, assignedByUser.getId());
 		setIfUpdated(assignedApplication::getUserId, assignedApplication::setUserId, userId);
 		assignedApplication.setAssignedAt(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
+        assignedApplication.setStatus(AssignedApplicationEnum.AWAITING.getValue());
 		Optional<ApplicationEvaluationEntity> entityOptional = applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(assignedApplication.getId());
 		if(entityOptional.isPresent()) { 
 			ApplicationEvaluationEntity oldApplicationEvaluationEntity = Utils.getClonedEntityForData(entityOptional.get());
@@ -141,10 +137,7 @@ public class AssignedApplicationsDao {
        assignApplication.setApplication(application);
        assignApplication.setAssignedBy(assignedByUser.getId());
        assignApplication.setUserId(userId);
-        assignApplication.setStatus(AssignedApplicationEnum.OPEN.getValue());
-        if (assignedApplicationsRequest.getStatus() != null) {
-            assignApplication.setStatus(assignedApplicationsRequest.getStatus().getValue());
-        }
+        assignApplication.setStatus(AssignedApplicationEnum.AWAITING.getValue());
        assignApplication.setNote(assignedApplicationsRequest.getNote());
        assignApplication.setIsDeleted(false);
        assignApplication.setAssignedAt(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
@@ -226,7 +219,7 @@ public class AssignedApplicationsDao {
        log.info("Assigned Application deleted with ID: {}", id);
    }

-        public List<AssignedApplicationsResponse> getAllAssignedApplications(HttpServletRequest request, Long userId) {
+        public List<AssignedApplicationsResponse> getAllAssignedApplications(HttpServletRequest request, Long userId,List<AssignedApplicationEnum> statusList) {
        	UserEntity user = validator.validateUser(request);
        	if(validator.checkIsPreInstructor() && userId == null) {
        		throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.USER_ID_NOT_NULL_MSG));
@@ -234,18 +227,24 @@ public class AssignedApplicationsDao {
        	if(userId != null) {        		
        		validator.validatePreInstructor(request, userId);
        	}
-            Specification<AssignedApplicationsEntity> spec = search(user.getHub().getId() ,userId);
+            Specification<AssignedApplicationsEntity> spec = search(user.getHub().getId() ,userId,statusList);
            List<AssignedApplicationsEntity> assignedApplicationsEntityList = assignedApplicationsRepository.findAll(spec);
            return assignedApplicationsEntityList.stream()
                    .map(entity -> convertEntityToResponse(entity))
                    .collect(Collectors.toList());
        }
-        private Specification<AssignedApplicationsEntity> search(Long hubId, Long userId) {
+        private Specification<AssignedApplicationsEntity> search(Long hubId, Long userId,List<AssignedApplicationEnum> statusList) {
            return (root, query, builder) -> {
                Predicate predicate = builder.isFalse(root.get("isDeleted"));
                if (userId != null) {
                    predicate = builder.and(predicate, builder.equal(root.get("userId"), userId));
                }
+                if  (statusList != null && !statusList.isEmpty()) {
+                    List<String> statusNames = statusList.stream()
+                            .map(Enum::name)
+                            .collect(Collectors.toList());
+                    predicate = builder.and(predicate, root.get("status").in(statusNames));
+                }
                query.orderBy(
                        builder.desc(builder.isNotNull(root.get(GepafinConstant.ASSIGNED_AT))),
                        builder.desc(root.get(GepafinConstant.ASSIGNED_AT))
@@ -287,5 +286,14 @@ public class AssignedApplicationsDao {
        log.info("Assigned application fetched successfully: {}", response);
        return response;
    }
+    public AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {

+        AssignedApplicationsEntity assignedApplication = validateAssignedApplication(assignedApplicationId);
+        validator.validatePreInstructor(request, assignedApplication.getUserId());
+
+        AssignedApplicationsEntity oldAssignedApplicationEntity = Utils.getClonedEntityForData(assignedApplication);
+        assignedApplication.setStatus(status.getValue());
+        AssignedApplicationsEntity updatedAssignment = saveAssignedApplication(assignedApplication, oldAssignedApplicationEntity, VersionActionTypeEnum.UPDATE);
+        return convertEntityToResponse(updatedAssignment);
+    }
 }
--- a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
@@ -6,31 +6,23 @@ import net.gepafin.tendermanagement.entities.UserActionEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.entities.UserWithCompanyEntity;
 import net.gepafin.tendermanagement.entities.*;
-import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
-import net.gepafin.tendermanagement.enums.CallStatusEnum;
-import net.gepafin.tendermanagement.enums.RoleStatusEnum;
-import net.gepafin.tendermanagement.enums.UserStatusEnum;
+import net.gepafin.tendermanagement.enums.*;
 import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.repositories.*;
 import net.gepafin.tendermanagement.service.CompanyService;
 import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;

 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.List;
-import java.util.List;
+
 import java.util.stream.Collectors;

@Component
@@ -57,8 +49,6 @@ public class DashboardDao {
 	@Autowired
 	private ApplicationEvaluationRepository applicationEvaluationRepository;

-	@Autowired
-	private UserActionsRepository userActionsRepository;
 	@Autowired
 	private ApplicationAmendmentRequestRepository applicationAmendmentRequestRepository;

@@ -258,14 +248,15 @@ public class DashboardDao {

 		if (Boolean.FALSE.equals(applicationIds.isEmpty())) {
 			BigDecimal averageTime = applicationEvaluationRepository.findAverageEvaluationTimeByApplicationIds(applicationIds);
-			responseBean.setEvaluationAverageTime(averageTime != null ? averageTime : BigDecimal.ZERO);
+			responseBean.setEvaluationAverageTime(averageTime != null ? averageTime.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO);
 		}
 		LocalDate twoDaysLater = LocalDate.now().plusDays(2);
-
+		List<String> statusList =Arrays.asList( ApplicationEvaluationStatusTypeEnum.OPEN.getValue(), ApplicationEvaluationStatusTypeEnum.SOCCORSO.getValue());
 		Long dueApplications = applicationEvaluationRepository.countDueApplicationsBetween(
 				applicationIds,
 				LocalDate.now(),
-				twoDaysLater
+				twoDaysLater,
+				statusList
 		);

 		if (dueApplications != null) {
@@ -362,5 +353,57 @@ public class DashboardDao {
 		}
 	}

+	public AssignedApplicationWidgetResponseBean getApplicationDetailsForEvaluation(UserEntity userEntity) {
+	   Long userId = userEntity.getId();
+	   Long hubId = userEntity.getHub().getId();
+
+		Object[] results;
+		List<Long> applicationIds;
+		if (validator.checkIsPreInstructor()) {
+			results = assignedApplicationsRepository.countAssignedApplicationsWithStatus(userId, hubId);
+			applicationIds = assignedApplicationsRepository.findApplicationIdsByUserIdAndHubIdAndIsDeletedFalse(userId,hubId);
+		} else {
+			results = assignedApplicationsRepository.countAssignedApplicationsForHub(hubId);
+			applicationIds = assignedApplicationsRepository.findApplicationIdsByHubId(hubId);
+		}
+		AssignedApplicationWidgetResponseBean response = convertToResponse(results);
+		calculateEvaluationAvgTimeForAssignedApplication(response, applicationIds);
+		return response;
+	}
+
+	private void calculateEvaluationAvgTimeForAssignedApplication(AssignedApplicationWidgetResponseBean response, List<Long> applicationIds) {
+		if (applicationIds == null || applicationIds.isEmpty()) {
+			response.setAverageEvaluationDays(BigDecimal.ZERO);
+			response.setNumberOfApplicationExpiringIn48Hours(0L);
+			return;
+		}
+
+		BigDecimal averageTime = applicationEvaluationRepository.findAverageEvaluationTimeByApplicationIds(applicationIds);
+		response.setAverageEvaluationDays(averageTime != null ? averageTime.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO);
+
+		LocalDate today = LocalDate.now();
+		LocalDate twoDaysLater = today.plusDays(2);
+		List<String> statusList =Arrays.asList( ApplicationEvaluationStatusTypeEnum.OPEN.getValue(), ApplicationEvaluationStatusTypeEnum.SOCCORSO.getValue());
+		Long dueApplications = applicationEvaluationRepository.countDueApplicationsBetween(
+				applicationIds, today, twoDaysLater,statusList
+		);
+		response.setNumberOfApplicationExpiringIn48Hours(dueApplications != null ? dueApplications : 0L);
+	}
+
+	private AssignedApplicationWidgetResponseBean convertToResponse(Object[] results) {
+		AssignedApplicationWidgetResponseBean response = new AssignedApplicationWidgetResponseBean();
+
+		Object[] data = (Object[]) results[0];
+
+		response.setNumberOfAssignedApplication(data[0] instanceof Number ? ((Number) data[0]).longValue() : 0L);
+		response.setNumberOfApplicationInAmendmentState(data[1] instanceof Number ? ((Number) data[1]).longValue() : 0L);
+		response.setNumberOfApplicationInOpenState(data[2] instanceof Number ? ((Number) data[2]).longValue() : 0L);
+		response.setNumberOfApplicationInCloseState(data[3] instanceof Number ? ((Number) data[3]).longValue() : 0L);
+
+		return response;
+	}
+
+
+

 }
--- a/src/main/java/net/gepafin/tendermanagement/dao/NotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/NotificationDao.java
@@ -208,6 +208,20 @@ public class NotificationDao {
        }
    }

+    public void sendNotificationToInstructorManager(Map<String, String> placeHolders, ApplicationEvaluationEntity applicationEvaluationEntity, NotificationTypeEnum notificationTypeEnum) {
+
+        List<UserEntity> userEntities=userRepository.findByRoleEntity_RoleTypeAndHubId(RoleStatusEnum.ROLE_INSTRUCTOR_MANAGER.getValue(),applicationEvaluationEntity.getAssignedApplicationsEntity().getApplication().getHubId());
+        for (UserEntity user:userEntities) {
+            Long instructorId=user.getId();
+            ApplicationEntity application = applicationService.validateApplication(applicationEvaluationEntity.getApplicationId());
+            if (instructorId != null) {
+                NotificationReq notificationreq = createNotificationReq(notificationTypeEnum.getValue(), placeHolders, instructorId, application.getUserWithCompany(),
+                        null);
+                sendNotification(notificationreq);
+            }
+        }
+    }
+
    public List<Long> getAllCompanyIdsForUser(Long userId) {

        return userWithCompanyRepository.findActiveCompanyIdsByUserId(userId);
--- a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
@@ -340,7 +340,8 @@ public class PdfDao {
                for (String key : orderedKeys) {
                    if (stateFieldMap.containsKey(key)) {  // Only add data cell if key is in stateFieldMap
                        Object value = row.getOrDefault(key, ""); // Fetch value or use empty string if key not present
-                      String fieldValue= (String) value;
+//                      String fieldValue= (String) value;
+                        String fieldValue = value != null ? value.toString() : "";
                      if(Boolean.TRUE.equals(Utils.isItalianFormattedAmount(fieldValue))  ){
                            fieldValue= String.valueOf(Utils.convertToItalianFormat(fieldValue));
                        }