diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyApiResource.java index f53f63668..f53b31719 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyApiResource.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.HashSet; import java.util.List; -import java.util.Set; 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.mix.data.MixTaxonomyData; import org.apache.fineract.mix.service.MixTaxonomyReadPlatformService; @@ -45,25 +37,17 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class MixTaxonomyApiResource { - private static final Set RESPONSE_DATA_PARAMETERS = new HashSet<>( - Arrays.asList("taxonomyId", "name", "namespace", "dimension", "description")); - private final PlatformSecurityContext context; - private final ToApiJsonSerializer toApiJsonSerializer; private final MixTaxonomyReadPlatformService readTaxonomyService; - private final ApiRequestParameterHelper apiRequestParameterHelper; @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public String retrieveAll(@Context final UriInfo uriInfo) { + public List retrieveAll() { // FIXME - KW - no check for permission to read mix taxonomy data. this.context.authenticatedUser(); - final List taxonomyDatas = this.readTaxonomyService.retrieveAll(); - final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters()); - - return this.toApiJsonSerializer.serialize(settings, taxonomyDatas, RESPONSE_DATA_PARAMETERS); + return readTaxonomyService.retrieveAll(); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyMappingApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyMappingApiResource.java index 2e7ceede3..1b259780e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyMappingApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyMappingApiResource.java @@ -24,22 +24,16 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; 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.HashSet; -import java.util.Set; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.domain.CommandWrapper; import org.apache.fineract.commands.service.CommandWrapperBuilder; import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService; -import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -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.mix.data.MixTaxonomyMappingData; +import org.apache.fineract.mix.data.MixTaxonomyRequest; import org.apache.fineract.mix.service.MixTaxonomyMappingReadPlatformService; import org.springframework.stereotype.Component; @@ -49,32 +43,27 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class MixTaxonomyMappingApiResource { - private static final Set RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("identifier", "config")); - private final PlatformSecurityContext context; private final ToApiJsonSerializer toApiJsonSerializer; private final MixTaxonomyMappingReadPlatformService readTaxonomyMappingService; private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; - private final ApiRequestParameterHelper apiRequestParameterHelper; @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public String retrieveTaxonomyMapping(@Context final UriInfo uriInfo) { + public MixTaxonomyMappingData retrieveTaxonomyMapping() { this.context.authenticatedUser(); - final MixTaxonomyMappingData mappingData = this.readTaxonomyMappingService.retrieveTaxonomyMapping(); - final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters()); - return this.toApiJsonSerializer.serialize(settings, mappingData, RESPONSE_DATA_PARAMETERS); + return this.readTaxonomyMappingService.retrieveTaxonomyMapping(); } @PUT @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public String updateTaxonomyMapping(final String jsonRequestBody) { + public String updateTaxonomyMapping(final MixTaxonomyRequest mixTaxonomyRequest) { // TODO support multiple configuration file loading final Long mappingId = (long) 1; - final CommandWrapper commandRequest = new CommandWrapperBuilder().updateTaxonomyMapping(mappingId).withJson(jsonRequestBody) - .build(); + final CommandWrapper commandRequest = new CommandWrapperBuilder().updateTaxonomyMapping(mappingId) + .withJson(toApiJsonSerializer.serialize(mixTaxonomyRequest)).build(); final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest); diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyData.java b/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyData.java index 7be6199f9..57fc937da 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyData.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.mix.data; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -41,6 +42,7 @@ public class MixTaxonomyData { @SuppressWarnings("unused") private String description; + @JsonIgnore public boolean isPortfolio() { return this.type == 5; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyMappingData.java b/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyMappingData.java index 8b34240c1..7d52bba70 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyMappingData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyMappingData.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.mix.data; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -25,6 +26,7 @@ import lombok.experimental.Accessors; @Data @NoArgsConstructor @Accessors(chain = true) +@JsonInclude(JsonInclude.Include.NON_NULL) public class MixTaxonomyMappingData { private String identifier; diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyRequest.java b/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyRequest.java new file mode 100644 index 000000000..4a37e7262 --- /dev/null +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/data/MixTaxonomyRequest.java @@ -0,0 +1,37 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.mix.data; + +import java.io.Serial; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MixTaxonomyRequest implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private String identifier; + private String config; +}