Skip to content

FINERACT-2549: Migrate ClientExternalIdTest from RestAssured to fineract-client-feign #5659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dpk376 wants to merge 1 commit into
base: develop
Choose a base branch
from
+102 −182
Open

FINERACT-2549: Migrate ClientExternalIdTest from RestAssured to fineract-client-feign #5659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...t-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
Expand Down Expand Up @@ -297,7 +298,7 @@ public String postClientTemplate(@QueryParam("legalFormType") final String legal
@Path("{clientId}/obligeedetails")
@Produces({ MediaType.APPLICATION_JSON })
@Operation(summary = "Retrieve client obligee details", operationId = "retrieveClientObligeeDetails", description = "Retrieve client obligee details")
@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientObligeeDetailsResponse.class)))
@ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ClientsApiResourceSwagger.GetObligeeData.class))))
@ApiResponse(responseCode = "400", description = "Bad Request")
public String retrieveObligeeDetails(@PathParam("clientId") final Long clientId, @Context final UriInfo uriInfo) {
return retrieveClientObligeeDetails(clientId, null);
Expand Down Expand Up @@ -410,7 +411,7 @@ public String delete(@PathParam("externalId") @Parameter(description = "external
@Path("/external-id/{externalId}/obligeedetails")
@Produces({ MediaType.APPLICATION_JSON })
@Operation(summary = "Retrieve client obligee details", operationId = "retrieveClientObligeeDetailsByExternalId", description = "Retrieve client obligee details using the client external Id")
@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientObligeeDetailsResponse.class)))
@ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ClientsApiResourceSwagger.GetObligeeData.class))))
@ApiResponse(responseCode = "400", description = "Bad Request")
public String retrieveObligeeDetails(@PathParam("externalId") final String externalId, @Context final UriInfo uriInfo) {
return retrieveClientObligeeDetails(null, externalId);
Expand Down
43 changes: 19 additions & 24 deletions ...der/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,33 +433,28 @@ public static final class GetClientTransferProposalDateResponse {
public LocalDate proposedTransferDate;
}

@Schema(description = "GetClientObligeeDetailsResponse")
public static final class GetClientObligeeDetailsResponse {
@Schema(description = "GetObligeeData")
public static final class GetObligeeData {

static final class GetObligeeData {
private GetObligeeData() {}

private GetObligeeData() {}

@Schema(example = "John")
public String firstName;
@Schema(example = "Doe")
public String lastName;
@Schema(example = "John Doe")
public String displayName;
@Schema(example = "00000002")
public String accountNumber;
@Schema(example = "12000.00")
public Double loanAmount;
@Schema(example = "100.00")
public Double guaranteeAmount;
@Schema(example = "10000.00")
public Double amountReleased;
@Schema(example = "1000.00")
public Double amountTransferred;

}
@Schema(example = "John")
public String firstName;
@Schema(example = "Doe")
public String lastName;
@Schema(example = "John Doe")
public String displayName;
@Schema(example = "00000002")
public String accountNumber;
@Schema(example = "12000.00")
public Double loanAmount;
@Schema(example = "100.00")
public Double guaranteeAmount;
@Schema(example = "10000.00")
public Double amountReleased;
@Schema(example = "1000.00")
public Double amountTransferred;

public Set<GetObligeeData> obligees;
}

@Schema(description = "GetClientsClientIdAccountsResponse")
Expand Down
Loading
Loading