Merge pull request #8 from openMF/enhancement/savings_account_accrual…

…_charges Savings Account enhancement for accrual fee transactions
openMF · Oct 5, 2023 · 0871bcf · 0871bcf
2 parents 34b29d9 + 25be73c
commit 0871bcf
Show file tree

Hide file tree

Showing 112 changed files with 6,531 additions and 1,193 deletions.
diff --git a/.github/workflows/build-docker-mariadb.yml b/.github/workflows/build-docker-mariadb.yml
@@ -12,7 +12,9 @@ jobs:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:

diff --git a/.github/workflows/build-docker-postgresql.yml b/.github/workflows/build-docker-postgresql.yml
@@ -12,7 +12,9 @@ jobs:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:

diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
@@ -11,7 +11,9 @@ jobs:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:

diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml
@@ -30,7 +30,9 @@ jobs:
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:
@@ -86,7 +88,7 @@ jobs:
 
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # tag=v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
         with:
           name: test-results
           path: |
@@ -96,7 +98,7 @@ jobs:
 
       - name: Archive server logs
         if: always()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # tag=v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
         with:
           name: server-logs
           path: |

diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml
@@ -30,7 +30,9 @@ jobs:
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:
@@ -86,7 +88,7 @@ jobs:
 
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # tag=v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
         with:
           name: test-results
           path: |
@@ -96,7 +98,7 @@ jobs:
 
       - name: Archive server logs
         if: always()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # tag=v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
         with:
           name: server-logs
           path: |

diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml
@@ -31,7 +31,9 @@ jobs:
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:
@@ -87,7 +89,7 @@ jobs:
 
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # tag=v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
         with:
           name: test-results
           path: |
@@ -97,7 +99,7 @@ jobs:
 
       - name: Archive server logs
         if: always()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # tag=v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
         with:
           name: server-logs
           path: |

diff --git a/.github/workflows/smoke-activemq.yml b/.github/workflows/smoke-activemq.yml
@@ -12,7 +12,9 @@ jobs:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:

diff --git a/.github/workflows/smoke-kafka.yml b/.github/workflows/smoke-kafka.yml
@@ -12,7 +12,9 @@ jobs:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -20,7 +20,9 @@ jobs:
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -15,7 +15,7 @@ jobs:
       pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8
+    - uses: actions/stale@v8
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         # stale-issue-message: 'Stale issue message'

diff --git a/build.gradle b/build.gradle
@@ -67,6 +67,7 @@ buildscript {
 }
 
 plugins {
+    id 'me.qoomon.git-versioning' version '6.4.2'
     id "org.barfuin.gradle.taskinfo" version "2.1.0"
     id 'com.adarshr.test-logger' version '3.2.0'
     id 'com.diffplug.spotless' version '6.19.0' apply false
@@ -85,7 +86,6 @@ plugins {
     id 'org.asciidoctor.jvm.gems' version '3.3.2' apply false
     id 'org.asciidoctor.kindlegen.base' version '3.2.0' apply false
     id 'com.google.cloud.tools.jib' version '3.3.2' apply false
-    id 'fr.brouillard.oss.gradle.jgitver' version '0.10.0-rc03'
     id 'org.sonarqube' version '4.2.1.3168'
     id 'com.github.andygoossens.modernizer' version '1.8.0' apply false
     id 'com.github.spotbugs' version '5.0.14' apply false
@@ -99,17 +99,30 @@ description = '''\
 Run as:
 gradle clean bootRun'''
 
+version = "0.0.0-SNAPSHOT"
+gitVersioning.apply {
+    refs {
+        considerTagsOnBranches = true
+
+        tag("(?<version>.*)") {
+            version = "\${ref.version}"
+        }
+
+        branch(".+") {
+            version = "\${describe.tag.version.major}.\${describe.tag.version.minor}.\${describe.tag.version.patch.next}-SNAPSHOT"
+        }
+    }
+    rev {
+        version = "\${commit}"
+    }
+}
+
 ext['groovy.version'] = '4.0.6'
 ext['swaggerFile'] = "$rootDir/fineract-provider/build/classes/java/main/static/fineract.json".toString()
 
 allprojects  {
     group = 'org.apache.fineract'
 
-    jgitver {
-        strategy 'PATTERN'
-        versionPattern ( project.hasProperty('fineract.release.version') ? '${v}' : '${M}.${m}.${p}-${meta.GIT_SHA1_8}' )
-    }
-
     repositories {
         mavenCentral()
     }

diff --git a/fineract-core/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java b/fineract-core/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
@@ -182,6 +182,9 @@ private JsonElement resolveDependentVariables(final Map.Entry<String, JsonElemen
         } else if (element.isJsonArray()) {
             final JsonArray jsElementArray = element.getAsJsonArray();
             value = processJsonArray(jsElementArray, responseCtx);
+        } else if (element.isJsonNull()) {
+            // No further processing of null values
+            value = element;
         } else {
             value = resolveDependentVariable(element, responseCtx);
         }

diff --git a/...rg/apache/fineract/infrastructure/core/service/database/DatabaseSpecificSQLGenerator.java b/...rg/apache/fineract/infrastructure/core/service/database/DatabaseSpecificSQLGenerator.java
@@ -91,15 +91,17 @@ public String calcFoundRows() {
         }
     }
 
-    public String countLastExecutedQueryResult(String sql) {
+    public String countLastExecutedQueryResult(@NotNull String sql) {
         if (databaseTypeResolver.isMySQL()) {
             return "SELECT FOUND_ROWS()";
         } else {
             return countQueryResult(sql);
         }
     }
 
-    public String countQueryResult(String sql) {
+    public String countQueryResult(@NotNull String sql) {
+        // Needs to remove the limit and offset
+        sql = sql.replaceAll("LIMIT \\d+", "").replaceAll("OFFSET \\d+", "").trim();
         return format("SELECT COUNT(*) FROM (%s) AS temp", sql);
     }
 

diff --git a/...n/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java b/...n/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java
@@ -31,7 +31,6 @@ private PaymentTypeApiResourceConstants() {
     public static final String RESOURCE_NAME = "paymenttype";
     public static final String ENTITY_NAME = "PAYMENTTYPE";
 
-    public static final String resourceNameForPermissions = "PAYMENT_TYPE";
     public static final String ID = "id";
     public static final String NAME = "name";
     public static final String DESCRIPTION = "description";