diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm index 9bf849ba1..6459d963f 100644 --- a/api-docs/apiLive.htm +++ b/api-docs/apiLive.htm @@ -318,7 +318,7 @@ - standinginstructions/history + standinginstructionrunhistory Standinginstructions History @@ -2010,7 +2010,7 @@ scheduler?command=stop - Suspend a scheduler service + Suspend a scheduler service @@ -2124,7 +2124,7 @@ Notes {resource}/{resourceId}/notes - Add a Resource Note + Add a Resource Note Retrieve a Resource's Notes @@ -2141,7 +2141,7 @@ Documents {entityType}/{entityId}/documents - Create a Document + Create a Document List All Document Details @@ -2169,14 +2169,14 @@ Search search - Search Resources + Search Resources AdHoc Search search/advance - Advance Search + Advance Search @@ -24622,15 +24622,15 @@ No Request Body:
Use an sql fragment valid for the underlying standing instruction schema to filter results. e.g. name like %K%

Example Requests :

-
standinginstructions/history
+
standinginstructionrunhistory

-
standinginstructions/history?orderBy=name&sortOrder=DESC
+
standinginstructionrunhistory?orderBy=name&sortOrder=DESC

-
standinginstructions/history?offset=10&limit=50
+
standinginstructionrunhistory?offset=10&limit=50

- GET https://DomainName/api/v1/standinginstructions/history + GET https://DomainName/api/v1/standinginstructionrunhistory { "totalFilteredRecords": 2, @@ -30856,7 +30856,7 @@ No Request Body: - standinginstructions/history + standinginstructionrunhistory Standinginstructions History diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/StandingInstructionsHelper.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/StandingInstructionsHelper.java index 689f38a62..198148827 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/StandingInstructionsHelper.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/StandingInstructionsHelper.java @@ -15,6 +15,7 @@ import com.jayway.restassured.specification.ResponseSpecification; public class StandingInstructionsHelper { private static final String STANDING_INSTRUCTIONS_URL = "/mifosng-provider/api/v1/standinginstructions"; + private static final String STANDING_INSTRUCTIONS_RUNHISTORY_URL = "/mifosng-provider/api/v1/standinginstructionrunhistory"; private static final String LOCALE = "en_GB"; private static final String OFFICE_ID = "1"; private static final String INSTRUCTION_TYPE_FIXED = "1"; @@ -98,7 +99,7 @@ public class StandingInstructionsHelper { } public List getStandingInstructionHistory(Integer fromSavingsId, Integer fromAccountType, Integer fromClientId, Integer transferType) { - final String STANDING_INSTRUCTIONS_HISTORY_URL = STANDING_INSTRUCTIONS_URL + "/history?" + Utils.TENANT_IDENTIFIER + final String STANDING_INSTRUCTIONS_HISTORY_URL = STANDING_INSTRUCTIONS_RUNHISTORY_URL + "?" + Utils.TENANT_IDENTIFIER + "&fromSavingsId=" + fromSavingsId + "&fromAccountType=" + fromAccountType + "&clientId=" + fromClientId + "&transferType=" + transferType; System.out.println("STANDING_INSTRUCTIONS_HISTORY_URL="+STANDING_INSTRUCTIONS_HISTORY_URL); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionHistoryApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionHistoryApiResource.java index 4a02ec051..db71c49ce 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionHistoryApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionHistoryApiResource.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -@Path("/standinginstructions/history") +@Path("/standinginstructionrunhistory") @Component @Scope("singleton") public class StandingInstructionHistoryApiResource {