MOSIP:36804 - Filter related changes in API GET /partners/v3

Signed-off-by: sudeep <[email protected]>
mosip · Oct 24, 2024 · 301d198 · 301d198
1 parent 8260962
commit 301d198
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.../partner-management-service/src/main/java/io/mosip/pms/partner/manager/dto/FilterDto.java b/.../partner-management-service/src/main/java/io/mosip/pms/partner/manager/dto/FilterDto.java
@@ -4,11 +4,11 @@
 
 @Data
 public class FilterDto {
-    private String partnerId = "";
-    private String partnerTypeCode = "";
-    private String organizationName = "";
-    private String policyGroupName = "";
-    private String certificateUploadStatus = "";
-    private String emailAddress = "";
+    private String partnerId;
+    private String partnerTypeCode;
+    private String organizationName;
+    private String policyGroupName;
+    private String certificateUploadStatus;
+    private String emailAddress;
     private Boolean isActive;
 }
diff --git a/...ner/pms-common/src/main/java/io/mosip/pms/common/repository/PartnerSummaryRepository.java b/...ner/pms-common/src/main/java/io/mosip/pms/common/repository/PartnerSummaryRepository.java
@@ -11,20 +11,20 @@
 @Repository("PartnerSummaryRepository")
 public interface PartnerSummaryRepository extends BaseRepository<PartnerSummaryEntity, String> {
 
-    @Query("SELECT new PartnerSummaryEntity(" +
+    @Query(value = "SELECT new PartnerSummaryEntity(" +
             "p.id, p.partnerTypeCode, p.name, p.policyGroup.id, pg.name, " +
             "p.emailId, CASE WHEN p.certificateAlias IS NULL THEN 'not_uploaded' ELSE 'uploaded' END, " +
             "p.approvalStatus, p.isActive, p.crDtimes) " +
             "FROM PartnerV3 p " +
             "LEFT JOIN p.policyGroup pg " +
-            "WHERE (:partnerId = '' OR p.id LIKE CONCAT('%', :partnerId, '%')) " +
-            "AND (:partnerTypeCode = '' OR p.partnerTypeCode LIKE CONCAT('%', :partnerTypeCode, '%')) " +
-            "AND (:organizationName = '' OR p.name LIKE CONCAT('%', :organizationName, '%')) " +
-            "AND (:policyGroupName = '' OR pg.name LIKE CONCAT('%', :policyGroupName, '%')) " +
-            "AND (:certificateUploadStatus = '' OR " +
+            "WHERE (:partnerId IS NULL OR p.id LIKE %:partnerId%) " +
+            "AND (:partnerTypeCode IS NULL OR p.partnerTypeCode LIKE %:partnerTypeCode%) " +
+            "AND (:organizationName IS NULL OR p.name LIKE %:organizationName%) " +
+            "AND (:policyGroupName IS NULL OR pg.name LIKE %:policyGroupName%) " +
+            "AND (:certificateUploadStatus IS NULL OR " +
             "(:certificateUploadStatus = 'not_uploaded' AND p.certificateAlias IS NULL) " +
             "OR (:certificateUploadStatus = 'uploaded' AND p.certificateAlias IS NOT NULL)) " +
-            "AND (:emailAddress = '' OR p.emailId LIKE CONCAT('%', :emailAddress, '%')) " +
+            "AND (:emailAddress IS NULL OR p.emailId LIKE %:emailAddress%) " +
             "AND (:isActive IS NULL OR p.isActive = :isActive)"
     )
     Page<PartnerSummaryEntity> getSummaryOfAllPartners(