Bug fix regarding refactor (#62)

egovernments · Sep 7, 2021 · 8ee00d2 · 8ee00d2
1 parent d00ea74
commit 8ee00d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...ster-data-service/src/main/java/org/egov/repository/queryBuilder/ProjectQueryBuilder.java b/...ster-data-service/src/main/java/org/egov/repository/queryBuilder/ProjectQueryBuilder.java
@@ -27,11 +27,11 @@ public Query buildQuerySearch(ProjectSearchCriteria projectSearchCriteria) {
         }
 
         if (!StringUtils.isEmpty(projectSearchCriteria.getExpenditureId())) {
-            criteria.and("eatId").is(projectSearchCriteria.getExpenditureId());
+            criteria.and("expenditureId").is(projectSearchCriteria.getExpenditureId());
         }
 
-        if (!StringUtils.isEmpty(projectSearchCriteria.getDepartmentId())) {
-            criteria.and("departmentId").is(projectSearchCriteria.getDepartmentId());
+        if (!StringUtils.isEmpty(projectSearchCriteria.getGetDepartmentEntitytId())) {
+            criteria.and("departmentEntitytId").is(projectSearchCriteria.getGetDepartmentEntitytId());
         }
 
         if (projectSearchCriteria.getIds() != null && !projectSearchCriteria.getIds().isEmpty())

diff --git a/...-services/ifix-master-data-service/src/main/java/org/egov/validator/ProjectValidator.java b/...-services/ifix-master-data-service/src/main/java/org/egov/validator/ProjectValidator.java
@@ -75,9 +75,9 @@ public void validateProjectSearchRequest(ProjectSearchRequest projectSearchReque
                         "Length range [2-64]");
             }
 
-            if (!StringUtils.isEmpty(projectSearchCriteria.getDepartmentId())
-                    && (projectSearchCriteria.getDepartmentId().length() < 2
-                    || projectSearchCriteria.getDepartmentId().length() > 64)) {
+            if (!StringUtils.isEmpty(projectSearchCriteria.getGetDepartmentEntitytId())
+                    && (projectSearchCriteria.getGetDepartmentEntitytId().length() < 2
+                    || projectSearchCriteria.getGetDepartmentEntitytId().length() > 64)) {
 
                 throw new CustomException(MasterDataConstants.DEPARTMENT_ID, "Department id length is invalid. " +
                         "Length range [2-64]");

diff --git a/...ces/ifix-master-data-service/src/main/java/org/egov/web/models/ProjectSearchCriteria.java b/...ces/ifix-master-data-service/src/main/java/org/egov/web/models/ProjectSearchCriteria.java
@@ -38,8 +38,8 @@ public class ProjectSearchCriteria {
     @JsonProperty("expenditureId")
     private String expenditureId = null;
 
-    @JsonProperty("departmentId")
-    private String departmentId = null;
+    @JsonProperty("departmentEntitytId")
+    private String getDepartmentEntitytId = null;
 
     @JsonProperty("locationId")
     private String locationId = null;