Merge the Apache Fineract - Upstream

.gitpod.yml

@@ -37,6 +37,6 @@ tasks:
       # NB MySQL on GitPod.io is currently quite slow.
       # similar to .travis.yml, but using authentication_string= instead of password= due to mysql major version difference
       mysql -e "USE mysql;\nUPDATE user SET authentication_string=PASSWORD('mysql') WHERE user='root';\nFLUSH PRIVILEGES;\n"
-      ./gradlew createDB -PdbName=mifosplatform-tenants
-      ./gradlew createDB -PdbName=mifostenant-default
+      ./gradlew createDB -PdbName=fineract_tenants
+      ./gradlew createDB -PdbName=fineract_default
       ./gradlew build -x test

.travis.yml

@@ -36,8 +36,8 @@ addons:
 
 before_install:
   - echo "USE mysql;\nUPDATE user SET password=PASSWORD('mysql') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
-  - mysql -u root -pmysql -e 'CREATE DATABASE IF NOT EXISTS `mifosplatform-tenants`;'
-  - mysql -u root -pmysql -e 'CREATE DATABASE IF NOT EXISTS `mifostenant-default`;'
+  - mysql -u root -pmysql -e 'CREATE DATABASE IF NOT EXISTS `fineract_tenants`;'
+  - mysql -u root -pmysql -e 'CREATE DATABASE IF NOT EXISTS `fineract_default`;'
 # Hardcoding the time zone is a temporary fix for https://issues.apache.org/jira/browse/FINERACT-723
   - export TZ=Asia/Kolkata
 

Dockerfile

@@ -51,6 +51,6 @@ COPY ./docker/server.xml /opt/bitnami/tomcat/conf
 RUN chmod 664 /opt/bitnami/tomcat/conf/server.xml
 
 WORKDIR /opt/bitnami/tomcat/lib
-# org.drizzle.jdbc.DrizzleDriver is used in docker/server.xml for jdbc/mifosplatform-tenants DataSource
+# org.drizzle.jdbc.DrizzleDriver is used in docker/server.xml for jdbc/fineract_tenants DataSource
 # (But note that connections to individual tenant DBs may use another driver...)
 RUN wget https://repo1.maven.org/maven2/org/drizzle/jdbc/drizzle-jdbc/1.4/drizzle-jdbc-1.4.jar

README.md

@@ -8,7 +8,7 @@ Fineract is a mature platform with open APIs that provides a reliable, robust, a
 [![Code Now! (Gitpod)](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/apache/fineract)
 to start contributing to this project in the online web-based IDE GitPod.io right away!
 (You may initially have to press F1 to Find Command and run "Java: Start Language Server".)
-It's of course also possible to contribute with a "traditional" loca ldevelopment environment (see below).
+It's of course also possible to contribute with a "traditional" local development environment (see below).
 
 Community
 =========
@@ -36,8 +36,8 @@ Instructions how to run for local development
 ============
 
 Run the following commands:
-1. `./gradlew createDB -PdbName=mifosplatform-tenants`
-1. `./gradlew createDB -PdbName=mifostenant-default`
+1. `./gradlew createDB -PdbName=fineract_tenants`
+1. `./gradlew createDB -PdbName=fineract_default`
 1. `./gradlew tomcatRunWAR`
 
 
@@ -71,8 +71,8 @@ Instructions to execute Integration tests
 > Note that if this is the first time to access MySQL DB, then you may need to reset your password.
 
 Run the following commands, very similarly to how [.travis.yml](.travis.yml) does:
-1. `./gradlew createDB -PdbName=mifosplatform-tenants`
-1. `./gradlew createDB -PdbName=mifostenant-default`
+1. `./gradlew createDB -PdbName=fineract_tenants`
+1. `./gradlew createDB -PdbName=fineract_default`
 1. `./gradlew clean integrationTest`
 
 
@@ -110,10 +110,19 @@ and the `mysqlserver` environment variable is now no longer supported.)_
 Checkstyle
 ============
 
-This project enforces [its code conventions](fineract-provider/config/checkstyle/checkstyle.xml) using Checkstyle.
+This project enforces its code conventions using [checkstyle.xml](fineract-provider/config/checkstyle/checkstyle.xml).  It is configured to run automatically during the normal Gradle build, and fail if there are any style violations detected.
 We recommend that you configure your favourite Java IDE to match those conventions.  For Eclipse, you can
 File > Import > General > Preferences our [config/fineractdev-eclipse-preferences.epf](config/fineractdev-eclipse-preferences.epf).
+You could also use Checkstyle directly in your IDE (but you don't neccesarily have to, it may just be more convenient for you).  For Eclipse, use https://checkstyle.org/eclipse-cs/ and load our checkstyle.xml into it, for IntelliJ you can use [CheckStyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea).
 
+Code Coverage Reports
+============
+
+The project uses Jacoco to measure unit tests code coverage, to generate a report run the following command: 
+
+    `./gradlew clean build jacocoTestReport`
+
+Generated reports can be found in build/code-coverage directory.
 
 Version
 ============
@@ -159,6 +168,7 @@ Please refer to <https://cwiki.apache.org/confluence/display/FINERACT/Fineract+1
 
 Please see <https://cwiki.apache.org/confluence/display/FINERACT/How-to+articles> for technical details to get started.
 
+Please visit <https://issues.apache.org/jira/projects/FINERACT/> to open or find issues.
 
 Roadmap
 ============
@@ -181,6 +191,8 @@ documents the process through which you can become a committer in this project.
 [Pull Request Size Limit](https://cwiki.apache.org/confluence/display/FINERACT/Pull+Request+Size+Limit)
 documents that we cannot accept huge "code dump" Pull Requests, with some related suggestions.
 
+[How to Release Apache Fineract](https://cwiki.apache.org/confluence/x/DRwIB) documents the process how we make the source code that is available here in this git repository into a binary release ZIP available on http://fineract.apache.org.
+
 
 More Information
 ============

api-docs/apiLive.htm

@@ -2546,6 +2546,24 @@ <h2 class="flybar-button">Org</h2>
 								<td></td>
 								<td></td>
 							</tr>
+                            <tr>
+                                <td><a href="#rates">Rates</a></td>
+                                <td>rates</td>
+                                <td><a href="#create_rate">Create Rate</a></td>
+                                <td><a href="#rate_list">List Rates</a></td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                            <tr>
+                                <td></td>
+                                <td>rates/{rateId}</td>
+                                <td></td>
+                                <td><a href="#retrieve_rate">Retrieve Rate</a></td>
+                                <td><a href="#update_rate">Update Rate</a></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
 						</table>
 					</div>
 				</div>
@@ -12142,7 +12160,17 @@ <h4>Retrieve a Transaction Details</h4>
     "displayLabel": "US Dollar ($)"
   },
   "amount": 559.88,
-  "interestPortion": 559.88
+  "interestPortion": 559.88,
+  "loanChargePaidByList": [
+    {
+      "id": 29,
+      "amount": 138.700000,
+      "installmentNumber": 0,
+      "chargeId": 7,
+      "transactionId": 35,
+      "name": "Late Penalty Charge"
+    } 
+  ]
 }
 					</code>
 				</div>
@@ -16174,7 +16202,7 @@ <h4>Create a Loan Product</h4>
 							numberOfRepaymentVariationsForBorrowerCycle,
 							interestRateVariationsForBorrowerCycle,
 							multiDisburseLoan,maxTrancheCount,
-							outstandingLoanBalance,overdueDaysForNPA,holdGuaranteeFunds, principalThresholdForLastInstalment, accountMovesOutOfNPAOnlyOnArrearsCompletion, canDefineInstallmentAmount, installmentAmountInMultiplesOf, allowAttributeOverrides, allowPartialPeriodInterestCalcualtion
+							outstandingLoanBalance,overdueDaysForNPA,holdGuaranteeFunds, principalThresholdForLastInstalment, accountMovesOutOfNPAOnlyOnArrearsCompletion, canDefineInstallmentAmount, installmentAmountInMultiplesOf, allowAttributeOverrides, allowPartialPeriodInterestCalcualtion, rates
 							</td>
 						</tr>
 					</table>
@@ -43279,7 +43307,198 @@ <h4>Update Tax Group</h4>
 			</div>
 			<!-- End of Tax Group -->
 
-		<!-- start of clients api docs -->
+            <!-- Start of Rates-->
+            <a id="rates" name="rates" class="old-syle-anchor">&nbsp;</a>
+            <div class="method-section">
+                <div class="method-description">
+                    <h3>Rates</h3>
+                    <p>This defines the Rates</p>
+                    <table class=matrixHeading>
+                        <tr class="matrixHeadingBG">
+                            <td>
+                                <div class="fineractHeading2">Field Descriptions</div>
+                            </td>
+                        </tr>
+                        <tr class=alt>
+                            <td>name</td>
+                        </tr>
+                        <tr>
+                            <td class=fielddesc>Name of Rate
+                            </td>
+                        </tr>
+                        <tr class=alt>
+                            <td>productApply</td>
+                        </tr>
+                        <tr>
+                            <td class=fielddesc>
+                                Enum value that defines to which entity the rate will be applicable.
+                                Available options are:
+                                1=Loans
+
+                                Once a rate definition is created, this attribute cannot be changed at any point
+                            </td>
+                        </tr>
+                        <tr class=alt>
+                            <td>Active</td>
+                        </tr>
+                        <tr>
+                            <td class=fielddesc>
+                                Flag indicating if the rate is currently active
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <a id="create_rate" name="create_rate"
+               class="old-syle-anchor">&nbsp;</a>
+            <div class="method-section">
+                <div class="method-description">
+                    <h4>Create a new Rate</h4>
+                    <p>Creates a new Rate</p>
+                    <table class=matrixHeading>
+                        <tr class="matrixHeadingBG">
+                            <td>
+                                <div class="fineractHeading2">Mandatory Fields</div>
+                            </td>
+                        </tr>
+                        <tr class=alt>
+                            <td>name</td>
+                        </tr>
+                        <tr class=alt>
+                            <td>percentage</td>
+                        </tr>
+                        <tr class=alt>
+                            <td>productApply</td>
+                        </tr>
+                        <tr class=alt>
+                            <td>active</td>
+                        </tr>
+                    </table>
+                </div>
+                <div class="method-example">
+                    <code class="method-declaration">
+                        POST https://DomainName/api/v1/rates
+                    </code>
+                    <code class="method-request">
+                        POST rates
+                        Content-Type: application/json
+                        Request Body:
+                        {
+                        "productApply":1,
+                        "name":"Loan rate",
+                        "percentage":"12",
+                        "active":true,
+                        "locale":"en"
+                        }
+                    </code>
+                    <code class="method-response">
+                        {
+                        "resourceId": 1
+                        }
+                    </code>
+                </div>
+            </div>
+            <a id="rate_list" name="rate_list"
+               class="old-syle-anchor">&nbsp;</a>
+            <div class="method-section">
+                <div class="method-description">
+                    <h4>List Rates</h4>
+                    <p>List Rates</p>
+                </div>
+                <div class="method-example">
+                    <code class="method-declaration">
+                        GET https://DomainName/api/v1/rates
+                    </code>
+                    <code class="method-request">
+                        GET rates
+                        Content-Type: application/json
+                    </code>
+                    <code class="method-response">
+                        [
+                        {
+                        "id":1,
+                        "name":"Loan Rate",
+                        "percentage":12.00,
+                        "productApply":1,
+                        "active":true
+                        },
+                        {
+                        "id":2,
+                        "name":"Public Rate",
+                        "percentage":30.00,
+                        "productApply":1,
+                        "active":true
+                        },
+                        {
+                        "id":3,
+                        "name":"Private Rate",
+                        "percentage":14.00,
+                        "productApply":1,
+                        "active":true
+                        }
+                        ]
+                    </code>
+                </div>
+            </div>
+            <a id="retrieve_rate" name="retrieve_rate"
+               class="old-syle-anchor">&nbsp;</a>
+            <div class="method-section">
+                <div class="method-description">
+                    <h4>Retrieve a Rate</h4>
+                    <p>Return the details of an existing Rate</p>
+                </div>
+                <div class="method-example">
+                    <code class="method-declaration">
+                        GET https://DomainName/api/v1/rates/{rateId}
+                    </code>
+                    <code class="method-request">
+                        GET rates/1
+                        Content-Type: application/json
+                    </code>
+                    <code class="method-response">
+                        {
+                        "id":1,
+                        "name":"Loan Rate",
+                        "percentage":12.00,
+                        "productApply":1,
+                        "active":true
+                        }
+                    </code>
+                </div>
+            </div>
+            <a id="update_rate" name="update_rate"
+               class="old-syle-anchor">&nbsp;</a>
+            <div class="method-section">
+                <div class="method-description">
+                    <h4>Update a Rate</h4>
+                    <p>Updates an existing Rate</p>
+                </div>
+                <div class="method-example">
+                    <code class="method-declaration">
+                        POST https://DomainName/api/v1/rates/{rateId}
+                    </code>
+                    <code class="method-request">
+                        POST rates/3
+                        Content-Type: application/json
+                        Request Body:
+                        {
+                        "percentage":"17",
+                        }
+                    </code>
+                    <code class="method-response">
+                        {
+                        "resourceId":3,
+                        "changes":
+                        {
+                        "percentage":17
+                        }
+                        }
+                    </code>
+                </div>
+            </div>
+            <!-- End of Rates -->
+
+            <!-- start of clients api docs -->
 		<a id="templates" name="clients" class="old-syle-anchor">&nbsp;</a>
 		<div class="method-section">
 			<div class="method-description">
@@ -46751,7 +46970,7 @@ <h4>Retrieve a Loan Transaction Details</h4>
   },
   "amount": 559.88,
   "interestPortion": 559.88
-}
+   }
 					</code>
 				</div>
 			</div>

docker-compose.yml

@@ -43,7 +43,7 @@ services:
     depends_on:
       - fineractmysql
     environment:
-      - JAVA_OPTS=-Dfineract_tenants_url=jdbc:mysql:thin://fineractmysql:3306/mifosplatform-tenants -Dfineract_tenants_driver=org.drizzle.jdbc.DrizzleDriver -Dfineract_tenants_uid=root -Dfineract_tenants_pwd=skdcnwauicn2ucnaecasdsajdnizucawencascdca -Djava.awt.headless=true -XX:+UseG1GC -Dfile.encoding=UTF-8
+      - JAVA_OPTS=-Dfineract_tenants_url=jdbc:mysql:thin://fineractmysql:3306/fineract_tenants -Dfineract_tenants_driver=org.drizzle.jdbc.DrizzleDriver -Dfineract_tenants_uid=root -Dfineract_tenants_pwd=skdcnwauicn2ucnaecasdsajdnizucawencascdca -Djava.awt.headless=true -XX:+UseG1GC -Dfile.encoding=UTF-8
       - FINERACT_DEFAULT_TENANTDB_HOSTNAME=fineractmysql
       - FINERACT_DEFAULT_TENANTDB_PORT=3306
       - FINERACT_DEFAULT_TENANTDB_UID=root