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

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

@@ -391,6 +391,16 @@ public class GepafinConstant {
     public static final String NON_EMPTY_TABLES="nonEmptyTables";
     public static final String VALIDATION_IN_TABLE = "validation.table.message";
     public static final String CALL_EXPIRED="call.expired";
+    public static final String PROTOCOL="protocol";
+    public static final String PROTOCOL_NUMBER="protocolNumber";
+    public static final String NOTE="note";
+    public static final String INTERNAL_NOTE="internalNote";
+    public static final String ACTION_TYPE="actionType";
+    public static final String ACTION_CONTEXT="actionContext";
+    public static final String METHOD_TYPE="methodType";
+
+
+
     public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero";
 
 

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

@@ -2,8 +2,10 @@ package net.gepafin.tendermanagement.dao;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Join;
 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;
@@ -12,6 +14,7 @@ import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity.SystemEm
 import net.gepafin.tendermanagement.enums.*;
 import net.gepafin.tendermanagement.model.request.*;
 import net.gepafin.tendermanagement.model.response.*;
+import net.gepafin.tendermanagement.model.util.SortBy;
 import net.gepafin.tendermanagement.repositories.*;
 import net.gepafin.tendermanagement.service.*;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
@@ -25,6 +28,8 @@ import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
 
@@ -37,6 +42,7 @@ import java.util.stream.Collectors;
 import static java.time.temporal.ChronoUnit.DAYS;
 import static net.gepafin.tendermanagement.util.Utils.log;
 import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 @Component
 public class ApplicationAmendmentRequestDao {
@@ -1258,4 +1264,118 @@ public class ApplicationAmendmentRequestDao {
 		documentService.deleteFile(documentId);
 	}
 
+    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())) {
+            predicates.add(root.get("applicationEvaluationEntity").get("assignedApplicationsEntity").get("application").get("userId").in(userId));
+        }
+        if (Boolean.FALSE.equals(validator.checkIsBeneficiary())) {
+            predicates.add(root.get("applicationEvaluationEntity").get("assignedApplicationsEntity").get("userId").in(userId));
+        }
+
+        return predicates;
+
+    }
 }

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

@@ -1538,6 +1538,22 @@ public class ApplicationDao {
                     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));
         }
 

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

@@ -1,16 +1,24 @@
 package net.gepafin.tendermanagement.dao;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
 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.entities.*;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
+import net.gepafin.tendermanagement.model.request.*;
+import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
 import net.gepafin.tendermanagement.enums.*;
 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.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;
@@ -25,16 +33,20 @@ import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationExceptio
 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;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static net.gepafin.tendermanagement.util.Utils.log;
 import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 @Component
 public class AssignedApplicationsDao {
@@ -288,6 +300,118 @@ public class AssignedApplicationsDao {
         log.info("Assigned application fetched successfully: {}", response);
         return response;
     }
+    public PageableResponseBean<List<AssignedApplicationsResponse>> getAllAssignedApplicationsByPagination(UserEntity user, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean,Long userId) {
+        Integer pageNo = null;
+        Integer pageLimit = null;
+        if (assignedApplicationPageableRequestBean.getGlobalFilters() != null) {
+            pageNo = assignedApplicationPageableRequestBean.getGlobalFilters().getPage();
+            pageLimit = assignedApplicationPageableRequestBean.getGlobalFilters().getLimit();
+        }
+        if (pageLimit == null || pageLimit <= 0) {
+            pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT;
+        }
+        if (pageNo == null || pageNo <= 0) {
+            pageNo = GepafinConstant.DEFAULT_PAGE;
+        }
+        Specification<AssignedApplicationsEntity> spec = searchByPagination( assignedApplicationPageableRequestBean, user,userId);
+        Page<AssignedApplicationsEntity> entityPage = assignedApplicationsRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+        // Prepare the response
+
+
+        List<AssignedApplicationsResponse> assignedApplicationsResponses = entityPage.getContent().stream()
+                .map(application -> {
+                    AssignedApplicationsResponse response = convertEntityToResponse(application);
+                    return response;
+                })
+                .collect(Collectors.toList());
+
+
+
+        PageableResponseBean<List<AssignedApplicationsResponse>> pageableResponseBean = new PageableResponseBean<>();
+        pageableResponseBean.setBody(assignedApplicationsResponses);
+        pageableResponseBean.setCurrentPage(entityPage.getNumber() + 1);
+        pageableResponseBean.setTotalPages(entityPage.getTotalPages());
+        pageableResponseBean.setTotalRecords(entityPage.getTotalElements());
+        pageableResponseBean.setPageSize(entityPage.getSize());
+
+        return pageableResponseBean;
+    }
+
+    public Specification<AssignedApplicationsEntity> searchByPagination(AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean, UserEntity userEntity,Long userId) {
+        return (root, query, criteriaBuilder) -> {
+
+            List<Predicate> predicates = getPredicates(assignedApplicationPageableRequestBean, criteriaBuilder, root, userEntity,userId);
+            SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true);
+
+            if (assignedApplicationPageableRequestBean.getGlobalFilters() != null
+                    && assignedApplicationPageableRequestBean.getGlobalFilters().getSortBy() != null &&
+                    assignedApplicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName() != null && Boolean.FALSE.equals(
+                    isEmpty(assignedApplicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName()))) {
+                sortBy.setColumnName(assignedApplicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName());
+                sortBy.setSortDesc(true);
+                if (assignedApplicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc() != null) {
+                    sortBy.setSortDesc(assignedApplicationPageableRequestBean.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(AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean,
+                                          CriteriaBuilder criteriaBuilder, Root<AssignedApplicationsEntity> root, UserEntity userEntity,Long userId) {
+
+        Integer year = null;
+        String search = null;
+        if (assignedApplicationPageableRequestBean.getGlobalFilters() != null) {
+            year = assignedApplicationPageableRequestBean.getGlobalFilters().getYear();
+            search = assignedApplicationPageableRequestBean.getGlobalFilters().getSearch();
+        }
+        List<Predicate> predicates = new ArrayList<>();
+
+        Boolean isBeneficiary = validator.checkIsBeneficiary();
+        if (userId!=null) {
+            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_ID), userId));
+        }
+        if (year != null && year > 0) {
+            int filterYear = assignedApplicationPageableRequestBean.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.NOTE)),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(titlePredicate));
+        }
+
+        // Filter by `status` (if status list is provided)
+        if (assignedApplicationPageableRequestBean.getStatus() != null && !assignedApplicationPageableRequestBean.getStatus().isEmpty()) {
+            List<String> statusValues = assignedApplicationPageableRequestBean.getStatus().stream()
+                    .map(AssignedApplicationEnum::name) // Convert enum to string
+                    .toList();
+            predicates.add(root.get(GepafinConstant.STATUS).in(statusValues));
+        }
+        predicates.add(criteriaBuilder.isFalse(root.get(GepafinConstant.IS_DELETED)));
+
+
+
+        return predicates;
+
+    }
     public AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {
 
         AssignedApplicationsEntity assignedApplication = validateAssignedApplication(assignedApplicationId);

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

@@ -4,6 +4,7 @@ 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;
@@ -414,4 +415,48 @@ public class NotificationDao {
         predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_ID), userId));
         return predicates;
     }
+
+    public PageableResponseBean<List<NotificationResponse>> getNotificationsByUserIdAndCompanyIdByPagination(Long userId, Long companyId, NotificationRequestBean notificationRequestBean) {
+        UserWithCompanyEntity userWithCompany;
+        if (companyId != null) {
+            userWithCompany = companyDao.validateUserWithCompny(userId, companyId);
+        }else {
+            userWithCompany=null;
+        }
+        Integer pageNo = null;
+        Integer pageLimit = null;
+        if (notificationRequestBean.getGlobalFilters() != null) {
+            pageNo = notificationRequestBean.getGlobalFilters().getPage();
+            pageLimit = notificationRequestBean.getGlobalFilters().getLimit();
+        }
+        if (pageLimit == null || pageLimit <= 0) {
+            pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT;
+        }
+        if (pageNo == null || pageNo <= 0) {
+            pageNo = GepafinConstant.DEFAULT_PAGE;
+        }
+        Specification<NotificationEntity> spec = search(userId, notificationRequestBean);
+        if(userWithCompany!=null){
+        spec = spec.and((root, query, criteriaBuilder) ->
+                criteriaBuilder.equal(root.get("userWithCompany").get("id"), userWithCompany.getId()));
+}
+        Page<NotificationEntity> entityPage = notificationRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+        // Prepare the response
+        List<NotificationResponse> notificationResponses = entityPage.getContent().stream()
+                .map(notification -> {
+                    NotificationResponse response = convertNotificationEntityToNotificationResponse(notification);
+                    return response;
+                })
+                .collect(Collectors.toList());
+
+
+        PageableResponseBean<List<NotificationResponse>> pageableResponseBean = new PageableResponseBean<>();
+        pageableResponseBean.setBody(notificationResponses);
+        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;
+    }
 }

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

@@ -2,15 +2,18 @@ package net.gepafin.tendermanagement.dao;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import jakarta.servlet.http.HttpServletRequest;
-import net.gepafin.tendermanagement.entities.RoleActionContextEntity;
+import net.gepafin.tendermanagement.constants.GepafinConstant;
-import net.gepafin.tendermanagement.entities.UserActionEntity;
+import net.gepafin.tendermanagement.entities.*;
-import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.TimePeriodEnum;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
-import net.gepafin.tendermanagement.model.response.ActionContextLabelResponse;
+import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
-import net.gepafin.tendermanagement.model.response.SummaryPageResponseBean;
+import net.gepafin.tendermanagement.model.request.ApplicationPageableRequestBean;
-import net.gepafin.tendermanagement.model.response.UserActionResponseBean;
+import net.gepafin.tendermanagement.model.request.UserActionPaginationRequest;
+import net.gepafin.tendermanagement.model.response.*;
+import net.gepafin.tendermanagement.model.util.SortBy;
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
 import net.gepafin.tendermanagement.repositories.RoleActionContextRepository;
 import net.gepafin.tendermanagement.repositories.UserActionsRepository;
@@ -23,9 +26,12 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+
 @Component
 public class UserActionDao {
 
@@ -41,16 +47,14 @@ public class UserActionDao {
     @Autowired
     private RoleActionContextRepository roleActionContextRepository;
 
-    public SummaryPageResponseBean getUserAction(HttpServletRequest request, UserEntity userEntity, TimePeriodEnum timeFilter, List<UserActionContextEnum> actionContext){
+    public SummaryPageResponseBean getUserAction(HttpServletRequest request, UserEntity userEntity){
         Long numberOfLoginAttempts = userActionsRepository.countUserLoginAttempts(userEntity.getId());
         Long applicationsProcessed = assignedApplicationsRepository.countAssignedApplicationsByUserId(userEntity.getId());
 
-        List<UserActionEntity> userActions = getFilterUserActions(userEntity.getId(),timeFilter,actionContext);
+        return createSummaryPageResponse(userEntity,numberOfLoginAttempts,applicationsProcessed);
-
-        return createSummaryPageResponse(userEntity,numberOfLoginAttempts,applicationsProcessed,userActions);
     }
 
-    public SummaryPageResponseBean createSummaryPageResponse(UserEntity user, Long numberOfLoginAttempts, Long applicationsProcessed, List<UserActionEntity> userActions){
+    public SummaryPageResponseBean createSummaryPageResponse(UserEntity user, Long numberOfLoginAttempts, Long applicationsProcessed){
         SummaryPageResponseBean response = new SummaryPageResponseBean();
         response.setRole(user.getRoleEntity().getRoleName());
         response.setLastLogin(user.getLastLogin());
@@ -59,9 +63,6 @@ public class UserActionDao {
         response.setEmail(user.getEmail());
         response.setNumberOfLoginAttempts(numberOfLoginAttempts);
         response.setApplicationsProcessed(applicationsProcessed);
-
-        List<UserActionResponseBean> userAction = convertEntityToResponse(userActions);
-        response.setUserActions(userAction);
         return response;
     }
 
@@ -137,6 +138,7 @@ public class UserActionDao {
             responseBean.setResponse(action.getResponse());
             responseBean.setCreatedDate(action.getCreatedDate());
             responseBean.setUpdatedDate(action.getUpdatedDate());
+            responseBean.setMethodType(action.getMethodType());
             return responseBean;
         }).collect(Collectors.toList());
     }
@@ -157,4 +159,138 @@ public class UserActionDao {
             return responseBean;
         }).collect(Collectors.toList());
     }
+    public PageableResponseBean<List<UserActionResponseBean>> getUserActionByPagination(UserEntity user, UserActionPaginationRequest userActionPaginationRequest) {
+        Integer pageNo = null;
+        Integer pageLimit = null;
+        if (userActionPaginationRequest.getGlobalFilters() != null) {
+            pageNo = userActionPaginationRequest.getGlobalFilters().getPage();
+            pageLimit = userActionPaginationRequest.getGlobalFilters().getLimit();
+        }
+        if (pageLimit == null || pageLimit <= 0) {
+            pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT;
+        }
+        if (pageNo == null || pageNo <= 0) {
+            pageNo = GepafinConstant.DEFAULT_PAGE;
+        }
+        Specification<UserActionEntity> spec = search(userActionPaginationRequest,user);
+        Page<UserActionEntity> entityPage = userActionsRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+        // Prepare the response
+        Long numberOfLoginAttempts = userActionsRepository.countUserLoginAttempts(user.getId());
+        Long applicationsProcessed = assignedApplicationsRepository.countAssignedApplicationsByUserId(user.getId());
+
+
+        List<UserActionResponseBean> userActionResponseBeans = convertEntityToResponse(entityPage.stream().toList());
+
+
+        PageableResponseBean<List<UserActionResponseBean>> pageableResponseBean = new PageableResponseBean<>();
+        pageableResponseBean.setBody(userActionResponseBeans);
+        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<UserActionEntity> search(UserActionPaginationRequest userActionPaginationRequest,UserEntity userEntity) {
+        return (root, query, criteriaBuilder) -> {
+
+            List<Predicate> predicates = getPredicates(userActionPaginationRequest, criteriaBuilder, root,userEntity);
+            SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true);
+
+            if (userActionPaginationRequest .getGlobalFilters() != null
+                    && userActionPaginationRequest.getGlobalFilters().getSortBy() != null &&
+                    userActionPaginationRequest.getGlobalFilters().getSortBy().getColumnName() != null && Boolean.FALSE.equals(
+                    isEmpty(userActionPaginationRequest.getGlobalFilters().getSortBy().getColumnName()))) {
+                sortBy.setColumnName(userActionPaginationRequest.getGlobalFilters().getSortBy().getColumnName());
+                sortBy.setSortDesc(true);
+                if (userActionPaginationRequest.getGlobalFilters().getSortBy().getSortDesc() != null) {
+                    sortBy.setSortDesc(userActionPaginationRequest.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(UserActionPaginationRequest userActionPaginationRequest,
+                                          CriteriaBuilder criteriaBuilder, Root<UserActionEntity> root,UserEntity userEntity) {
+
+        Integer year = null;
+        String search = null;
+        if (userActionPaginationRequest.getGlobalFilters() != null) {
+            year = userActionPaginationRequest.getGlobalFilters().getYear();
+            search = userActionPaginationRequest.getGlobalFilters().getSearch();
+        }
+        List<Predicate> predicates = new ArrayList<>();
+
+        if (year != null && year > 0) {
+            int filterYear = userActionPaginationRequest.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 actionType = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get(GepafinConstant.ACTION_TYPE)),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(actionType));
+            Predicate actionContext = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get(GepafinConstant.ACTION_CONTEXT)),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(actionContext));
+            Predicate methodType = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get(GepafinConstant.METHOD_TYPE)),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(methodType));
+        }
+
+        // Filter by `status` (if status list is provided)
+        if (userActionPaginationRequest.getActionContext() != null && !userActionPaginationRequest.getActionContext().isEmpty()) {
+            List<String> statusValues = userActionPaginationRequest.getActionContext().stream()
+                    .map(UserActionContextEnum::name) // Convert enum to string
+                    .toList();
+            predicates.add(root.get("actionContext").in(statusValues));
+        }
+        if (userActionPaginationRequest.getActionType() != null && !userActionPaginationRequest.getActionType().isEmpty()) {
+            List<String> statusValues = userActionPaginationRequest.getActionType().stream()
+                    .map(UserActionLogsEnum::name) // Convert enum to string
+                    .toList();
+            predicates.add(root.get("actionType").in(statusValues));
+        }
+
+        TimePeriodEnum timeRange= userActionPaginationRequest.getTimeFilter();
+        if (timeRange != null) {
+            LocalDateTime startDate = null;
+            LocalDateTime endDate = LocalDateTime.now();
+
+            switch (timeRange) {
+                case LAST_WEEK -> startDate = endDate.minusWeeks(1);
+                case LAST_QUARTER -> startDate = endDate.minusMonths(3);
+                case LAST_SEMESTER -> startDate = endDate.minusMonths(6);
+                case LAST_YEAR -> startDate = endDate.minusYears(1);
+            }
+
+            if (startDate != null) {
+                predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), startDate, endDate));
+            }
+        }
+        predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_ID), userEntity.getId()));
+
+        return predicates;
+
+    }
 }

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

@@ -1,5 +1,8 @@
 package net.gepafin.tendermanagement.dao;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import net.gepafin.tendermanagement.config.SamlSuccessHandler;
@@ -10,6 +13,7 @@ import net.gepafin.tendermanagement.enums.*;
 import net.gepafin.tendermanagement.model.request.*;
 import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.model.util.JWTToken;
+import net.gepafin.tendermanagement.model.util.SortBy;
 import net.gepafin.tendermanagement.repositories.BeneficiaryRepository;
 import net.gepafin.tendermanagement.repositories.UserRepository;
 import net.gepafin.tendermanagement.service.HubService;
@@ -29,8 +33,13 @@ 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.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,6 +47,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 @Component
 public class UserDao {
@@ -597,6 +607,152 @@ public class UserDao {
         log.info("Total users found with role ID {}: {}", roleIds, userResponseBeans.size());
         return userResponseBeans;
     }
+    public PageableResponseBean<List<UserResponseBean>> getUserByPagination(UserPaginationRequestBean userPaginationRequestBean,UserEntity userEntity) {
+            Integer pageNo = null;
+        Integer pageLimit = null;
+        if (userPaginationRequestBean.getGlobalFilters() != null) {
+            pageNo = userPaginationRequestBean.getGlobalFilters().getPage();
+            pageLimit = userPaginationRequestBean.getGlobalFilters().getLimit();
+        }
+        if (pageLimit == null || pageLimit <= 0) {
+            pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT;
+        }
+        if (pageNo == null || pageNo <= 0) {
+            pageNo = GepafinConstant.DEFAULT_PAGE;
+        }
+        Specification<UserEntity> spec = search(userPaginationRequestBean,userEntity);
+        Page<UserEntity> entityPage = userRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+
+        List<UserResponseBean> applicationResponses = entityPage.getContent().stream()
+                .map(user -> {
+                    UserResponseBean response = convertUserEntityToUserResponse(user);
+                    return response;
+                })
+                .collect(Collectors.toList());
+
+
+        PageableResponseBean<List<UserResponseBean>> 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<UserEntity> search(UserPaginationRequestBean userPaginationRequestBean,UserEntity userEntity) {
+        return (root, query, criteriaBuilder) -> {
+
+            List<Predicate> predicates = getPredicates(userPaginationRequestBean, criteriaBuilder, root,userEntity);
+            SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true);
+
+            if (userPaginationRequestBean .getGlobalFilters() != null
+                    && userPaginationRequestBean.getGlobalFilters().getSortBy() != null &&
+                    userPaginationRequestBean.getGlobalFilters().getSortBy().getColumnName() != null && Boolean.FALSE.equals(
+                    isEmpty(userPaginationRequestBean.getGlobalFilters().getSortBy().getColumnName()))) {
+                sortBy.setColumnName(userPaginationRequestBean.getGlobalFilters().getSortBy().getColumnName());
+                sortBy.setSortDesc(true);
+                if (userPaginationRequestBean.getGlobalFilters().getSortBy().getSortDesc() != null) {
+                    sortBy.setSortDesc(userPaginationRequestBean.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(UserPaginationRequestBean userPaginationRequestBean,
+                                          CriteriaBuilder criteriaBuilder, Root<UserEntity> root,UserEntity user) {
+
+        Integer year = null;
+        String search = null;
+        if (userPaginationRequestBean.getGlobalFilters() != null) {
+            year = userPaginationRequestBean.getGlobalFilters().getYear();
+            search = userPaginationRequestBean.getGlobalFilters().getSearch();
+        }
+        List<Predicate> predicates = new ArrayList<>();
+
+        if (year != null && year > 0) {
+            int filterYear = userPaginationRequestBean.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 predicate = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get("firstName")),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(predicate));
+            Predicate predicate1 = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get("lastName")),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(predicate1));
+
+            Predicate predicate2 = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get("phoneNumber")),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(predicate2));
+
+            Predicate predicate3 = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get("organization")),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(predicate3));
+
+            Predicate predicate4 = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get("address")),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(predicate4));
+
+            Predicate predicate5 = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get("city")),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(predicate5));
+
+            Predicate predicate6 = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get("country")),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(predicate6));
+
+
+        }
+
+        // Filter by `status` (if status list is provided)
+        if (userPaginationRequestBean.getStatus() != null && !userPaginationRequestBean.getStatus().isEmpty()) {
+            List<String> statusValues = userPaginationRequestBean.getStatus().stream()
+                    .map(UserStatusEnum::name) // Convert enum to string
+                    .toList();
+            predicates.add(root.get(GepafinConstant.STATUS).in(statusValues));
+        }
+        if (userPaginationRequestBean.getRole() != null && !userPaginationRequestBean.getRole().isEmpty()) {
+            List<String> roleValues = userPaginationRequestBean.getRole().stream()
+                    .map(RoleStatusEnum::name) // Convert enum to string
+                    .toList();
+            predicates.add(root.get("roleEntity").get("roleType").in(roleValues));
+        }
+        predicates.add(root.get(GepafinConstant.HUB).get("id").in(user.getHub().getId()));
+
+        return predicates;
+
+    }
 
     public UserResponseBean updateUserDetails(HttpServletRequest request , Long userId, UpdateUserReqForBeneficiary userReq){
         log.info("Updating user by beneficiary with ID: {}", userId);
@@ -647,9 +803,4 @@ public class UserDao {
         return convertUserEntityToUserResponse(userEntity);
     }
 
-
-
-
-
-
 }

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

@@ -192,7 +192,11 @@ public enum UserActionContextEnum {
 
 
     GET_USER_ACTION("GET_USER_ACTION"),
-    GET_ACTION_CONTEXT_LABELS("GET_ACTION_CONTEXT_LABELS");
+    GET_ACTION_CONTEXT_LABELS("GET_ACTION_CONTEXT_LABELS"),
+    GET_ALL_ASSIGNED_APPLICATION_BY_PAGINATION("GET_ALL_ASSIGNED_APPLICATION_BY_PAGINATION"),
+     GET_ALL_APPLICATION_AMENDMENT_BY_PAGINATION("GET_ALL_APPLICATION_AMENDMENT_BY_PAGINATION"),
+    GET_ALL_USER_ACTION_BY_PAGINATION("GET_ALL_USER_ACTION_BY_PAGINATION"),
+    GET_ALL_USER_BY_PAGINATION("GET_ALL_USER_BY_PAGINATION");
 
     private final String value;
 

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

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
+
+import java.util.List;
+
+@Data
+public class ApplicationAmendmentPaginationRequestBean {
+
+    private GlobalFilters globalFilters;
+
+    private List<ApplicationAmendmentRequestEnum> status;
+}

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
+
+import java.util.List;
+
+@Data
+public class AssignedApplicationPageableRequestBean {
+
+
+    private GlobalFilters globalFilters;
+
+    private List<AssignedApplicationEnum> status;
+}

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

@@ -0,0 +1,21 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.TimePeriodEnum;
+import net.gepafin.tendermanagement.enums.UserActionContextEnum;
+import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
+
+import java.util.List;
+
+@Data
+public class UserActionPaginationRequest {
+
+   private GlobalFilters globalFilters;
+
+   private TimePeriodEnum timeFilter;
+
+   private List<UserActionContextEnum> actionContext;
+
+   private List<UserActionLogsEnum> actionType;
+
+}

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

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.RoleStatusEnum;
+import net.gepafin.tendermanagement.enums.UserStatusEnum;
+
+import java.util.List;
+
+@Data
+public class UserPaginationRequestBean {
+
+    private GlobalFilters globalFilters;
+
+    private List<UserStatusEnum> status;
+
+    private List<RoleStatusEnum> role;
+}

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

@@ -14,5 +14,4 @@ public class SummaryPageResponseBean {
     private LocalDateTime registrationDate;
     private Long numberOfLoginAttempts;
     private Long applicationsProcessed;
-    private List<UserActionResponseBean> userActions;
 }

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

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.repositories;
 
 import net.gepafin.tendermanagement.entities.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -10,7 +11,7 @@ import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface UserRepository extends JpaRepository<UserEntity, Long> {
+public interface UserRepository extends JpaRepository<UserEntity, Long>, JpaSpecificationExecutor<UserEntity> {
 	
     UserEntity findByBeneficiaryId(Long beneficiaryId);
 

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

@@ -4,10 +4,12 @@ import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
 import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.model.request.ApplicationAmendmentPaginationRequestBean;
 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.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean;
 
 import java.util.List;
@@ -27,4 +29,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);
 }

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

@@ -2,11 +2,13 @@ package net.gepafin.tendermanagement.service;
 
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
+import net.gepafin.tendermanagement.model.request.AssignedApplicationPageableRequestBean;
 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.AssignedApplicationsResponse;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 
 import java.util.List;
 
@@ -21,5 +23,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);
     AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status);
 }

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

@@ -7,7 +7,9 @@ import net.gepafin.tendermanagement.model.request.NotificationReq;
 import net.gepafin.tendermanagement.model.request.NotificationRequestBean;
 import net.gepafin.tendermanagement.model.response.NotificationResponse;
 import net.gepafin.tendermanagement.model.response.PageableResponseBean;
+import net.gepafin.tendermanagement.model.util.Response;
 import org.springframework.data.domain.Page;
+import org.springframework.http.ResponseEntity;
 
 import java.util.List;
 
@@ -25,4 +27,7 @@ public interface NotificationService {
     public List<NotificationResponse> getNotificationsByCompanyIdAndUserId(Long userId, Long companyId, List<NotificationEnum> statuses);
 
     PageableResponseBean<List<NotificationResponse>> getAllNotification(HttpServletRequest request,Long userId, NotificationRequestBean notificationRequestBean);
-}
+
+    PageableResponseBean<List<NotificationResponse>> getNotificationsByUserIdAndCompanyIdByPagination(HttpServletRequest request, Long userId, Long companyId, NotificationRequestBean notificationRequestBean);
+
+    }

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

@@ -3,13 +3,19 @@ package net.gepafin.tendermanagement.service;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.enums.TimePeriodEnum;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
+import net.gepafin.tendermanagement.model.request.UserActionPaginationRequest;
 import net.gepafin.tendermanagement.model.response.ActionContextLabelResponse;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.SummaryPageResponseBean;
+import net.gepafin.tendermanagement.model.response.UserActionResponseBean;
 
 import java.util.List;
 
 public interface UserActionService {
-    public SummaryPageResponseBean getUserAction(HttpServletRequest request, Long userId, TimePeriodEnum timeFilter, List<UserActionContextEnum> actionContext);
+    public SummaryPageResponseBean getUserAction(HttpServletRequest request, Long userId);
 
     public List<ActionContextLabelResponse> getActionContextLabels(HttpServletRequest request, Long userId);
+
+    public PageableResponseBean<List<UserActionResponseBean>> getUserActionByPagination(HttpServletRequest request, Long userId, UserActionPaginationRequest userActionPaginationRequest);
+
 }

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

@@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.*;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.UserSamlResponse;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
@@ -47,6 +48,7 @@ public interface UserService {
     public UserEntity getUserEntityById(Long userId);
     List<UserResponseBean> getAllUsers(HttpServletRequest request, List<Long> roleIds);
 
+    PageableResponseBean<List<UserResponseBean>> getUserByPagination(HttpServletRequest request, UserPaginationRequestBean userPaginationRequestBean);
     UserResponseBean updateUserDetails(HttpServletRequest request, Long userId, UpdateUserReqForBeneficiary userReq);
 
 }

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

@@ -8,10 +8,12 @@ import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
 import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
+import net.gepafin.tendermanagement.model.request.ApplicationAmendmentPaginationRequestBean;
 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.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean;
 import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository;
 import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
@@ -149,4 +151,10 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm
             applicationAmendmentRequestDao.sendReminderEmail(amendmentId);
         }
     }
+
+    @Override
+    public PageableResponseBean<List<ApplicationAmendmentRequestResponse>> getApplicationAmendmentByPaginnation(HttpServletRequest request, Long userId, ApplicationAmendmentPaginationRequestBean amendmentPaginationRequestBean) {
+       UserEntity user=validator.validateUser(request);
+        return applicationAmendmentRequestDao.getApplicationAmendmentByPaginnation(userId,amendmentPaginationRequestBean);
+    }
 }

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

@@ -4,11 +4,13 @@ import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.dao.AssignedApplicationsDao;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.model.request.AssignedApplicationPageableRequestBean;
 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.AssignedApplicationsResponse;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.service.AssignedApplicationsService;
 import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +64,13 @@ public class AssignedApplicationsServiceImpl implements AssignedApplicationsServ
     public AssignedApplicationsEntity validateAssignedApplication(Long assignedApplicationId) {
         return assignedApplicationsDao.validateAssignedApplication(assignedApplicationId);
     }
+
+    @Override
+    public PageableResponseBean<List<AssignedApplicationsResponse>> getAllAssignedApplicationsByPagination(HttpServletRequest request, Long userId, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean) {
+        UserEntity user=validator.validateUser(request);
+        return assignedApplicationsDao.getAllAssignedApplicationsByPagination(user,assignedApplicationPageableRequestBean,userId);
+    }
+
     @Override
     public AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {
         return   assignedApplicationsDao.updateAssignedApplicationStatus(request, assignedApplicationId, status);

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

@@ -74,4 +74,9 @@ public class NotificationServiceImpl implements NotificationService {
                UserEntity userEntity = validator.validateUser(request);
         return notificationDao.getAllNotification(userId,notificationRequestBean);
     }
+
+    @Override
+    public PageableResponseBean<List<NotificationResponse>> getNotificationsByUserIdAndCompanyIdByPagination(HttpServletRequest request, Long userId, Long companyId, NotificationRequestBean notificationRequestBean) {
+        return notificationDao.getNotificationsByUserIdAndCompanyIdByPagination(userId,companyId,notificationRequestBean);
+    }
 }

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

@@ -5,8 +5,11 @@ import net.gepafin.tendermanagement.dao.UserActionDao;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.TimePeriodEnum;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
+import net.gepafin.tendermanagement.model.request.UserActionPaginationRequest;
 import net.gepafin.tendermanagement.model.response.ActionContextLabelResponse;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.SummaryPageResponseBean;
+import net.gepafin.tendermanagement.model.response.UserActionResponseBean;
 import net.gepafin.tendermanagement.service.UserActionService;
 import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,9 +28,9 @@ public class UserActionServiceImpl implements UserActionService {
 
 
     @Override
-    public SummaryPageResponseBean getUserAction(HttpServletRequest request, Long userId, TimePeriodEnum timeFilter, List<UserActionContextEnum> actionContext) {
+    public SummaryPageResponseBean getUserAction(HttpServletRequest request, Long userId) {
         UserEntity user  = validator.validateUserId(request, userId);
-        return userActionDao.getUserAction(request,user,timeFilter,actionContext);
+        return userActionDao.getUserAction(request,user);
     }
 
     @Override
@@ -35,4 +38,10 @@ public class UserActionServiceImpl implements UserActionService {
         UserEntity user = validator.validateUserId(request, userId);
         return userActionDao.getActionContextLabels(request,user);
     }
+
+    @Override
+    public PageableResponseBean<List<UserActionResponseBean>> getUserActionByPagination(HttpServletRequest request, Long userId, UserActionPaginationRequest userActionPaginationRequest) {
+        UserEntity user = validator.validateUserId(request, userId);
+        return userActionDao.getUserActionByPagination(user,userActionPaginationRequest);
+    }
 }

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

@@ -11,6 +11,7 @@ import net.gepafin.tendermanagement.model.request.UpdateUserReq;
 import net.gepafin.tendermanagement.model.request.UserReq;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.*;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.UserSamlResponse;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
@@ -131,6 +132,11 @@ public class UserServiceImpl implements UserService {
         return userDao.getAllUsers(user, roleIds);
     }
 
+    @Override
+    public PageableResponseBean<List<UserResponseBean>> getUserByPagination(HttpServletRequest request, UserPaginationRequestBean userPaginationRequestBean) {
+        UserEntity user = validator.validateUser(request);
+        return userDao.getUserByPagination(userPaginationRequestBean, user);
+    }
     @Override
     @Transactional(rollbackFor = Exception.class)
     public UserResponseBean updateUserDetails(HttpServletRequest request, Long userId, UpdateUserReqForBeneficiary userReq) {

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

@@ -9,11 +9,11 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
-import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
+import net.gepafin.tendermanagement.model.request.*;
-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.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;
@@ -78,7 +78,7 @@ public interface ApplicationAmendmentRequestApi {
     @GetMapping(value = "", produces = "application/json")
     ResponseEntity<Response<ApplicationAmendmentRequestResponse>> getApplicationAmendmentRequestById(HttpServletRequest request,@Parameter(description = "The application amendment id", required = true) @RequestParam(value = "id", required = true) Long id);
 
-    @Operation(summary = "Api to get all applications amendment request by preInstructor user Id",
+    @Operation(summary = "Api to get all applications amendment request by preInstructor user Id (deprecated)",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -107,7 +107,7 @@ public interface ApplicationAmendmentRequestApi {
                                                                                             @Parameter(description = "The Application Amendment id", required = true) @PathVariable("id") Long id,
                                                                                             @Parameter(description = "Assigned Application request object", required = true) @Valid @RequestBody ApplicationAmendmentRequestBean applicationAmendmentRequestBean);
 
-    @Operation(summary = "Api to get all applications amendment request by beneficary user Id",
+    @Operation(summary = "Api to get all applications amendment request by beneficary user Id (deprecated)",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -191,4 +191,17 @@ public interface ApplicationAmendmentRequestApi {
             @Parameter( required = true)
             @PathVariable(value = "amendmentId") Long amendmentId);
 
+    @Operation(summary = "Api to get all application amendment by pagination",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @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,
+                                                                                                                                  @RequestBody ApplicationAmendmentPaginationRequestBean userActionPaginationRequest);
+
 }

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

@@ -6,12 +6,14 @@ import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
+import net.gepafin.tendermanagement.model.request.AssignedApplicationPageableRequestBean;
 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.ApplicationResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
 import org.springframework.http.MediaType;
@@ -58,7 +60,7 @@ public interface AssignedApplicationsApi {
     ResponseEntity<Response<Void>> deleteAssignedApplication(HttpServletRequest request,
                                                      @Parameter(description = "The assigned application id", required = true) @PathVariable("id") Long id);
 
-    @Operation(summary = "Api to get all assigned applications",
+    @Operation(summary = "Api to get all assigned applications (deprecated) ",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -116,5 +118,18 @@ public interface AssignedApplicationsApi {
                                                                           @Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) AssignedApplicationEnum status);
 
 
+    @Operation(summary = "Api to get all assigned applications by pagination",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @PostMapping(value = "/pagination", produces = "application/json")
+    ResponseEntity<Response<PageableResponseBean<List<AssignedApplicationsResponse>>>> 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/NotificationApi.java

@@ -87,7 +87,7 @@ public interface NotificationApi {
     ResponseEntity<Response<Void>> deleteNotification(HttpServletRequest request,
             @Parameter(description = "The notification id", required = true) @PathVariable(value = "id", required = true) Long id);
 
-    @Operation(summary = "API to get notifications by user ID and company ID", responses = { @ApiResponse(responseCode = "200", description = "OK"),
+    @Operation(summary = "API to get notifications by user ID and company ID (deprecated) ", responses = { @ApiResponse(responseCode = "200", description = "OK"),
             @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                     @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
             @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -110,6 +110,22 @@ public interface NotificationApi {
     @PostMapping(value = "/user/{userId}/pagination", consumes = "application/json", produces = "application/json")
     ResponseEntity<Response<PageableResponseBean<List<NotificationResponse>>>> getAllNotification(HttpServletRequest request,@Parameter(description = "The user id", required = true) @PathVariable(value = "userId") Long userId, @RequestBody NotificationRequestBean notificationRequestBean);
 
+
+
+
+    @Operation(summary = "API to get notifications by user ID and company ID by pagination", responses = { @ApiResponse(responseCode = "200", description = "OK"),
+            @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                    @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+            @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                    @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+            @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                    @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @PostMapping(value = "/user/{userId}/company/{companyId}/pagination", produces = "application/json")
+    ResponseEntity<Response<PageableResponseBean<List<NotificationResponse>>>> getNotificationsByUserIdAndCompanyIdByPagination(HttpServletRequest request,
+                                                                                              @Parameter(description = "The user id", required = true) @PathVariable(value = "userId") Long userId,
+                                                                                              @Parameter(description = "The company ID", required = true) @PathVariable(value = "companyId") Long companyId,
+                                                                                                          @RequestBody NotificationRequestBean notificationRequestBean);
+
 }
 
 

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

@@ -8,20 +8,21 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.enums.TimePeriodEnum;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
+import net.gepafin.tendermanagement.model.request.UserActionPaginationRequest;
 import net.gepafin.tendermanagement.model.response.ActionContextLabelResponse;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.SummaryPageResponseBean;
+import net.gepafin.tendermanagement.model.response.UserActionResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
 public interface UserActionApi {
-    @Operation(summary = "Api to get user action",
+    @Operation(summary = "Api to get user summary ",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -31,9 +32,7 @@ public interface UserActionApi {
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
     @GetMapping(value = "/user/{userId}", produces = { "application/json" })
-    ResponseEntity<Response<SummaryPageResponseBean>> getUserAction(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId,
+    ResponseEntity<Response<SummaryPageResponseBean>> getUserAction(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId);
-                                                                    @Parameter(description = "Time Filter") @RequestParam(value = "timeFilter", required = false) TimePeriodEnum timeFilter,
-                                                                    @Parameter(description = "Action Context") @RequestParam(value = "actionContext", required = false) List<UserActionContextEnum> actionContext);
 
     @Operation(summary = "Api to get action context label",
             responses = {
@@ -46,4 +45,18 @@ public interface UserActionApi {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
     @GetMapping(value = "/user/{userId}/action-context", produces = { "application/json" })
     ResponseEntity<Response<List<ActionContextLabelResponse>>> getActionContextLabels(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId);
+
+    @Operation(summary = "Api to get all user action by pagination",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @PostMapping(value = "/user/{userId}/pagination", produces = { "application/json" })
+    ResponseEntity<Response<PageableResponseBean<List<UserActionResponseBean>>>> getUserActionByPaginnation(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId,
+                                                                                                            @RequestBody UserActionPaginationRequest userActionPaginationRequest);
+
 }

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

@@ -10,6 +10,8 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.*;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
+import net.gepafin.tendermanagement.model.response.SummaryPageResponseBean;
 import net.gepafin.tendermanagement.model.response.UserSamlResponse;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
@@ -225,7 +227,7 @@ public interface UserApi {
     ResponseEntity<Response<UserSamlResponse>> validateNewUserToken(HttpServletRequest request,
     		@Parameter(description = "The spid token", required = true) @PathVariable("token") String token);
 
-    @Operation(summary = "Api to get all users",
+    @Operation(summary = "Api to get all users (deprecated)",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -244,6 +246,20 @@ public interface UserApi {
     @ResponseBody
 	void returnNoFavicon();
 
+    @Operation(summary = "Api to get all user by pagination",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @PostMapping(value = "/pagination", produces = { "application/json" })
+    ResponseEntity<Response<PageableResponseBean<List<UserResponseBean>>>> getUserByPagination(HttpServletRequest request,
+                                                                                              @RequestBody UserPaginationRequestBean userPaginationRequestBean);
+
+
     @Operation(summary = "Api to update user",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),

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

@@ -7,11 +7,9 @@ import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
 import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
-import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
+import net.gepafin.tendermanagement.model.request.*;
-import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean;
-import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest;
-import net.gepafin.tendermanagement.model.request.UserActionRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.service.ApplicationAmendmentRequestService;
@@ -188,4 +186,15 @@ public class ApplicationAmendmentRequestController implements ApplicationAmendme
                 .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.REMINDER_EMAIL_SENT_SUCCESS_MSG)));
     }
 
+    @Override
+    public ResponseEntity<Response<PageableResponseBean<List<ApplicationAmendmentRequestResponse>>>> 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);
+        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

@@ -8,11 +8,14 @@ import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
 import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
+import net.gepafin.tendermanagement.model.request.AssignedApplicationPageableRequestBean;
 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.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;
@@ -93,6 +96,15 @@ public class AssignedApplicationsController implements AssignedApplicationsApi {
     }
 
     @Override
+    public ResponseEntity<Response<PageableResponseBean<List<AssignedApplicationsResponse>>>> 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);
+        return ResponseEntity.status(HttpStatus.OK).body(new Response<>(assigenedApplicationResponses, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_ASSIGNED_APPLICATION_SUCCESS_MSG)));
+
+    }
+
     public ResponseEntity<Response<AssignedApplicationsResponse>> updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {
 
         /** This code is responsible for creating user action logs for the "update assigned application status" operation. **/

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

@@ -92,4 +92,11 @@ public class NotificationApiController implements NotificationApi {
         return ResponseEntity.status(HttpStatus.OK).body(new Response<>(notificationResponses, Status.SUCCESS, Translator.toLocale(GepafinConstant.NOTIFICATION_FETCHED_SUCCESSFULLY)));
     }
 
+    @Override
+    public ResponseEntity<Response<PageableResponseBean<List<NotificationResponse>>>> getNotificationsByUserIdAndCompanyIdByPagination(HttpServletRequest request, Long userId, Long companyId, NotificationRequestBean notificationRequestBean) {
+        PageableResponseBean<List<NotificationResponse>> notificationResponses=notificationService.getNotificationsByUserIdAndCompanyIdByPagination(request, userId,companyId,notificationRequestBean);
+        return ResponseEntity.status(HttpStatus.OK).body(new Response<>(notificationResponses, Status.SUCCESS, Translator.toLocale(GepafinConstant.NOTIFICATION_FETCHED_SUCCESSFULLY)));
+
+    }
+
 }

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

@@ -6,9 +6,12 @@ import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.enums.TimePeriodEnum;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
 import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
+import net.gepafin.tendermanagement.model.request.UserActionPaginationRequest;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
 import net.gepafin.tendermanagement.model.response.ActionContextLabelResponse;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.SummaryPageResponseBean;
+import net.gepafin.tendermanagement.model.response.UserActionResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.service.UserActionService;
 import net.gepafin.tendermanagement.util.LoggingUtil;
@@ -33,12 +36,12 @@ public class UserActionApiController implements UserActionApi {
     private LoggingUtil loggingUtil;
 
     @Override
-    public ResponseEntity<Response<SummaryPageResponseBean>> getUserAction(HttpServletRequest request, Long userId, TimePeriodEnum timeFilter, List<UserActionContextEnum> actionContext) {
+    public ResponseEntity<Response<SummaryPageResponseBean>> getUserAction(HttpServletRequest request, Long userId) {
 
         /** This code is responsible for creating user action logs for the "get user action" operation. **/
         loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW)
                 .actionContext(UserActionContextEnum.GET_USER_ACTION).build());
-                SummaryPageResponseBean userActionResponse= userActionService.getUserAction(request,userId,timeFilter,actionContext);
+                SummaryPageResponseBean userActionResponse= userActionService.getUserAction(request,userId);
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new Response<>(userActionResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.USER_ACTION_FETCHED_SUCCESSFULLY)));
     }
@@ -54,5 +57,16 @@ public class UserActionApiController implements UserActionApi {
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new Response<>(actionContextResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.ACTION_CONTEXT_LABELS_FETCHED_SUCCESSFULLY)));
     }
+
+    @Override
+    public ResponseEntity<Response<PageableResponseBean<List<UserActionResponseBean>>>> getUserActionByPaginnation(HttpServletRequest request, Long userId, UserActionPaginationRequest userActionPaginationRequest) {
+        loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW)
+                .actionContext(UserActionContextEnum.GET_ALL_USER_ACTION_BY_PAGINATION).build());
+
+        PageableResponseBean<List<UserActionResponseBean>> userActionResponse= userActionService.getUserActionByPagination(request,userId,userActionPaginationRequest);
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(new Response<>(userActionResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.USER_ACTION_FETCHED_SUCCESSFULLY)));
+
+    }
 }
 

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

@@ -11,6 +11,7 @@ import net.gepafin.tendermanagement.enums.UserActionContextEnum;
 import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.*;
+import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.response.UserSamlResponse;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
@@ -249,6 +250,15 @@ public class UserApiController implements UserApi {
     }
 
     @Override
+    public ResponseEntity<Response<PageableResponseBean<List<UserResponseBean>>>> getUserByPagination(HttpServletRequest request, UserPaginationRequestBean userPaginationRequestBean) {
+        loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW)
+                .actionContext(UserActionContextEnum.GET_ALL_USER_BY_PAGINATION).build());
+
+        PageableResponseBean<List<UserResponseBean>> users = userService.getUserByPagination(request, userPaginationRequestBean);
+
+        return ResponseEntity.status(HttpStatus.OK).body(new Response<>(users, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_USERS_SUCCESS_MSG)));
+
+    }
     public ResponseEntity<Response<UserResponseBean>> updateUserDetails(HttpServletRequest request,
                                                                  @PathVariable("userId") Long userId,
                                                                  @Valid @RequestBody UpdateUserReqForBeneficiary userReq) {