From ccd5d9408a7d73d5e9073a61f77c6fc29f61afcb Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Fri, 22 Nov 2024 12:52:22 +0530
Subject: [PATCH] Added companyName in assigned application response

---
 .../gepafin/tendermanagement/constants/GepafinConstant.java  | 1 +
 .../tendermanagement/dao/AssignedApplicationsDao.java        | 5 +++++
 .../model/response/AssignedApplicationsResponse.java         | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index fa2fceda..e3304967 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -295,5 +295,6 @@ public class GepafinConstant {
     public static final String USER_MUST_BE_ASSOCIATED_WITH_COMPANY="user.must.be.associated.with.company.to.create.application";
     public static final String COMPANY_ID_REQUIRED_FOR_PREFERRED_CALL = "company.id.required.for.preferred.call";
     public static final String SUBMISSION_DATE = "submissionDate";
+    public static final String ASSIGNED_AT = "assignedAt";
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
index b3e27da5..ca6e44ba 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
@@ -128,6 +128,7 @@ public class AssignedApplicationsDao {
         assignedApplicationsResponse.setAssignedAt(assignedApplications.getAssignedAt());
         assignedApplicationsResponse.setProtocolNumber(protocolNumber);
         assignedApplicationsResponse.setCallName(callName);
+        assignedApplicationsResponse.setCompanyName(application.getCompany().getCompanyName());
         assignedApplicationsResponse.setBeneficiaryName(beneficiaryName);
         assignedApplicationsResponse.setSubmissionDate(submissionDate);
         assignedApplicationsResponse.setCallEndDate(callEndDate);
@@ -171,6 +172,10 @@ public class AssignedApplicationsDao {
                 if (userId != null) {
                     predicate = builder.and(predicate, builder.equal(root.get("userId"), userId));
                 }
+                query.orderBy(
+                        builder.desc(builder.isNotNull(root.get(GepafinConstant.ASSIGNED_AT))),
+                        builder.desc(root.get(GepafinConstant.ASSIGNED_AT))
+                );
                 predicate = builder.and(predicate, builder.equal(root.get("application").get("hubId"), hubId));
                 return predicate;
             };
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
index b5ad3aae..3affe42f 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
@@ -20,6 +20,7 @@ public class AssignedApplicationsResponse extends BaseBean {
     private LocalDateTime submissionDate;
     private LocalDateTime callStartDate;
     private LocalDateTime callEndDate;
+    private String companyName;
 
 }