Resolved conflicts

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

@@ -101,6 +101,7 @@ public class GepafinConstant {
     public static final String STATUS_SAME_ERROR = "status.same.error";
     public static final String INVALID_STATUS_CHANGE_FROM_DRAFT = "invalid.status.change.from.draft";
     public static final String INVALID_STATUS_CHANGE_FROM_PUBLISH = "invalid.status.change.from.publish";
+    public static final String INVALID_STATUS_CHANGE_FROM_PUBLISH_TO_DRAFT = "invalid.status.change.from.publish.to.draft";
     public static final String STATUS_CANNOT_BE_CHANGED = "status.cannot.be.changed";
     public static final String PUBLISHED_CALL_NOT_UPDATE = "published.call.not.update";
     public static final String INVALID_USER = "invalid_user";
@@ -531,6 +532,12 @@ public class GepafinConstant {
     public static final String GET_FIELD_VALUE="getFieldValue";
     public static final String GET_REPORT_ENABLE="getReportEnable";
     public static final String GET_REPORT_HEADER="getReportHeader";
+
+    public static final String APPOINTMENT_ID="appointmentId";
+    public static final String APPLICATION_STATUS="applicationStatus";
+
+
+
 }
 
 

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

@@ -14,12 +14,14 @@ import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
+import net.gepafin.tendermanagement.model.response.AssignedApplicationViewResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.model.response.PageableResponseBean;
 import net.gepafin.tendermanagement.model.util.SortBy;
 import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
 import net.gepafin.tendermanagement.repositories.ApplicationRepository;
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
+import net.gepafin.tendermanagement.repositories.AssignedApplicationsViewRepository;
 import net.gepafin.tendermanagement.service.ApplicationService;
 import net.gepafin.tendermanagement.service.CompanyService;
 import net.gepafin.tendermanagement.service.UserService;
@@ -77,6 +79,9 @@ public class AssignedApplicationsDao {
     @Autowired
     private ApplicationEvaluationRepository applicationEvaluationRepository;
 
+    @Autowired
+    private AssignedApplicationsViewRepository assignedApplicationsViewRepository;
+
     public AssignedApplicationsResponse createAssignedApplications(Long applicationId, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest) {
         log.info("Assigning application to pre-Instructor with details: {}", applicationId, userId);
 
@@ -297,7 +302,7 @@ public class AssignedApplicationsDao {
         log.info("Assigned application fetched successfully: {}", response);
         return response;
     }
-    public PageableResponseBean<List<AssignedApplicationsResponse>> getAllAssignedApplicationsByPagination(UserEntity user, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean,Long userId) {
+    public PageableResponseBean<List<AssignedApplicationViewResponse>> getAllAssignedApplicationsByPagination(UserEntity user, AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean,Long userId) {
         Integer pageNo = null;
         Integer pageLimit = null;
         if (assignedApplicationPageableRequestBean.getGlobalFilters() != null) {
@@ -310,21 +315,15 @@ public class AssignedApplicationsDao {
         if (pageNo == null || pageNo <= 0) {
             pageNo = GepafinConstant.DEFAULT_PAGE;
         }
-        Specification<AssignedApplicationsEntity> spec = searchByPagination( assignedApplicationPageableRequestBean, user,userId);
+        Specification<AssignedApplicationsView> spec = searchByPagination( assignedApplicationPageableRequestBean, user,userId);
-        Page<AssignedApplicationsEntity> entityPage = assignedApplicationsRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+        Page<AssignedApplicationsView> entityPage = assignedApplicationsViewRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
         // Prepare the response
 
-
+        List<AssignedApplicationViewResponse> assignedApplicationsResponses = entityPage.getContent().stream()
-        List<AssignedApplicationsResponse> assignedApplicationsResponses = entityPage.getContent().stream()
+                .map(this::getAssignedApplicationResponseByView)
-                .map(application -> {
-                    AssignedApplicationsResponse response = convertEntityToResponse(application);
-                    return response;
-                })
                 .collect(Collectors.toList());
 
-
+        PageableResponseBean<List<AssignedApplicationViewResponse>> pageableResponseBean = new PageableResponseBean<>();
-
-        PageableResponseBean<List<AssignedApplicationsResponse>> pageableResponseBean = new PageableResponseBean<>();
         pageableResponseBean.setBody(assignedApplicationsResponses);
         pageableResponseBean.setCurrentPage(entityPage.getNumber() + 1);
         pageableResponseBean.setTotalPages(entityPage.getTotalPages());
@@ -334,7 +333,7 @@ public class AssignedApplicationsDao {
         return pageableResponseBean;
     }
 
-    public Specification<AssignedApplicationsEntity> searchByPagination(AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean, UserEntity userEntity,Long userId) {
+    public Specification<AssignedApplicationsView> searchByPagination(AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean, UserEntity userEntity,Long userId) {
         return (root, query, criteriaBuilder) -> {
 
             List<Predicate> predicates = getPredicates(assignedApplicationPageableRequestBean, criteriaBuilder, root, userEntity,userId);
@@ -350,30 +349,35 @@ public class AssignedApplicationsDao {
                     sortBy.setSortDesc(assignedApplicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc());
                 }
             }
-            Path<?> sortPath;
+//            Path<?> sortPath;
-            Join<AssignedApplicationsEntity, ApplicationEntity> applicationJoin = root.join(GepafinConstant.APPLICATION, JoinType.LEFT);
+//            Join<AssignedApplicationsEntity, ApplicationEntity> applicationJoin = root.join(GepafinConstant.APPLICATION, JoinType.LEFT);
+//
+//            if (GepafinConstant.APPLICATION_ID.equals(sortBy.getColumnName())) {
+//                sortPath = root.join(GepafinConstant.APPLICATION, JoinType.LEFT).get(GepafinConstant.ID);  // Join ApplicationEntity and sort by application.id
+//            }
+//          else if (GepafinConstant.PROTOCOL_NUMBER.equals(sortBy.getColumnName())) {
+//                Join<ApplicationEntity, ProtocolEntity> protocolJoin = applicationJoin.join(GepafinConstant.PROTOCOL, JoinType.LEFT);
+//                sortPath = protocolJoin.get(GepafinConstant.PROTOCOL_NUMBER);
+//            }
+//            else {
+//                sortPath = root.get(sortBy.getColumnName()); // Sorting by a field in AmendmentEntity
+//            }
+//            query.orderBy(criteriaBuilder.desc(sortPath));
+//            if (Boolean.FALSE.equals(sortBy.getSortDesc())) {
+//                query.orderBy(criteriaBuilder.asc(sortPath));
+//            }
+//            return query.where(criteriaBuilder.and(predicates.toArray(new Predicate[0]))).getRestriction();
+
+            Path<?> sortPath = root.get(sortBy.getColumnName()); // All fields are accessible directly in the view
+            query.orderBy(sortBy.getSortDesc() ? criteriaBuilder.desc(sortPath) : criteriaBuilder.asc(sortPath));
 
-            if (GepafinConstant.APPLICATION_ID.equals(sortBy.getColumnName())) {
-                sortPath = root.join(GepafinConstant.APPLICATION, JoinType.LEFT).get(GepafinConstant.ID);  // Join ApplicationEntity and sort by application.id
-            }
-          else if (GepafinConstant.PROTOCOL_NUMBER.equals(sortBy.getColumnName())) {
-                Join<ApplicationEntity, ProtocolEntity> protocolJoin = applicationJoin.join(GepafinConstant.PROTOCOL, JoinType.LEFT);
-                sortPath = protocolJoin.get(GepafinConstant.PROTOCOL_NUMBER);
-            }
-            else {
-                sortPath = root.get(sortBy.getColumnName()); // Sorting by a field in AmendmentEntity
-            }
-            query.orderBy(criteriaBuilder.desc(sortPath));
-            if (Boolean.FALSE.equals(sortBy.getSortDesc())) {
-                query.orderBy(criteriaBuilder.asc(sortPath));
-            }
             return query.where(criteriaBuilder.and(predicates.toArray(new Predicate[0]))).getRestriction();
         };
     }
 
 
     private List<Predicate> getPredicates(AssignedApplicationPageableRequestBean assignedApplicationPageableRequestBean,
-                                          CriteriaBuilder criteriaBuilder, Root<AssignedApplicationsEntity> root, UserEntity userEntity,Long userId) {
+                                          CriteriaBuilder criteriaBuilder, Root<AssignedApplicationsView> root, UserEntity userEntity,Long userId) {
 
         Integer year = null;
         String search = null;
@@ -404,12 +408,35 @@ public class AssignedApplicationsDao {
 
         }
         // Search in `title` and `message` (if search term is provided)
-        if (search != null && !search.isEmpty()) {
+//        if (search != null && !search.isEmpty()) {
-            Predicate titlePredicate = criteriaBuilder.like(
+//            Predicate titlePredicate = criteriaBuilder.like(
-                    criteriaBuilder.upper(root.get(GepafinConstant.NOTE)),
+//                    criteriaBuilder.upper(root.get(GepafinConstant.NOTE)),
-                    "%" + search.toUpperCase() + "%"
+//                    "%" + search.toUpperCase() + "%"
-            );
+//            );
-            predicates.add(criteriaBuilder.or(titlePredicate));
+//            predicates.add(criteriaBuilder.or(titlePredicate));
+//        }
+
+        if (search != null && !search.trim().isEmpty()) {
+            String pattern = "%" + search.toUpperCase() + "%";
+            List<Predicate> searchPredicates = new ArrayList<>();
+
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.CALL_NAME)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.COMPANY_NAME)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.STATUS)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.NDG_STRING)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.APPOINTMENT_ID)), pattern));
+            searchPredicates.add(criteriaBuilder.like(criteriaBuilder.upper(root.get(GepafinConstant.APPLICATION_STATUS)), pattern));
+
+            // Convert numeric fields to string for search (optional and DB-specific; otherwise exact match)
+            try {
+                Long searchLong = Long.parseLong(search);
+                searchPredicates.add(criteriaBuilder.equal(root.get(GepafinConstant.APPLICATION_ID), searchLong));
+                searchPredicates.add(criteriaBuilder.equal(root.get(GepafinConstant.PROTOCOL_NUMBER), searchLong));
+            } catch (NumberFormatException ignored) {
+                // Ignore if search is not a number
+            }
+
+            predicates.add(criteriaBuilder.or(searchPredicates.toArray(new Predicate[0])));
         }
 
         // Filter by `status` (if status list is provided)
@@ -421,12 +448,31 @@ public class AssignedApplicationsDao {
         }
         predicates.add(criteriaBuilder.isFalse(root.get(GepafinConstant.IS_DELETED)));
 
-        applyFilters(root, criteriaBuilder, predicates, filters);
+        Utils.applyFiltersByPagination(root, criteriaBuilder, predicates, filters);
-
 
         return predicates;
 
     }
+
+    private AssignedApplicationViewResponse getAssignedApplicationResponseByView(AssignedApplicationsView view) {
+        AssignedApplicationViewResponse response = new AssignedApplicationViewResponse();
+        response.setId(view.getId());
+        response.setUserId(view.getUserId());
+        response.setStatus(AssignedApplicationEnum.valueOf(view.getStatus()));
+        response.setApplicationId(view.getApplicationId());
+        response.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(view.getApplicationStatus()));
+        response.setSubmissionDate(view.getSubmissionDate());
+        response.setEvaluationEndDate(view.getEvaluationEndDate());
+        response.setNdg(view.getNdg());
+        response.setAppointmentId(view.getAppointmentId());
+        response.setProtocolNumber(view.getProtocolNumber());
+        response.setCallName(view.getCallName());
+        response.setCompanyName(view.getCompanyName());
+        response.setCreatedDate(view.getCreatedDate());
+        response.setUpdatedDate(view.getUpdatedDate());
+        return response;
+    }
+
     public AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {
 
         AssignedApplicationsEntity assignedApplication = validateAssignedApplication(assignedApplicationId);

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

@@ -124,6 +124,9 @@ public class CallDao {
 	@Autowired
 	private EvaluationFormDao evalualtionFormDao;
 
+	@Autowired
+	private ApplicationRepository applicationRepository;
+
 	public CallResponse createCallStep1(CreateCallRequestStep1 createCallRequest, UserEntity userEntity) {
 		createCallRequest.setRegionId(userEntity.getRoleEntity().getRegion().getId());
 		CallEntity callEntity = convertToCallEntity(createCallRequest, userEntity);
@@ -598,8 +601,8 @@ public class CallDao {
 				if (!requestEndDate.equals(storedEndDate)) { // Check if dates are different
 
 					setIfUpdated(callEntity::getEndDate, callEntity::setEndDate, dates.get(1));
-					callEntity.setStatus(CallStatusEnum.PUBLISH.getValue());
+//					callEntity.setStatus(CallStatusEnum.PUBLISH.getValue());
-					callRepository.save(callEntity);
+//					callRepository.save(callEntity);
 					isEndDateUpdated = true;
 				}
 		    }
@@ -611,13 +614,13 @@ public class CallDao {
 
 			if (!requestEndTime.equals(storedEndTime)) {
 				setIfUpdated(callEntity::getEndTime, callEntity::setEndTime, DateTimeUtil.parseTime(updateCallRequest.getEndTime()));
-				callEntity.setStatus(CallStatusEnum.PUBLISH.getValue());
+//				callEntity.setStatus(CallStatusEnum.PUBLISH.getValue());
-				callRepository.save(callEntity);
+//				callRepository.save(callEntity);
 				isEndTimeUpdated = true;
 			}
 		}
 		if (isEndDateUpdated || isEndTimeUpdated) {
-
+			callRepository.save(callEntity);
 			loggingUtil.logUserAction(UserActionRequest.builder()
 					.request(request)
 					.actionType(UserActionLogsEnum.UPDATE)
@@ -902,7 +905,7 @@ public class CallDao {
 	public CallResponse updateCallStatus(CallEntity callEntity, CallStatusEnum statusReq) {
 		CallEntity oldCallEntity = Utils.getClonedEntityForData(callEntity);
 		CallStatusEnum currentStatus = CallStatusEnum.valueOf(callEntity.getStatus());
-		validateStatusChange(currentStatus, statusReq);
+		validateStatusChange(currentStatus, statusReq, callEntity.getId());
 		callEntity.setStatus(statusReq.getValue());
 		callEntity = callRepository.save(callEntity);
 
@@ -922,36 +925,37 @@ public class CallDao {
 		return convertToCallResponseBean(callEntity);
 	}
 
-	private void validateStatusChange(CallStatusEnum currentStatus, CallStatusEnum newStatus) {
+	private void validateStatusChange(CallStatusEnum currentStatus, CallStatusEnum newStatus, Long callId) {
-		if (currentStatus == newStatus) {
-			throw new CustomValidationException(Status.VALIDATION_ERROR,
-					Translator.toLocale(GepafinConstant.STATUS_SAME_ERROR));
-		}
 
+		if (currentStatus == newStatus) {
+			throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.STATUS_SAME_ERROR));
+		}
 		switch (currentStatus) {
 			case DRAFT:
 				if (newStatus == CallStatusEnum.READY_TO_PUBLISH || newStatus == CallStatusEnum.PUBLISH) {
-				throw new CustomValidationException(Status.VALIDATION_ERROR,
+					throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_DRAFT));
-						Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_DRAFT));
 				}
 				break;
+
 			case PUBLISH:
-			if (newStatus == CallStatusEnum.READY_TO_PUBLISH || newStatus == CallStatusEnum.DRAFT) {
+				if (newStatus == CallStatusEnum.READY_TO_PUBLISH) {
-				throw new CustomValidationException(Status.VALIDATION_ERROR,
+					throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_PUBLISH));
-						Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_PUBLISH));
+				}
+				if (newStatus == CallStatusEnum.DRAFT && Boolean.TRUE.equals(applicationRepository.existsByCallId(callId))) {
+					throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_STATUS_CHANGE_FROM_PUBLISH_TO_DRAFT));
 				}
 				break;
 
 			case EXPIRED:
-			throw new CustomValidationException(Status.VALIDATION_ERROR,
+				throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.STATUS_CANNOT_BE_CHANGED));
-					Translator.toLocale(GepafinConstant.STATUS_CANNOT_BE_CHANGED));
+
 			case READY_TO_PUBLISH:
 				break;
 			default:
 				break;
+		}
+	}
 
-		}
-	}
 	public CallEntity validatePublishedCall(Long callId, Long hubId) {
 		CallEntity callEntity= callRepository
 				.findByIdAndStatusAndHubId(callId, CallStatusEnum.PUBLISH.getValue(), hubId);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2728,4 +2728,13 @@
                 path="db/dump/create_application_form_view.sql"/>
     </changeSet>
 
+
+    <changeSet id="08-04-2025_PK_160730" author="Piyush kag">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/create_assigned_application_view.sql"/>
+    </changeSet>
+    <changeSet id="14-04-2025_RK_161000" author="Rajesh Khore">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_form_field_data_14_04_2025.sql"/>
+    </changeSet>
 </databaseChangeLog>

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

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

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

@@ -0,0 +1,84 @@
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Testo Breve"},{"name":"placeholder","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 1;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Testo Lungo"},{"name":"placeholder","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 2;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Testo Formattato"},{"name":"placeholder","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]',
+    validators = '{"isRequired":false,"minLength":null,"maxLength":null,"custom":null}'
+WHERE id = 3;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Numero"},{"name":"placeholder","value":0},{"name":"step","value":0},{"name":"isRequestedAmount","value":false},{"name":"variable","value":[]},{"name":"formula","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 4;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Scelta Singola"},{"name":"options","value":[]},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 5;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Menu a Tendina"},{"name":"options","value":[]},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 6;
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Scelta Multipla"},{"name":"options","value":[]},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 7;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Casella di Spunta"},{"name":"isChecklistItem","value":false},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 8;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Data"},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]',
+    validators = '{"isRequired":false,"custom":null}'
+WHERE id = 9;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Caricamento File"},{"name":"mime","value":[]},{"name":"isDelegation","value":false}]',
+    validators = '{"isRequired":false,"maxSize":100000,"custom":null}'
+WHERE id = 10;
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Partita IVA"},{"name":"placeholder","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 11;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Codice Fiscale"},{"name":"placeholder","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 12;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"CAP"},{"name":"placeholder","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 13;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"IBAN"},{"name":"placeholder","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 14;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Campo Email"},{"name":"placeholder","value":"nome@esempio.it"},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 15;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Campo PEC"},{"name":"placeholder","value":"nome@pec.it"},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 16;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Indirizzo URL"},{"name":"placeholder","value":""},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 17;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Marca da bollo"},{"name":"placeholder","value":"Numero identificativo"},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 18;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Tabella"},{"name":"table_columns","value":{}},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]',
+    validators = '{"custom":"nonEmptyTables"}'
+WHERE id = 20;
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Tabella"},{"name":"criteria_table_columns","value":{}},{"name":"variable","value":[]},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 21;
+
+UPDATE FORM_FIELD
+SET settings = '[{"name":"label","value":"Casella di Spunta"},{"name":"isChecklistItem","value":true},{"name":"reportEnable","value":false},{"name":"reportHeader","value":""}]'
+WHERE id = 22;

src/main/resources/message_en.properties

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

src/main/resources/message_it.properties

@@ -60,8 +60,8 @@ status.same.error=Lo stato ? gi? impostato.
 invalid.status.change.from.draft=Lo stato non pu? essere cambiato in READY_TO_PUBLISH o PUBLISH da DRAFT.
 status.cannot.be.changed=Lo stato non pu? essere cambiato.
 published.call.not.update=Il bando pubblicato non pu? essere aggiornato.
-invalid.status.change.from.publish=Lo stato non pu? essere modificato in READY_TO_PUBLISH o DRAFT da PUBLISH.
+invalid.status.change.from.publish=Lo stato non pu? essere modificato in READY_TO_PUBLISH da PUBLISH.
-
+invalid.status.change.from.publish.to.draft=Lo stato non pu essere modificato da PUBLISH a DRAFT poich sono gi state create applicazioni per questa CALL.
 
 # Login-related messages
 login.successfully=Accesso effettuato con successo.