diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 9b37da79..a87b2631 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -504,6 +504,10 @@ public class GepafinConstant { public static final String APPLICATION="application"; public static final String APPLICATION_ID="applicationId"; public static final String USER_WITH_COMPANY_ID="userWithCompanyId"; + public static final String ASSIGNED_USER_ID="assignedUserId"; + public static final String APPLICATION_USER_ID="applicationUserId"; + public static final String INVALID_USER_ID="invalid.user"; + public static final String COMPANY_NAME="companyName"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index a766d1a5..daa4391b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -134,6 +134,12 @@ public class ApplicationAmendmentRequestDao { @Autowired private ApplicationEvaluationFormRepository applicationEvaluationFormRepository; + @Autowired + private ApplicationAmendmentRequestViewRepository applicationAmendmentRequestViewRepository; + + @Autowired + private ApplicationDao applicationDao; + public ApplicationAmendmentRequestResponse getApplicationDataForAmendment(Long applicationEvaluationId) { log.info("Fetching the application data for the Amendment process {}", applicationEvaluationId); ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId); @@ -1268,7 +1274,122 @@ public class ApplicationAmendmentRequestDao { documentService.deleteFile(documentId); } - public PageableResponseBean> getApplicationAmendmentByPaginnation(Long userId, ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) { +// public PageableResponseBean> getApplicationAmendmentByPaginnation(Long userId, ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) { +// Integer pageNo = null; +// Integer pageLimit = null; +// if (applicationAmendmentPaginationRequestBean.getGlobalFilters() != null) { +// pageNo = applicationAmendmentPaginationRequestBean.getGlobalFilters().getPage(); +// pageLimit = applicationAmendmentPaginationRequestBean.getGlobalFilters().getLimit(); +// } +// if (pageLimit == null || pageLimit <= 0) { +// pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT; +// } +// if (pageNo == null || pageNo <= 0) { +// pageNo = GepafinConstant.DEFAULT_PAGE; +// } +// Specification spec = searchPagination(userId,applicationAmendmentPaginationRequestBean); +// Page entityPage = applicationAmendmentRequestRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit)); +// +// +// List applicationResponses = entityPage.getContent().stream() +// .map(application -> { +// ApplicationAmendmentRequestResponse response = convertEntityToResponse(application,false); +// return response; +// }) +// .collect(Collectors.toList()); +// +// +// PageableResponseBean> pageableResponseBean = new PageableResponseBean<>(); +// pageableResponseBean.setBody(applicationResponses); +// pageableResponseBean.setCurrentPage(entityPage.getNumber() + 1); // Page numbers typically start from 0, so add 1 for user-friendly indexing +// pageableResponseBean.setTotalPages(entityPage.getTotalPages()); +// pageableResponseBean.setTotalRecords(entityPage.getTotalElements()); +// pageableResponseBean.setPageSize(entityPage.getSize()); +// +// return pageableResponseBean; +// } +// +// public Specification searchPagination(Long userId,ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) { +// return (root, query, criteriaBuilder) -> { +// +// List predicates = getPredicates(applicationAmendmentPaginationRequestBean, criteriaBuilder, root,userId); +// SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true); +// +// if (applicationAmendmentPaginationRequestBean .getGlobalFilters() != null +// && applicationAmendmentPaginationRequestBean.getGlobalFilters().getSortBy() != null && +// applicationAmendmentPaginationRequestBean.getGlobalFilters().getSortBy().getColumnName() != null && Boolean.FALSE.equals( +// isEmpty(applicationAmendmentPaginationRequestBean.getGlobalFilters().getSortBy().getColumnName()))) { +// sortBy.setColumnName(applicationAmendmentPaginationRequestBean.getGlobalFilters().getSortBy().getColumnName()); +// sortBy.setSortDesc(true); +// if (applicationAmendmentPaginationRequestBean.getGlobalFilters().getSortBy().getSortDesc() != null) { +// sortBy.setSortDesc(applicationAmendmentPaginationRequestBean.getGlobalFilters().getSortBy().getSortDesc()); +// } +// } +// +// query.orderBy(criteriaBuilder.desc(root.get(sortBy.getColumnName()))); +// if (Boolean.FALSE.equals(sortBy.getSortDesc())) { +// query.orderBy(criteriaBuilder.asc(root.get(sortBy.getColumnName()))); +// } +// return query.where(criteriaBuilder.and(predicates.toArray(new Predicate[0]))).getRestriction(); +// }; +// } +// +// +// private List getPredicates(ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean, +// CriteriaBuilder criteriaBuilder, Root root,Long userId) { +// +// Integer year = null; +// String search = null; +// if (amendmentPaginationRequestBean.getGlobalFilters() != null) { +// year = amendmentPaginationRequestBean.getGlobalFilters().getYear(); +// search = amendmentPaginationRequestBean.getGlobalFilters().getSearch(); +// } +// List predicates = new ArrayList<>(); +// +// if (year != null && year > 0) { +// int filterYear = amendmentPaginationRequestBean.getGlobalFilters().getYear(); +// +//// Create LocalDateTime boundaries for the start and end of the year +// LocalDateTime startOfYear = LocalDateTime.of(filterYear, 1, 1, 0, 0); +// LocalDateTime endOfYear = LocalDateTime.of(filterYear, 12, 31, 23, 59, 59); +// +//// Add the range comparison to filter records within the year +// predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), startOfYear, endOfYear)); +// +// } +// // Search in `title` and `message` (if search term is provided) +// if (search != null && !search.isEmpty()) { +// Predicate notePredicate = criteriaBuilder.like( +// criteriaBuilder.upper(root.get(GepafinConstant.NOTE)), +// "%" + search.toUpperCase() + "%" +// ); +// predicates.add(criteriaBuilder.or(notePredicate)); +// Predicate internalNotePredicate = criteriaBuilder.like( +// criteriaBuilder.upper(root.get(GepafinConstant.INTERNAL_NOTE)), +// "%" + search.toUpperCase() + "%" +// ); +// predicates.add(criteriaBuilder.or(internalNotePredicate)); +// } +// +// // Filter by `status` (if status list is provided) +// if (amendmentPaginationRequestBean.getStatus() != null && !amendmentPaginationRequestBean.getStatus().isEmpty()) { +// List statusValues = amendmentPaginationRequestBean.getStatus().stream() +// .map(ApplicationAmendmentRequestEnum::name) // Convert enum to string +// .toList(); +// predicates.add(root.get(GepafinConstant.STATUS).in(statusValues)); +// } +// if(Boolean.TRUE.equals(validator.checkIsBeneficiary()) || Boolean.TRUE.equals(validator.checkIsConfidi())) { +// predicates.add(root.get("applicationEvaluationEntity").get("assignedApplicationsEntity").get("application").get("userId").in(userId)); +// } +// else { +// predicates.add(root.get("applicationEvaluationEntity").get("assignedApplicationsEntity").get("userId").in(userId)); +// } +// +// return predicates; +// +// } + + public PageableResponseBean> getApplicationAmendmentByPaginationByView(Long userId, ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) { Integer pageNo = null; Integer pageLimit = null; if (applicationAmendmentPaginationRequestBean.getGlobalFilters() != null) { @@ -1281,20 +1402,20 @@ public class ApplicationAmendmentRequestDao { if (pageNo == null || pageNo <= 0) { pageNo = GepafinConstant.DEFAULT_PAGE; } - Specification spec = searchPagination(userId,applicationAmendmentPaginationRequestBean); - Page entityPage = applicationAmendmentRequestRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit)); + Specification spec = searchPaginationByView(userId,applicationAmendmentPaginationRequestBean); + Page entityPage = applicationAmendmentRequestViewRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit)); - List applicationResponses = entityPage.getContent().stream() - .map(application -> { - ApplicationAmendmentRequestResponse response = convertEntityToResponse(application,false); + List applicationAmendmentRequestViewResponses = entityPage.getContent().stream() + .map(amendmentRequestView -> { + ApplicationAmendmentRequestViewResponse response = convertAmendmentEntityToApplicationAmendmentRequestViewResponse(amendmentRequestView); return response; }) .collect(Collectors.toList()); - PageableResponseBean> pageableResponseBean = new PageableResponseBean<>(); - pageableResponseBean.setBody(applicationResponses); + PageableResponseBean> pageableResponseBean = new PageableResponseBean<>(); + pageableResponseBean.setBody(applicationAmendmentRequestViewResponses); pageableResponseBean.setCurrentPage(entityPage.getNumber() + 1); // Page numbers typically start from 0, so add 1 for user-friendly indexing pageableResponseBean.setTotalPages(entityPage.getTotalPages()); pageableResponseBean.setTotalRecords(entityPage.getTotalElements()); @@ -1302,11 +1423,10 @@ public class ApplicationAmendmentRequestDao { return pageableResponseBean; } - - public Specification searchPagination(Long userId,ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) { + public Specification searchPaginationByView(Long userId,ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) { return (root, query, criteriaBuilder) -> { - List predicates = getPredicates(applicationAmendmentPaginationRequestBean, criteriaBuilder, root,userId); + List predicates = getPredicatesByView(applicationAmendmentPaginationRequestBean, criteriaBuilder, root,userId); SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true); if (applicationAmendmentPaginationRequestBean .getGlobalFilters() != null @@ -1329,15 +1449,19 @@ public class ApplicationAmendmentRequestDao { } - private List getPredicates(ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean, - CriteriaBuilder criteriaBuilder, Root root,Long userId) { + private List getPredicatesByView(ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean, + CriteriaBuilder criteriaBuilder, Root root,Long userId) { Integer year = null; String search = null; + Map filters = new HashMap<>(); if (amendmentPaginationRequestBean.getGlobalFilters() != null) { year = amendmentPaginationRequestBean.getGlobalFilters().getYear(); search = amendmentPaginationRequestBean.getGlobalFilters().getSearch(); } + if (amendmentPaginationRequestBean.getFilters() != null) { + filters = amendmentPaginationRequestBean.getFilters(); + } List predicates = new ArrayList<>(); if (year != null && year > 0) { @@ -1351,19 +1475,37 @@ public class ApplicationAmendmentRequestDao { predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), startOfYear, endOfYear)); } - // Search in `title` and `message` (if search term is provided) + if (search != null && !search.isEmpty()) { - Predicate notePredicate = criteriaBuilder.like( - criteriaBuilder.upper(root.get(GepafinConstant.NOTE)), + List searchPredicates = new ArrayList<>(); + + searchPredicates.add(criteriaBuilder.like( + criteriaBuilder.upper(root.get(GepafinConstant.CALL_NAME)), "%" + search.toUpperCase() + "%" - ); - predicates.add(criteriaBuilder.or(notePredicate)); - Predicate internalNotePredicate = criteriaBuilder.like( - criteriaBuilder.upper(root.get(GepafinConstant.INTERNAL_NOTE)), + )); + + searchPredicates.add(criteriaBuilder.like( + criteriaBuilder.upper(root.get(GepafinConstant.COMPANY_NAME)), "%" + search.toUpperCase() + "%" - ); - predicates.add(criteriaBuilder.or(internalNotePredicate)); + )); + + // Uncomment these if needed + // searchPredicates.add(criteriaBuilder.like( + // criteriaBuilder.upper(root.get(GepafinConstant.NOTE)), + // "%" + search.toUpperCase() + "%" + // )); + // + // searchPredicates.add(criteriaBuilder.like( + // criteriaBuilder.upper(root.get(GepafinConstant.INTERNAL_NOTE)), + // "%" + search.toUpperCase() + "%" + // )); + + Predicate finalPredicate = criteriaBuilder.or(searchPredicates.toArray(new Predicate[0])); + + predicates.add(finalPredicate); } + Utils.applyFiltersByPagination(root, criteriaBuilder, predicates, filters); + // Filter by `status` (if status list is provided) if (amendmentPaginationRequestBean.getStatus() != null && !amendmentPaginationRequestBean.getStatus().isEmpty()) { @@ -1372,14 +1514,33 @@ public class ApplicationAmendmentRequestDao { .toList(); predicates.add(root.get(GepafinConstant.STATUS).in(statusValues)); } - if(Boolean.TRUE.equals(validator.checkIsBeneficiary()) || Boolean.TRUE.equals(validator.checkIsConfidi())) { - predicates.add(root.get("applicationEvaluationEntity").get("assignedApplicationsEntity").get("application").get("userId").in(userId)); - } - else { - predicates.add(root.get("applicationEvaluationEntity").get("assignedApplicationsEntity").get("userId").in(userId)); + boolean isBeneficiaryOrConfidi = validator.checkIsBeneficiary() || validator.checkIsConfidi(); + boolean isPreInstructor = validator.checkIsPreInstructor(); + boolean isInstructorManagerWithPersonalRecords = validator.checkIsInstructorManager() && + Boolean.TRUE.equals(amendmentPaginationRequestBean.getPersonalRecords()); + + if (isBeneficiaryOrConfidi) { + predicates.add(root.get(GepafinConstant.APPLICATION_USER_ID).in(userId)); + } else if (isPreInstructor || isInstructorManagerWithPersonalRecords) { + predicates.add(root.get(GepafinConstant.ASSIGNED_USER_ID).in(userId)); } return predicates; } + public ApplicationAmendmentRequestViewResponse convertAmendmentEntityToApplicationAmendmentRequestViewResponse(ApplicationAmendmentRequestView applicationAmendmentRequestView){ + ApplicationAmendmentRequestViewResponse applicationAmendmentRequestViewResponse=new ApplicationAmendmentRequestViewResponse(); + applicationAmendmentRequestViewResponse.setId(applicationAmendmentRequestView.getId()); + applicationAmendmentRequestViewResponse.setApplicationId(applicationAmendmentRequestView.getApplicationId()); + applicationAmendmentRequestViewResponse.setProtocolNumber(applicationAmendmentRequestView.getProtocolNumber()); + applicationAmendmentRequestViewResponse.setCallName(applicationAmendmentRequestView.getCallName()); + applicationAmendmentRequestViewResponse.setCompanyName(applicationAmendmentRequestView.getCompanyName()); + applicationAmendmentRequestViewResponse.setStartDate(applicationAmendmentRequestView.getStartDate()); + applicationAmendmentRequestViewResponse.setExpirationDate(applicationAmendmentRequestView.getExpirationDate()); + applicationAmendmentRequestViewResponse.setAssigendUserName(applicationAmendmentRequestView.getAssigendUserName()); + applicationAmendmentRequestViewResponse.setStatus(applicationAmendmentRequestView.getStatus()); + return applicationAmendmentRequestViewResponse; + } + + } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index b63a63fc..a98b3ff9 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -1467,185 +1467,6 @@ public class ApplicationDao { } } - public PageableResponseBean> getAllApplicationByPagination(UserEntity userEntity, Long callId, Long companyId, ApplicationPageableRequestBean applicationPageableRequestBean) { - Integer pageNo = null; - Integer pageLimit = null; - - UserWithCompanyEntity userWithCompany= userWithCompanyRepository.findByUserIdAndCompanyIdAndIsDeletedFalse(userEntity.getId(), companyId).orElse(null); - Long userWithCompanyId = userWithCompany!=null?userWithCompany.getId():null; - if (applicationPageableRequestBean.getGlobalFilters() != null) { - pageNo = applicationPageableRequestBean.getGlobalFilters().getPage(); - pageLimit = applicationPageableRequestBean.getGlobalFilters().getLimit(); - } - if (pageLimit == null || pageLimit <= 0) { - pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT; - } - if (pageNo == null || pageNo <= 0) { - pageNo = GepafinConstant.DEFAULT_PAGE; - } - Specification spec = search(callId,companyId, userWithCompanyId, applicationPageableRequestBean, userEntity); - Page entityPage = applicationRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit)); - // Prepare the response - - - List applicationResponses = entityPage.getContent().stream() - .map(application -> { - ApplicationResponse response = getApplicationResponse(application); - return response; - }) - .collect(Collectors.toList()); - - - PageableResponseBean> pageableResponseBean = new PageableResponseBean<>(); - pageableResponseBean.setBody(applicationResponses); - pageableResponseBean.setCurrentPage(entityPage.getNumber() + 1); // Page numbers typically start from 0, so add 1 for user-friendly indexing - pageableResponseBean.setTotalPages(entityPage.getTotalPages()); - pageableResponseBean.setTotalRecords(entityPage.getTotalElements()); - pageableResponseBean.setPageSize(entityPage.getSize()); - - return pageableResponseBean; - } - - public Specification search(Long callId, Long companyId, Long userWithCompanyId, ApplicationPageableRequestBean applicationPageableRequestBean, UserEntity userEntity) { - return (root, query, criteriaBuilder) -> { - - List predicates = getPredicates(applicationPageableRequestBean, criteriaBuilder, root, callId,companyId, userWithCompanyId, userEntity); - SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true); - - if (applicationPageableRequestBean.getGlobalFilters() != null - && applicationPageableRequestBean.getGlobalFilters().getSortBy() != null && - applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName() != null && Boolean.FALSE.equals( - isEmpty(applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName()))) { - sortBy.setColumnName(applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName()); - sortBy.setSortDesc(true); - if (applicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc() != null) { - sortBy.setSortDesc(applicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc()); - } - } - - query.orderBy(criteriaBuilder.desc(root.get(sortBy.getColumnName()))); - if (Boolean.FALSE.equals(sortBy.getSortDesc())) { - query.orderBy(criteriaBuilder.asc(root.get(sortBy.getColumnName()))); - } - return query.where(criteriaBuilder.and(predicates.toArray(new Predicate[0]))).getRestriction(); - }; - } - - - private List getPredicates(ApplicationPageableRequestBean applicationPageableRequestBean, - CriteriaBuilder criteriaBuilder, Root root, Long callId,Long companyId, Long userWithCompanyId, UserEntity userEntity) { - - Integer year = null; - String search = null; - Integer daysRange = null; - Map filters = new HashMap<>(); - if (applicationPageableRequestBean.getGlobalFilters() != null) { - year = applicationPageableRequestBean.getGlobalFilters().getYear(); - search = applicationPageableRequestBean.getGlobalFilters().getSearch(); - daysRange = applicationPageableRequestBean.getDaysRange(); - } - if (applicationPageableRequestBean.getFilters() != null) { - filters = applicationPageableRequestBean.getFilters(); - } - List predicates = new ArrayList<>(); - -// Boolean isBeneficiary = validator.checkIsBeneficiary(); - if (Boolean.TRUE.equals(validator.checkIsBeneficiary()) || Boolean.TRUE.equals(validator.checkIsConfidi())) { - predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_ID), userEntity.getId())); - } - if (year != null && year > 0) { - int filterYear = applicationPageableRequestBean.getGlobalFilters().getYear(); - -// Create LocalDateTime boundaries for the start and end of the year - LocalDateTime startOfYear = LocalDateTime.of(filterYear, 1, 1, 0, 0); - LocalDateTime endOfYear = LocalDateTime.of(filterYear, 12, 31, 23, 59, 59); - -// Add the range comparison to filter records within the year - predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), startOfYear, endOfYear)); - - } - // Search in `title` and `message` (if search term is provided) - if (search != null && !search.isEmpty()) { - Predicate titlePredicate = criteriaBuilder.like( - criteriaBuilder.upper(root.get(GepafinConstant.COMMENTS)), - "%" + search.toUpperCase() + "%" - ); -// Predicate protocolPredicate = criteriaBuilder.like( -// criteriaBuilder.function( -// "TO_CHAR", -// String.class, -// criteriaBuilder.function("CAST", String.class, root.get(GepafinConstant.PROTOCOL).get(GepafinConstant.PROTOCOL_NUMBER)) -// ), -// "%" + search + "%" -// ); - - Predicate callNamePredicate =criteriaBuilder.like( - criteriaBuilder.upper(root.get(GepafinConstant.CALL).get(GepafinConstant.NAME)), // Adjust field name - "%" + search.toUpperCase() + "%" - ); - -// predicates.add(criteriaBuilder.or(protocolPredicate)); - predicates.add(criteriaBuilder.or(callNamePredicate)); - predicates.add(criteriaBuilder.or(titlePredicate)); - } - - // Filter by `status` (if status list is provided) - if (applicationPageableRequestBean.getStatus() != null && !applicationPageableRequestBean.getStatus().isEmpty()) { - List statusValues = applicationPageableRequestBean.getStatus().stream() - .map(ApplicationStatusTypeEnum::name) // Convert enum to string - .toList(); - predicates.add(root.get(GepafinConstant.STATUS).in(statusValues)); - } - - if (callId != null) { - CallEntity call = callService.validateCall(callId); - predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.CALL).get(GepafinConstant.ID), callId)); - } - - // Optional companyId filter - if (userWithCompanyId != null) { - predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_WITH_COMPANY).get(GepafinConstant.ID), userWithCompanyId)); - } - if (companyId != null) { - predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.COMPANY_ID), companyId)); - } - - if (daysRange != null && daysRange >= 0) { - LocalDateTime today = LocalDateTime.now(); - LocalDateTime pastDate = today.minusDays(daysRange); - predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), pastDate, today)); - } - applyFilters(root, criteriaBuilder, predicates, filters); - - predicates.add(criteriaBuilder.isFalse(root.get(GepafinConstant.IS_DELETED))); - - predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.HUB_ID), userEntity.getHub().getId())); - - - return predicates; - } - private void applyFilters(Root root, CriteriaBuilder criteriaBuilder, List predicates, Map filters) { - if (Boolean.FALSE.equals(filters.isEmpty())) { - for (Map.Entry entry : filters.entrySet()) { - String fieldName = entry.getKey(); - FilterCriteria filterCriteria = entry.getValue(); - Object value = filterCriteria.getValue(); - MatchModeEnum matchMode = filterCriteria.getMatchMode(); - - if (value != null && matchMode != null) { - Path fieldPath = root.get(fieldName); - if (fieldPath != null) { - Utils.applyStringFilter(fieldPath, criteriaBuilder, predicates, value, matchMode); - Utils.applyNumberFilter(fieldPath, criteriaBuilder, predicates, value, matchMode); - Utils.applyDateFilter(fieldPath, criteriaBuilder, predicates, value, matchMode,root); - } - } - } - } - } - - - // private Path getFieldPath(Root root, String fieldName) { // try { @@ -1918,27 +1739,29 @@ public class ApplicationDao { } // Search in `title` and `message` (if search term is provided) if (search != null && !search.isEmpty()) { + String searchPattern = "%" + search.toUpperCase() + "%"; + Predicate titlePredicate = criteriaBuilder.like( criteriaBuilder.upper(root.get(GepafinConstant.COMMENTS)), - "%" + search.toUpperCase() + "%" - ); -// Predicate protocolPredicate = criteriaBuilder.like( -// criteriaBuilder.function( -// "TO_CHAR", -// String.class, -// criteriaBuilder.function("CAST", String.class, root.get(GepafinConstant.PROTOCOL).get(GepafinConstant.PROTOCOL_NUMBER)) -// ), -// "%" + search + "%" -// ); - - Predicate callNamePredicate =criteriaBuilder.like( - criteriaBuilder.upper(root.get(GepafinConstant.CALL_TITLE)), // Adjust field name - "%" + search.toUpperCase() + "%" + searchPattern ); -// predicates.add(criteriaBuilder.or(protocolPredicate)); - predicates.add(criteriaBuilder.or(callNamePredicate)); - predicates.add(criteriaBuilder.or(titlePredicate)); + Predicate callTitlePredicate = criteriaBuilder.like( + criteriaBuilder.upper(root.get(GepafinConstant.CALL_TITLE)), + searchPattern + ); + Predicate callNamePredicate = criteriaBuilder.like( + criteriaBuilder.upper(root.get(GepafinConstant.CALL_NAME)), + searchPattern + ); + Predicate companyName = criteriaBuilder.like( + criteriaBuilder.upper(root.get(GepafinConstant.COMPANY_NAME)), + searchPattern + ); + + // Combine them using a single `or()` + Predicate finalPredicate = criteriaBuilder.or(titlePredicate, callTitlePredicate,callNamePredicate,companyName); + predicates.add(finalPredicate); } // Filter by `status` (if status list is provided) @@ -1967,7 +1790,7 @@ public class ApplicationDao { LocalDateTime pastDate = today.minusDays(daysRange); predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), pastDate, today)); } - applyFilters(root, criteriaBuilder, predicates, filters); + Utils.applyFiltersByPagination(root, criteriaBuilder, predicates, filters); predicates.add(criteriaBuilder.isFalse(root.get(GepafinConstant.IS_DELETED))); @@ -1981,7 +1804,7 @@ public class ApplicationDao { ApplicationResponse responseBean = new ApplicationResponse(); List flowEdgesList = flowEdgesRepository.findByCallId(applicationView.getCallId()); Long totalFormSteps = flowFormDao.calculateTotalSteps(flowEdgesList); - Long completedSteps= Long.valueOf(flowFormDao.getCompletedStepsByView(applicationView.getId(), false)); + Long completedSteps = Long.valueOf(flowFormDao.getCompletedStepsByView(applicationView.getId(), false)); Integer progress = calculateProgress(totalFormSteps, completedSteps); responseBean.setId(applicationView.getId()); responseBean.setProgress(progress); @@ -1995,19 +1818,10 @@ public class ApplicationDao { responseBean.setEvaluationVersion(EvaluationVersionEnum.valueOf(applicationView.getEvaluationVersion())); responseBean.setComments(applicationView.getComments()); responseBean.setCompanyId(applicationView.getCompanyId()); - Optional assignedApplicationsOptional = - assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationView.getId()); - if(assignedApplicationsOptional.isPresent()){ - responseBean.setAssignedUserId(assignedApplicationsOptional.get().getUserId()); - UserEntity user = userService.validateUser(assignedApplicationsOptional.get().getUserId()); - String firstName = user.getFirstName() != null ? user.getFirstName() : ""; - String lastName = user.getLastName() != null ? user.getLastName() : ""; - String userName = String.join(" ", firstName, lastName).trim(); - responseBean.setAssignedUserName(userName); - } - CompanyEntity company=companyService.validateCompany(applicationView.getCompanyId()); - responseBean.setCompanyName(company.getCompanyName()); - responseBean.setProtocolNumber(applicationView.getProtocolNumber()); + responseBean.setAssignedUserId(applicationView.getAssignedUserId()); + responseBean.setAssignedUserName(applicationView.getAssignedUserName()); + responseBean.setCompanyName(applicationView.getCompanyName()); + responseBean.setProtocolNumber(applicationView.getProtocolNumber()); responseBean.setAmountAccepted(applicationView.getAmountAccepted()); responseBean.setAmountRequested(applicationView.getAmountRequested()); responseBean.setDateAccepted(applicationView.getDateAccepted()); diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestView.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestView.java new file mode 100644 index 00000000..b5ee0ecc --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestView.java @@ -0,0 +1,67 @@ +package net.gepafin.tendermanagement.entities; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.Immutable; + +import java.time.LocalDateTime; + +@Entity +@Immutable +@Table(name = "application_amendment_request_view") +@Getter +@Setter +@IdClass(ApplicationAmendmentRequestViewId.class) +public class ApplicationAmendmentRequestView { + + + @Id + @Column(name = "ID") + private Long id; + + @Column(name = "APPLICATION_ID") + private Long applicationId; + + @Column(name = "PROTOCOL_NUMBER") + private Long protocolNumber; + + @Column(name = "CALL_NAME") + private String callName; + + @Column(name = "COMPANY_NAME") + private String companyName; + + @Column(name = "START_DATE") + private LocalDateTime startDate; + + @Column(name = "EXPIRATION_DATE") + private LocalDateTime expirationDate; + + @Column(name = "ASSIGNED_USER_NAME") + private String assigendUserName; + + @Column(name = "ASSIGNED_USER_ID") + private Long assignedUserId; + + @Column(name = "STATUS") + private String status; + + @Column(name = "NOTE") + private String note; + + @Column(name = "INTERNAL_NOTE") + private String internalNote; + + @Column(name = "APPLICATION_USER_ID") + private Long applicationUserId; + + @Column(name = "CREATED_DATE") + private String createdDate; + + @Column(name = "UPDATED_DATE") + private String updatedDate; + + @Column(name = "IS_DELETED") + private Boolean isDeleted; +} diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestViewId.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestViewId.java new file mode 100644 index 00000000..f80e5475 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestViewId.java @@ -0,0 +1,14 @@ +package net.gepafin.tendermanagement.entities; + +public class ApplicationAmendmentRequestViewId { + + private static final long serialVersionUID = 1L; + private Long id; + + public ApplicationAmendmentRequestViewId() { + } + + public ApplicationAmendmentRequestViewId(Long id) { + this.id = id; + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationView.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationView.java index ec9c0965..54593c2e 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationView.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationView.java @@ -80,7 +80,7 @@ public class ApplicationView implements Serializable { private Long protocolNumber; @Column(name = "ASSIGNED_USER_ID") - private Long assigned_user_id; + private Long assignedUserId; @Column(name = "ASSIGNED_USER_NAME") private String assignedUserName; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentPaginationRequestBean.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentPaginationRequestBean.java index 42318247..8f717f92 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentPaginationRequestBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentPaginationRequestBean.java @@ -4,6 +4,7 @@ import lombok.Data; import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum; import java.util.List; +import java.util.Map; @Data public class ApplicationAmendmentPaginationRequestBean { @@ -11,4 +12,9 @@ public class ApplicationAmendmentPaginationRequestBean { private GlobalFilters globalFilters; private List status; + + private Map filters; + + private Boolean personalRecords; + } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestViewResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestViewResponse.java new file mode 100644 index 00000000..e4139131 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestViewResponse.java @@ -0,0 +1,27 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class ApplicationAmendmentRequestViewResponse { + + private Long id; + + private Long applicationId; + + private Long protocolNumber; + + private String callName; + + private String companyName; + + private LocalDateTime startDate; + + private LocalDateTime expirationDate; + + private String assigendUserName; + + private String status; +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestViewRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestViewRepository.java new file mode 100644 index 00000000..adce7672 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestViewRepository.java @@ -0,0 +1,8 @@ +package net.gepafin.tendermanagement.repositories; + +import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestView; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface ApplicationAmendmentRequestViewRepository extends JpaRepository , JpaSpecificationExecutor { +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/ApplicationAmendmentRequestService.java b/src/main/java/net/gepafin/tendermanagement/service/ApplicationAmendmentRequestService.java index 7893b776..d54d49d3 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/ApplicationAmendmentRequestService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationAmendmentRequestService.java @@ -9,6 +9,7 @@ import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest; import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean; import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest; import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse; +import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestViewResponse; import net.gepafin.tendermanagement.model.response.PageableResponseBean; import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean; @@ -29,5 +30,5 @@ public interface ApplicationAmendmentRequestService { public ApplicationAmendmentRequestResponse updateApplicationAmendmentStatus(HttpServletRequest request, Long applicationAmendmentId, ApplicationAmendmentRequestEnum status); void sendReminderEmail(HttpServletRequest request,Long amendmentId); - PageableResponseBean> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean); + PageableResponseBean> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java index af31f78a..1d7a38a9 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java @@ -13,12 +13,15 @@ import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest; import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean; import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest; import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse; +import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestViewResponse; import net.gepafin.tendermanagement.model.response.PageableResponseBean; import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean; import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository; import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository; import net.gepafin.tendermanagement.service.ApplicationAmendmentRequestService; +import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.Validator; +import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.springframework.beans.factory.annotation.Autowired; @@ -41,6 +44,9 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm @Autowired private ApplicationEvaluationRepository applicationEvaluationRepository; + @Autowired + private UserService userService; + @Override public ApplicationAmendmentRequestResponse getApplicationDataForAmendment(HttpServletRequest request, Long applicationEvaluationId) { Optional entityOptional = applicationEvaluationRepository.findByIdAndIsDeletedFalse(applicationEvaluationId); @@ -153,8 +159,16 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm } @Override - public PageableResponseBean> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean) { - UserEntity user=validator.validateUser(request); - return applicationAmendmentRequestDao.getApplicationAmendmentByPaginnation(userId,amendmentPaginationRequestBean); + public PageableResponseBean> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean) { + boolean isSpecialUser = validator.checkIsBeneficiary() || + validator.checkIsConfidi() || + validator.checkIsPreInstructor() || + validator.checkIsInstructorManager(); + + if (isSpecialUser && Boolean.TRUE.equals(validator.checkRequestedUserWithUserId(request,userId))) { + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_USER_ID)); + } + + return applicationAmendmentRequestDao.getApplicationAmendmentByPaginationByView(userId,amendmentPaginationRequestBean); } } diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java index aa62ab23..e2e06771 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java @@ -37,6 +37,7 @@ import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.enums.MatchModeEnum; +import net.gepafin.tendermanagement.model.request.FilterCriteria; import net.gepafin.tendermanagement.model.request.GlobalFilters; import net.gepafin.tendermanagement.web.rest.api.errors.*; import net.objecthunter.exp4j.Expression; @@ -111,6 +112,7 @@ public class Utils { } return null; } + public static String extractFileName(String filePath) { if (filePath == null || filePath.isEmpty()) { return null; @@ -123,6 +125,7 @@ public class Utils { return filePath; } } + public static String decodeBase64String(String decodedString) { if (StringUtils.isBlank(decodedString)) { return decodedString; @@ -130,18 +133,20 @@ public class Utils { byte[] decode = Base64.getDecoder().decode(decodedString.getBytes(StandardCharsets.UTF_8)); return new String(decode, StandardCharsets.UTF_8); } - - public static void setIfNotNull(Consumer setter, T value) { - if (value != null) { - setter.accept(value); - } - } - public static void setIfUpdated(Supplier getter, Consumer setter, T newValue) { - T currentValue = getter.get(); - if (newValue != null && !newValue.equals(currentValue)) { - setter.accept(newValue); - } - } + + public static void setIfNotNull(Consumer setter, T value) { + if (value != null) { + setter.accept(value); + } + } + + public static void setIfUpdated(Supplier getter, Consumer setter, T newValue) { + T currentValue = getter.get(); + if (newValue != null && !newValue.equals(currentValue)) { + setter.accept(newValue); + } + } + public static String convertListToJsonString(List list) { try { return mapper.writeValueAsString(list); @@ -151,6 +156,7 @@ public class Utils { return null; } } + public static List convertJsonStringToList(String jsonString, Class clazz) { try { TypeReference> typeRef = new TypeReference>() { @@ -166,6 +172,7 @@ public class Utils { return null; } } + public static String convertMapIntoJsonString(Map map) { try { ObjectMapper mapper = new ObjectMapper(); @@ -180,6 +187,7 @@ public class Utils { } return null; } + public static Map convertIntoJson(String jsonString) { if (jsonString != null && !jsonString.isEmpty()) { try { @@ -192,6 +200,7 @@ public class Utils { } return null; } + public static U convertSourceObjectToDestinationObject(T source, Class destinationClass) { try { mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); @@ -202,6 +211,7 @@ public class Utils { } return null; } + public static void retainOnlySpecificFields(T requestObject, List retainFields) throws IllegalAccessException { // Get all declared fields of the request object's class Field[] fields = requestObject.getClass().getDeclaredFields(); @@ -217,22 +227,23 @@ public class Utils { } public static String encodeData(String data) { - return Base64.getEncoder().encodeToString(data.getBytes(StandardCharsets.UTF_8)); - } + return Base64.getEncoder().encodeToString(data.getBytes(StandardCharsets.UTF_8)); + } - public static String decodeData(String token) { - byte[] decodedBytes = Base64.getDecoder().decode(token); - return new String(decodedBytes, StandardCharsets.UTF_8); - } + public static String decodeData(String token) { + byte[] decodedBytes = Base64.getDecoder().decode(token); + return new String(decodedBytes, StandardCharsets.UTF_8); + } public static String generateSecureSamlToken() { - SecureRandom secureRandom = new SecureRandom(); - byte[] tokenBytes = new byte[24]; - secureRandom.nextBytes(tokenBytes); - String token = Base64.getUrlEncoder().withoutPadding().encodeToString(tokenBytes); - log.debug("Generated secure token: {}", token); - return token; - } + SecureRandom secureRandom = new SecureRandom(); + byte[] tokenBytes = new byte[24]; + secureRandom.nextBytes(tokenBytes); + String token = Base64.getUrlEncoder().withoutPadding().encodeToString(tokenBytes); + log.debug("Generated secure token: {}", token); + return token; + } + public static String generateSecureToken() { SecureRandom secureRandom = new SecureRandom(); byte[] tokenBytes = new byte[5]; @@ -241,6 +252,7 @@ public class Utils { log.debug("Generated secure token: {}", token); return token; } + public static Map> convertStringIntoMap(String jsonString) { try { return mapper.readValue(jsonString, new TypeReference>>() { @@ -250,26 +262,26 @@ public class Utils { return null; } } - + public static void callException(Integer staus, FeignException ex) { switch (staus) { - case 400: - throw new FeignClientValidationException(HttpStatus.valueOf(staus), ex.getMessage()); + case 400: + throw new FeignClientValidationException(HttpStatus.valueOf(staus), ex.getMessage()); - case 401: - throw new FeignClientUnauthorizedException(HttpStatus.valueOf(staus), ex.getMessage()); + case 401: + throw new FeignClientUnauthorizedException(HttpStatus.valueOf(staus), ex.getMessage()); - case 403: - throw new FeignClientForbiddenException(HttpStatus.valueOf(staus), ex.getMessage()); + case 403: + throw new FeignClientForbiddenException(HttpStatus.valueOf(staus), ex.getMessage()); - case 404: - throw new FeignClientNotFoundException(HttpStatus.valueOf(staus), ex.getMessage()); - default: - log.error("Exception occured :- {0}", ex); - throw ex; + case 404: + throw new FeignClientNotFoundException(HttpStatus.valueOf(staus), ex.getMessage()); + default: + log.error("Exception occured :- {0}", ex); + throw ex; } } - + public static Boolean isValidEmail(String email) { String EMAIL_REGEX = "^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$"; if (email == null || email.isEmpty()) { @@ -283,7 +295,7 @@ public class Utils { String data = String.valueOf(System.currentTimeMillis()); return data.substring(data.length() - range); } - + public static String convertObjectToJsonString(Object object) { try { // Check if the object is a string @@ -327,7 +339,7 @@ public class Utils { } } - public static Map> parseJsonContent(String jsonContent) { + public static Map> parseJsonContent(String jsonContent) { ObjectMapper objectMapper = new ObjectMapper(); try { return mapper.readValue(jsonContent, HashMap.class); @@ -336,22 +348,23 @@ public class Utils { } return new HashMap<>(); } - + // Utility method to replace placeholders with their values, handling nulls public static String replacePlaceholders(String text, Map placeholders) { - if (text == null) { - return ""; - } - for (Map.Entry entry : placeholders.entrySet()) { - text = replaceNull(text, entry.getKey(), entry.getValue()); - } - return text; + if (text == null) { + return ""; + } + for (Map.Entry entry : placeholders.entrySet()) { + text = replaceNull(text, entry.getKey(), entry.getValue()); + } + return text; } // Method to safely replace nulls with an empty string or a default value private static String replaceNull(String text, String target, String replacement) { - return text.replace(target, replacement != null ? replacement : ""); + return text.replace(target, replacement != null ? replacement : ""); } + public static String getClientIpAddress(HttpServletRequest request) { String header = request.getHeader("X-Forwarded-For"); if (org.apache.commons.lang3.StringUtils.isBlank(header)) { @@ -360,6 +373,7 @@ public class Utils { return new StringTokenizer(header, ",").nextToken().trim(); } + public static List convertJsonToList(String json, TypeReference> typeRef) { ObjectMapper objectMapper = new ObjectMapper(); try { @@ -372,11 +386,15 @@ public class Utils { public static String convertObjectToJson(Object obj) { try { - if(obj == null){return null;} + if (obj == null) { + return null; + } return new ObjectMapper().writeValueAsString(obj); } catch (JsonProcessingException e) { log.error("Failed to convert object to JSON: {}", e.getMessage(), e); - throw new RuntimeException("Failed to convert object to JSON", e);}} + throw new RuntimeException("Failed to convert object to JSON", e); + } + } public static String replaceSpacesWithUnderscores(String content) { if (content == null) { @@ -384,10 +402,10 @@ public class Utils { } return content.trim().replace(" ", "_"); } + public static List> convertJsonStringIntoJsonList(String jsonString) { try { - if(isEmpty(jsonString)) - { + if (isEmpty(jsonString)) { return new ArrayList<>(); } ObjectMapper mapper = new ObjectMapper(); @@ -398,6 +416,7 @@ public class Utils { } return null; } + public static String convertToString(Object input) { if (input == null) { return "null"; // Return string "null" for null input @@ -459,6 +478,7 @@ public class Utils { throw new RuntimeException("Error converting map to string", e); } } + public static boolean isValidDateString(String dateStr) { Pattern datePattern = Pattern.compile("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}"); return datePattern.matcher(dateStr).matches(); @@ -476,7 +496,7 @@ public class Utils { return targetFormat.format(date); } catch (ParseException e) { - log.error("error while prcoessing date formate"); + log.error("error while prcoessing date formate"); return null; } } @@ -522,6 +542,7 @@ public class Utils { return "Invalid amount format"; } } + public static boolean isItalianFormattedAmount(String input) { // Regular expression to match Italian-style amounts (e.g., 41.003,00 or 123,45) String sanitizedInput = input.replace(",", ""); @@ -534,7 +555,7 @@ public class Utils { public static String encryptCredential(String value) { try { - if(Boolean.FALSE.equals(isEmpty(value))) { + if (Boolean.FALSE.equals(isEmpty(value))) { IvParameterSpec iv = new IvParameterSpec(GepafinConstant.ENCRYPT_INIT_VECTOR.getBytes("UTF-8")); SecretKeySpec skeySpec = new SecretKeySpec(Base64.getDecoder().decode(GepafinConstant.ENCRYPT_KEY), "AES"); @@ -555,7 +576,7 @@ public class Utils { public static String decryptCredential(String encrypted) { try { - if(Boolean.FALSE.equals(isEmpty(encrypted))) { + if (Boolean.FALSE.equals(isEmpty(encrypted))) { IvParameterSpec iv = new IvParameterSpec(GepafinConstant.ENCRYPT_INIT_VECTOR.getBytes("UTF-8")); SecretKeySpec skeySpec = new SecretKeySpec(Base64.getDecoder().decode(GepafinConstant.ENCRYPT_KEY), "AES"); @@ -618,19 +639,19 @@ public class Utils { return null; } } - - public static void setHttpServletRequestForScheduler() { - MockHttpServletRequest mockRequest = new MockHttpServletRequest(); - mockRequest.setRequestURI("/scheduled"); - mockRequest.setMethod("POST"); - ServletRequestAttributes attributes = new ServletRequestAttributes(mockRequest); - RequestContextHolder.setRequestAttributes(attributes); - } - public static void clearHttpServletRequest() { - // Clear the RequestContextHolder after task execution - RequestContextHolder.resetRequestAttributes(); - } + public static void setHttpServletRequestForScheduler() { + MockHttpServletRequest mockRequest = new MockHttpServletRequest(); + mockRequest.setRequestURI("/scheduled"); + mockRequest.setMethod("POST"); + ServletRequestAttributes attributes = new ServletRequestAttributes(mockRequest); + RequestContextHolder.setRequestAttributes(attributes); + } + + public static void clearHttpServletRequest() { + // Clear the RequestContextHolder after task execution + RequestContextHolder.resetRequestAttributes(); + } public static String generateAuthTokenForLoginToOdessa() { @@ -739,7 +760,8 @@ public class Utils { public static String createChannelForUserAndCompany(Long userId, Long companyId) { return GepafinConstant.COMMON_SINGLE_CHANNEL_PREFIX + userId + GepafinConstant.COMPANY_PREFIX + companyId; } - public static GlobalFilters setPageNumberAndLimit(GlobalFilters globalFilters){ + + public static GlobalFilters setPageNumberAndLimit(GlobalFilters globalFilters) { if (globalFilters == null) { if (globalFilters.getLimit() == null || globalFilters.getLimit() <= 0) { globalFilters.setLimit(GepafinConstant.DEFAULT_PAGE_LIMIT); @@ -767,6 +789,7 @@ public class Utils { private static Map defaultErrorResponse() { return Collections.singletonMap("message", Translator.toLocale(GepafinConstant.INVALID_VATNUMBER)); } + public static List extractValues(String input) { List extractedValues = new ArrayList<>(); Pattern pattern = Pattern.compile("\\{(.*?)\\}"); // Regex to match {value} @@ -777,6 +800,7 @@ public class Utils { } return extractedValues; } + public static double evaluateExpression(String expression) { try { Expression exp = new ExpressionBuilder(expression).build(); @@ -786,6 +810,7 @@ public class Utils { return Double.NaN; // Return NaN if the expression is invalid } } + public static boolean isNumeric(String input) { if (input == null || input.trim().isEmpty()) { return false; @@ -793,9 +818,11 @@ public class Utils { return input.matches("-?\\d+(\\.\\d+)?"); } + public static boolean isValidBoolean(String value) { return "true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value); } + public static Map convertJsonStringToMap(String jsonString) { try { return mapper.readValue(jsonString, Map.class); @@ -905,8 +932,10 @@ public class Utils { switch (mode) { case DATEIS -> predicates.add(criteriaBuilder.equal(dateField, dateValue)); case DATEISNOT -> predicates.add(criteriaBuilder.notEqual(dateField, dateValue)); - case BEFORE -> predicates.add(criteriaBuilder.lessThan(fieldPath.as(Timestamp.class), Timestamp.valueOf(dateTimeValue))); - case AFTER -> predicates.add(criteriaBuilder.greaterThan(fieldPath.as(Timestamp.class), Timestamp.valueOf(dateTimeValue))); + case BEFORE -> + predicates.add(criteriaBuilder.lessThan(fieldPath.as(Timestamp.class), Timestamp.valueOf(dateTimeValue))); + case AFTER -> + predicates.add(criteriaBuilder.greaterThan(fieldPath.as(Timestamp.class), Timestamp.valueOf(dateTimeValue))); } } } @@ -937,4 +966,25 @@ public class Utils { Translator.toLocale(GepafinConstant.VALIDATION_ERROR_FILE_EMPTY)); } } -} \ No newline at end of file + + public static void applyFiltersByPagination(Root root, CriteriaBuilder criteriaBuilder, List predicates, Map filters) { + if (Boolean.FALSE.equals(filters.isEmpty())) { + for (Map.Entry entry : filters.entrySet()) { + String fieldName = entry.getKey(); + FilterCriteria filterCriteria = entry.getValue(); + Object value = filterCriteria.getValue(); + MatchModeEnum matchMode = filterCriteria.getMatchMode(); + + if (value != null && matchMode != null) { + Path fieldPath = root.get(fieldName); + if (fieldPath != null) { + Utils.applyStringFilter(fieldPath, criteriaBuilder, predicates, value, matchMode); + Utils.applyNumberFilter(fieldPath, criteriaBuilder, predicates, value, matchMode); + Utils.applyDateFilter(fieldPath, criteriaBuilder, predicates, value, matchMode, root); + } + } + } + } + } +} + diff --git a/src/main/java/net/gepafin/tendermanagement/util/Validator.java b/src/main/java/net/gepafin/tendermanagement/util/Validator.java index 21e2bd1a..a68dc1bd 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Validator.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Validator.java @@ -206,4 +206,12 @@ public class Validator { } return false; } + public Boolean checkRequestedUserWithUserId(HttpServletRequest request,Long userId){ + UserEntity user=validateUser(request); + UserEntity requestedUser=userService.validateUser(userId); + if( Boolean.FALSE.equals(user.getId().equals(requestedUser.getId()))){ + return true; + } + return false; + } } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationAmendmentRequestApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationAmendmentRequestApi.java index 8f1c5b2b..eb0c05f0 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationAmendmentRequestApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationAmendmentRequestApi.java @@ -10,11 +10,7 @@ import jakarta.validation.Valid; import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum; import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; import net.gepafin.tendermanagement.model.request.*; -import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse; -import net.gepafin.tendermanagement.model.response.ApplicationResponse; -import net.gepafin.tendermanagement.model.response.PageableResponseBean; -import net.gepafin.tendermanagement.model.response.SummaryPageResponseBean; -import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean; +import net.gepafin.tendermanagement.model.response.*; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; import org.springframework.http.MediaType; @@ -201,7 +197,7 @@ public interface ApplicationAmendmentRequestApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @PostMapping(value = "/user/{userId}/pagination", produces = { "application/json" }) - ResponseEntity>>> getApplicationAmendmentByPaginnation(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId, - @RequestBody ApplicationAmendmentPaginationRequestBean userActionPaginationRequest); + ResponseEntity>>> getApplicationAmendmentByPaginnation(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId, + @RequestBody ApplicationAmendmentPaginationRequestBean userActionPaginationRequest); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationAmendmentRequestController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationAmendmentRequestController.java index 562a84b3..585a6d1e 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationAmendmentRequestController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationAmendmentRequestController.java @@ -9,6 +9,7 @@ import net.gepafin.tendermanagement.enums.UserActionContextEnum; import net.gepafin.tendermanagement.enums.UserActionLogsEnum; import net.gepafin.tendermanagement.model.request.*; import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse; +import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestViewResponse; import net.gepafin.tendermanagement.model.response.PageableResponseBean; import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean; import net.gepafin.tendermanagement.model.util.Response; @@ -187,11 +188,11 @@ public class ApplicationAmendmentRequestController implements ApplicationAmendme } @Override - public ResponseEntity>>> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean) { + public ResponseEntity>>> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean) { loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW) .actionContext(UserActionContextEnum.GET_ALL_APPLICATION_AMENDMENT_BY_PAGINATION).build()); - PageableResponseBean> listPageableResponseBean=applicationAmendmentRequestService.getApplicationAmendmentByPaginnation(request,userId,amendmentPaginationRequestBean); + PageableResponseBean> listPageableResponseBean=applicationAmendmentRequestService.getApplicationAmendmentByPaginnation(request,userId,amendmentPaginationRequestBean); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(listPageableResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_DATA_FOR_AMENDMENT_SUCCESS_MSG))); diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index a692a560..379e56e2 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -2690,4 +2690,9 @@ + + + + diff --git a/src/main/resources/db/dump/create_application_amendment_request_view.sql b/src/main/resources/db/dump/create_application_amendment_request_view.sql new file mode 100644 index 00000000..ec882e6e --- /dev/null +++ b/src/main/resources/db/dump/create_application_amendment_request_view.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE VIEW application_amendment_request_view AS + +SELECT a.id, + a.application_id, + p.protocol_number, + cl.name AS call_name, + c.company_name, + a.start_date, + a.end_date AS expiration_date, + COALESCE(NULLIF(TRIM(BOTH FROM concat(COALESCE(u.first_name, ''), ' ', COALESCE(u.last_name, ''))), ''), '') AS assigned_user_name, + aa.user_id AS assigned_user_id, + a.status, + a.note, + a.internal_note, + app.user_id AS application_user_id, + a.created_date, + a.updated_date, + a.is_deleted +FROM gepafin_schema.application_amendment_request a +LEFT JOIN gepafin_schema.application app ON a.application_id = app.id AND (app.is_deleted IS FALSE OR app.is_deleted IS NULL) +LEFT JOIN gepafin_schema.call cl ON app.call_id = cl.id +LEFT JOIN gepafin_schema.company c ON app.company_id = c.id +LEFT JOIN gepafin_schema.protocol p ON a.protocol_id = p.id +LEFT JOIN gepafin_schema.assigned_applications aa ON app.id = aa.application_id AND (aa.is_deleted IS FALSE OR aa.is_deleted IS NULL) +LEFT JOIN gepafin_schema.gepafin_user u ON aa.user_id = u.id +WHERE a.is_deleted IS FALSE OR a.is_deleted IS NULL ORDER BY id; \ No newline at end of file diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index 2c27f379..80915228 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -398,3 +398,4 @@ error.invalid.limit=Limit should be between 1 and 3000. insufficient.score.msg = Insufficient score to pass to the technical and economic-financial evaluation password.expired.for.login.to.odessa = Odessa login password has been expired. +invalid.user=Invalid user. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 7b0293bf..02fdd1a7 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -389,4 +389,5 @@ error.invalid.limit=Il limite dovrebbe essere compreso tra 1 e 3000. insufficient.score.msg = Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria validation.table.message=I dati per il campo {0} non sono presenti. -password.expired.for.login.to.odessa = La password di accesso a Odessa è scaduta \ No newline at end of file +password.expired.for.login.to.odessa = La password di accesso a Odessa è scaduta +invalid.user=Utente non valido. \ No newline at end of file