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

update loanproducts resource class with support for create and update through post and put.

Browse Source
This commit is contained in:
Keith Woodlock
2012-05-09 00:12:03 +01:00
parent f7542e5a8e
commit 29a004f746
7 changed files with 191 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-data/src/main/java/org/mifosng/data/command/CalculateLoanScheduleCommand.java
+7 -7
View File
@@ -95,13 +95,13 @@ public class CalculateLoanScheduleCommand {
this.commonLoanProperties.setPrincipal(principal); this.commonLoanProperties.setPrincipal(principal);
} }
public Boolean getFlexibleRepaymentSchedule() { // public Boolean getFlexibleRepaymentSchedule() {
return this.commonLoanProperties.getFlexibleRepaymentSchedule(); // return this.commonLoanProperties.getFlexibleRepaymentSchedule();
} // }
//
public Boolean getInterestRebateAllowed() { // public Boolean getInterestRebateAllowed() {
return this.commonLoanProperties.getInterestRebateAllowed(); // return this.commonLoanProperties.getInterestRebateAllowed();
} // }
public Integer getInterestRateFrequencyMethod() { public Integer getInterestRateFrequencyMethod() {
return commonLoanProperties.getInterestRateFrequencyMethod(); return commonLoanProperties.getInterestRateFrequencyMethod();
mifosng-data/src/main/java/org/mifosng/data/command/CommonLoanProperties.java
+6 -6
View File
@@ -117,13 +117,13 @@ public class CommonLoanProperties {
this.principal = principal; this.principal = principal;
} }
public Boolean getFlexibleRepaymentSchedule() { // public Boolean getFlexibleRepaymentSchedule() {
return this.flexibleRepaymentSchedule; // return this.flexibleRepaymentSchedule;
} // }
public Boolean getInterestRebateAllowed() { // public Boolean getInterestRebateAllowed() {
return this.interestRebateAllowed; // return this.interestRebateAllowed;
} // }
public Integer getInterestRateFrequencyMethod() { public Integer getInterestRateFrequencyMethod() {
return interestRateFrequencyMethod; return interestRateFrequencyMethod;
mifosng-data/src/main/java/org/mifosng/data/command/CreateLoanProductCommand.java
+8 -8
View File
@@ -144,18 +144,18 @@ public class CreateLoanProductCommand implements LoanProductCommandData {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.mifosng.data.command.LoanProductCommandData#getFlexibleRepaymentSchedule() * @see org.mifosng.data.command.LoanProductCommandData#getFlexibleRepaymentSchedule()
*/ */
@Override // @Override
public Boolean getFlexibleRepaymentSchedule() { // public Boolean getFlexibleRepaymentSchedule() {
return this.commonLoanProperties.getFlexibleRepaymentSchedule(); // return this.commonLoanProperties.getFlexibleRepaymentSchedule();
} // }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.mifosng.data.command.LoanProductCommandData#getInterestRebateAllowed() * @see org.mifosng.data.command.LoanProductCommandData#getInterestRebateAllowed()
*/ */
@Override // @Override
public Boolean getInterestRebateAllowed() { // public Boolean getInterestRebateAllowed() {
return this.commonLoanProperties.getInterestRebateAllowed(); // return this.commonLoanProperties.getInterestRebateAllowed();
} // }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.mifosng.data.command.LoanProductCommandData#getInterestRateFrequencyMethod() * @see org.mifosng.data.command.LoanProductCommandData#getInterestRateFrequencyMethod()
mifosng-data/src/main/java/org/mifosng/data/command/LoanProductCommandData.java
+2 -2
View File
@@ -22,9 +22,9 @@ public interface LoanProductCommandData {
BigDecimal getPrincipal(); BigDecimal getPrincipal();
Boolean getFlexibleRepaymentSchedule(); // Boolean getFlexibleRepaymentSchedule();
Boolean getInterestRebateAllowed(); // Boolean getInterestRebateAllowed();
Integer getInterestRateFrequencyMethod(); Integer getInterestRateFrequencyMethod();
mifosng-data/src/main/java/org/mifosng/data/command/SubmitLoanApplicationCommand.java
+7 -7
View File
@@ -187,13 +187,13 @@ public class SubmitLoanApplicationCommand {
this.commonLoanProperties.setPrincipal(principal); this.commonLoanProperties.setPrincipal(principal);
} }
public Boolean getFlexibleRepaymentSchedule() { // public Boolean getFlexibleRepaymentSchedule() {
return this.commonLoanProperties.getFlexibleRepaymentSchedule(); // return this.commonLoanProperties.getFlexibleRepaymentSchedule();
} // }
//
public Boolean getInterestRebateAllowed() { // public Boolean getInterestRebateAllowed() {
return this.commonLoanProperties.getInterestRebateAllowed(); // return this.commonLoanProperties.getInterestRebateAllowed();
} // }
public Integer getInterestRateFrequencyMethod() { public Integer getInterestRateFrequencyMethod() {
return commonLoanProperties.getInterestRateFrequencyMethod(); return commonLoanProperties.getInterestRateFrequencyMethod();
mifosng-data/src/main/java/org/mifosng/data/command/UpdateLoanProductCommand.java
+7 -7
View File
@@ -106,13 +106,13 @@ public class UpdateLoanProductCommand implements LoanProductCommandData {
this.commonLoanProperties.setPrincipal(principal); this.commonLoanProperties.setPrincipal(principal);
} }
public Boolean getFlexibleRepaymentSchedule() { // public Boolean getFlexibleRepaymentSchedule() {
return this.commonLoanProperties.getFlexibleRepaymentSchedule(); // return this.commonLoanProperties.getFlexibleRepaymentSchedule();
} // }
//
public Boolean getInterestRebateAllowed() { // public Boolean getInterestRebateAllowed() {
return this.commonLoanProperties.getInterestRebateAllowed(); // return this.commonLoanProperties.getInterestRebateAllowed();
} // }
public Integer getInterestRateFrequencyMethod() { public Integer getInterestRateFrequencyMethod() {
return commonLoanProperties.getInterestRateFrequencyMethod(); return commonLoanProperties.getInterestRateFrequencyMethod();
mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java
+154 -72
View File
@@ -1,24 +1,37 @@
package org.mifosng.platform.api; package org.mifosng.platform.api;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.mifosng.data.EntityIdentifier;
import org.mifosng.data.ErrorResponse;
import org.mifosng.data.ErrorResponseList;
import org.mifosng.data.LoanProductData; import org.mifosng.data.LoanProductData;
import org.mifosng.data.LoanProductList; import org.mifosng.data.LoanProductList;
import org.mifosng.data.command.CreateLoanProductCommand;
import org.mifosng.data.command.UpdateLoanProductCommand;
import org.mifosng.platform.ReadPlatformService; import org.mifosng.platform.ReadPlatformService;
import org.mifosng.platform.WritePlatformService; import org.mifosng.platform.WritePlatformService;
import org.mifosng.platform.exceptions.ApplicationDomainRuleException;
import org.mifosng.platform.exceptions.ClientNotAuthenticatedException; import org.mifosng.platform.exceptions.ClientNotAuthenticatedException;
import org.mifosng.platform.security.PlatformUserDetailsService; import org.mifosng.platform.exceptions.NewDataValidationException;
import org.mifosng.platform.user.domain.AppUser; import org.mifosng.platform.user.domain.AppUser;
import org.mifosng.platform.user.domain.AppUserRepository; import org.mifosng.platform.user.domain.AppUserRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContext;
@@ -26,14 +39,21 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/* /*
*
* @see http://viewfromthefringe.blogspot.com/2010/06/versioning-rest-services.html
* @see http://jersey.576304.n2.nabble.com/Restful-Service-Versioning-td6332833.html
*
* Note: Jersey looks for 'requests' starting with 'api' e.g. this resources url is https://[localhost:8080]/api/v1/loanproducts * Note: Jersey looks for 'requests' starting with 'api' e.g. this resources url is https://[localhost:8080]/api/v1/loanproducts
* Note: Called this class *ApiResource as if you leave it as same class name as older 'resource' class, jersey throws a wobbler. * Note: Named this class *ApiResource as if you leave it as same class name as older 'resource' class, jersey throws a wobbler.
* Note: no authentication scheme is in place so calls that match api/v1/** are not managed by spring security for now. * Note: no authentication scheme is in place so calls that match api/v1/** are not managed by spring security for now.
* *
* 1. resource is versioned * 1. resource is versioned here but will move the 'version' part to web.xml when finished.
* 2. using plural of resource e.g. loanproducts rather than loanproduct * 2. using plural of resource e.g. loanproducts rather than loanproduct
* 3. @GET results in list of all loan products being returned (no scoping relevant here) * 3. @GET results in list of all loan products being returned (no scoping relevant here)
* 4. Only 'produce'ing JSON by limiting to @Produces({MediaType.APPLICATION_JSON}) * 4. Only 'produce'ing JSON by limiting to @Produces({MediaType.APPLICATION_JSON})
* 5. The java object returned is LoanProductData and LoanProductList when list of products returned.
* These java objects are annotated with @XmlRootElement so JAXB reader/writers will automatically translate to JSON format.
* 6. @GET /loanproducts/{productId} results in loan product of that identifier or appropiate error response
*/ */
@Path("/v1/loanproducts") @Path("/v1/loanproducts")
@Component @Component
@@ -62,80 +82,142 @@ public class LoanProductApiResource {
@Produces({MediaType.APPLICATION_JSON}) @Produces({MediaType.APPLICATION_JSON})
public Response retrieveAllLoanProducts() { public Response retrieveAllLoanProducts() {
hardcodeUserIntoSecurityContext(); try {
hardcodeUserIntoSecurityContext();
Collection<LoanProductData> products = this.readPlatformService.retrieveAllLoanProducts();
Collection<LoanProductData> products = this.readPlatformService.retrieveAllLoanProducts();
return Response.ok().entity(new LoanProductList(products)).build(); return Response.ok().entity(new LoanProductList(products)).build();
} catch (ClientNotAuthenticatedException e) {
throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build());
} catch (AccessDeniedException e) {
ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id");
ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse));
throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build());
} catch (ApplicationDomainRuleException e) {
throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build());
} catch (NewDataValidationException e) {
throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build());
}
} }
@GET
@Path("{productId}")
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Produces({ MediaType.APPLICATION_JSON})
public Response retrieveLoanProductDetails(@PathParam("productId") final Long productId) {
// @POST try {
// @Path("new") hardcodeUserIntoSecurityContext();
// @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
// @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) LoanProductData loanProduct = this.readPlatformService.retrieveLoanProduct(productId);
// public Response createLoanProduct(final CreateLoanProductCommand command) {
// return Response.ok().entity(loanProduct).build();
// try { } catch (ClientNotAuthenticatedException e) {
// EntityIdentifier entityIdentifier = this.writePlatformService.createLoanProduct(command); throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build());
// } catch (AccessDeniedException e) {
// return Response.ok().entity(entityIdentifier).build(); ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id");
// } catch (ClientNotAuthenticatedException e) { ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse));
// throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build()); throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build());
// } catch (AccessDeniedException e) { } catch (ApplicationDomainRuleException e) {
// ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id"); throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build());
// ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse)); } catch (NewDataValidationException e) {
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build()); throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build());
// } catch (ApplicationDomainRuleException e) { }
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build()); }
// } catch (NewDataValidationException e) {
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build()); // example POST request
// } // http://localhost:8085/mifosng-provider/api/v1/loanproducts/
// Content-Type: application/json
// {
// "name": "test",
// "description": "test",
// "commonLoanProperties": {
// "currencyCode": "USD",
// "digitsAfterDecimal": 2,
// "principal": 100000,
// "repaymentEvery": 1,
// "repaymentFrequency": 2,
// "numberOfRepayments": 12,
// "amortizationMethod": 1,
// "inArrearsToleranceAmount": 1000,
// "interestRatePerPeriod": 2,
// "interestRateFrequencyMethod": 2,
// "interestMethod": 0,
// "interestCalculationPeriodMethod": 1
// }
// } // }
// @POST
// @POST @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
// @Path("update") @Produces({ MediaType.APPLICATION_JSON})
// @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) public Response createLoanProduct(CreateLoanProductCommand command) {
// @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
// public Response updateLoanProduct(final UpdateLoanProductCommand command) { try {
// hardcodeUserIntoSecurityContext();
// try {
// EntityIdentifier entityIdentifier = this.writePlatformService.updateLoanProduct(command); EntityIdentifier entityIdentifier = this.writePlatformService.createLoanProduct(command);
// return Response.ok().entity(entityIdentifier).build();
// } catch (ClientNotAuthenticatedException e) { return Response.ok().entity(entityIdentifier).build();
// throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build()); } catch (ClientNotAuthenticatedException e) {
// } catch (AccessDeniedException e) { throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build());
// ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id"); } catch (AccessDeniedException e) {
// ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse)); ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id");
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build()); ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse));
// } catch (ApplicationDomainRuleException e) { throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build());
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build()); } catch (ApplicationDomainRuleException e) {
// } catch (NewDataValidationException e) { throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build());
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build()); } catch (NewDataValidationException e) {
throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build());
}
}
// example PUT request
// http://localhost:8085/mifosng-provider/api/v1/loanproducts/
// Content-Type: application/json
// {
// "id": 7,
// "name": "test",
// "description": "test",
// "externalId": "",
// "commonLoanProperties": {
// "currencyCode": "USD",
// "digitsAfterDecimal": 2,
// "principal": 100000,
// "repaymentEvery": 1,
// "repaymentFrequency": 2,
// "numberOfRepayments": 12,
// "amortizationMethod": 1,
// "inArrearsToleranceAmount": 1000,
// "interestRatePerPeriod": 2,
// "interestRateFrequencyMethod": 2,
// "interestMethod": 0,
// "interestCalculationPeriodMethod": 1
// }
// } // }
// } @PUT
// @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
// @GET @Produces({ MediaType.APPLICATION_JSON })
// @Path("{productId}") public Response updateLoanProduct(final UpdateLoanProductCommand command) {
// @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
// @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) try {
// public Response retrieveLoanProductDetails(@PathParam("productId") final Long productId) { hardcodeUserIntoSecurityContext();
//
// try { EntityIdentifier entityIdentifier = this.writePlatformService.updateLoanProduct(command);
// LoanProductData loanProduct = this.readPlatformService.retrieveLoanProduct(productId);
// return Response.ok().entity(entityIdentifier).build();
// return Response.ok().entity(loanProduct).build(); } catch (ClientNotAuthenticatedException e) {
// } catch (ClientNotAuthenticatedException e) { throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build());
// throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build()); } catch (AccessDeniedException e) {
// } catch (AccessDeniedException e) { ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id");
// ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id"); ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse));
// ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse)); throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build());
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build()); } catch (ApplicationDomainRuleException e) {
// } catch (ApplicationDomainRuleException e) { throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build());
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build()); } catch (NewDataValidationException e) {
// } catch (NewDataValidationException e) { throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build());
// throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build()); }
// } }
// }
// //
// @GET // @GET
// @Path("empty") // @Path("empty")