FINERACT-2408: Add entityStatus mapping for SAVING and SHARE entities in search API

Author: Dhanno98

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

@@ -213,6 +213,15 @@ 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;
@@ -165,16 +168,20 @@ public SearchData mapRow(final ResultSet rs, @SuppressWarnings("unused") final i
 
             if (entityType.equalsIgnoreCase("client") || entityType.equalsIgnoreCase("clientidentifier")) {
                 entityStatus = ClientEnumerations.status(entityStatusEnum);
-            }
-
-            else if (entityType.equalsIgnoreCase("group") || entityType.equalsIgnoreCase("center")) {
+            } else if (entityType.equalsIgnoreCase("group") || entityType.equalsIgnoreCase("center")) {
                 entityStatus = GroupingTypeEnumerations.status(entityStatusEnum);
-            }
-
-            else if (entityType.equalsIgnoreCase("loan")) {
+            } else if (entityType.equalsIgnoreCase("loan")) {
                 LoanStatusEnumData loanStatusEnumData = LoanEnumerations.status(entityStatusEnum);
 
                 entityStatus = LoanEnumerations.status(loanStatusEnumData);
+            } else if (entityType.equalsIgnoreCase("saving")) {
+                SavingsAccountStatusEnumData savingsAccountStatusEnumData = SavingsEnumerations.status(entityStatusEnum);
+
+                entityStatus = SavingsEnumerations.status(savingsAccountStatusEnumData);
+            } else if (entityType.equalsIgnoreCase("share")) {
+                ShareAccountStatusEnumData shareAccountStatusEnumData = SharesEnumerations.status(entityStatusEnum);
+
+                entityStatus = SharesEnumerations.status(shareAccountStatusEnumData);
             }
 
             return new SearchData(entityId, entityAccountNo, entityExternalId, entityName, entityType, parentId, parentName, parentType,

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

@@ -32,6 +32,15 @@ private SharesEnumerations() {
 
     }
 
+    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 Integer statusEnum) {
         return status(ShareAccountStatusType.fromInt(statusEnum));
     }