CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

FINERACT-2169: Refactor group level api;

Browse Source
This commit is contained in:
viktorpavlenko
2025-04-23 12:15:02 +02:00
committed by Adam Saghy
parent 2ec05beea6
commit a72a919562
3 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsLevelApiResource.java
+3 -20
View File
@@ -23,17 +23,9 @@ import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET; import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path; import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces; import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.UriInfo; import java.util.List;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import lombok.RequiredArgsConstructor; 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.infrastructure.security.service.PlatformSecurityContext;
import org.apache.fineract.portfolio.group.data.GroupLevelData; import org.apache.fineract.portfolio.group.data.GroupLevelData;
import org.apache.fineract.portfolio.group.service.GroupLevelReadPlatformService; import org.apache.fineract.portfolio.group.service.GroupLevelReadPlatformService;
@@ -45,25 +37,16 @@ import org.springframework.stereotype.Component;
@RequiredArgsConstructor @RequiredArgsConstructor
public class GroupsLevelApiResource { 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 PlatformSecurityContext context;
private final GroupLevelReadPlatformService groupLevelReadPlatformService; private final GroupLevelReadPlatformService groupLevelReadPlatformService;
private final ToApiJsonSerializer<GroupLevelData> toApiJsonSerializer;
private final ApiRequestParameterHelper apiRequestParameterHelper;
@GET @GET
@Consumes({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
public String retrieveAllGroups(@Context final UriInfo uriInfo) { public List<GroupLevelData> retrieveAllGroups() {
this.context.authenticatedUser().validateHasReadPermission("GROUP"); this.context.authenticatedUser().validateHasReadPermission("GROUP");
final Collection<GroupLevelData> groupLevel = this.groupLevelReadPlatformService.retrieveAllLevels(); return this.groupLevelReadPlatformService.retrieveAllLevels();
final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
return this.toApiJsonSerializer.serialize(settings, groupLevel, GROUPLEVEL_DATA_PARAMETERS);
} }
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformService.java
+2 -2
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.portfolio.group.service; package org.apache.fineract.portfolio.group.service;
import java.util.Collection; import java.util.List;
import org.apache.fineract.portfolio.group.data.GroupLevelData; import org.apache.fineract.portfolio.group.data.GroupLevelData;
public interface GroupLevelReadPlatformService { public interface GroupLevelReadPlatformService {
Collection<GroupLevelData> retrieveAllLevels(); List<GroupLevelData> retrieveAllLevels();
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java
+2 -2
View File
@@ -20,7 +20,7 @@ package org.apache.fineract.portfolio.group.service;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Collection; import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
@@ -35,7 +35,7 @@ public class GroupLevelReadPlatformServiceImpl implements GroupLevelReadPlatform
private final JdbcTemplate jdbcTemplate; private final JdbcTemplate jdbcTemplate;
@Override @Override
public Collection<GroupLevelData> retrieveAllLevels() { public List<GroupLevelData> retrieveAllLevels() {
this.context.authenticatedUser(); this.context.authenticatedUser();
final GroupLevelDataMapper rm = new GroupLevelDataMapper(); final GroupLevelDataMapper rm = new GroupLevelDataMapper();