[fineract] branch develop updated: FINERACT-1503:FixStaffModule

[aleks]

This is an automated email from the ASF dual-hosted git repository.

aleks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 72fd2fe  FINERACT-1503:FixStaffModule
72fd2fe is described below

commit 72fd2fe13456b4d330c3bca0e10bc6586307a72b
Author: rrpawar96 <rrpawar141...@gmail.com>
AuthorDate: Wed Feb 16 16:20:56 2022 +0530

    FINERACT-1503:FixStaffModule
---
 .../staff/service/StaffReadPlatformServiceImpl.java    |  2 +-
 .../apache/fineract/integrationtests/StaffTest.java    | 18 ++++++++++++++++++
 .../common/organisation/StaffHelper.java               |  6 ++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java
 
b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java
index 72db8d4..2355f41 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java
@@ -236,7 +236,7 @@ public class StaffReadPlatformServiceImpl implements 
StaffReadPlatformService {
         extraCriteria.addNonNullCriteria(" s.office_id = ", officeId);
 
         if (loanOfficersOnly) {
-            extraCriteria.addCriteria(" s.is_loan_officer is ", " true ");
+            extraCriteria.addCriteria(" s.is_loan_officer = ", true);
         }
         // Passing status parameter to get ACTIVE (By Default), INACTIVE or ALL
         // (Both active and Inactive) employees
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/StaffTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/StaffTest.java
index 016f758..75ce47b 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/StaffTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/StaffTest.java
@@ -241,4 +241,22 @@ public class StaffTest {
         map.put("xyz", "xyz");
         StaffHelper.updateStaff(requestSpec, responseSpecForValidationError, 
1, map);
     }
+
+    @Test
+    public void testStaffLoanOfficer() {
+        final Map<String, Object> map = StaffHelper.getMapWithJoiningDate();
+
+        map.put("officeId", 1);
+        map.put("firstname", Utils.randomNameGenerator("michael_", 5));
+        map.put("lastname", Utils.randomNameGenerator("Doe_", 5));
+        map.put("isLoanOfficer", true);
+
+        StaffHelper.createStaffWithJson(requestSpec, responseSpec, new 
Gson().toJson(map));
+
+        List<Map<String, Object>> responseActive = 
StaffHelper.getStaffListWithLoanOfficerStatus(requestSpec, responseSpec, 
"true");
+        for (final Map<String, Object> staff : responseActive) {
+            Assertions.assertNotNull(staff.get("id"));
+            Assertions.assertEquals(true, staff.get("isLoanOfficer"));
+        }
+    }
 }
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
index c1df1f2..93e212e 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
@@ -87,6 +87,12 @@ public final class StaffHelper {
         return Utils.performServerGet(requestSpec, responseSpec, url, "");
     }
 
+    public static List<Map<String, Object>> 
getStaffListWithLoanOfficerStatus(final RequestSpecification requestSpec,
+            final ResponseSpecification responseSpec, final String 
loanOfficerStatus) {
+        final String url = CREATE_STAFF_URL + "?" + Utils.TENANT_IDENTIFIER + 
"&loanOfficersOnly=" + loanOfficerStatus;
+        return Utils.performServerGet(requestSpec, responseSpec, url, "");
+    }
+
     public static Map<String, Object> updateStaff(final RequestSpecification 
requestSpec, final ResponseSpecification responseSpec,
             final Integer staffId, final Map<String, Object> changes) {
         final String url = CREATE_STAFF_URL + "/" + staffId + "?" + 
Utils.TENANT_IDENTIFIER;