Merge pull request #272 from Kitzanos/develop

Sync Master with Develop (29/04/2025)

pom.xml

@@ -258,6 +258,17 @@
 		</dependency>
 
 
+		<!-- Jakarta email support -->
+		<!-- https://jakarta.ee/specifications/mail/ -->
+		<!-- https://github.com/jakartaee/mail-api -->
+		<!-- https://mvnrepository.com/artifact/jakarta.mail/jakarta.mail-api -->
+		<dependency>
+			<groupId>com.sun.mail</groupId>
+			<artifactId>jakarta.mail</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+
+
 	</dependencies>
 <repositories>
     <repository>

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -101,6 +101,7 @@ public class GepafinConstant {
     public static final String STATUS_SAME_ERROR = "status.same.error";
     public static final String INVALID_STATUS_CHANGE_FROM_DRAFT = "invalid.status.change.from.draft";
     public static final String INVALID_STATUS_CHANGE_FROM_PUBLISH = "invalid.status.change.from.publish";
+    public static final String INVALID_STATUS_CHANGE_FROM_PUBLISH_TO_DRAFT = "invalid.status.change.from.publish.to.draft";
     public static final String STATUS_CANNOT_BE_CHANGED = "status.cannot.be.changed";
     public static final String PUBLISHED_CALL_NOT_UPDATE = "published.call.not.update";
     public static final String INVALID_USER = "invalid_user";
@@ -136,7 +137,9 @@ public class GepafinConstant {
     public static final String UPDATING_FORM_VALUE_IMPACT_ON_FLOW = "updating.form.value.impact.on.flow";
     public static final String APPLICATION_IS_INCOMPLETE_MSG = "application.is.incomplete";
     public static final String AUTHORIZATION = "Authorization";
-    public static final String CHECK_VATNUMBER_V2_NEW_URL = "https://imprese.openapi.it/advance";
+    public static final String CHECK_VATNUMBER_URL_V1 = "https://imprese.openapi.it/advance";
+    public static final String CHECK_VATNUMBER_URL_V2 = "https://company.openapi.com/IT-advanced";
+    public static final String VAT_CHECK_API_VERSION = "VAT_CHECK_API_VERSION";
     public static final String VALIDATION_FIELD_CUSTOM = "validation.field.custom";
     public static final String VALIDATION_CODICE_FISCALE = "validation.codice.fiscale";
     public static final String VALIDATION_CAP = "validation.cap";
@@ -529,6 +532,11 @@ public class GepafinConstant {
     public static final String GET_FIELD_VALUE="getFieldValue";
     public static final String GET_REPORT_ENABLE="getReportEnable";
     public static final String GET_REPORT_HEADER="getReportHeader";
+
+    public static final String APPOINTMENT_ID="appointmentId";
+    public static final String APPLICATION_STATUS="applicationStatus";
+
+    public static final String RINALDO_EMAIL = "rinaldo.bonazzo@bflows.net";
 }
 
 

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<List<ApplicationAmendmentRequestResponse>> getApplicationAmendmentByPaginnation(Long userId, ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) {
+//    public PageableResponseBean<List<ApplicationAmendmentRequestResponse>> 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<ApplicationAmendmentRequestEntity> spec = searchPagination(userId,applicationAmendmentPaginationRequestBean);
+//        Page<ApplicationAmendmentRequestEntity> entityPage = applicationAmendmentRequestRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+//
+//
+//        List<ApplicationAmendmentRequestResponse> applicationResponses = entityPage.getContent().stream()
+//                .map(application -> {
+//                    ApplicationAmendmentRequestResponse response = convertEntityToResponse(application,false);
+//                    return response;
+//                })
+//                .collect(Collectors.toList());
+//
+//
+//        PageableResponseBean<List<ApplicationAmendmentRequestResponse>> 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<ApplicationAmendmentRequestEntity> searchPagination(Long userId,ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) {
+//        return (root, query, criteriaBuilder) -> {
+//
+//            List<Predicate> 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<Predicate> getPredicates(ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean,
+//                                          CriteriaBuilder criteriaBuilder, Root<ApplicationAmendmentRequestEntity> root,Long userId) {
+//
+//        Integer year = null;
+//        String search = null;
+//        if (amendmentPaginationRequestBean.getGlobalFilters() != null) {
+//            year = amendmentPaginationRequestBean.getGlobalFilters().getYear();
+//            search = amendmentPaginationRequestBean.getGlobalFilters().getSearch();
+//        }
+//        List<Predicate> 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<String> 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<List<ApplicationAmendmentRequestViewResponse>> 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<ApplicationAmendmentRequestEntity> spec = searchPagination(userId,applicationAmendmentPaginationRequestBean);
+        Specification<ApplicationAmendmentRequestView> spec = searchPaginationByView(userId,applicationAmendmentPaginationRequestBean);
-        Page<ApplicationAmendmentRequestEntity> entityPage = applicationAmendmentRequestRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+        Page<ApplicationAmendmentRequestView> entityPage = applicationAmendmentRequestViewRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
 
 
-        List<ApplicationAmendmentRequestResponse> applicationResponses = entityPage.getContent().stream()
+        List<ApplicationAmendmentRequestViewResponse> applicationAmendmentRequestViewResponses = entityPage.getContent().stream()
-                .map(application -> {
+                .map(amendmentRequestView -> {
-                    ApplicationAmendmentRequestResponse response = convertEntityToResponse(application,false);
+                    ApplicationAmendmentRequestViewResponse response = convertAmendmentEntityToApplicationAmendmentRequestViewResponse(amendmentRequestView);
                     return response;
                 })
                 .collect(Collectors.toList());
 
 
-        PageableResponseBean<List<ApplicationAmendmentRequestResponse>> pageableResponseBean = new PageableResponseBean<>();
+        PageableResponseBean<List<ApplicationAmendmentRequestViewResponse>> pageableResponseBean = new PageableResponseBean<>();
-        pageableResponseBean.setBody(applicationResponses);
+        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<ApplicationAmendmentRequestView> searchPaginationByView(Long userId,ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) {
-    public Specification<ApplicationAmendmentRequestEntity> searchPagination(Long userId,ApplicationAmendmentPaginationRequestBean applicationAmendmentPaginationRequestBean) {
         return (root, query, criteriaBuilder) -> {
 
-            List<Predicate> predicates = getPredicates(applicationAmendmentPaginationRequestBean, criteriaBuilder, root,userId);
+            List<Predicate> 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<Predicate> getPredicates(ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean,
+    private List<Predicate> getPredicatesByView(ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean,
-                                          CriteriaBuilder criteriaBuilder, Root<ApplicationAmendmentRequestEntity> root,Long userId) {
+                                          CriteriaBuilder criteriaBuilder, Root<ApplicationAmendmentRequestView> root,Long userId) {
 
         Integer year = null;
         String search = null;
+        Map<String, FilterCriteria> filters = new HashMap<>();
         if (amendmentPaginationRequestBean.getGlobalFilters() != null) {
             year = amendmentPaginationRequestBean.getGlobalFilters().getYear();
             search = amendmentPaginationRequestBean.getGlobalFilters().getSearch();
         }
+        if (amendmentPaginationRequestBean.getFilters() != null) {
+            filters = amendmentPaginationRequestBean.getFilters();
+        }
         List<Predicate> 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(
+            List<Predicate> searchPredicates = new ArrayList<>();
-                    criteriaBuilder.upper(root.get(GepafinConstant.NOTE)),
+
+            searchPredicates.add(criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get(GepafinConstant.CALL_NAME)),
                     "%" + search.toUpperCase() + "%"
-            );
+            ));
-            predicates.add(criteriaBuilder.or(notePredicate));
+
-            Predicate internalNotePredicate = criteriaBuilder.like(
+            searchPredicates.add(criteriaBuilder.like(
-                    criteriaBuilder.upper(root.get(GepafinConstant.INTERNAL_NOTE)),
+                    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())) {
+        boolean isBeneficiaryOrConfidi = validator.checkIsBeneficiary() || validator.checkIsConfidi();
-            predicates.add(root.get("applicationEvaluationEntity").get("assignedApplicationsEntity").get("application").get("userId").in(userId));
+        boolean isPreInstructor = validator.checkIsPreInstructor();
-        }
+        boolean isInstructorManagerWithPersonalRecords = validator.checkIsInstructorManager() &&
-        else {
+                Boolean.TRUE.equals(amendmentPaginationRequestBean.getPersonalRecords());
-            predicates.add(root.get("applicationEvaluationEntity").get("assignedApplicationsEntity").get("userId").in(userId));
+
+        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;
+    }
+
+
 }

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

@@ -132,8 +132,6 @@ public class ApplicationDao {
     @Value("${rinaldo_email}")
 	private String rinaldoEmail;
 
-    @Value("${carlo_email}")
-	private String carloEmail;
 
     @Value("${call.id}")
     private String callId;
@@ -198,6 +196,9 @@ public class ApplicationDao {
     @Autowired
     private ApplicationEvaluationRepository applicationEvaluationRepository;
 
+    @Autowired
+    private ApplicationViewRepository applicationViewRepository;
+
     @Autowired
     private ApplicationFormViewRepository applicationFormViewRepository;
 
@@ -976,6 +977,13 @@ public class ApplicationDao {
             applicationEntity.setStatus(status.getValue());
             log.info("Status updated to DRAFT for applicationId: " + applicationId);
         }
+        if (status.equals(ApplicationStatusTypeEnum.AWAITING) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.READY.getValue()))) {
+            ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository.findByApplicationIdAndStatus(applicationId,
+                    ApplicationSignedDocumentStatusEnum.ACTIVE.getValue());
+            deleteSignedDocumentFromS3(applicationSignedDocument);
+            applicationEntity.setStatus(status.getValue());
+            log.info("Status updated to AWAITING for applicationId: " + applicationId);
+        }
         applicationEntity = applicationRepository.save(applicationEntity);
         log.info("Application status updated successfully | applicationId: {}, newStatus: {}", applicationId, applicationEntity.getStatus());
 
@@ -1150,24 +1158,6 @@ public class ApplicationDao {
 
         EmailLogRequest emailLogRequest=emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(),RecipientTypeEnum.PROPERTIES,null,userEntity.getEmail(),userEntity.getId(),applicationEntity.getId(),null,applicationEntity.getCall().getId());
 
-//        mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null);
-//        mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null);
-//        mailUtil.sendByMailGun(subject, body, List.of(rinaldoEmail), null);
-//      if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))) {
-//          if (validator.isProductionProfileActivated()) {
-//              emailLogRequest.setRecipientEmails(carloEmail);
-////        	mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
-//              emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
-//          }
-//          List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
-//                  .map(String::trim)
-//                  .filter(email -> !email.isEmpty())
-//                  .toList();
-//
-//          emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
-//          emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail, emailLogRequest);
-//      }
-
         List<String> hubEmails = Arrays.stream(hub.getEmail().split(","))
                 .map(String::trim)
                 .filter(email -> !email.isEmpty())
@@ -1192,9 +1182,7 @@ public class ApplicationDao {
         ApplicationSignedDocumentEntity oldApplicationSingedDocumentData = Utils.getClonedEntityForData(applicationSignedDocument);
 
         if (applicationSignedDocument != null) {
-            throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_ASSIGNED));
+            deleteSignedDocumentFromS3(applicationSignedDocument);
-            //			applicationSignedDocument.setStatus(ApplicationSignedDocumentStatusEnum.INACTIVE.getValue());
-            //			applicationSignedDocumentRepository.save(applicationSignedDocument);
         }
         UploadFileOnAmazonS3Response uploadFileOnAmazonS3 = uploadFileOnAmazonS3ForUserSignedDocument(file, applicationEntity.getCall().getId(), applicationId);
         applicationSignedDocument = new ApplicationSignedDocumentEntity();
@@ -1217,6 +1205,19 @@ public class ApplicationDao {
 
         return convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument);
     }
+    public void deleteSignedDocumentFromS3(ApplicationSignedDocumentEntity applicationSignedDocumentEntity){
+        ApplicationSignedDocumentEntity oldApplicationSignedDocument = Utils.getClonedEntityForData(applicationSignedDocumentEntity);
+        String oldS3Path = applicationSignedDocumentEntity.getFilePath();
+        String newS3Path = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.DELETED_USER_SIGNED_DOCUMENT,applicationSignedDocumentEntity.getApplication().getCall().getId(),applicationSignedDocumentEntity.getApplication().getId(),0L);
+
+        UploadFileOnAmazonS3Response response = amazonS3Service.moveFile(applicationSignedDocumentEntity.getFileName(), oldS3Path, newS3Path);
+        applicationSignedDocumentEntity.setStatus(ApplicationSignedDocumentStatusEnum.INACTIVE.getValue());
+        applicationSignedDocumentEntity.setFileName(response.getFileName());
+        applicationSignedDocumentEntity.setFilePath(response.getFilePath());
+
+        applicationSignedDocumentRepository.save(applicationSignedDocumentEntity);
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.SOFT_DELETE).oldData(oldApplicationSignedDocument).newData(applicationSignedDocumentEntity).build());
+    }
 
     private void validateFileTypeForCall(MultipartFile file, ApplicationEntity applicationEntity) {
         List<String> validCallIds = Arrays.asList(callId.split(","));
@@ -1460,279 +1461,22 @@ public class ApplicationDao {
         }
     }
 
-    public PageableResponseBean<List<ApplicationResponse>> getAllApplicationByPagination(UserEntity userEntity, Long callId, Long companyId, ApplicationPageableRequestBean applicationPageableRequestBean) {
-        Integer pageNo = null;
-        Integer pageLimit = null;
 
-        UserWithCompanyEntity userWithCompany= userWithCompanyRepository.findByUserIdAndCompanyIdAndIsDeletedFalse(userEntity.getId(), companyId).orElse(null);
+//    private Path<?> getFieldPath(Root<?> root, String fieldName) {
-        Long userWithCompanyId = userWithCompany!=null?userWithCompany.getId():null;
+//        try {
-        if (applicationPageableRequestBean.getGlobalFilters() != null) {
+//            return switch (fieldName) {
-            pageNo = applicationPageableRequestBean.getGlobalFilters().getPage();
+////                case GepafinConstant.CALL_ID -> root.get(GepafinConstant.CALL).get(GepafinConstant.ID);
-            pageLimit = applicationPageableRequestBean.getGlobalFilters().getLimit();
+////                case GepafinConstant.CALL_TITLE -> root.get(GepafinConstant.CALL).get(GepafinConstant.NAME);
-        }
+////                case GepafinConstant.CALL_END_DATE -> root.get(GepafinConstant.CALL).get(GepafinConstant.END_DATE);
-        if (pageLimit == null || pageLimit <= 0) {
+////                case GepafinConstant.CALL_END_TIME -> root.get(GepafinConstant.CALL).get(GepafinConstant.END_TIME);
-            pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT;
+////                case GepafinConstant.MODIFIED_DATE -> root.get(GepafinConstant.CALL).get(GepafinConstant.UPDATED_DATE);
-        }
+////                case GepafinConstant.PROTOCOL_NUMBER-> root.get(GepafinConstant.PROTOCOL).get(GepafinConstant.PROTOCOL_NUMBER);
-        if (pageNo == null || pageNo <= 0) {
+//                default -> root.get(fieldName);
-            pageNo = GepafinConstant.DEFAULT_PAGE;
+//            };
-        }
+//        } catch (IllegalArgumentException e) {
-        Specification<ApplicationEntity> spec = search(callId,companyId, userWithCompanyId, applicationPageableRequestBean, userEntity);
+//            return null;
-        Page<ApplicationEntity> entityPage = applicationRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+//        }
-        // Prepare the response
+//    }
-
-
-        List<ApplicationResponse> applicationResponses = entityPage.getContent().stream()
-                .map(application -> {
-                    ApplicationResponse response = getApplicationResponse(application);
-                    return response;
-                })
-                .collect(Collectors.toList());
-
-
-        PageableResponseBean<List<ApplicationResponse>> 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<ApplicationEntity> search(Long callId, Long companyId, Long userWithCompanyId, ApplicationPageableRequestBean applicationPageableRequestBean, UserEntity userEntity) {
-        return (root, query, criteriaBuilder) -> {
-
-            List<Predicate> 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<Predicate> getPredicates(ApplicationPageableRequestBean applicationPageableRequestBean,
-                                          CriteriaBuilder criteriaBuilder, Root<ApplicationEntity> root, Long callId,Long companyId, Long userWithCompanyId, UserEntity userEntity) {
-
-        Integer year = null;
-        String search = null;
-        Integer daysRange = null;
-        Map<String, FilterCriteria> 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<Predicate> 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<String> 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<Predicate> predicates, Map<String, FilterCriteria> filters) {
-        if (Boolean.FALSE.equals(filters.isEmpty())) {
-            for (Map.Entry<String, FilterCriteria> 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 = getFieldPath(root, fieldName);
-                    if (fieldPath != null) {
-                        applyStringFilter(fieldPath, criteriaBuilder, predicates, value, matchMode);
-                        applyNumberFilter(fieldPath, criteriaBuilder, predicates, value, matchMode);
-                        applyDateFilter(fieldPath, criteriaBuilder, predicates, value, matchMode,root);
-                    }
-                }
-            }
-        }
-    }
-
-    private void applyStringFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode) {
-        if (value instanceof String) {
-            String valueStr = (String) value;
-            if (fieldPath.getJavaType().equals(String.class)) {
-                MatchModeEnum mode = MatchModeEnum.fromObject(matchMode.getValue());
-                switch (mode) {
-                    case CONTAINS ->
-                            predicates.add(criteriaBuilder.like(criteriaBuilder.lower(fieldPath.as(String.class)), "%" + valueStr.toLowerCase() + "%"));
-                    case EQUALS -> predicates.add(criteriaBuilder.equal(fieldPath, valueStr));
-                    case STARTSWITH ->
-                            predicates.add(criteriaBuilder.like(criteriaBuilder.lower(fieldPath.as(String.class)), valueStr.toLowerCase() + "%"));
-                    case ENDSWITH ->
-                            predicates.add(criteriaBuilder.like(criteriaBuilder.lower(fieldPath.as(String.class)), "%" + valueStr.toLowerCase()));
-                }
-            }
-        }
-    }
-
-    private void applyNumberFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode) {
-        if (Number.class.isAssignableFrom(fieldPath.getJavaType())) {
-            Number numberValue = null;
-            if (value instanceof Number) {
-                numberValue = (Number) value;
-            }
-            MatchModeEnum mode = MatchModeEnum.fromObject(matchMode.getValue());
-            switch (mode) {
-                case EQUALS -> predicates.add(criteriaBuilder.equal(fieldPath, numberValue));
-            }
-        }
-    }
-
-
-
-
-    private void applyDateFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode, Root<?> root) {
-        if (fieldPath.getJavaType().equals(LocalDateTime.class)) {
-            // Convert input string: Replace 'T' with space
-            String formattedValue = value.toString().replace("T", " ");
-
-            // Handle timezones and UTC (`Z` or `+HH:mm`)
-            if (formattedValue.contains("Z") || formattedValue.matches(".*[+-]\\d{2}:\\d{2}$")) {
-                OffsetDateTime offsetDateTime = OffsetDateTime.parse(value.toString(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-                formattedValue = offsetDateTime.toLocalDateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
-            }
-
-            // Check if more than 3 decimal places exist
-            if (formattedValue.contains(".")) {
-                int dotIndex = formattedValue.indexOf(".");
-                if (formattedValue.length() > dotIndex + 4) {
-                    formattedValue = formattedValue.substring(0, dotIndex + 4); // Keep only 3 decimals
-                }
-            } else {
-                formattedValue += ".000"; // Ensure 3 decimals
-            }
-
-            // Define correct date-time format
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-
-            // Parse the formatted value into LocalDateTime
-            LocalDateTime dateTimeValue = LocalDateTime.parse(formattedValue, formatter);
-
-            // Extract only the date portion
-            LocalDate dateValue = dateTimeValue.toLocalDate();
-
-            // Convert database field to LocalDate for date-only comparison
-            Expression<LocalDate> dateField = criteriaBuilder.function("DATE", LocalDate.class, fieldPath);
-
-            MatchModeEnum mode = MatchModeEnum.fromObject(matchMode.getValue());
-
-            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)));
-            }
-        }
-    }
-
-
-
-
-    private Path<?> getFieldPath(Root<?> root, String fieldName) {
-        try {
-            return switch (fieldName) {
-                case GepafinConstant.CALL_ID -> root.get(GepafinConstant.CALL).get(GepafinConstant.ID);
-                case GepafinConstant.CALL_TITLE -> root.get(GepafinConstant.CALL).get(GepafinConstant.NAME);
-                case GepafinConstant.CALL_END_DATE -> root.get(GepafinConstant.CALL).get(GepafinConstant.END_DATE);
-                case GepafinConstant.CALL_END_TIME -> root.get(GepafinConstant.CALL).get(GepafinConstant.END_TIME);
-                case GepafinConstant.MODIFIED_DATE -> root.get(GepafinConstant.CALL).get(GepafinConstant.UPDATED_DATE);
-                case GepafinConstant.PROTOCOL_NUMBER-> root.get(GepafinConstant.PROTOCOL).get(GepafinConstant.PROTOCOL_NUMBER);
-                default -> root.get(fieldName);
-            };
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-    }
 
 
     public void checkCallEndDate(CallEntity call) {
@@ -1890,6 +1634,195 @@ public class ApplicationDao {
         }
          return application;
     }
+    public PageableResponseBean<List<ApplicationResponse>> getAllApplicationByPaginationByView(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<ApplicationView> spec = searchByView(callId,companyId, userWithCompanyId, applicationPageableRequestBean, userEntity);
+        Page<ApplicationView> entityPage = applicationViewRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+        // Prepare the response
+
+
+        List<ApplicationResponse> applicationResponses = entityPage.getContent().stream()
+                .map(application -> {
+                    ApplicationResponse response = getApplicationResponseByView(application);
+                    return response;
+                })
+                .collect(Collectors.toList());
+
+
+        PageableResponseBean<List<ApplicationResponse>> 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<ApplicationView> searchByView(Long callId, Long companyId, Long userWithCompanyId, ApplicationPageableRequestBean applicationPageableRequestBean, UserEntity userEntity) {
+        return (root, query, criteriaBuilder) -> {
+
+            List<Predicate> predicates = getPredicatesByView(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<Predicate> getPredicatesByView(ApplicationPageableRequestBean applicationPageableRequestBean,
+                                          CriteriaBuilder criteriaBuilder, Root<ApplicationView> root, Long callId,Long companyId, Long userWithCompanyId, UserEntity userEntity) {
+
+        Integer year = null;
+        String search = null;
+        Integer daysRange = null;
+        Map<String, FilterCriteria> 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<Predicate> 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()) {
+            String searchPattern = "%" + search.toUpperCase() + "%";
+
+            Predicate titlePredicate = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get(GepafinConstant.COMMENTS)),
+                    searchPattern
+            );
+
+            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)
+        if (applicationPageableRequestBean.getStatus() != null && !applicationPageableRequestBean.getStatus().isEmpty()) {
+            List<String> 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_ID), callId));
+        }
+
+        // Optional companyId filter
+        if (userWithCompanyId != null) {
+            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_WITH_COMPANY_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));
+        }
+        Utils.applyFiltersByPagination(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 ApplicationResponse getApplicationResponseByView(ApplicationView applicationView) {
+        ApplicationResponse responseBean = new ApplicationResponse();
+        List<FlowEdgesEntity> flowEdgesList = flowEdgesRepository.findByCallId(applicationView.getCallId());
+        Long totalFormSteps = flowFormDao.calculateTotalSteps(flowEdgesList);
+        Long completedSteps = Long.valueOf(flowFormDao.getCompletedStepsByView(applicationView.getId(), false));
+        Integer progress = calculateProgress(totalFormSteps, completedSteps);
+        responseBean.setId(applicationView.getId());
+        responseBean.setProgress(progress);
+        responseBean.setCallTitle(applicationView.getCallTitle());
+        responseBean.setCallEndDate(applicationView.getCallEndDate());
+        responseBean.setCallEndTime(applicationView.getCallEndTime());
+        responseBean.setModifiedDate(applicationView.getModifiedDate());
+        responseBean.setCallId(applicationView.getCallId());
+        responseBean.setSubmissionDate(applicationView.getSubmissionDate());
+        responseBean.setStatus(applicationView.getStatus());
+        responseBean.setEvaluationVersion(EvaluationVersionEnum.valueOf(applicationView.getEvaluationVersion()));
+        responseBean.setComments(applicationView.getComments());
+        responseBean.setCompanyId(applicationView.getCompanyId());
+        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());
+        responseBean.setDateRejected(applicationView.getDateRejected());
+        return responseBean;
+    }
+
     public List<ApplicationFormView> getApplicationFormData(Long callId) {
         List<ApplicationFormView> applicationFormViews=new ArrayList<>();
 
@@ -2199,4 +2132,6 @@ public class ApplicationDao {
             tableDataByApp.put(appId, flattenedAll);
         }
     }
+
+
 }

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

@@ -720,9 +720,11 @@ public class AppointmentDao {
             // Build the appointment request body
             AppointmentCreationRequest appointmentCreationRequest = buildAppointmentCreationRequest(applicationId, createAppointmentRequest, appointmentTemplateId,
                     templateRichiestaData);
+            log.info("AppointmentCreationRequest : {}", appointmentCreationRequest);
             String appointmentRequestBody = Utils.convertObjectToJson(appointmentCreationRequest);
 
             // Make API call to create the appointment
+            log.info("Context:{}, Authorization Token : {}, RequestBody : {}", context, authorizationToken, appointmentRequestBody);
             ResponseEntity<Object> appointmentResponse = appointmentApiService.createAppointment(authorizationToken, context, appointmentRequestBody);
             String appointmentId = extractAppointmentIdFromResponse(appointmentResponse);
 
@@ -751,6 +753,7 @@ public class AppointmentDao {
     private String extractAppointmentIdFromResponse(ResponseEntity<Object> appointmentResponse) {
 
         if (appointmentResponse.getBody() != null) {
+            log.info("Appointment API Response : {}", appointmentResponse.getBody());
             Map<String, Object> responseBody = (Map<String, Object>) appointmentResponse.getBody();
             if (responseBody.containsKey(GepafinConstant.DATA_STRING)) {
                 Map<String, Object> data = (Map<String, Object>) responseBody.get(GepafinConstant.DATA_STRING);

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

@@ -1,8 +1,6 @@
 package net.gepafin.tendermanagement.dao;
 
-import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.*;
-import jakarta.persistence.criteria.Predicate;
-import jakarta.persistence.criteria.Root;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
@@ -16,12 +14,14 @@ import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
 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.AssignedApplicationViewResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.util.SortBy;
 import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
 import net.gepafin.tendermanagement.repositories.ApplicationRepository;
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
+import net.gepafin.tendermanagement.repositories.AssignedApplicationsViewRepository;
 import net.gepafin.tendermanagement.service.ApplicationService;
 import net.gepafin.tendermanagement.service.CompanyService;
 import net.gepafin.tendermanagement.service.UserService;
@@ -39,9 +39,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static net.gepafin.tendermanagement.util.Utils.log;
@@ -81,6 +79,9 @@ public class AssignedApplicationsDao {
     @Autowired
     private ApplicationEvaluationRepository applicationEvaluationRepository;
 
+    @Autowired
+    private AssignedApplicationsViewRepository assignedApplicationsViewRepository;
+
     public AssignedApplicationsResponse createAssignedApplications(Long applicationId, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest) {
         log.info("Assigning application to pre-Instructor with details: {}", applicationId, userId);
 
@@ -301,7 +302,7 @@ public class AssignedApplicationsDao {
         log.info("Assigned application fetched successfully: {}", response);
         return response;
     }
-    public PageableResponseBean<List<AssignedApplicationsResponse>> getAllAssignedApplicationsByPagination(UserEntity user, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean,Long userId) {
+    public PageableResponseBean<List<AssignedApplicationViewResponse>> getAllAssignedApplicationsByPagination(UserEntity user, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean,Long userId) {
         Integer pageNo = null;
         Integer pageLimit = null;
         if (assignedApplicationPageableRequestBean.getGlobalFilters() != null) {
@@ -314,21 +315,15 @@ public class AssignedApplicationsDao {
         if (pageNo == null || pageNo <= 0) {
             pageNo = GepafinConstant.DEFAULT_PAGE;
         }
-        Specification<AssignedApplicationsEntity> spec = searchByPagination( assignedApplicationPageableRequestBean, user,userId);
+        Specification<AssignedApplicationsView> spec = searchByPagination( assignedApplicationPageableRequestBean, user,userId);
-        Page<AssignedApplicationsEntity> entityPage = assignedApplicationsRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+        Page<AssignedApplicationsView> entityPage = assignedApplicationsViewRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
         // Prepare the response
 
-
+        List<AssignedApplicationViewResponse> assignedApplicationsResponses = entityPage.getContent().stream()
-        List<AssignedApplicationsResponse> assignedApplicationsResponses = entityPage.getContent().stream()
+                .map(this::getAssignedApplicationResponseByView)
-                .map(application -> {
-                    AssignedApplicationsResponse response = convertEntityToResponse(application);
-                    return response;
-                })
                 .collect(Collectors.toList());
 
-
+        PageableResponseBean<List<AssignedApplicationViewResponse>> pageableResponseBean = new PageableResponseBean<>();
-
-        PageableResponseBean<List<AssignedApplicationsResponse>> pageableResponseBean = new PageableResponseBean<>();
         pageableResponseBean.setBody(assignedApplicationsResponses);
         pageableResponseBean.setCurrentPage(entityPage.getNumber() + 1);
         pageableResponseBean.setTotalPages(entityPage.getTotalPages());
@@ -338,7 +333,7 @@ public class AssignedApplicationsDao {
         return pageableResponseBean;
     }
 
-    public Specification<AssignedApplicationsEntity> searchByPagination(AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean, UserEntity userEntity,Long userId) {
+    public Specification<AssignedApplicationsView> searchByPagination(AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean, UserEntity userEntity,Long userId) {
         return (root, query, criteriaBuilder) -> {
 
             List<Predicate> predicates = getPredicates(assignedApplicationPageableRequestBean, criteriaBuilder, root, userEntity,userId);
@@ -354,25 +349,47 @@ public class AssignedApplicationsDao {
                     sortBy.setSortDesc(assignedApplicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc());
                 }
             }
+//            Path<?> sortPath;
+//            Join<AssignedApplicationsEntity, ApplicationEntity> applicationJoin = root.join(GepafinConstant.APPLICATION, JoinType.LEFT);
+//
+//            if (GepafinConstant.APPLICATION_ID.equals(sortBy.getColumnName())) {
+//                sortPath = root.join(GepafinConstant.APPLICATION, JoinType.LEFT).get(GepafinConstant.ID);  // Join ApplicationEntity and sort by application.id
+//            }
+//          else if (GepafinConstant.PROTOCOL_NUMBER.equals(sortBy.getColumnName())) {
+//                Join<ApplicationEntity, ProtocolEntity> protocolJoin = applicationJoin.join(GepafinConstant.PROTOCOL, JoinType.LEFT);
+//                sortPath = protocolJoin.get(GepafinConstant.PROTOCOL_NUMBER);
+//            }
+//            else {
+//                sortPath = root.get(sortBy.getColumnName()); // Sorting by a field in AmendmentEntity
+//            }
+//            query.orderBy(criteriaBuilder.desc(sortPath));
+//            if (Boolean.FALSE.equals(sortBy.getSortDesc())) {
+//                query.orderBy(criteriaBuilder.asc(sortPath));
+//            }
+//            return query.where(criteriaBuilder.and(predicates.toArray(new Predicate[0]))).getRestriction();
+
+            Path<?> sortPath = root.get(sortBy.getColumnName()); // All fields are accessible directly in the view
+            query.orderBy(sortBy.getSortDesc() ? criteriaBuilder.desc(sortPath) : criteriaBuilder.asc(sortPath));
 
-            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<Predicate> getPredicates(AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean,
-                                          CriteriaBuilder criteriaBuilder, Root<AssignedApplicationsEntity> root, UserEntity userEntity,Long userId) {
+                                          CriteriaBuilder criteriaBuilder, Root<AssignedApplicationsView> root, UserEntity userEntity,Long userId) {
 
         Integer year = null;
         String search = null;
+        Map<String, FilterCriteria> filters = new HashMap<>();
+
         if (assignedApplicationPageableRequestBean.getGlobalFilters() != null) {
             year = assignedApplicationPageableRequestBean.getGlobalFilters().getYear();
             search = assignedApplicationPageableRequestBean.getGlobalFilters().getSearch();
         }
+        if (assignedApplicationPageableRequestBean.getFilters() != null) {
+            filters = assignedApplicationPageableRequestBean.getFilters();
+        }
         List<Predicate> predicates = new ArrayList<>();
 
         Boolean isBeneficiary = validator.checkIsBeneficiary();
@@ -391,12 +408,35 @@ public class AssignedApplicationsDao {
 
         }
         // Search in `title` and `message` (if search term is provided)
-        if (search != null && !search.isEmpty()) {
+//        if (search != null && !search.isEmpty()) {
-            Predicate titlePredicate = criteriaBuilder.like(
+//            Predicate titlePredicate = criteriaBuilder.like(
-                    criteriaBuilder.upper(root.get(GepafinConstant.NOTE)),
+//                    criteriaBuilder.upper(root.get(GepafinConstant.NOTE)),
-                    "%" + search.toUpperCase() + "%"
+//                    "%" + search.toUpperCase() + "%"
-            );
+//            );
-            predicates.add(criteriaBuilder.or(titlePredicate));
+//            predicates.add(criteriaBuilder.or(titlePredicate));
+//        }
+
+        if (search != null && !search.trim().isEmpty()) {
+            String pattern = "%" + search.toUpperCase() + "%";
+            List<Predicate> searchPredicates = new ArrayList<>();
+
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.CALL_NAME)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.COMPANY_NAME)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.STATUS)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.NDG_STRING)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.APPOINTMENT_ID)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.APPLICATION_STATUS)), pattern));
+
+            // Convert numeric fields to string for search (optional and DB-specific; otherwise exact match)
+            try {
+                Long searchLong = Long.parseLong(search);
+                searchPredicates.add(criteriaBuilder.equal(root.get(GepafinConstant.APPLICATION_ID), searchLong));
+                searchPredicates.add(criteriaBuilder.equal(root.get(GepafinConstant.PROTOCOL_NUMBER), searchLong));
+            } catch (NumberFormatException ignored) {
+                // Ignore if search is not a number
+            }
+
+            predicates.add(criteriaBuilder.or(searchPredicates.toArray(new Predicate[0])));
         }
 
         // Filter by `status` (if status list is provided)
@@ -408,11 +448,31 @@ public class AssignedApplicationsDao {
         }
         predicates.add(criteriaBuilder.isFalse(root.get(GepafinConstant.IS_DELETED)));
 
-
+        Utils.applyFiltersByPagination(root, criteriaBuilder, predicates, filters);
 
         return predicates;
 
     }
+
+    private AssignedApplicationViewResponse getAssignedApplicationResponseByView(AssignedApplicationsView view) {
+        AssignedApplicationViewResponse response = new AssignedApplicationViewResponse();
+        response.setId(view.getId());
+        response.setUserId(view.getUserId());
+        response.setStatus(AssignedApplicationEnum.valueOf(view.getStatus()));
+        response.setApplicationId(view.getApplicationId());
+        response.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(view.getApplicationStatus()));
+        response.setSubmissionDate(view.getSubmissionDate());
+        response.setEvaluationEndDate(view.getEvaluationEndDate());
+        response.setNdg(view.getNdg());
+        response.setAppointmentId(view.getAppointmentId());
+        response.setProtocolNumber(view.getProtocolNumber());
+        response.setCallName(view.getCallName());
+        response.setCompanyName(view.getCompanyName());
+        response.setCreatedDate(view.getCreatedDate());
+        response.setUpdatedDate(view.getUpdatedDate());
+        return response;
+    }
+
     public AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {
 
         AssignedApplicationsEntity assignedApplication = validateAssignedApplication(assignedApplicationId);
@@ -423,4 +483,39 @@ public class AssignedApplicationsDao {
         AssignedApplicationsEntity updatedAssignment = saveAssignedApplication(assignedApplication, oldAssignedApplicationEntity, VersionActionTypeEnum.UPDATE);
         return convertEntityToResponse(updatedAssignment);
     }
+    private void applyFilters(Root<?> root, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Map<String, FilterCriteria> filters) {
+        if (Boolean.FALSE.equals(filters.isEmpty())) {
+            for (Map.Entry<String, FilterCriteria> 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 = getFieldPath(root, 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 {
+            return switch (fieldName) {
+                case GepafinConstant.APPLICATION_ID -> root.get(GepafinConstant.APPLICATION).get(GepafinConstant.ID);
+                case GepafinConstant.PROTOCOL_NUMBER-> root.get(GepafinConstant.APPLICATION).get(GepafinConstant.PROTOCOL).get(GepafinConstant.PROTOCOL_NUMBER);
+                default -> root.get(fieldName);
+            };
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
 }

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

@@ -124,6 +124,9 @@ public class CallDao {
 	@Autowired
 	private EvaluationFormDao evalualtionFormDao;
 
+	@Autowired
+	private ApplicationRepository applicationRepository;
+
 	public CallResponse createCallStep1(CreateCallRequestStep1 createCallRequest, UserEntity userEntity) {
 		createCallRequest.setRegionId(userEntity.getRoleEntity().getRegion().getId());
 		CallEntity callEntity = convertToCallEntity(createCallRequest, userEntity);
@@ -902,7 +905,7 @@ public class CallDao {
 	public CallResponse updateCallStatus(CallEntity callEntity, CallStatusEnum statusReq) {
 		CallEntity oldCallEntity = Utils.getClonedEntityForData(callEntity);
 		CallStatusEnum currentStatus = CallStatusEnum.valueOf(callEntity.getStatus());
-		validateStatusChange(currentStatus, statusReq);
+		validateStatusChange(currentStatus, statusReq, callEntity.getId());
 		callEntity.setStatus(statusReq.getValue());
 		callEntity = callRepository.save(callEntity);
 
@@ -922,36 +925,37 @@ public class CallDao {
 		return convertToCallResponseBean(callEntity);
 	}
 
-	private void validateStatusChange(CallStatusEnum currentStatus, CallStatusEnum newStatus) {
+	private void validateStatusChange(CallStatusEnum currentStatus, CallStatusEnum newStatus, Long callId) {
-		if (currentStatus == newStatus) {
-			throw new CustomValidationException(Status.VALIDATION_ERROR,
-					Translator.toLocale(GepafinConstant.STATUS_SAME_ERROR));
-		}
 
+		if (currentStatus == newStatus) {
+			throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.STATUS_SAME_ERROR));
+		}
 		switch (currentStatus) {
 			case DRAFT:
 				if (newStatus == CallStatusEnum.READY_TO_PUBLISH || newStatus == CallStatusEnum.PUBLISH) {
-				throw new CustomValidationException(Status.VALIDATION_ERROR,
+					throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_DRAFT));
-						Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_DRAFT));
 				}
 				break;
+
 			case PUBLISH:
-			if (newStatus == CallStatusEnum.READY_TO_PUBLISH || newStatus == CallStatusEnum.DRAFT) {
+				if (newStatus == CallStatusEnum.READY_TO_PUBLISH) {
-				throw new CustomValidationException(Status.VALIDATION_ERROR,
+					throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_PUBLISH));
-						Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_PUBLISH));
+				}
+				if (newStatus == CallStatusEnum.DRAFT && Boolean.TRUE.equals(applicationRepository.existsByCallId(callId))) {
+					throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_PUBLISH_TO_DRAFT));
 				}
 				break;
 
 			case EXPIRED:
-			throw new CustomValidationException(Status.VALIDATION_ERROR,
+				throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.STATUS_CANNOT_BE_CHANGED));
-					Translator.toLocale(GepafinConstant.STATUS_CANNOT_BE_CHANGED));
+
 			case READY_TO_PUBLISH:
 				break;
 			default:
 				break;
+		}
+	}
 
-		}
-	}
 	public CallEntity validatePublishedCall(Long callId, Long hubId) {
 		CallEntity callEntity= callRepository
 				.findByIdAndStatusAndHubId(callId, CallStatusEnum.PUBLISH.getValue(), hubId);

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

@@ -1,9 +1,7 @@
 package net.gepafin.tendermanagement.dao;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.data.domain.Pageable; // Correct package
 
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
@@ -20,7 +18,6 @@ import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
 import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
 import net.gepafin.tendermanagement.repositories.ApplicationRepository;
 import net.gepafin.tendermanagement.repositories.FaqRepository;
-import net.gepafin.tendermanagement.service.feignClient.VatCheckService;
 import net.gepafin.tendermanagement.util.LoggingUtil;
 import net.gepafin.tendermanagement.web.rest.api.errors.*;
 import org.apache.commons.lang3.StringUtils;
@@ -37,7 +34,6 @@ import net.gepafin.tendermanagement.model.response.CompanyResponse;
 import net.gepafin.tendermanagement.service.UserService;
 import net.gepafin.tendermanagement.util.Utils;
 
-import static net.gepafin.tendermanagement.util.Utils.convertObjectToJsonString;
 import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
 
 @Component
@@ -73,10 +69,6 @@ public class CompanyDao {
 	private HttpServletRequest request;
 
 
-	@Autowired
-	private VatCheckService vatCheckService; // Service to call VAT API
-
-
 	private static final String NOT_FOUND_JSON = "{\"data\": \"not found\"}";
 
 	public CompanyResponse createCompany(UserEntity userEntity, CompanyRequest companyRequest) {
@@ -146,24 +138,7 @@ public class CompanyDao {
 		loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).oldData(null).newData(userWithCompany).build());
 		if (StringUtils.isEmpty(companyEntity.getJson())) {
 			companyEntity.setJson(Utils.convertMapIntoJsonString(companyRequest.getVatCheckResponse()));
-			Map<String, Object> vatCheckResponse = companyRequest.getVatCheckResponse();
+			updateCodiceAtecoFieldWithNewJson(companyEntity);
-			Map<String, Object> data = (Map<String, Object>) vatCheckResponse.get("data");
-			if (data != null) {
-				if (data.containsKey("dettaglio")) {
-					Map<String, Object> dettaglio = (Map<String, Object>) data.get("dettaglio");
-					if (dettaglio != null) {
-						if (dettaglio.containsKey("codice_ateco")) {
-							Object codiceAtecoObj = dettaglio.get("codice_ateco");
-							String codiceAteco = (codiceAtecoObj != null) ? codiceAtecoObj.toString() : null;
-
-							if (codiceAteco != null) {
-								companyEntity.setCodiceAteco(codiceAteco);
-							}
-						}
-					}
-				}
-			}
-
 			companyEntity = companyRepository.save(companyEntity);
 
 			/** This code is responsible for adding a version history log for "updating company json field" operation. **/
@@ -193,25 +168,8 @@ public class CompanyDao {
 		entity.setAnnualRevenue(request.getAnnualRevenue());
 		entity.setHub(userEntity.getHub());
 		entity.setJson(Utils.convertMapIntoJsonString(request.getVatCheckResponse()));
-		if (request.getVatCheckResponse() != null) {
+		updateCodiceAtecoFieldWithNewJson(entity);
-			Map<String, Object> vatCheckResponse = request.getVatCheckResponse();
-			Map<String, Object> data = (Map<String, Object>) vatCheckResponse.get("data");
-			if (data != null) {
-				if (data.containsKey("dettaglio")) {
-					Map<String, Object> dettaglio = (Map<String, Object>) data.get("dettaglio");
-					if (dettaglio != null) {
-						if (dettaglio.containsKey("codice_ateco")) {
-							Object codiceAtecoObj = dettaglio.get("codice_ateco");
-							String codiceAteco = (codiceAtecoObj != null) ? codiceAtecoObj.toString() : null;
 	
-							if (codiceAteco != null) {
-								entity.setCodiceAteco(codiceAteco);
-							}
-						}
-					}
-				}
-			}
-		}
 		return entity;
 	}
 
@@ -469,7 +427,7 @@ public class CompanyDao {
 					log.info("Company ID {}: JSON field updated successfully.", company.getId());
 
 					// Extract and set codiceAteco field
-					updateCodiceAtecoField(company);
+					updateCodiceAtecoFieldWithNewJson(company);
 
 					successfulUpdates++;
 				} else {
@@ -503,49 +461,89 @@ public class CompanyDao {
 	private void updateCodiceAtecoField(CompanyEntity company) {
 		Map<String, Object> vatCheckResponse = Utils.convertJsonStringToMap(company.getJson());
 
-		if (vatCheckResponse != null && vatCheckResponse.containsKey("data")) {
+		if (vatCheckResponse == null) {
+			log.warn("Company ID {}: Invalid JSON response.", company.getId());
+			return;
+		}
+
 		Object dataObj = vatCheckResponse.get("data");
+		if (!(dataObj instanceof Map<?, ?> dataMap)) {
+			log.warn("Company ID {}: 'data' is missing or not a valid object.", company.getId());
+			return;
+		}
 
-			if (dataObj instanceof Map) {
+		if (!dataMap.containsKey("dettaglio")) {
-				Map<String, Object> dataMap = (Map<String, Object>) dataObj;
+			log.warn("Company ID {}: 'dettaglio' not present inside 'data'. Skipping codiceAteco update.", company.getId());
-				log.info("Company ID {}: Available keys inside 'data' -> {}", company.getId(), dataMap.keySet());
+			return;
+		}
 
-				if (dataMap.containsKey("dettaglio")) {
 		Object dettaglioObj = dataMap.get("dettaglio");
+		if (!(dettaglioObj instanceof Map<?, ?> dettaglio)) {
+			log.warn("Company ID {}: 'dettaglio' is not a valid object.", company.getId());
+			return;
+		}
 
-					if (dettaglioObj instanceof Map) {
-						Map<String, Object> dettaglio = (Map<String, Object>) dettaglioObj;
-
-						if (dettaglio.containsKey("codice_ateco")) {
 		Object codiceAtecoObj = dettaglio.get("codice_ateco");
+		if (!(codiceAtecoObj instanceof String codiceAteco) || codiceAteco.isEmpty()) {
+			log.warn("Company ID {}: 'codice_ateco' is missing, empty, or not a string.", company.getId());
+			return;
+		}
 
-							if (codiceAtecoObj instanceof String) {
-								String codiceAteco = (String) codiceAtecoObj;
-
-								if (codiceAteco != null && !codiceAteco.isEmpty()) {
 		company.setCodiceAteco(codiceAteco);
-									log.info("Company ID {}: codiceAteco updated to {}", company.getId(), codiceAteco);
+		logCodiceAtecoUpdate(company, codiceAteco);
-								} else {
-									log.warn("Company ID {}: codiceAteco is null or empty in the response.", company.getId());
 	}
-							} else {
+
-								log.warn("Company ID {}: 'codice_ateco' is not a string, actual type: {}", company.getId(), codiceAtecoObj.getClass());
+	private void updateCodiceAtecoFieldWithNewJson(CompanyEntity company) {
+		if (company == null || company.getJson() == null || company.getJson().isEmpty()) {
+			log.warn("Company is null or JSON data is empty.");
+			return;
 		}
-						} else {
+
-							log.warn("Company ID {}: 'dettaglio' does not contain 'codice_ateco' key.", company.getId());
+		Map<String, Object> companyDataMap = Utils.convertJsonStringToMap(company.getJson());
+		if (companyDataMap == null) {
+			log.warn("Company ID {}: Failed to parse JSON data.", company.getId());
+			return;
 		}
-					} else {
+
-						log.warn("Company ID {}: 'dettaglio' is not a Map, actual type: {}", company.getId(), dettaglioObj.getClass());
+		// Extract 'data' section
+		Map<String, Object> dataMap = Utils.extractMap(companyDataMap, "data");
+		Object dataObj = companyDataMap.get("data");
+
+		if (dataMap == null) {
+			log.warn("Company ID {}: 'data' section is missing or invalid in the JSON.", company.getId());
+			return;
 		}
+		if (dataObj instanceof Map<?, ?>) {
+			// if data is a single object
+			updateCodiceAtecoField(company);
 		} else {
-					log.warn("Company ID {}: 'dettaglio' section is missing inside 'data'!", company.getId());
+			// Extract 'atecoClassification' section
+			Map<String, Object> atecoClassificationMap = Utils.extractMap(dataMap, "atecoClassification");
+			if (atecoClassificationMap == null) {
+				log.warn("Company ID {}: 'atecoClassification' section is missing or invalid.", company.getId());
+				return;
 			}
-			} else {
+
-				log.warn("Company ID {}: 'data' is not a Map, actual type: {}", company.getId(), dataObj.getClass());
+			// Extract 'ateco' section
+			Map<String, Object> atecoMap = Utils.extractMap(atecoClassificationMap, "ateco");
+			if (atecoMap == null) {
+				log.warn("Company ID {}: 'ateco' section is missing or invalid.", company.getId());
+				return;
 			}
+
+			// Extract and set 'code'
+			String atecoCode = Utils.extractString(atecoMap, "code");
+			if (atecoCode != null && !atecoCode.isEmpty()) {
+				company.setCodiceAteco(atecoCode);
+				logCodiceAtecoUpdate(company, atecoCode);
 			} else {
-			log.warn("Company ID {}: 'data' section missing in the JSON response.", company.getId());
+				log.warn("Company ID {}: 'code' inside 'ateco' is empty or missing.", company.getId());
+			}
 		}
 	}
 
+	private static void logCodiceAtecoUpdate(CompanyEntity company, String atecoCode) {
+
+		log.info("Company ID {}: codiceAteco updated to {}", company.getId(), atecoCode);
+	}
 }

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

@@ -209,7 +209,6 @@ public class DelegationDao {
 
 		companyDao.validateCompany(companyId);
 		companyDao.getUserWithCompany(userEntity.getId(), companyId);
-		validateFileType(file);
 		UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(userEntity.getId(),companyId);
 		UserCompanyDelegationEntity userCompanyDelegationEntity = userCompanyDelegationRepository
 				.findByUserIdAndUserWithCompanyIdAndStatus(userEntity.getId(), userWithCompanyEntity.getId(),

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.*;
+import net.gepafin.tendermanagement.enums.EmailServiceTypeEnum;
 import net.gepafin.tendermanagement.enums.RecipientTypeEnum;
 import net.gepafin.tendermanagement.model.request.EmailConfig;
 import net.gepafin.tendermanagement.model.request.EmailLogRequest;
@@ -15,6 +16,7 @@ import net.gepafin.tendermanagement.service.*;
 import net.gepafin.tendermanagement.service.impl.EmailService;
 import net.gepafin.tendermanagement.service.impl.EmailServiceFactory;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
+import net.gepafin.tendermanagement.service.impl.SystemEmailService;
 import net.gepafin.tendermanagement.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -140,7 +142,9 @@ public class EmailNotificationDao {
                if (rinaldoEmail != null) {
                    EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.PROPERTIES,null ,
                            rinaldoEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
-                   sendMail(applicationEntity.getHubId(), subject, body, List.of(rinaldoEmail), emailLogRequest);
+
+                   //SMTP
+                   sendMail(null, subject, body, List.of(rinaldoEmail), emailLogRequest);
                }
               if (applicationEvaluationEntity.isPresent()) {
                   Long preInstructorId = applicationEvaluationEntity.get().getUserId(); // Assuming UserEntity has an email field
@@ -275,10 +279,17 @@ public class EmailNotificationDao {
 
     public void sendMail(Long hubId, String subject, String body, List<String> recipientEmails, EmailLogRequest emailLogRequest) {
 
-        EmailConfig emailConfig = retrieveEmailConfig(hubId);
+        EmailConfig emailConfig = new EmailConfig();
+        if (recipientEmails.stream().anyMatch(email -> email.equals(GepafinConstant.RINALDO_EMAIL))) {
+            emailConfig.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE.getValue());
             EmailService emailService = emailServiceFactory.getEmailService(emailConfig.getEmailServiceType());
             emailService.sendEmail(subject, body, recipientEmails, emailConfig, emailLogRequest);
-//        emailService.sendEmail(subject, body, recipientEmails, emailConfig);
+        } else {
+            emailConfig = retrieveEmailConfig(hubId);
+            EmailService emailService = emailServiceFactory.getEmailService(emailConfig.getEmailServiceType());
+            emailService.sendEmail(subject, body, recipientEmails, emailConfig, emailLogRequest);
+
+        }
     }
 
     public EmailConfig retrieveEmailConfig(Long hubId) {

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

@@ -369,5 +369,17 @@ public class FlowFormDao {
 		return getNextForm(currentFormEntity, applicationEntity);
 	}
 
-
+	public Integer getCompletedStepsByView(Long applicationId, Boolean isSendValidationError) {
+		Integer completedSteps=0;
+		List<ApplicationFormEntity> applicationFormList = applicationFormRepository.findByApplicationId(applicationId);
+		List<ApplicationFormFieldEntity> applicationFormFieldEntities=new ArrayList<>();
+		for (ApplicationFormEntity applicationFormEntity:applicationFormList){
+			applicationFormFieldEntities=applicationFormFieldRepository.findByApplicationFormId(applicationFormEntity.getId());
+			Boolean isCompleted=formDao.validateCompletedSteps(applicationFormFieldEntities, null, applicationFormEntity.getForm(), isSendValidationError);
+			if(Boolean.TRUE.equals(isCompleted)){
+				completedSteps++;
+			}
+		}
+		return completedSteps;
+	}
 }

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

@@ -511,7 +511,7 @@ public class FormDao {
 //            Map<String, Object> customData=null;
             try {
 //                Map<String, Object> vatCheckResponse = vatCheckDao.checkVatNumberApi(value);
-            	vatCheckDao.checkVatNumberApi(value);
+            	vatCheckDao.checkVatNumber(value);
 //                if (Boolean.FALSE.equals(CollectionUtils.isEmpty(vatCheckResponse))) {
 //                    customData = vatCheckResponse;
 //                }

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

@@ -1,10 +1,8 @@
 package net.gepafin.tendermanagement.dao;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
@@ -12,7 +10,6 @@ import net.gepafin.tendermanagement.entities.*;
 import net.gepafin.tendermanagement.enums.NotificationEnum;
 import net.gepafin.tendermanagement.enums.NotificationTypeEnum;
 import net.gepafin.tendermanagement.enums.RoleStatusEnum;
-import net.gepafin.tendermanagement.model.request.GlobalFilters;
 import net.gepafin.tendermanagement.model.request.NotificationReq;
 import net.gepafin.tendermanagement.model.request.NotificationRequestBean;
 import net.gepafin.tendermanagement.model.response.NotificationResponse;
@@ -28,22 +25,19 @@ import net.gepafin.tendermanagement.util.DateTimeUtil;
 import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
-import org.opensaml.xmlsec.signature.G;
 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.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
@@ -92,7 +86,7 @@ public class NotificationDao {
         log.info("Sending notification to user {} with content: {}", userId, notificationReq.getMessage());
         List<Long> companyIds = notificationReq.getCompanyIds();
 
-        if (companyIds == null || companyIds.isEmpty()) {
+        if (companyIds == null || companyIds.isEmpty() || companyIds.stream().allMatch(Objects::isNull)) {
             sendToUser(userId, notificationEntity);
         } else {
             sendToCompanies(userId, companyIds, notificationEntity);
@@ -154,7 +148,7 @@ public class NotificationDao {
         notificationEntity.setUserId(notificationReq.getUserId());
         notificationEntity.setStatus(NotificationEnum.UNREAD.getValue());
         notificationEntity.setIsDeleted(Boolean.FALSE);
-        notificationEntity.setUserWithCompany(notificationReq.getUserWithCompanyEntity() != null ? notificationReq.getUserWithCompanyEntity() : null);
+        notificationEntity.setUserWithCompany(notificationReq.getUserWithCompanyEntity());
         notificationEntity.setMessage(message);
         notificationEntity.setTitle(notificationReq.getTitle());
         return notificationEntity;

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

@@ -1,14 +1,15 @@
 package net.gepafin.tendermanagement.dao;
 
 import feign.FeignException;
-import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
-import net.gepafin.tendermanagement.entities.CompanyEntity;
+import net.gepafin.tendermanagement.enums.VatCheckVersionTypeEnum;
 import net.gepafin.tendermanagement.model.response.VatCheckResponseBean;
-import net.gepafin.tendermanagement.service.feignClient.VatCheckService;
+import net.gepafin.tendermanagement.repositories.GlobalConfigRepository;
-import net.gepafin.tendermanagement.util.LoggingUtil;
+import net.gepafin.tendermanagement.service.feignClient.VatCheckV1Service;
+import net.gepafin.tendermanagement.service.feignClient.VatCheckV2Service;
 import net.gepafin.tendermanagement.util.Utils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,32 +21,36 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
 public class VatCheckDao {
 
     @Autowired
-    private VatCheckService vatCheckService;
+    private VatCheckV2Service vatCheckV2Service;
 
-    @Value("${vatCheckNewToken}")
+    @Autowired
-    public String vatCheckNewToken;
+    private VatCheckV1Service vatCheckV1Service;
+
+    @Value("${vatCheckTokenV2}")
+    public String vatCheckTokenV2;
+
+    @Value("${vatCheckTokenV1}")
+    public String vatCheckTokenV1;
 
     @Value("${isVatCheckGloballyDisabled}")
     public String isVatCheckGloballyDisabled;
 
+    @Autowired
+    private GlobalConfigRepository globalConfigRepository;
+
     public final Logger log = LoggerFactory.getLogger(VatCheckDao.class);
 
-    @Autowired
+    public VatCheckResponseBean checkVatNumberV1(String vatNumber) {
-    private LoggingUtil loggingUtil;
-
-    @Autowired
-    private HttpServletRequest request;
-
-    public VatCheckResponseBean checkVatNumberApi(String vatNumber) {
         VatCheckResponseBean vatCheckResponseBean = new VatCheckResponseBean();
         vatCheckResponseBean.setValid(false);
         vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
@@ -53,20 +58,102 @@ public class VatCheckDao {
             vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
             return vatCheckResponseBean;
         }
-        Map<String, Object> responseBody = new HashMap<>();
         try {
             HttpHeaders headers = new HttpHeaders();
             headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
             headers.setContentType(MediaType.APPLICATION_JSON);
-            headers.set(GepafinConstant.AUTHORIZATION, "Bearer " + vatCheckNewToken);
+            headers.set(GepafinConstant.AUTHORIZATION, "Bearer " + vatCheckTokenV1);
             headers.add(org.apache.http.HttpHeaders.USER_AGENT, "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0");
 
-            URI baseUrl = URI.create(GepafinConstant.CHECK_VATNUMBER_V2_NEW_URL);
+            URI baseUrl = URI.create(GepafinConstant.CHECK_VATNUMBER_URL_V1);
-            ResponseEntity<Map<String, Object>> response = vatCheckService.checkVatNumber(baseUrl, vatNumber, headers);
+            ResponseEntity<Map<String, Object>> response = vatCheckV1Service.checkVatNumber(baseUrl, vatNumber, headers);
-
 
             if (response.getStatusCode() == HttpStatus.OK && response.hasBody()) {
-                log.info("Successfully checked vat number");
+                logSuccess();
+                Map<String, Object> responseMap = response.getBody();
+                if (responseMap != null) {
+                    processValidResponseV1(responseMap, vatCheckResponseBean);
+                } else {
+                    log.warn("Response map or vatCheckResponseBean is null.");
+                }
+            }
+
+        } catch (FeignException ex) {
+                if (ex.status() == 406) {
+                    try {
+                        Map<String, Object> errorResponse = Utils.parseErrorResponse(ex.contentUTF8());
+                        processValidResponseV1(errorResponse, vatCheckResponseBean);
+                    } catch (Exception parseEx) {
+                        log.error("Failed to parse 406 error response: {0}", parseEx);
+                    }
+                } else {
+                    log.error("Exception occurred while checking vat number: {0}", ex);
+                    Utils.callException(ex.status(), ex);
+                }
+            }
+        return vatCheckResponseBean;
+    }
+
+    public static void processValidResponseV1(Map<String, Object> responseMap, VatCheckResponseBean vatCheckResponseBean) {
+        Object dataObj = responseMap.get("data");
+        if (dataObj instanceof Map<?, ?> rawDataMap) {
+            Map<String, Object> responseBody = new LinkedHashMap<>();
+            rawDataMap.forEach((k, v) -> {
+                if (k instanceof String strKey) {
+                    responseBody.put(strKey, v);
+                }
+            });
+
+            List.of("timestamp_creation", "timestamp_last_update", "id", "data_iscrizione").forEach(responseBody.keySet()::remove);
+
+            Map<String, Object> data = new LinkedHashMap<>();
+            data.put("data", responseBody);
+
+            vatCheckResponseBean.setValid(true);
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.VALID_VATNUMBER_MSG));
+            vatCheckResponseBean.setVatCheckResponse(data);
+        } else {
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+        }
+
+    }
+
+    public VatCheckResponseBean checkVatNumber(String vatNumber) {
+
+        try {
+            String vatApiVersion = getVatCheckVersion();
+            if(!isVatCheckApiV2(vatApiVersion)){
+                return checkVatNumberV1(vatNumber);
+            }
+            return checkVatNumberV2(vatNumber);
+        } catch (Exception e) {
+            logErrorMessage(e);
+            VatCheckResponseBean vatCheckResponseBean = new VatCheckResponseBean();
+            vatCheckResponseBean.setValid(false);
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+            return vatCheckResponseBean;
+        }
+    }
+
+    public VatCheckResponseBean checkVatNumberV2(String vatNumber) {
+
+        VatCheckResponseBean vatCheckResponseBean = new VatCheckResponseBean();
+        vatCheckResponseBean.setValid(false);
+        vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+        if (Boolean.TRUE.equals(Boolean.parseBoolean(isVatCheckGloballyDisabled))) {
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+            return vatCheckResponseBean;
+        }
+        try {
+            HttpHeaders headers = new HttpHeaders();
+            headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+            headers.set(GepafinConstant.AUTHORIZATION, "Bearer " + vatCheckTokenV2);
+
+            URI baseUrl = URI.create(GepafinConstant.CHECK_VATNUMBER_URL_V2);
+            ResponseEntity<Map<String, Object>> response = vatCheckV2Service.checkVatNumber(baseUrl, vatNumber, headers);
+
+            if (response.getStatusCode() == HttpStatus.OK && response.hasBody()) {
+                logSuccess();
                 Map<String, Object> responseMap = response.getBody();
                 processValidResponse(responseMap, vatCheckResponseBean);
             }
@@ -85,40 +172,65 @@ public class VatCheckDao {
         }
         return vatCheckResponseBean;
     }
+    
     public static void processValidResponse(Map<String, Object> responseMap, VatCheckResponseBean vatCheckResponseBean) {
-        if (responseMap != null && responseMap.containsKey("data")) {
-            Map<String, Object> responseBody = (Map<String, Object>) responseMap.get("data");
 
-            if (responseBody != null) {
+        if (responseMap == null || !responseMap.containsKey("data")) {
-                responseBody.remove("timestamp_creation");
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
-                responseBody.remove("timestamp_last_update");
+            return;
-                responseBody.remove("data_iscrizione");
+        }
-                responseBody.remove("id");
 
-                Map<String, Object> data = new LinkedHashMap<>();
+        Object dataObject = responseMap.get("data");
-                data.put("data", responseBody);
+        if (!(dataObject instanceof List<?> dataList) || dataList.isEmpty()) {
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+            return;
+        }
+
+        List<Map<String, Object>> processedList = new ArrayList<>();
+
+        for (Object item : dataList) {
+            if (item instanceof Map<?, ?> mapItem) {
+                Map<String, Object> responseBody = new LinkedHashMap<>();
+                mapItem.forEach((key, value) -> {
+                    if (key instanceof String strKey) {
+                        responseBody.put(strKey, value);
+                    }
+                });
+
+                List.of("creationTimestamp", "lastUpdateTimestamp", "id").forEach(responseBody.keySet()::remove);
+
+                processedList.add(responseBody);
+            }
+        }
+
+        if (processedList.isEmpty()) {
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+            return;
+        }
 
         vatCheckResponseBean.setValid(true);
         vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.VALID_VATNUMBER_MSG));
-                vatCheckResponseBean.setVatCheckResponse(data);
+        vatCheckResponseBean.setVatCheckResponse(Map.of("data", processedList));
-            } else {
-                vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
-            }
-        } else {
-            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
-        }
     }
 
-	public VatCheckResponseBean checkVatNumber(String vatNumber) {
+    private void logSuccess() {
-		try {
+
-			return checkVatNumberApi(vatNumber);
+        log.info("Successfully checked vat number");
-		} catch (Exception e) {
+    }
+
+    private static boolean isVatCheckApiV2(String vatApiVersion) {
+        boolean isNotBlank = StringUtils.isNotBlank(vatApiVersion);
+        boolean isNotEmpty = StringUtils.isNotEmpty(vatApiVersion);
+        return isNotBlank && isNotEmpty && Boolean.TRUE.equals(vatApiVersion.equals(VatCheckVersionTypeEnum.V2.getValue()));
+    }
+
+    private String getVatCheckVersion() {
+
+        return globalConfigRepository.findContentByTypeAndIsDeletedFalse(GepafinConstant.VAT_CHECK_API_VERSION);
+    }
+
+    private void logErrorMessage(Exception e) {
+
         log.error("Error in checkVatNumber: {}", e.getMessage());
-        VatCheckResponseBean vatCheckResponseBean = new VatCheckResponseBean();
-        vatCheckResponseBean.setValid(false);
-        vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
-        return vatCheckResponseBean;
     }
 }
-
-}

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;
+}

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;
+    }
+}

src/main/java/net/gepafin/tendermanagement/entities/ApplicationView.java

@@ -0,0 +1,95 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.Immutable;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+@Entity
+@Immutable
+@Table(name = "application_view")
+@Getter
+@Setter
+@IdClass(ApplicationViewId.class)
+public class ApplicationView implements Serializable {
+
+    @Id
+    @Column(name = "ID")
+    private Long id;
+
+    @Column(name = "STATUS")
+    private String status;
+
+    @Column(name = "IS_DELETED")
+    private Boolean isDeleted;
+
+    @Column(name = "USER_ID")
+    private Long userId;
+
+    @Column(name = "SUBMISSION_DATE")
+    private LocalDateTime submissionDate;
+
+    @Column(name ="COMMENTS")
+    private String comments;
+
+    @Column(name = "AMOUNT_REQUESTED")
+    private BigDecimal amountRequested;
+
+    @Column(name = "AMOUNT_ACCEPTED")
+    private BigDecimal amountAccepted;
+
+    @Column(name = "DATE_ACCEPTED")
+    private LocalDateTime dateAccepted;
+
+    @Column(name = "DATE_REJECTED")
+    private LocalDateTime dateRejected;
+
+    @Column(name = "EVALUATION_VERSION")
+    private String evaluationVersion;
+
+    @Column(name = "CALL_ID")
+    private Long callId;
+
+    @Column(name = "CALL_TITLE")
+    private String callTitle;
+
+    @Column(name = "CALL_END_DATE")
+    private LocalDateTime callEndDate;
+
+    @Column(name = "CALL_END_TIME")
+    private LocalTime callEndTime;
+
+    @Column(name = "MODIFIED_DATE")
+    private LocalDateTime modifiedDate;
+
+    @Column(name = "COMPANY_ID")
+    private Long companyId;
+
+    @Column(name = "USER_WITH_COMPANY_ID")
+    private Long userWithCompanyId;
+
+    @Column(name = "COMPANY_NAME")
+    private String companyName;
+
+    @Column(name = "PROTOCOL_NUMBER")
+    private Long protocolNumber;
+
+    @Column(name = "ASSIGNED_USER_ID")
+    private Long assignedUserId;
+
+    @Column(name = "ASSIGNED_USER_NAME")
+    private String assignedUserName;
+
+    @Column(name = "HUB_ID")
+    private Long hubId;
+
+    @Column(name = "CREATED_DATE")
+    private LocalDateTime createdDate;
+
+
+}

src/main/java/net/gepafin/tendermanagement/entities/ApplicationViewId.java

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.entities;
+
+import lombok.Data;
+
+@Data
+public class ApplicationViewId {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+
+    public ApplicationViewId() {
+    }
+
+    public ApplicationViewId(Long id) {
+        this.id = id;
+    }
+}

src/main/java/net/gepafin/tendermanagement/entities/AssignedApplicationsView.java

@@ -0,0 +1,61 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.*;
+import lombok.Data;
+import org.hibernate.annotations.Immutable;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Immutable
+@Data
+@Table(name = "assigned_applications_view")
+@IdClass(AssignedApplicationsViewId.class)
+public class AssignedApplicationsView{
+
+    @Id
+    @Column(name = "ID")
+    private Long id;
+
+    @Column(name = "APPLICATION_ID")
+    private Long applicationId;
+
+    @Column(name = "USER_ID")
+    private Long userId;
+
+    @Column(name = "PROTOCOL_NUMBER")
+    private Long protocolNumber;
+
+    @Column(name = "CALL_NAME")
+    private String callName;
+
+    @Column(name = "COMPANY_NAME")
+    private String companyName;
+
+    @Column(name = "STATUS")
+    private String status;
+
+    @Column(name = "NDG")
+    private String ndg;
+
+    @Column(name = "APPOINTMENT_ID")
+    private String appointmentId;
+
+    @Column(name = "APPLICATION_STATUS")
+    private String applicationStatus;
+
+    @Column(name = "SUBMISSION_DATE")
+    private LocalDateTime submissionDate;
+
+    @Column(name = "EVALUATION_END_DATE")
+    private LocalDateTime evaluationEndDate;
+
+    @Column(name = "CREATED_DATE")
+    private LocalDateTime createdDate;
+
+    @Column(name = "UPDATED_DATE")
+    private LocalDateTime updatedDate;
+
+    @Column(name = "IS_DELETED")
+    private Boolean isDeleted;
+}

src/main/java/net/gepafin/tendermanagement/entities/AssignedApplicationsViewId.java

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.entities;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class AssignedApplicationsViewId implements Serializable{
+    private static final long serialVersionUID = 1L;
+    private Long id;
+
+    public AssignedApplicationsViewId() {}
+
+    public AssignedApplicationsViewId(Long id) {
+        this.id = id;
+    }
+}

src/main/java/net/gepafin/tendermanagement/entities/GlobalConfigEntity.java

@@ -0,0 +1,21 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name = "GLOBAL_CONFIG")
+public class GlobalConfigEntity extends BaseEntity{
+
+    @Column(name = "CONTENT")
+    private String content;
+
+    @Column(name = "TYPE")
+    private String type;
+
+    @Column(name = "IS_DELETED")
+    private Boolean isDeleted = false;
+}

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

@@ -8,7 +8,8 @@ public enum DocOtherSourceTypeEnum {
     DELETED_APPLICATION("DELETED_APPLICATION"),
     DELETED_EVALUATION("DELETED_EVALUATION"),
     DELETED_CALL("DELETED_CALL"),
-    DELETED_AMENDMENT("DELETED_AMENDMENT");
+    DELETED_AMENDMENT("DELETED_AMENDMENT"),
+    DELETED_USER_SIGNED_DOCUMENT("DELETED_USER_SIGNED_DOCUMENT");
 
     private String value;
 

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

@@ -5,7 +5,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum EmailServiceTypeEnum {
 
     MAILGUN_SERVICE("MAILGUN_SERVICE"),
-    PEC_SERVICE("PEC_SERVICE");
+    PEC_SERVICE("PEC_SERVICE"),
+    SYSTEM_EMAIL_SERVICE("SYSTEM_EMAIL_SERVICE");
 
     private String value;
 

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

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

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<ApplicationAmendmentRequestEnum> status;
+
+    private Map<String, FilterCriteria> filters;
+
+    private Boolean personalRecords;
+
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class AssignedApplicationPageableRequestBean {
@@ -12,4 +13,7 @@ public class AssignedApplicationPageableRequestBean {
     private GlobalFilters globalFilters;
 
     private List<AssignedApplicationEnum> status;
+
+    private Map<String, FilterCriteria> filters;
+
 }

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;
+}

src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationViewResponse.java

@@ -0,0 +1,24 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+import java.time.LocalDateTime;
+
+@Data
+public class AssignedApplicationViewResponse extends BaseBean {
+    private Long userId;
+    private Long applicationId;
+    private AssignedApplicationEnum status;
+    private LocalDateTime submissionDate;
+    private ApplicationStatusTypeEnum applicationStatus;
+    private LocalDateTime evaluationEndDate;
+    private String ndg;
+    private String appointmentId;
+    private Long protocolNumber;
+    private String callName;
+    private String companyName;
+
+}

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<ApplicationAmendmentRequestView,Long> , JpaSpecificationExecutor<ApplicationAmendmentRequestView> {
+}

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java

@@ -177,4 +177,5 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
 	@Query("UPDATE ApplicationEntity a SET a.ndgStatus = NULL WHERE a.ndgStatus = :status")
 	void resetNdgStatusForInProgress(@Param("status") String status);
 
+	boolean existsByCallId(Long callId);
 }

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationViewRepository.java

@@ -0,0 +1,10 @@
+package net.gepafin.tendermanagement.repositories;
+
+import net.gepafin.tendermanagement.entities.ApplicationView;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ApplicationViewRepository extends JpaRepository<ApplicationView,Long> , JpaSpecificationExecutor<ApplicationView> {
+}

src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsViewRepository.java

@@ -0,0 +1,9 @@
+package net.gepafin.tendermanagement.repositories;
+
+import net.gepafin.tendermanagement.entities.AssignedApplicationsView;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface AssignedApplicationsViewRepository extends JpaRepository<AssignedApplicationsView,Long> , JpaSpecificationExecutor<AssignedApplicationsView> {
+
+}

src/main/java/net/gepafin/tendermanagement/repositories/GlobalConfigRepository.java

@@ -0,0 +1,11 @@
+package net.gepafin.tendermanagement.repositories;
+
+import net.gepafin.tendermanagement.entities.GlobalConfigEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+public interface GlobalConfigRepository extends JpaRepository<GlobalConfigEntity, Long> {
+
+    @Query("SELECT gc.content FROM GlobalConfigEntity gc WHERE gc.type = :vatCheckApiVersion AND gc.isDeleted = false")
+    String findContentByTypeAndIsDeletedFalse(String vatCheckApiVersion);
+}

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<List<ApplicationAmendmentRequestResponse>> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean);
+    PageableResponseBean<List<ApplicationAmendmentRequestViewResponse>> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean);
 }

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

@@ -7,6 +7,7 @@ import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
+import net.gepafin.tendermanagement.model.response.AssignedApplicationViewResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 
@@ -23,6 +24,6 @@ public interface AssignedApplicationsService {
     AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, UpdateAssignedApplicationRequest assignedApplicationsRequest);
     AssignedApplicationsResponse getAssignedApplicationById(HttpServletRequest request, Long id);
     AssignedApplicationsEntity validateAssignedApplication(Long assignedApplicationId);
-    PageableResponseBean<List<AssignedApplicationsResponse>> getAllAssignedApplicationsByPagination(HttpServletRequest request, Long userId, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean);
+    PageableResponseBean<List<AssignedApplicationViewResponse>> getAllAssignedApplicationsByPagination(HttpServletRequest request, Long userId, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean);
     AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status);
 }

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

@@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.service;
 
 import java.io.ByteArrayOutputStream;
 import java.util.List;
-import java.util.Map;
 
 import net.gepafin.tendermanagement.model.request.LimitRequest;
 import net.gepafin.tendermanagement.model.response.VatCheckResponseBean;

src/main/java/net/gepafin/tendermanagement/service/feignClient/VatCheckV1Service.java

@@ -11,13 +11,9 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import java.net.URI;
 import java.util.Map;
 
-@FeignClient(value = "vat-check-service", url = GepafinConstant.CHECK_VATNUMBER_V2_NEW_URL)
+@FeignClient(value = "vat-check-v1-service", url = GepafinConstant.CHECK_VATNUMBER_URL_V1)
-public interface VatCheckService {
+public interface VatCheckV1Service {
-
 
     @GetMapping("/{vatNumber}")
-    ResponseEntity<Map<String, Object>> checkVatNumber(URI baseUrl,
+    ResponseEntity<Map<String, Object>> checkVatNumber(URI baseUrl, @PathVariable("vatNumber") String vatNumber, @RequestHeader HttpHeaders headers);
-            @PathVariable("vatNumber") String vatNumber,
-            @RequestHeader HttpHeaders headers
-    );
 }

src/main/java/net/gepafin/tendermanagement/service/feignClient/VatCheckV2Service.java

@@ -0,0 +1,19 @@
+package net.gepafin.tendermanagement.service.feignClient;
+
+import net.gepafin.tendermanagement.constants.GepafinConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.net.URI;
+import java.util.Map;
+
+@FeignClient(value = "vat-check-v2-service", url = GepafinConstant.CHECK_VATNUMBER_URL_V2)
+public interface VatCheckV2Service {
+
+    @GetMapping("/{vatNumber}")
+    ResponseEntity<Map<String, Object>> checkVatNumber(URI baseUrl, @PathVariable("vatNumber") String vatNumber, @RequestHeader HttpHeaders headers);
+}

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<ApplicationEvaluationEntity> entityOptional = applicationEvaluationRepository.findByIdAndIsDeletedFalse(applicationEvaluationId);
@@ -153,8 +159,16 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm
     }
 
     @Override
-    public PageableResponseBean<List<ApplicationAmendmentRequestResponse>> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean) {
+    public PageableResponseBean<List<ApplicationAmendmentRequestViewResponse>> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean) {
-       UserEntity user=validator.validateUser(request);
+        boolean isSpecialUser = validator.checkIsBeneficiary() ||
-        return applicationAmendmentRequestDao.getApplicationAmendmentByPaginnation(userId,amendmentPaginationRequestBean);
+                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);
     }
 }

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

@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.service.impl;
 
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.dao.ApplicationDao;
@@ -17,6 +18,7 @@ import net.gepafin.tendermanagement.model.request.ApplicationRequestBean;
 import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.service.ApplicationService;
 import net.gepafin.tendermanagement.service.CallService;
+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.ForbiddenAccessException;
@@ -117,6 +119,7 @@ public class ApplicationServiceImpl implements ApplicationService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ApplicationSignedDocumentResponse uploadSignedDocument(HttpServletRequest request, Long applicationId, MultipartFile file) {
+        Utils.validateFileType(file);
     	return applicationDao.uploadSignedDocument(request, applicationId, file);
     }
     
@@ -149,7 +152,7 @@ public class ApplicationServiceImpl implements ApplicationService {
         if (companyId != null) {
             validator.validateUserWithCompany(request, companyId);
         }
-        return applicationDao.getAllApplicationByPagination(userEntity,callId,companyId,applicationPageableRequestBean);
+        return applicationDao.getAllApplicationByPaginationByView(userEntity,callId,companyId,applicationPageableRequestBean);
     }
 
     @Override

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

@@ -9,6 +9,7 @@ import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
+import net.gepafin.tendermanagement.model.response.AssignedApplicationViewResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.service.AssignedApplicationsService;
@@ -66,7 +67,7 @@ public class AssignedApplicationsServiceImpl implements AssignedApplicationsServ
     }
 
     @Override
-    public PageableResponseBean<List<AssignedApplicationsResponse>> getAllAssignedApplicationsByPagination(HttpServletRequest request, Long userId, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean) {
+    public PageableResponseBean<List<AssignedApplicationViewResponse>> getAllAssignedApplicationsByPagination(HttpServletRequest request, Long userId, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean) {
         UserEntity user=validator.validateUser(request);
         return assignedApplicationsDao.getAllAssignedApplicationsByPagination(user,assignedApplicationPageableRequestBean,userId);
     }

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

@@ -9,6 +9,7 @@ import net.gepafin.tendermanagement.model.request.CompanyDocumentRequest;
 import net.gepafin.tendermanagement.model.response.CompanyDocumentResponseBean;
 import net.gepafin.tendermanagement.model.response.DocumentResponseBean;
 import net.gepafin.tendermanagement.service.CompanyDocumentService;
+import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ public class CompanyDocumentServiceImpl implements CompanyDocumentService {
     public List<CompanyDocumentResponseBean> uploadFileForCompany(HttpServletRequest request, List<MultipartFile> files, Long companyId, Long documentCategoryId , CompanyDocumentTypeEnum documentSourceTypeEnum, LocalDateTime expirationDate,String name) {
         Map<String, Object> userInfo = validator.getUserInfoFromToken(request);
         Long userId = validator.getUserId(userInfo);
+        files.forEach(Utils::validateFileType);
         return companyDocumentDao.uploadFileForCompany(request,userId,files,companyId,documentCategoryId,documentSourceTypeEnum,expirationDate,name);
     }
 

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

@@ -4,8 +4,10 @@ import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Map;
 
+import jdk.jshell.execution.Util;
 import net.gepafin.tendermanagement.model.request.LimitRequest;
 import net.gepafin.tendermanagement.model.response.VatCheckResponseBean;
+import net.gepafin.tendermanagement.util.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -107,6 +109,7 @@ public class CompanyServiceImpl implements CompanyService {
 	public CompanyDelegationResponse uploadCompanyDelegation(HttpServletRequest request, Long companyId, MultipartFile file) {
 		UserEntity userEntity = validator.validateUser(request);
 		validator.validateUserWithCompany(request, companyId);
+		Utils.validateFileType(file);
 		return delegationDao.uploadCompanyDelegation(userEntity, companyId, file);
 	}
 	

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

@@ -11,6 +11,7 @@ import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum;
 import net.gepafin.tendermanagement.enums.DocumentTypeEnum;
 import net.gepafin.tendermanagement.model.response.DocumentResponseBean;
 import net.gepafin.tendermanagement.service.DocumentService;
+import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ public class DocumentServiceImpl implements DocumentService {
     public List<DocumentResponseBean> uploadFile(HttpServletRequest request,List<MultipartFile> files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType) {
         Map<String, Object> userInfo = validator.getUserInfoFromToken(request);
         Long userId = validator.getUserId(userInfo);
+        files.forEach(Utils::validateFileType);
         return documentDao.uploadFiles(userId,files,sourceId,sourceType,fileType);
     }
     @Override

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

@@ -12,13 +12,15 @@ public class EmailServiceFactory {
     @Autowired
     private MailgunEmailService mailgunEmailService;
 
+    @Autowired
+    private SystemEmailService systemEmailService;
+
     public EmailService getEmailService(String serviceType) {
-        if ("MAILGUN_SERVICE".equals(serviceType)) {
+
-            return mailgunEmailService;
+        return switch (serviceType) {
-        } else if ("PEC_SERVICE".equals(serviceType)) {
+            case "PEC_SERVICE" -> pecEmailService;
-            return pecEmailService;
+            case "SYSTEM_EMAIL_SERVICE" -> systemEmailService;
-        } else {
+            default -> mailgunEmailService;
-            throw new IllegalArgumentException("Invalid email service type: " + serviceType);
+        };
-        }
     }
 }

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

@@ -0,0 +1,83 @@
+package net.gepafin.tendermanagement.service.impl;
+
+import com.mailgun.api.v3.MailgunMessagesApi;
+import com.mailgun.client.MailgunClient;
+import com.mailgun.model.message.MessageResponse;
+import net.gepafin.tendermanagement.dao.EmailLogDao;
+import net.gepafin.tendermanagement.entities.EmailLogEntity;
+import net.gepafin.tendermanagement.enums.EmailServiceTypeEnum;
+import net.gepafin.tendermanagement.enums.StatusTypeEnum;
+import net.gepafin.tendermanagement.model.request.EmailConfig;
+import net.gepafin.tendermanagement.model.request.EmailLogRequest;
+import net.gepafin.tendermanagement.util.Utils;
+import net.gepafin.tendermanagement.util.Validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class SystemEmailService implements EmailService {
+
+    @Value("${mailGun_user}")
+    public String mailGunUser;
+
+    @Value("${mailGun_apiKey}")
+    public String mailGunApiKey;
+
+    @Value("${mailGun_domainName}")
+    public String mailGunDomainName;
+
+    @Value("${mailGun_base_url}")
+    public String mailGunBaseUrl;
+
+    @Value("${isMailSendingEnabled}")
+    private String isEmailSendingEnabled;
+
+    @Autowired
+    private Validator validator;
+
+    @Autowired
+    private EmailLogDao emailLogDao;
+
+    public final Logger log = LoggerFactory.getLogger(SystemEmailService.class);
+
+    public void sendEmail(String subject, String body, List<String> recipientEmails, EmailConfig emailConfig, EmailLogRequest emailLogRequest) {
+
+        if (Boolean.FALSE.equals(Boolean.parseBoolean(isEmailSendingEnabled))) {
+            return;
+        }
+
+        emailLogRequest.setEmailSubject(subject);
+        emailLogRequest.setEmailBody(body);
+        emailLogRequest.setSendStatus(StatusTypeEnum.SUCCESS.getValue());
+        emailLogRequest.setRecipientEmails(Utils.listToCommaSeparatedString(recipientEmails));
+
+        if (Boolean.FALSE.equals(validator.isTestProfileActivated())) {
+            MessageResponse response = null;
+            try {
+                MailgunMessagesApi mailgunMessagesApi = MailgunClient.config(mailGunBaseUrl, mailGunApiKey).createApi(MailgunMessagesApi.class);
+
+                String mailFrom = mailGunUser;
+                com.mailgun.model.message.Message message = com.mailgun.model.message.Message.builder().from(mailFrom).to(recipientEmails).subject(subject).html(body).build();
+
+                response = mailgunMessagesApi.sendMessage(mailGunDomainName, message);
+            } catch (Exception e) {
+                emailLogRequest.setSendStatus(StatusTypeEnum.FAILED.getValue());
+                emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE);
+                emailLogRequest.setErrorMessage(e.getMessage());
+                emailLogDao.createEmailLog(emailLogRequest);
+
+                throw new RuntimeException("Failed to send email via Mailgun: " + (response != null ? response.getMessage() : "No response from Mailgun"), e);
+            }
+            emailLogRequest.setEmailServiceResponse(response.toString());
+            emailLogDao.createEmailLog(emailLogRequest);
+        }
+    }
+
+}
+
+

src/main/java/net/gepafin/tendermanagement/util/Utils.java

@@ -5,9 +5,14 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
+import java.sql.Timestamp;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -24,10 +29,17 @@ import jakarta.persistence.ManyToMany;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 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;
 import net.objecthunter.exp4j.ExpressionBuilder;
 import org.apache.commons.collections4.MapUtils;
@@ -45,13 +57,10 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import feign.FeignException;
 import io.micrometer.common.util.StringUtils;
-import net.gepafin.tendermanagement.web.rest.api.errors.FeignClientForbiddenException;
-import net.gepafin.tendermanagement.web.rest.api.errors.FeignClientNotFoundException;
-import net.gepafin.tendermanagement.web.rest.api.errors.FeignClientUnauthorizedException;
-import net.gepafin.tendermanagement.web.rest.api.errors.FeignClientValidationException;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.crypto.Cipher;
 import javax.crypto.Mac;
@@ -103,6 +112,7 @@ public class Utils {
 		}
 		return null;
 	}
+
 	public static String extractFileName(String filePath) {
 		if (filePath == null || filePath.isEmpty()) {
 			return null;
@@ -115,6 +125,7 @@ public class Utils {
 			return filePath;
 		}
 	}
+
 	public static String decodeBase64String(String decodedString) {
 		if (StringUtils.isBlank(decodedString)) {
 			return decodedString;
@@ -128,12 +139,14 @@ public class Utils {
 			setter.accept(value);
 		}
 	}
+
 	public static <T> void setIfUpdated(Supplier<T> getter, Consumer<T> setter, T newValue) {
 		T currentValue = getter.get();
 		if (newValue != null && !newValue.equals(currentValue)) {
 			setter.accept(newValue);
 		}
 	}
+
 	public static <T> String convertListToJsonString(List<T> list) {
 		try {
 			return mapper.writeValueAsString(list);
@@ -143,6 +156,7 @@ public class Utils {
 			return null;
 		}
 	}
+
 	public static <T> List<T> convertJsonStringToList(String jsonString, Class<T> clazz) {
 		try {
 			TypeReference<List<T>> typeRef = new TypeReference<List<T>>() {
@@ -158,6 +172,7 @@ public class Utils {
 			return null;
 		}
 	}
+
 	public static String convertMapIntoJsonString(Map<String, Object> map) {
 		try {
 			ObjectMapper mapper = new ObjectMapper();
@@ -172,6 +187,7 @@ public class Utils {
 		}
 		return null;
 	}
+
 	public static Map<String, Object> convertIntoJson(String jsonString) {
 		if (jsonString != null && !jsonString.isEmpty()) {
 			try {
@@ -184,6 +200,7 @@ public class Utils {
 		}
 		return null;
 	}
+
 	public static <T, U> U convertSourceObjectToDestinationObject(T source, Class<U> destinationClass) {
 		try {
 			mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
@@ -194,6 +211,7 @@ public class Utils {
 		}
 		return null;
 	}
+
 	public static <T> void retainOnlySpecificFields(T requestObject, List<T> retainFields) throws IllegalAccessException {
 		// Get all declared fields of the request object's class
 		Field[] fields = requestObject.getClass().getDeclaredFields();
@@ -225,6 +243,7 @@ public class Utils {
 		log.debug("Generated secure token: {}", token);
 		return token;
 	}
+
 	public static String generateSecureToken() {
 		SecureRandom secureRandom = new SecureRandom();
 		byte[] tokenBytes = new byte[5];
@@ -233,6 +252,7 @@ public class Utils {
 		log.debug("Generated secure token: {}", token);
 		return token;
 	}
+
 	public static Map<String, List<Object>> convertStringIntoMap(String jsonString) {
 		try {
 			return mapper.readValue(jsonString, new TypeReference<Map<String, List<Object>>>() {
@@ -344,6 +364,7 @@ public class Utils {
 	private static String replaceNull(String text, String target, String 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)) {
@@ -352,6 +373,7 @@ public class Utils {
 
 		return new StringTokenizer(header, ",").nextToken().trim();
 	}
+
 	public static <T> List<T> convertJsonToList(String json, TypeReference<List<T>> typeRef) {
 		ObjectMapper objectMapper = new ObjectMapper();
 		try {
@@ -364,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) {
@@ -376,10 +402,10 @@ public class Utils {
 		}
 		return content.trim().replace(" ", "_");
 	}
+
 	public static List<Map<String, Object>> convertJsonStringIntoJsonList(String jsonString) {
 		try {
-			if(isEmpty(jsonString))
+			if (isEmpty(jsonString)) {
-			{
 				return new ArrayList<>();
 			}
 			ObjectMapper mapper = new ObjectMapper();
@@ -390,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
@@ -451,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();
@@ -514,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(",", "");
@@ -731,6 +760,7 @@ 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) {
 		if (globalFilters == null) {
 			if (globalFilters.getLimit() == null || globalFilters.getLimit() <= 0) {
@@ -759,6 +789,7 @@ public class Utils {
 	private static Map<String, Object> defaultErrorResponse() {
 		return Collections.singletonMap("message", Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
 	}
+
 	public static List<String> extractValues(String input) {
 		List<String> extractedValues = new ArrayList<>();
 		Pattern pattern = Pattern.compile("\\{(.*?)\\}"); // Regex to match {value}
@@ -769,6 +800,7 @@ public class Utils {
 		}
 		return extractedValues;
 	}
+
 	public static double evaluateExpression(String expression) {
 		try {
 			Expression exp = new ExpressionBuilder(expression).build();
@@ -778,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;
@@ -785,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<String, Object> convertJsonStringToMap(String jsonString) {
 		try {
 			return mapper.readValue(jsonString, Map.class);
@@ -796,6 +831,161 @@ public class Utils {
 			return null;
 		}
 	}
+
+	public static void applyStringFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode) {
+		if (value instanceof String) {
+			String valueStr = (String) value;
+			if (fieldPath.getJavaType().equals(String.class)) {
+				MatchModeEnum mode = MatchModeEnum.fromObject(matchMode.getValue());
+				switch (mode) {
+					case CONTAINS ->
+							predicates.add(criteriaBuilder.like(criteriaBuilder.lower(fieldPath.as(String.class)), "%" + valueStr.toLowerCase() + "%"));
+					case EQUALS -> predicates.add(criteriaBuilder.equal(fieldPath, valueStr));
+					case STARTSWITH ->
+							predicates.add(criteriaBuilder.like(criteriaBuilder.lower(fieldPath.as(String.class)), valueStr.toLowerCase() + "%"));
+					case ENDSWITH ->
+							predicates.add(criteriaBuilder.like(criteriaBuilder.lower(fieldPath.as(String.class)), "%" + valueStr.toLowerCase()));
+				}
+			}
+		}
+	}
+
+	public static void applyNumberFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode) {
+
+		if (Number.class.isAssignableFrom(fieldPath.getJavaType())) {
+			Number numberValue = null;
+
+			if (value instanceof String stringValue) {
+				if (isInteger(stringValue)) {
+					numberValue = Long.parseLong(stringValue);
+				} else if (isDecimal(stringValue)) {
+					numberValue = Double.parseDouble(stringValue);
+				}
+			} else if (value instanceof Number number) {
+				numberValue = number;
+			}
+			if (numberValue != null) {
+				MatchModeEnum mode = MatchModeEnum.fromObject(matchMode.getValue());
+
+				if (mode == MatchModeEnum.EQUALS) {
+					predicates.add(criteriaBuilder.equal(fieldPath, numberValue));
+				}
+			}
+		}
+	}
+
+	private static boolean isInteger(String value) {
+
+		try {
+			Long.parseLong(value);
+			return true;
+		} catch (NumberFormatException e) {
+			return false;
+		}
+	}
+
+	private static boolean isDecimal(String value) {
+
+		try {
+			Double.parseDouble(value);
+			return value.contains(".");
+		} catch (NumberFormatException e) {
+			return false;
+		}
+	}
+
+	public static void applyDateFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode, Root<?> root) {
+		if (fieldPath.getJavaType().equals(LocalDateTime.class)) {
+			// Convert input string: Replace 'T' with space
+			String formattedValue = value.toString().replace("T", " ");
+
+			// Handle timezones and UTC (`Z` or `+HH:mm`)
+			if (formattedValue.contains("Z") || formattedValue.matches(".*[+-]\\d{2}:\\d{2}$")) {
+				OffsetDateTime offsetDateTime = OffsetDateTime.parse(value.toString(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+				formattedValue = offsetDateTime.toLocalDateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
+			}
+
+			// Check if more than 3 decimal places exist
+			if (formattedValue.contains(".")) {
+				int dotIndex = formattedValue.indexOf(".");
+				if (formattedValue.length() > dotIndex + 4) {
+					formattedValue = formattedValue.substring(0, dotIndex + 4); // Keep only 3 decimals
+				}
+			} else {
+				formattedValue += ".000"; // Ensure 3 decimals
+			}
+
+			// Define correct date-time format
+			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+
+			// Parse the formatted value into LocalDateTime
+			LocalDateTime dateTimeValue = LocalDateTime.parse(formattedValue, formatter);
+
+			// Extract only the date portion
+			LocalDate dateValue = dateTimeValue.toLocalDate();
+
+			// Convert database field to LocalDate for date-only comparison
+			jakarta.persistence.criteria.Expression<LocalDate> dateField = criteriaBuilder.function("DATE", LocalDate.class, fieldPath);
+
+			MatchModeEnum mode = MatchModeEnum.fromObject(matchMode.getValue());
+
+			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)));
+			}
+		}
+	}
+
+
+	/**
+	 * Extracts a Map from a parent Map safely.
+	 */
+	public static Map<String, Object> extractMap(Map<String, Object> parentMap, String key) {
+		Object obj = parentMap.get(key);
+		if (obj instanceof Map<?, ?> map) {
+			return (Map<String, Object>) map;
+		}
+		return null;
+	}
+
+	/**
+	 * Extracts a String from a Map safely.
+	 */
+	public static String extractString(Map<String, Object> parentMap, String key) {
+		Object obj = parentMap.get(key);
+		return (obj instanceof String str) ? str : null;
+	}
+
+	public static void validateFileType(MultipartFile file) {
+		if (file.isEmpty()) {
+			throw new CustomValidationException(Status.VALIDATION_ERROR,
+					Translator.toLocale(GepafinConstant.VALIDATION_ERROR_FILE_EMPTY));
+		}
+	}
+
+	public static void applyFiltersByPagination(Root<?> root, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Map<String, FilterCriteria> filters) {
+		if (Boolean.FALSE.equals(filters.isEmpty())) {
+			for (Map.Entry<String, FilterCriteria> 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);
+					}
+				}
+			}
+		}
+	}
 	public static List<Map<String, Object>> convertJsonToListMap(String jsonString) {
 		try {
 			if (jsonString == null || jsonString.trim().isEmpty()) {
@@ -820,4 +1010,6 @@ public class Utils {
 			return Collections.emptyList();
 		}
 	}
+
 }
+

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;
+	}
 }

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.*;
-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.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<Response<PageableResponseBean<List<ApplicationAmendmentRequestResponse>>>> getApplicationAmendmentByPaginnation(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId,
+    ResponseEntity<Response<PageableResponseBean<List<ApplicationAmendmentRequestViewResponse>>>> getApplicationAmendmentByPaginnation(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId,
                                                                                                                                        @RequestBody ApplicationAmendmentPaginationRequestBean userActionPaginationRequest);
 
 }

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

@@ -12,6 +12,7 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationResponse;
+import net.gepafin.tendermanagement.model.response.AssignedApplicationViewResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
@@ -128,7 +129,7 @@ public interface AssignedApplicationsApi {
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
     @PostMapping(value = "/pagination", produces = "application/json")
-    ResponseEntity<Response<PageableResponseBean<List<AssignedApplicationsResponse>>>> getAllAssignedApplicationsByPagination(HttpServletRequest request,
+    ResponseEntity<Response<PageableResponseBean<List<AssignedApplicationViewResponse>>>> getAllAssignedApplicationsByPagination(HttpServletRequest request,
                                                                                                                                  @Parameter(description = "The User ID", required = false) @RequestParam(value = "userId",required = false) Long userId, @RequestBody AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean);
 
 

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<Response<PageableResponseBean<List<ApplicationAmendmentRequestResponse>>>> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean) {
+    public ResponseEntity<Response<PageableResponseBean<List<ApplicationAmendmentRequestViewResponse>>>> 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<List<ApplicationAmendmentRequestResponse>> listPageableResponseBean=applicationAmendmentRequestService.getApplicationAmendmentByPaginnation(request,userId,amendmentPaginationRequestBean);
+        PageableResponseBean<List<ApplicationAmendmentRequestViewResponse>> 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)));
 

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

@@ -12,10 +12,7 @@ import net.gepafin.tendermanagement.model.request.AssignedApplicationPageableReq
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
-import net.gepafin.tendermanagement.model.response.ApplicationResponse;
+import net.gepafin.tendermanagement.model.response.*;
-import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
-import net.gepafin.tendermanagement.model.response.NotificationResponse;
-import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.service.AssignedApplicationsService;
 import net.gepafin.tendermanagement.util.LoggingUtil;
@@ -96,11 +93,11 @@ public class AssignedApplicationsController implements AssignedApplicationsApi {
     }
 
     @Override
-    public ResponseEntity<Response<PageableResponseBean<List<AssignedApplicationsResponse>>>> getAllAssignedApplicationsByPagination(HttpServletRequest request, Long userId, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean) {
+    public ResponseEntity<Response<PageableResponseBean<List<AssignedApplicationViewResponse>>>> getAllAssignedApplicationsByPagination(HttpServletRequest request, Long userId, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean) {
         loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW)
                 .actionContext(UserActionContextEnum.GET_ALL_ASSIGNED_APPLICATION_BY_PAGINATION).build());
 
-        PageableResponseBean<List<AssignedApplicationsResponse>> assigenedApplicationResponses=assignedApplicationsService.getAllAssignedApplicationsByPagination(request, userId,assignedApplicationPageableRequestBean);
+        PageableResponseBean<List<AssignedApplicationViewResponse>> assigenedApplicationResponses=assignedApplicationsService.getAllAssignedApplicationsByPagination(request, userId,assignedApplicationPageableRequestBean);
         return ResponseEntity.status(HttpStatus.OK).body(new Response<>(assigenedApplicationResponses, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_ASSIGNED_APPLICATION_SUCCESS_MSG)));
 
     }

src/main/resources/application-dev.properties

@@ -14,7 +14,6 @@ isPecServiceEnabled = false
 #default_System_Receiver_Email=antonio.manca@bflows.net
 gepafin_email=rinaldo.bonazzo@bflows.net
 rinaldo_email=rinaldo.bonazzo@bflows.net
-carlo_email=test@test.test
 default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
 
 #Login to Odessa, Appointment Creation, Upload document Configuration

src/main/resources/application-local.properties

@@ -13,7 +13,6 @@ isPecServiceEnabled = false
 #default_System_Receiver_Email=test@test.test
 gepafin_email=test@test.test
 rinaldo_email=test@test.test
-carlo_email=test@test.test
 default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
 
 appointment.base.url=https://demo.galileonetwork.it/gateway/rest

src/main/resources/application-production.properties

@@ -20,7 +20,6 @@ isPecServiceEnabled = true
 #default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
 gepafin_email=bandi@pec.gepafin.it
 rinaldo_email=rinaldo.bonazzo@bflows.net
-carlo_email=carlo.mancosu@bflows.net
 default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
 # TEST DEPLOY Configuration
 

src/main/resources/application-testing.properties

@@ -11,7 +11,6 @@ isPecServiceEnabled = false
 #default_System_Receiver_Email=test@test.test
 gepafin_email=test@test.test
 rinaldo_email=test@test.test
-carlo_email=test@test.test
 default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
 
 appointment.base.url=https://demo.galileonetwork.it/gateway/rest

src/main/resources/application.properties

@@ -47,7 +47,8 @@ fe.base.url=https://bandi-staging.memento.credit
 spring.main.allow-circular-references=true
 
 isVatCheckGloballyDisabled = true
-vatCheckNewToken: 66026bd891a51044e90e08c4
+vatCheckTokenV1: 66026bd891a51044e90e08c4
+vatCheckTokenV2: 671916c76c6e822f660774d4
 
 #SPID configuration
 spid.ipd.base.url=https://federatest.umbriadigitale.it
@@ -55,7 +56,10 @@ active.profile.folder=dev
 
 # MailGun API
 mailGun_base_url=https://api.eu.mailgun.net/
-
+#Below credentials are only for sending mail to rinaldo
+mailGun_apiKey= 398e3dea1911fe941af261906ec99362-07e2c238-8094421f
+mailGun_user=comunicazione@paghiamoci.ai
+mailGun_domainName=paghiamoci.ai
 
 api.pecUrl=https://ws.pecmassiva.com
 #senderEmail=mailer@bflows.net

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -2684,6 +2684,59 @@
                 path="db/dump/create_application_form_view.sql"/>
     </changeSet>
 
+    <changeSet id="25-03-2025_NK_160730" author="Nisha Kashyap">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/create_application_view.sql"/>
+    </changeSet>
+    <changeSet id="25-03-2025_PK_193115" author="Piyush Kag">
+        <insert tableName="s3_path_configuration">
+            <column name="type" value="DELETED_USER_SIGNED_DOCUMENT"/>
+            <column name="path" value="call/{call_id}/application/{application_id}/user_signed_document/deleted"/>
+            <column name="bucket_name" value="mementoresources"/>
+            <column name="created_date" value="2025-03-25 03:00:00"/>
+            <column name="updated_date" value="2024-03-25 03:00:00"/>
+            <column name="parent_folder" value="gepafin/local"/>
+        </insert>
+    </changeSet>
+
+    <changeSet id="01-04-2025_PK_185849" author="Piyush Kag">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/create_application_amendment_request_view.sql"/>
+    </changeSet>
+
+    <changeSet id="03-04-2025_PK_152010" author="Piyush kag">
+        <createTable tableName="global_config">
+            <column name="id" type="INTEGER" autoIncrement="true">
+                <constraints primaryKey="true" primaryKeyName="global_config_pkey" nullable="false"/>
+            </column>
+            <column name="content" type="TEXT"/>
+            <column name="type" type="TEXT"/>
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false"/>
+            <column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="true"/>
+            </column>
+        </createTable>
+    </changeSet>
+
+    <changeSet id="03-04-2025_PK_154010" author="Piyush kag">
+        <insert tableName="global_config">
+            <column name="type" value="VAT_CHECK_API_VERSION"/>
+            <column name="content" value="V2"/>
+            <column name="created_date" value="2025-04-03 05:00:00"/>
+            <column name="updated_date" value="2024-04-03 05:00:00"/>
+            <column name="is_deleted" value="false"/>
+        </insert>
+    </changeSet>
+
+
+    <changeSet id="08-04-2025_PK_160730" author="Piyush kag">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/create_assigned_application_view.sql"/>
+    </changeSet>
+
     <changeSet id="28-04-2025_PK_154315" author="Piyush Kag">
         <sqlFile dbms="postgresql"
                  path="db/dump/update_json_template_for_notification_28_04_2025.sql"/>

src/main/resources/db/changelog/dynamic-triggers.xml

@@ -13,10 +13,13 @@
             BEGIN
             -- Loop through all tables in the schema that have the 'updated_date' column
             FOR r IN (
-            SELECT table_name
+            SELECT c.table_name
-            FROM information_schema.columns
+            FROM information_schema.columns c
-            WHERE column_name = 'updated_date'
+            JOIN information_schema.tables t
-            AND table_schema = 'gepafin_schema'
+            ON c.table_name = t.table_name AND c.table_schema = t.table_schema
+            WHERE c.column_name = 'updated_date'
+            AND c.table_schema = 'gepafin_schema'
+            AND t.table_type = 'BASE TABLE'  -- Excludes views
             )
             LOOP
             EXECUTE format(
@@ -30,10 +33,13 @@
 
             -- Loop through all tables in the schema that have the 'created_date' column
             FOR r IN (
-            SELECT table_name
+            SELECT c.table_name
-            FROM information_schema.columns
+            FROM information_schema.columns c
-            WHERE column_name = 'created_date'
+            JOIN information_schema.tables t
-            AND table_schema = 'gepafin_schema'
+            ON c.table_name = t.table_name AND c.table_schema = t.table_schema
+            WHERE c.column_name = 'created_date'
+            AND c.table_schema = 'gepafin_schema'
+            AND t.table_type = 'BASE TABLE'  -- Excludes views
             )
             LOOP
             EXECUTE format(

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;

src/main/resources/db/dump/create_application_view.sql

@@ -0,0 +1,81 @@
+CREATE OR REPLACE VIEW application_view AS
+
+SELECT
+    a.id,
+    a.status,
+    a.submission_date,
+    a.comments,
+    a.amount_requested,
+    a.amount_accepted,
+    a.date_accepted,
+    a.date_rejected,
+    a.is_deleted,
+    a.hub_id,
+    a.user_id,
+    a.evaluation_version AS evaluation_version,
+    a.updated_date AS modified_date,
+    a.created_date AS created_date,
+
+
+
+    -- Call Details
+    a.call_id AS call_id,
+     cl.name AS call_title,
+    cl.end_date AS call_end_date,
+    cl.end_time AS call_end_time,
+
+    -- Company Details
+    a.COMPANY_ID AS company_id,
+    c.company_name AS company_name,
+
+    -- Protocol Details
+    p.protocol_number AS protocol_number,
+
+
+	 -- Assigned User Details from ASSIGNED_APPLICATION and GEPPAFIN_USER
+    COALESCE(aa.user_id, NULL) AS assigned_user_id,
+    COALESCE(
+        NULLIF(
+            TRIM(CONCAT(
+                COALESCE(u.first_name, ''), ' ',
+                COALESCE(u.last_name, '')
+            )),
+            ''
+        ),
+        ''
+    ) AS assigned_user_name,
+
+-- User with Company Details (From Application's User)
+    COALESCE(uwc.id, NULL) AS user_with_company_id
+
+
+FROM gepafin_schema.APPLICATION a
+
+-- Join Call Entity
+LEFT JOIN gepafin_schema.CALL cl
+    ON a.CALL_ID = cl.id
+
+-- Join Company Entity (Ensuring it is not deleted)
+LEFT JOIN gepafin_schema.COMPANY c
+    ON a.COMPANY_ID = c.id
+
+-- Join Protocol Entity
+LEFT JOIN gepafin_schema.PROTOCOL p
+    ON a.PROTOCOL_NUMBER = p.id
+
+-- Join Assigned Application Entity (Ensuring it is not deleted)
+LEFT JOIN gepafin_schema.assigned_applications aa
+    ON a.id = aa.APPLICATION_ID
+    AND (aa.IS_DELETED IS FALSE OR aa.IS_DELETED IS NULL)
+
+	-- Join User Entity (Get First & Last Name Combined)
+LEFT JOIN gepafin_schema.GEPAFIN_USER u
+    ON aa.user_id = u.id
+
+    -- Get User With Company ID (From Application's User & Company)
+    LEFT JOIN gepafin_schema.USER_WITH_COMPANY uwc
+        ON a.user_id = uwc.user_id
+        AND a.COMPANY_ID = uwc.company_id
+        AND uwc.is_deleted = FALSE -- Ensuring the user is active
+
+WHERE a.IS_DELETED IS FALSE OR a.IS_DELETED IS NULL;

src/main/resources/db/dump/create_assigned_application_view.sql

@@ -0,0 +1,52 @@
+CREATE OR REPLACE VIEW assigned_applications_view AS
+SELECT
+    -- From assigned_applications
+    aa.id AS id,
+    aa.user_id AS user_id,
+    aa.status AS status,
+    aa.created_date AS created_date,
+    aa.updated_date AS updated_date,
+    aa.is_deleted AS is_deleted,
+
+    -- From application
+    a.id AS application_id,
+    a.status AS application_status,
+    a.submission_date AS submission_date,
+    ae.end_date AS evaluation_end_date,
+    a.ndg AS ndg,
+    a.appointment_id AS appointment_id,
+
+    -- From protocol (OneToOne)
+    p.protocol_number AS protocol_number,
+
+    -- From call (ManyToOne)
+    cl.name AS call_name,
+
+    -- From company (ManyToOne)
+    c.company_name AS company_name
+
+FROM gepafin_schema.assigned_applications aa
+
+-- Join application (ManyToOne from assigned_applications)
+LEFT JOIN gepafin_schema.application a
+    ON aa.application_id = a.id
+    AND (a.is_deleted IS FALSE OR a.is_deleted IS NULL)
+
+-- Join application_evaluation (application_id matches + not deleted)
+LEFT JOIN gepafin_schema.application_evaluation ae
+    ON ae.application_id = a.id
+    AND (ae.is_deleted IS FALSE OR ae.is_deleted IS NULL)
+
+-- Join protocol (OneToOne from application)
+LEFT JOIN gepafin_schema.protocol p
+    ON a.protocol_number = p.id
+
+-- Join call (ManyToOne from application)
+LEFT JOIN gepafin_schema.call cl
+    ON a.call_id = cl.id
+
+-- Join company (ManyToOne from application)
+LEFT JOIN gepafin_schema.company c
+    ON a.company_id = c.id
+
+WHERE aa.is_deleted IS FALSE OR aa.is_deleted IS NULL;

src/main/resources/message_en.properties

@@ -60,7 +60,8 @@ status.same.error=Status is already set.
 invalid.status.change.from.draft=Status cannot be changed to READY_TO_PUBLISH or PUBLISH from DRAFT.
 status.cannot.be.changed=Status cannot be changed.
 published.call.not.update=Published call cannot be updated.
-invalid.status.change.from.publish=Status cannot be changed to READY_TO_PUBLISH or DRAFT from PUBLISH.
+invalid.status.change.from.publish=Status cannot be changed to READY_TO_PUBLISH from PUBLISH.
+invalid.status.change.from.publish.to.draft=Status cannot be changed to DRAFT from PUBLISH as Applications are already created for this CALL.
 validation.table.message=Data for field {0} is not present.
 
 
@@ -398,3 +399,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.

src/main/resources/message_it.properties

@@ -60,8 +60,8 @@ status.same.error=Lo stato ? gi? impostato.
 invalid.status.change.from.draft=Lo stato non pu? essere cambiato in READY_TO_PUBLISH o PUBLISH da DRAFT.
 status.cannot.be.changed=Lo stato non pu? essere cambiato.
 published.call.not.update=Il bando pubblicato non pu? essere aggiornato.
-invalid.status.change.from.publish=Lo stato non pu? essere modificato in READY_TO_PUBLISH o DRAFT da PUBLISH.
+invalid.status.change.from.publish=Lo stato non pu? essere modificato in READY_TO_PUBLISH da PUBLISH.
-
+invalid.status.change.from.publish.to.draft=Lo stato non pu essere modificato da PUBLISH a DRAFT poich sono gi state create applicazioni per questa CALL.
 
 # Login-related messages
 login.successfully=Accesso effettuato con successo.
@@ -390,3 +390,4 @@ insufficient.score.msg = Punteggio non sufficiente per passaggio alla valutazion
 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
+invalid.user=Utente non valido.