Fineract-2408: Update search api resource to support SAVING & SHARE entities

fineract-core/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java

@@ -213,6 +213,14 @@ public static SavingsAccountTransactionEnumData transactionType(final SavingsAcc
         return optionData;
     }
 
+    public static EnumOptionData status(final SavingsAccountStatusEnumData status) {
+        Long id = status.getId();
+        String code = status.getCode();
+        String value = status.getValue();
+
+        return new EnumOptionData(id, code, value);
+    }
+
     public static SavingsAccountStatusEnumData status(final Integer statusEnum) {
         return status(SavingsAccountStatusType.fromInt(statusEnum));
     }

fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java

@@ -38,12 +38,15 @@
 import org.apache.fineract.portfolio.loanproduct.data.LoanProductData;
 import org.apache.fineract.portfolio.loanproduct.service.LoanEnumerations;
 import org.apache.fineract.portfolio.loanproduct.service.LoanProductReadPlatformService;
+import org.apache.fineract.portfolio.savings.data.SavingsAccountStatusEnumData;
 import org.apache.fineract.portfolio.savings.service.SavingsEnumerations;
 import org.apache.fineract.portfolio.search.SearchConstants;
 import org.apache.fineract.portfolio.search.data.AdHocQuerySearchConditions;
 import org.apache.fineract.portfolio.search.data.AdHocSearchQueryData;
 import org.apache.fineract.portfolio.search.data.SearchConditions;
 import org.apache.fineract.portfolio.search.data.SearchData;
+import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountStatusEnumData;
+import org.apache.fineract.portfolio.shareaccounts.service.SharesEnumerations;
 import org.apache.fineract.useradministration.domain.AppUser;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -72,6 +75,7 @@ public List<SearchData> retriveMatchingData(final SearchConditions searchConditi
         } else {
             params.addValue("search", "%" + searchConditions.getSearchQuery() + "%");
         }
+
         return namedParameterJdbcTemplate.query(searchSchema(searchConditions), params, rm);
     }
 
@@ -177,6 +181,16 @@ else if (entityType.equalsIgnoreCase("loan")) {
                 entityStatus = LoanEnumerations.status(loanStatusEnumData);
             }
 
+            else if (entityType.equalsIgnoreCase("saving")) {
+                SavingsAccountStatusEnumData savingStatusEnumData = SavingsEnumerations.status(entityStatusEnum);
+                entityStatus = SavingsEnumerations.status(savingStatusEnumData);
+            }
+
+            else if (entityType.equalsIgnoreCase("share")) {
+                ShareAccountStatusEnumData shareStatusEnumData = SharesEnumerations.status(entityStatusEnum);
+                entityStatus = SharesEnumerations.status(shareStatusEnumData);
+            }
+
             return new SearchData(entityId, entityAccountNo, entityExternalId, entityName, entityType, parentId, parentName, parentType,
                     entityMobileNo, entityStatus, subEntityTypeCode.getCode());
         }

fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/SharesEnumerations.java

@@ -36,6 +36,14 @@ public static ShareAccountStatusEnumData status(final Integer statusEnum) {
         return status(ShareAccountStatusType.fromInt(statusEnum));
     }
 
+    public static EnumOptionData status(final ShareAccountStatusEnumData status) {
+        Long id = status.getId();
+        String code = status.getCode();
+        String value = status.getValue();
+
+        return new EnumOptionData(id, code, value);
+    }
+
     public static ShareAccountStatusEnumData status(final ShareAccountStatusType type) {
         final boolean submittedAndPendingApproval = type.isSubmittedAndPendingApproval();
         final boolean isApproved = type.isApproved();

integration-tests/src/test/java/org/apache/fineract/integrationtests/SearchResourcesTest.java

@@ -102,6 +102,43 @@ public void searchAnyValueOverLoanResources() {
         assertEquals(0, searchResponse.size());
     }
 
+    @Test
+    public void searchSavingsAndSharesHaveEntityStatus() {
+
+        // Create client
+        String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON, null);
+        final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
+        final Long clientId = clientResponse.getClientId();
+        final GetClientsClientIdResponse getClientResponse = ClientHelper.getClient(requestSpec, responseSpec, clientId.intValue());
+
+
+        final List<String> savingsResources = Arrays.asList("savings");
+        final ArrayList<GetSearchResponse> savingsSearchResponse = SearchHelper.getSearch(requestSpec, responseSpec,
+                getClientResponse.getAccountNo(), Boolean.FALSE, getResources(savingsResources));
+
+        // Verify valid entityStatus
+        savingsSearchResponse.stream()
+                .filter(result -> "SAVING".equalsIgnoreCase(result.getEntityType()))
+                .forEach(result -> {
+                    assertNotNull(result.getEntityStatus(), "SAVING entity should have entityStatus");
+                    assertNotNull(result.getEntityStatus().getId(), "SAVING entityStatus should have id");
+                    assertNotNull(result.getEntityStatus().getCode(), "SAVING entityStatus should have code");
+                });
+
+        final List<String> shareResources = Arrays.asList("shares");
+        final ArrayList<GetSearchResponse> shareSearchResponse = SearchHelper.getSearch(requestSpec, responseSpec,
+                getClientResponse.getAccountNo(), Boolean.FALSE, getResources(shareResources));
+
+        // Verify valid entityStatus
+        shareSearchResponse.stream()
+                .filter(result -> "SHARE".equalsIgnoreCase(result.getEntityType()))
+                .forEach(result -> {
+                    assertNotNull(result.getEntityStatus(), "SHARE entity should have entityStatus");
+                    assertNotNull(result.getEntityStatus().getId(), "SHARE entityStatus should have id");
+                    assertNotNull(result.getEntityStatus().getCode(), "SHARE entityStatus should have code");
+                });
+    }
+
     private String getResources(final List<String> resources) {
         return String.join(",", resources);
     }