From a72a9195627a72bd5fd588ff8ca7ddce08a9fb5b Mon Sep 17 00:00:00 2001
From: viktorpavlenko <vitek.pavfurious@gmail.com>
Date: Fri, 18 Apr 2025 08:00:00 +0300
Subject: [PATCH] FINERACT-2169: Refactor group level api;

---
 .../group/api/GroupsLevelApiResource.java     | 23 +++----------------
 .../GroupLevelReadPlatformService.java        |  4 ++--
 .../GroupLevelReadPlatformServiceImpl.java    |  4 ++--
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsLevelApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsLevelApiResource.java
index d2d18da50..2d01f7563 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsLevelApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsLevelApiResource.java
@@ -23,17 +23,9 @@ import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.UriInfo;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper;
-import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
-import org.apache.fineract.infrastructure.core.serialization.ToApiJsonSerializer;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.portfolio.group.data.GroupLevelData;
 import org.apache.fineract.portfolio.group.service.GroupLevelReadPlatformService;
@@ -45,25 +37,16 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 public class GroupsLevelApiResource {
 
-    private static final Set<String> GROUPLEVEL_DATA_PARAMETERS = new HashSet<>(Arrays.asList("levelId", "levelName", "parentLevelId",
-            "parentLevelName", "childLevelId", "childLevelName", "superParent", "recursable", "canHaveClients"));
-
     private final PlatformSecurityContext context;
     private final GroupLevelReadPlatformService groupLevelReadPlatformService;
-    private final ToApiJsonSerializer<GroupLevelData> toApiJsonSerializer;
-    private final ApiRequestParameterHelper apiRequestParameterHelper;
 
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    public String retrieveAllGroups(@Context final UriInfo uriInfo) {
+    public List<GroupLevelData> retrieveAllGroups() {
 
         this.context.authenticatedUser().validateHasReadPermission("GROUP");
 
-        final Collection<GroupLevelData> groupLevel = this.groupLevelReadPlatformService.retrieveAllLevels();
-        final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
-
-        return this.toApiJsonSerializer.serialize(settings, groupLevel, GROUPLEVEL_DATA_PARAMETERS);
-
+        return this.groupLevelReadPlatformService.retrieveAllLevels();
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformService.java
index e4c8b8f93..fc5f78c08 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformService.java
@@ -18,11 +18,11 @@
  */
 package org.apache.fineract.portfolio.group.service;
 
-import java.util.Collection;
+import java.util.List;
 import org.apache.fineract.portfolio.group.data.GroupLevelData;
 
 public interface GroupLevelReadPlatformService {
 
-    Collection<GroupLevelData> retrieveAllLevels();
+    List<GroupLevelData> retrieveAllLevels();
 
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java
index 21f114c65..6d4263e12 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java
@@ -20,7 +20,7 @@ package org.apache.fineract.portfolio.group.service;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Collection;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
@@ -35,7 +35,7 @@ public class GroupLevelReadPlatformServiceImpl implements GroupLevelReadPlatform
     private final JdbcTemplate jdbcTemplate;
 
     @Override
-    public Collection<GroupLevelData> retrieveAllLevels() {
+    public List<GroupLevelData> retrieveAllLevels() {
         this.context.authenticatedUser();
 
         final GroupLevelDataMapper rm = new GroupLevelDataMapper();