Loan charges can be fees or penalities. They can be defined using the charges api and associated with loan products.
- -Field Descriptions |
-
| chargeId | -
| The id of the charge definition. | -
| amount | -
| The flat amount or percenatge amount of the charge. (depending on its type) | -
| dueDate | -
| The date the loan charge is due for collection. Relevant for charges defined as specified due date. | -
This is a convenience resource. It can be useful when - building maintenance user interface screens for client - applications. The template data returned consists of any or all - of: -
Example Request:
-
-GET https://DomainName/api/v1/loans/{loanId}/charges/template
-
-
-{
- {
- "amountPaid": 0,
- "amountWaived": 0,
- "amountWrittenOff": 0,
- "chargeOptions": [
- {
- "id": 1,
- "name": "Bank Fee (per installment)",
- "active": true,
- "penalty": false,
- "currency": {
- "code": "UGX",
- "name": "Uganda Shilling",
- "decimalPlaces": 2,
- "displaySymbol": "USh",
- "nameCode": "currency.UGX",
- "displayLabel": "Uganda Shilling (USh)"
- },
- "amount": 1500,
- "chargeTimeType": {
- "id": 2,
- "code": "chargeTimeType.specifiedDueDate",
- "value": "Specified due date"
- },
- "chargeAppliesTo": {
- "id": 1,
- "code": "chargeAppliesTo.loan",
- "value": "Loan"
- },
- "chargeCalculationType": {
- "id": 1,
- "code": "chargeCalculationType.flat",
- "value": "Flat"
- }
- }
- ],
- "penalty": false
-}
-}
-
- Mandatory Fields |
-
| chargeId, amount, dueDate (depending on chargeTimeType of charge definition) | -
-POST https://DomainName/api/v1//loans/{loanId}/charges
-
-
-POST /loans/1/charges
-Content-Type: application/json
-Request Body:
-{
- "locale": "en",
- "dateFormat": "dd MMMM yyyy",
- "chargeId": 1,
- "amount": "333",
- "dueDate": "21 November 2011"
-}
-
-
-{
- "officeId": 1,
- "clientId": 1,
- "loanId": 1,
- "resourceId": 14
-}
-
-
-PUT https://DomainName/api/v1//loans/{loanId}/charges/{loanChargeId}
-
-
-PUT /loans/1/charges/14
-Content-Type: application/json
-Request Body:
-{
- "locale": "en",
- "amount": "650"
-}
-
-
-{
- "officeId": 1,
- "clientId": 1,
- "loanId": 1,
- "resourceId": 14,
- "changes": {
- "amount": 650,
- "locale": "en"
- }
-}
-
-
-DELETE https://DomainName/api/v1//loans/{loanId}/charges/{loanChargeId}
-
-
-DELETE /loans/1/charges/14
-Content-Type: application/json
-
-
-{
- "officeId": 1,
- "clientId": 1,
- "loanId": 1,
- "resourceId": 14
-}
-
-
-GET https://DomainName/api/v1//loans/{loanId}/charges/{loanChargeId}
-
-
-GET /loans/1/charges/1
-Content-Type: application/json
-
-
-{
- "id": 14,
- "chargeId": 1,
- "name": "Bank Fee (per installment)",
- "chargeTimeType": {
- "id": 2,
- "code": "chargeTimeType.specifiedDueDate",
- "value": "Specified due date"
- },
- "dueDate": [
- 2011,
- 11,
- 21
- ],
- "chargeCalculationType": {
- "id": 1,
- "code": "chargeCalculationType.flat",
- "value": "Flat"
- },
- "percentage": 0,
- "amountPercentageAppliedTo": 0,
- "currency": {
- "code": "UGX",
- "name": "Uganda Shilling",
- "decimalPlaces": 2,
- "displaySymbol": "USh",
- "nameCode": "currency.UGX",
- "displayLabel": "Uganda Shilling (USh)"
- },
- "amount": 650,
- "amountPaid": 0,
- "amountWaived": 0,
- "amountWrittenOff": 0,
- "amountOutstanding": 650,
- "amountOrPercentage": 650,
- "penalty": false
-}
-
- Its typical for MFIs to add extra costs for their loan products. They + can be either Fees or Penalties.
+Loan Charges are instances of Charges and + represent either fees and penalties for loan products. Refer Charges + for documentation of the various properties of a charge, Only additional properties ( + specific to the context of a Charge being associated with a Loan) are + described here
+Field Descriptions |
+
| amountPaid | +
| The Total amount which has been paid for this Charge + | +
| amountWaived | +
| The Total amount that has been waived for this Charge + | +
| amountWrittenOff | +
| Total amount written off from this Charge + | +
| amountOutstanding | +
| The Total outstanding amount for this Charge + | +
Example Requests:
+
+GET https://DomainName/api/v1/loans/{loanId}/charges
+
+
+[
+ {
+ "id": 1,
+ "chargeId": 1,
+ "name": "Loan Processing fee",
+ "chargeTimeType": {
+ "id": 1,
+ "code": "chargeTimeType.disbursement",
+ "value": "Disbursement"
+ },
+ "chargeCalculationType": {
+ "id": 1,
+ "code": "chargeCalculationType.flat",
+ "value": "Flat"
+ },
+ "percentage": 0,
+ "amountPercentageAppliedTo": 0,
+ "currency": {
+ "code": "USD",
+ "name": "US Dollar",
+ "decimalPlaces": 2,
+ "displaySymbol": "$",
+ "nameCode": "currency.USD",
+ "displayLabel": "US Dollar ($)"
+ },
+ "amount": 100,
+ "amountPaid": 0,
+ "amountWaived": 0,
+ "amountWrittenOff": 0,
+ "amountOutstanding": 100,
+ "amountOrPercentage": 100,
+ "penalty": false
+ },
+ {
+ "id": 7,
+ "chargeId": 2,
+ "name": "Collection Fee",
+ "chargeTimeType": {
+ "id": 2,
+ "code": "chargeTimeType.specifiedDueDate",
+ "value": "Specified due date"
+ },
+ "dueDate": [
+ 2013,
+ 3,
+ 29
+ ],
+ "chargeCalculationType": {
+ "id": 1,
+ "code": "chargeCalculationType.flat",
+ "value": "Flat"
+ },
+ "percentage": 0,
+ "amountPercentageAppliedTo": 0,
+ "currency": {
+ "code": "USD",
+ "name": "US Dollar",
+ "decimalPlaces": 2,
+ "displaySymbol": "$",
+ "nameCode": "currency.USD",
+ "displayLabel": "US Dollar ($)"
+ },
+ "amount": 100,
+ "amountPaid": 0,
+ "amountWaived": 0,
+ "amountWrittenOff": 0,
+ "amountOutstanding": 100,
+ "amountOrPercentage": 100,
+ "penalty": false
+ }
+]
+
+ This is a convenience resource. It can be useful when + building maintenance user interface screens for client + applications. The template data returned consists of any or all + of: +
Example Request:
+
+GET https://DomainName/api/v1/loans/{loanId}/charges/template
+
+
+{
+ "amountPaid": 0,
+ "amountWaived": 0,
+ "amountWrittenOff": 0,
+ "chargeOptions": [
+ {
+ "id": 2,
+ "name": "Collection Fee",
+ "active": true,
+ "penalty": false,
+ "currency": {
+ "code": "USD",
+ "name": "US Dollar",
+ "decimalPlaces": 2,
+ "displaySymbol": "$",
+ "nameCode": "currency.USD",
+ "displayLabel": "US Dollar ($)"
+ },
+ "amount": 100,
+ "chargeTimeType": {
+ "id": 2,
+ "code": "chargeTimeType.specifiedDueDate",
+ "value": "Specified due date"
+ },
+ "chargeAppliesTo": {
+ "id": 1,
+ "code": "chargeAppliesTo.loan",
+ "value": "Loan"
+ },
+ "chargeCalculationType": {
+ "id": 1,
+ "code": "chargeCalculationType.flat",
+ "value": "Flat"
+ }
+ },
+ {
+ "id": 3,
+ "name": "Late payment penalty",
+ "active": true,
+ "penalty": true,
+ "currency": {
+ "code": "USD",
+ "name": "US Dollar",
+ "decimalPlaces": 2,
+ "displaySymbol": "$",
+ "nameCode": "currency.USD",
+ "displayLabel": "US Dollar ($)"
+ },
+ "amount": 1,
+ "chargeTimeType": {
+ "id": 2,
+ "code": "chargeTimeType.specifiedDueDate",
+ "value": "Specified due date"
+ },
+ "chargeAppliesTo": {
+ "id": 1,
+ "code": "chargeAppliesTo.loan",
+ "value": "Loan"
+ },
+ "chargeCalculationType": {
+ "id": 1,
+ "code": "chargeCalculationType.flat",
+ "value": "Flat"
+ }
+ },
+ {
+ "id": 1,
+ "name": "Loan Processing fee",
+ "active": true,
+ "penalty": false,
+ "currency": {
+ "code": "USD",
+ "name": "US Dollar",
+ "decimalPlaces": 2,
+ "displaySymbol": "$",
+ "nameCode": "currency.USD",
+ "displayLabel": "US Dollar ($)"
+ },
+ "amount": 100,
+ "chargeTimeType": {
+ "id": 1,
+ "code": "chargeTimeType.disbursement",
+ "value": "Disbursement"
+ },
+ "chargeAppliesTo": {
+ "id": 1,
+ "code": "chargeAppliesTo.loan",
+ "value": "Loan"
+ },
+ "chargeCalculationType": {
+ "id": 1,
+ "code": "chargeCalculationType.flat",
+ "value": "Flat"
+ }
+ }
+ ],
+ "penalty": false
+}
+
+ Example Requests:
+
+GET https://DomainName/api/v1/loans/{loanId}/charges/{chargeId}
+
+
+{
+ "id": 1,
+ "chargeId": 1,
+ "name": "Loan Processing fee",
+ "chargeTimeType": {
+ "id": 1,
+ "code": "chargeTimeType.disbursement",
+ "value": "Disbursement"
+ },
+ "chargeCalculationType": {
+ "id": 1,
+ "code": "chargeCalculationType.flat",
+ "value": "Flat"
+ },
+ "percentage": 0,
+ "amountPercentageAppliedTo": 0,
+ "currency": {
+ "code": "USD",
+ "name": "US Dollar",
+ "decimalPlaces": 2,
+ "displaySymbol": "$",
+ "nameCode": "currency.USD",
+ "displayLabel": "US Dollar ($)"
+ },
+ "amount": 100,
+ "amountPaid": 0,
+ "amountWaived": 0,
+ "amountWrittenOff": 0,
+ "amountOutstanding": 100,
+ "amountOrPercentage": 100,
+ "penalty": false
+}
+ Mandatory Fields
+ for Loan Charges |
+
| chargeId, amount, dueDate | +
+POST https://DomainName/api/v1/loans/{loanId}/charges
+
+
+POST /loans/1/charges
+Content-Type: application/json
+Request Body:
+{
+ "chargeId": "2",
+ "locale": "en",
+ "amount": "100",
+ "dateFormat": "dd MMMM yyyy",
+ "dueDate": "29 April 2013"
+}
+
+
+{
+ "officeId": 1,
+ "clientId": 1,
+ "loanId": 1,
+ "resourceId": 31
+}
+
+ Currently Loan Charges may be updated only if the Loan + is not yet approved +
+
+PUT https://DomainName/api/v1/loans/{loanId}/charges/{chargeId}
+
+
+PUT loans/1/charges/12
+Content-Type: application/json
+Request Body:
+{
+ "dateFormat": "dd MMMM yyyy",
+ "locale": "en",
+ "amount": "60",
+ "dueDate": "27 March 2013"
+}
+
+
+{
+ "officeId": 1,
+ "clientId": 1,
+ "loanId": 1,
+ "resourceId": 6,
+ "changes": {
+ "dueDate": "27 March 2013",
+ "dateFormat": "dd MMMM yyyy",
+ "locale": "en",
+ "amount": 60.0
+ }
+}
+
+ + Note:Currently, A Loan Charge may only be removed from Loans that are not + yet approved. +
+
+DELETE https://DomainName/api/v1/loans/{loanId}/charges/{chargeId}
+
+
+DELETE loans/1/charges/2
+Content-Type: application/json
+No Request Body:
+
+
+{
+ "officeId": 1,
+ "clientId": 1,
+ "loanId": 1,
+ "resourceId": 2
+}
+
+ Allows you to model staff members. At present the key role - of signifigance is whether this staff member is a loan officer or + of significance is whether this staff member is a loan officer or not.
- Its typical for MFIs to add extra costs to their financial - products. There are typically Fees or Penalites. + Its typical for MFIs to add extra costs for their financial + products. There are typically Fees or Penalties.
-Charges is what we use to model both fees and penalities. +
Charges is what we use to model both fees and penalties. For now charges can only be associated with loan products / loans.
+Field Descriptions |
+
| name | +
| Name associated with this charge. | +
| active | +
| Boolean flag determines if the Charge is currently active. | +
| penalty | +
| Boolean flag determines if the Charge is a penalty. | +
| currency | +
| Details of the currency associated with this charge. + Refer Charges Template for additional details | +
| amount | +
| Field holds the details of the actual amount to be collected + in the case of "Flat Charges" or the percentage amount to be collected in + case of "Percentage Amount Charges". Refer Charges Template + for details of the Available Charge Types | +
| chargeTimeType | +
| The time at which the charge becomes Due. + Refer Charges Template for additional details | +
| chargeAppliesTo | +
| The Entity for which the charge can be applied (Loans etc). + Refer Charges Template for additional details | +
| chargeCalculationType | +
| Rules for calculating the amount for a particular Charge. + Refer Charges Template for additional details | +
This is a convenience resource. It can be useful when + building maintenance user interface screens for client + applications. The template data returned consists of any or all + of: +
Example Request:
+
+GET https://DomainName/api/v1/charges/template
+
+
+{
+ "active": false,
+ "penalty": false,
+ "currencyOptions":
+ [
+ {
+ "code": "USD",
+ "name": "US Dollar",
+ "decimalPlaces": 2,
+ "displaySymbol": "$",
+ "nameCode": "currency.USD",
+ "displayLabel": "US Dollar ($)"
+ }
+ ],
+ "chargeCalculationTypeOptions":
+ [
+ {
+ "id": 1,
+ "code": "chargeCalculationType.flat",
+ "value": "Flat"
+ },
+ {
+ "id": 2,
+ "code": "chargeCalculationType.percent.of.amount",
+ "value": "% Amount"
+ }
+ ],
+ "chargeAppliesToOptions":
+ [
+ {
+ "id": 1,
+ "code": "chargeAppliesTo.loan",
+ "value": "Loan"
+ }
+ ],
+ "chargeTimeTypeOptions":
+ [
+ {
+ "id": 1,
+ "code": "chargeTimeType.disbursement",
+ "value": "Disbursement"
+ },
+ {
+ "id": 2,
+ "code": "chargeTimeType.specifiedDueDate",
+ "value": "Specified due date"
+ }
+ ]
+}
+
+ { "resourceId": 1 }
+
+{
+ "resourceId": 1
+}
+
+
+POST charges
+Content-Type: application/json
+Request Body:
+{
+ "locale": "en",
+ "name": "Default Penalty",
+ "amount": "2",
+ "currencyCode": "USD",
+ "chargeAppliesTo": "1",
+ "chargeTimeType": "2",
+ "chargeCalculationType": "2",
+ "active": "true",
+ "penalty": "true"
+}
+
+
+{
+ "resourceId": 4
+}
+
An MFIs savings product offerings are modelled using this API.
-When creating savings accounts, the details from the savings product are used to autofill details of savings account.
+An MFIs savings product offerings are modeled using this API.
+When creating savings accounts, the details from the savings product are used to auto fill details of savings account.
Field Descriptions | ||||||
| A description of the product offering. | ||||||
| currencyCode | ||||||
| Three letter ISO code reprsenting currency. | ||||||
| Three letter ISO code representing currency. | ||||||
| digitsAfterDecimal | ||||||
| Override the currency default value for digitsAfterDecimal. | ||||||
| Loan Charges | loans/{loanId}/charges | -Add a loan charge | +Add a Loan Charge | diff --git a/keystore.jks b/keystore.jks new file mode 100644 index 000000000..d407af322 Binary files /dev/null and b/keystore.jks differ diff --git a/mifosng-db/migrations/V1__mifosplatform-core-ddl-latest.sql b/mifosng-db/migrations/V1__mifosplatform-core-ddl-latest.sql index 54a24d01b..339ef8b0b 100644 --- a/mifosng-db/migrations/V1__mifosplatform-core-ddl-latest.sql +++ b/mifosng-db/migrations/V1__mifosplatform-core-ddl-latest.sql @@ -595,6 +595,7 @@ CREATE TABLE `m_loan_arrears_aging` ( CREATE TABLE `m_guarantor` ( `id` BIGINT(20) NOT NULL AUTO_INCREMENT, `loan_id` BIGINT(20) NOT NULL, + `client_reln_cv_id` INT(11) DEFAULT NULL, `type_enum` SMALLINT(5) NOT NULL, `entity_id` BIGINT(20) NULL DEFAULT NULL, `firstname` VARCHAR(50) NULL DEFAULT NULL, @@ -611,6 +612,7 @@ CREATE TABLE `m_guarantor` ( `comment` VARCHAR(500) NULL DEFAULT NULL, PRIMARY KEY (`id`), INDEX `FK_m_guarantor_m_loan` (`loan_id`), + CONSTRAINT `FK_m_guarantor_m_code_value` FOREIGN KEY (`client_reln_cv_id`) REFERENCES `m_code_value` (`id`), CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -642,6 +644,7 @@ CREATE TABLE `m_loan_collateral` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `loan_id` bigint(20) NOT NULL, `type_cv_id` int(11) NOT NULL, + `value` DECIMAL(19,6) DEFAULT NULL, `description` varchar(500) DEFAULT NULL, PRIMARY KEY (`id`), KEY `FK_collateral_m_loan` (`loan_id`), diff --git a/mifosng-db/migrations/V2__mifosx-base-reference-data-utf8.sql b/mifosng-db/migrations/V2__mifosx-base-reference-data-utf8.sql index 80a68352d..1393ea946 100644 --- a/mifosng-db/migrations/V2__mifosx-base-reference-data-utf8.sql +++ b/mifosng-db/migrations/V2__mifosx-base-reference-data-utf8.sql @@ -271,7 +271,8 @@ VALUES ('LoanCollateral',1), ('LoanPurpose',1), ('Gender',1), -('YesNo',1); +('YesNo',1), +('GuarantorRelationship',1); INSERT INTO `m_code_value`(`code_id`,`code_value`,`order_position`) select mc.id, 'Passport', 1 @@ -291,4 +292,30 @@ where mc.`code_name` = "Customer Identifier"; INSERT INTO `m_code_value`(`code_id`,`code_value`,`order_position`) select mc.id, 'Any Other Id Type', 4 from m_code mc -where mc.`code_name` = "Customer Identifier"; \ No newline at end of file +where mc.`code_name` = "Customer Identifier"; + +-- Adding a few Default Guarantor Relationships +insert into m_code_value (code_id,code_value,order_position) + select id,"Spouse",0 + from m_code + where m_code.code_name="GuarantorRelationship"; + +insert into m_code_value (code_id,code_value,order_position) + select id,"Parent",0 + from m_code + where m_code.code_name="GuarantorRelationship"; + +insert into m_code_value (code_id,code_value,order_position) + select id,"Sibling",0 + from m_code + where m_code.code_name="GuarantorRelationship"; + +insert into m_code_value (code_id,code_value,order_position) + select id,"Business Associate",0 + from m_code + where m_code.code_name="GuarantorRelationship"; + +insert into m_code_value (code_id,code_value,order_position) + select id,"Other",0 + from m_code + where m_code.code_name="GuarantorRelationship"; \ No newline at end of file diff --git a/mifosng-db/migrations/V3__mifosx-permissions-and-authorisation-utf8.sql b/mifosng-db/migrations/V3__mifosx-permissions-and-authorisation-utf8.sql index 971065a42..aaf726ab1 100644 --- a/mifosng-db/migrations/V3__mifosx-permissions-and-authorisation-utf8.sql +++ b/mifosng-db/migrations/V3__mifosx-permissions-and-authorisation-utf8.sql @@ -220,6 +220,13 @@ INSERT INTO `m_permission` ('portfolio', 'UPDATE_GUARANTOR_CHECKER', 'GUARANTOR', 'UPDATE', 0), ('portfolio', 'DELETE_GUARANTOR', 'GUARANTOR', 'DELETE', 1), ('portfolio', 'DELETE_GUARANTOR_CHECKER', 'GUARANTOR', 'DELETE', 0), +('portfolio', 'READ_COLLATERAL', 'COLLATERAL', 'READ', '0'), +('portfolio', 'CREATE_COLLATERAL', 'COLLATERAL', 'CREATE', '1'), +('portfolio', 'UPDATE_COLLATERAL', 'COLLATERAL', 'UPDATE', '1'), +('portfolio', 'DELETE_COLLATERAL', 'COLLATERAL', 'DELETE', '1'), +('portfolio', 'CREATE_COLLATERAL_CHECKER', 'COLLATERAL', 'CREATE', '0'), +('portfolio', 'UPDATE_COLLATERAL_CHECKER', 'COLLATERAL', 'UPDATE', '0'), +('portfolio', 'DELETE_COLLATERAL_CHECKER', 'COLLATERAL', 'DELETE', '0'), ('transaction_loan', 'APPROVE_LOAN', 'LOAN', 'APPROVE', '1'), ('transaction_loan', 'APPROVEINPAST_LOAN', 'LOAN', 'APPROVEINPAST', '1'), ('transaction_loan', 'REJECT_LOAN', 'LOAN', 'REJECT', '1'), diff --git a/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql b/mifosng-db/old-schema-files/0001a-mifosplatform-core-ddl-latest.sql similarity index 99% rename from mifosng-db/0001a-mifosplatform-core-ddl-latest.sql rename to mifosng-db/old-schema-files/0001a-mifosplatform-core-ddl-latest.sql index 54a24d01b..dc02925ad 100644 --- a/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql +++ b/mifosng-db/old-schema-files/0001a-mifosplatform-core-ddl-latest.sql @@ -595,6 +595,7 @@ CREATE TABLE `m_loan_arrears_aging` ( CREATE TABLE `m_guarantor` ( `id` BIGINT(20) NOT NULL AUTO_INCREMENT, `loan_id` BIGINT(20) NOT NULL, + `client_reln_cv_id` INT(11) DEFAULT NULL, `type_enum` SMALLINT(5) NOT NULL, `entity_id` BIGINT(20) NULL DEFAULT NULL, `firstname` VARCHAR(50) NULL DEFAULT NULL, @@ -611,6 +612,7 @@ CREATE TABLE `m_guarantor` ( `comment` VARCHAR(500) NULL DEFAULT NULL, PRIMARY KEY (`id`), INDEX `FK_m_guarantor_m_loan` (`loan_id`), + CONSTRAINT `FK_m_guarantor_m_code_value` FOREIGN KEY (`client_reln_cv_id`) REFERENCES `m_code_value` (`id`) CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -642,6 +644,7 @@ CREATE TABLE `m_loan_collateral` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `loan_id` bigint(20) NOT NULL, `type_cv_id` int(11) NOT NULL, + `value` DECIMAL(19,6) DEFAULT NULL, `description` varchar(500) DEFAULT NULL, PRIMARY KEY (`id`), KEY `FK_collateral_m_loan` (`loan_id`), diff --git a/mifosng-db/0002-mifosx-base-reference-data-utf8.sql b/mifosng-db/old-schema-files/0002-mifosx-base-reference-data-utf8.sql similarity index 94% rename from mifosng-db/0002-mifosx-base-reference-data-utf8.sql rename to mifosng-db/old-schema-files/0002-mifosx-base-reference-data-utf8.sql index 80a68352d..1393ea946 100644 --- a/mifosng-db/0002-mifosx-base-reference-data-utf8.sql +++ b/mifosng-db/old-schema-files/0002-mifosx-base-reference-data-utf8.sql @@ -271,7 +271,8 @@ VALUES ('LoanCollateral',1), ('LoanPurpose',1), ('Gender',1), -('YesNo',1); +('YesNo',1), +('GuarantorRelationship',1); INSERT INTO `m_code_value`(`code_id`,`code_value`,`order_position`) select mc.id, 'Passport', 1 @@ -291,4 +292,30 @@ where mc.`code_name` = "Customer Identifier"; INSERT INTO `m_code_value`(`code_id`,`code_value`,`order_position`) select mc.id, 'Any Other Id Type', 4 from m_code mc -where mc.`code_name` = "Customer Identifier"; \ No newline at end of file +where mc.`code_name` = "Customer Identifier"; + +-- Adding a few Default Guarantor Relationships +insert into m_code_value (code_id,code_value,order_position) + select id,"Spouse",0 + from m_code + where m_code.code_name="GuarantorRelationship"; + +insert into m_code_value (code_id,code_value,order_position) + select id,"Parent",0 + from m_code + where m_code.code_name="GuarantorRelationship"; + +insert into m_code_value (code_id,code_value,order_position) + select id,"Sibling",0 + from m_code + where m_code.code_name="GuarantorRelationship"; + +insert into m_code_value (code_id,code_value,order_position) + select id,"Business Associate",0 + from m_code + where m_code.code_name="GuarantorRelationship"; + +insert into m_code_value (code_id,code_value,order_position) + select id,"Other",0 + from m_code + where m_code.code_name="GuarantorRelationship"; \ No newline at end of file diff --git a/mifosng-db/0003-mifosx-permissions-and-authorisation-utf8.sql b/mifosng-db/old-schema-files/0003-mifosx-permissions-and-authorisation-utf8.sql similarity index 97% rename from mifosng-db/0003-mifosx-permissions-and-authorisation-utf8.sql rename to mifosng-db/old-schema-files/0003-mifosx-permissions-and-authorisation-utf8.sql index 971065a42..aaf726ab1 100644 --- a/mifosng-db/0003-mifosx-permissions-and-authorisation-utf8.sql +++ b/mifosng-db/old-schema-files/0003-mifosx-permissions-and-authorisation-utf8.sql @@ -220,6 +220,13 @@ INSERT INTO `m_permission` ('portfolio', 'UPDATE_GUARANTOR_CHECKER', 'GUARANTOR', 'UPDATE', 0), ('portfolio', 'DELETE_GUARANTOR', 'GUARANTOR', 'DELETE', 1), ('portfolio', 'DELETE_GUARANTOR_CHECKER', 'GUARANTOR', 'DELETE', 0), +('portfolio', 'READ_COLLATERAL', 'COLLATERAL', 'READ', '0'), +('portfolio', 'CREATE_COLLATERAL', 'COLLATERAL', 'CREATE', '1'), +('portfolio', 'UPDATE_COLLATERAL', 'COLLATERAL', 'UPDATE', '1'), +('portfolio', 'DELETE_COLLATERAL', 'COLLATERAL', 'DELETE', '1'), +('portfolio', 'CREATE_COLLATERAL_CHECKER', 'COLLATERAL', 'CREATE', '0'), +('portfolio', 'UPDATE_COLLATERAL_CHECKER', 'COLLATERAL', 'UPDATE', '0'), +('portfolio', 'DELETE_COLLATERAL_CHECKER', 'COLLATERAL', 'DELETE', '0'), ('transaction_loan', 'APPROVE_LOAN', 'LOAN', 'APPROVE', '1'), ('transaction_loan', 'APPROVEINPAST_LOAN', 'LOAN', 'APPROVEINPAST', '1'), ('transaction_loan', 'REJECT_LOAN', 'LOAN', 'REJECT', '1'), diff --git a/mifosng-db/0004-mifosx-core-reports-utf8.sql b/mifosng-db/old-schema-files/0004-mifosx-core-reports-utf8.sql similarity index 100% rename from mifosng-db/0004-mifosx-core-reports-utf8.sql rename to mifosng-db/old-schema-files/0004-mifosx-core-reports-utf8.sql diff --git a/mifosng-db/patches/1-add-status-to-savings-account.sql b/mifosng-db/patchesPutOnDemoServer20130401/1-add-status-to-savings-account.sql similarity index 100% rename from mifosng-db/patches/1-add-status-to-savings-account.sql rename to mifosng-db/patchesPutOnDemoServer20130401/1-add-status-to-savings-account.sql diff --git a/mifosng-db/patches/2-audit-add-account-savings-id.sql b/mifosng-db/patchesPutOnDemoServer20130401/2-audit-add-account-savings-id.sql similarity index 100% rename from mifosng-db/patches/2-audit-add-account-savings-id.sql rename to mifosng-db/patchesPutOnDemoServer20130401/2-audit-add-account-savings-id.sql diff --git a/mifosng-db/patches/3-collateral-add-value.sql b/mifosng-db/patchesPutOnDemoServer20130401/3-collateral-add-value.sql old mode 100755 new mode 100644 similarity index 100% rename from mifosng-db/patches/3-collateral-add-value.sql rename to mifosng-db/patchesPutOnDemoServer20130401/3-collateral-add-value.sql diff --git a/mifosng-db/patches/4-add-interest-calculation-fields.sql b/mifosng-db/patchesPutOnDemoServer20130401/4-add-interest-calculation-fields.sql similarity index 100% rename from mifosng-db/patches/4-add-interest-calculation-fields.sql rename to mifosng-db/patchesPutOnDemoServer20130401/4-add-interest-calculation-fields.sql diff --git a/mifosng-db/patches/5-guarantor-add-relationship.sql b/mifosng-db/patchesPutOnDemoServer20130401/5-guarantor-add-relationship.sql old mode 100755 new mode 100644 similarity index 100% rename from mifosng-db/patches/5-guarantor-add-relationship.sql rename to mifosng-db/patchesPutOnDemoServer20130401/5-guarantor-add-relationship.sql diff --git a/mifosng-provider/build.gradle b/mifosng-provider/build.gradle index 26b2b42ce..513c128b3 100644 --- a/mifosng-provider/build.gradle +++ b/mifosng-provider/build.gradle @@ -180,11 +180,14 @@ task dist(type:Zip){ task deployPentahoReports() { def pentahoReportDir = System.properties['user.home'] + System.properties['file.separator'] + '.mifosx' + System.properties['file.separator'] + 'pentahoReports' - println ":deployPentahoReports - moving pentaho reports under: " + pentahoReportDir copy { from "src/main/pentahoReports" into pentahoReportDir } + + doLast { + println ':deployPentahoReports - moving pentaho reports under: ' + pentahoReportDir + } } war { @@ -200,6 +203,7 @@ tomcatRun { httpPort = 8080 httpsPort = 8443 stopPort = 8081 + stopKey= 'stopKey' enableSSL = true configFile = file('src/test/resources/META-INF/context.xml') } @@ -208,7 +212,10 @@ tomcatRunWar { httpPort = 8080 httpsPort = 8443 stopPort = 8081 + stopKey= 'stopKey' enableSSL = true + keystoreFile = file('../keystore.jks') + keystorePass = 'openmf' configFile = file('src/test/resources/META-INF/context.xml') } @@ -224,12 +231,53 @@ configurations { } task integrationTest(type:Test){ - description = "Run integration tests (located in src/integrationTest/java). Requires server to be running." + description = "Run integration tests (located in src/integrationTest/java). Starts tomcat in daemon mode before executing the tests." + doFirst { + tomcatRunWar.daemon = true + tomcatRunWar.execute() + } + + doLast { + tomcatStop.execute() + } testClassesDir = project.sourceSets.integrationTest.output.classesDir classpath = project.sourceSets.integrationTest.runtimeClasspath } +import groovy.sql.Sql + +repositories { + mavenCentral() +} +configurations { + driver +} +dependencies { + driver 'mysql:mysql-connector-java:5.1.16' +} + +URLClassLoader loader = GroovyObject.class.classLoader +configurations.driver.each {File file -> + loader.addURL(file.toURL()) +} + +task createDatabase<<{ + description= "Creates the Database mifosplatform-tenants and mifostenant-default" + sql = Sql.newInstance( 'jdbc:mysql://localhost:3306/', 'root', 'mysql', 'com.mysql.jdbc.Driver' ) + sql.execute( 'create database `mifosplatform-tenants`' ) + sql.execute( 'create database `mifostenant-default`' ) + +} +task dropDatabase<<{ + description= "Drops the created Databases mifosplatform-tenants and mifostenant-default" + sql = Sql.newInstance( 'jdbc:mysql://localhost:3306/', 'root', 'mysql', 'com.mysql.jdbc.Driver' ) + sql.execute( 'DROP DATABASE `mifosplatform-tenants`' ) + sql.execute( 'DROP DATABASE `mifostenant-default`' ) + +} + + apply plugin: 'flyway' buildscript { repositories { @@ -272,4 +320,5 @@ def qualifyVersionIfNecessary(version) { } } return version -} \ No newline at end of file +} + diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java similarity index 94% rename from mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java index f45081002..f76d226a6 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mifosplatform.audit.api; +package org.mifosplatform.commands.api; import java.util.Arrays; import java.util.Collection; @@ -21,9 +21,9 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; -import org.mifosplatform.audit.data.AuditData; -import org.mifosplatform.audit.data.AuditSearchData; -import org.mifosplatform.audit.service.AuditReadPlatformService; +import org.mifosplatform.commands.data.AuditData; +import org.mifosplatform.commands.data.AuditSearchData; +import org.mifosplatform.commands.service.AuditReadPlatformService; import org.mifosplatform.infrastructure.core.api.ApiParameterHelper; import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper; import org.mifosplatform.infrastructure.core.serialization.ApiRequestJsonSerializationSettings; @@ -33,10 +33,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -@Path("/audit") +@Path("/audits") @Component @Scope("singleton") -public class AuditApiResource { +public class AuditsApiResource { private final Set |