Merge branch 'afk11-bug-with-checkpoints' into master

jpos · Aug 25, 2020 · aabcd4b · aabcd4b
2 parents 4ca2146 + ba24292
commit aabcd4b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/modules/minigl/src/main/java/org/jpos/gl/Checkpoint.java b/modules/minigl/src/main/java/org/jpos/gl/Checkpoint.java
@@ -86,6 +86,7 @@ public String toString() {
             .append("layers", getLayers())
             .append("journal", getJournal())
             .append("account", getAccount())
+            .append("balance", getBalance())
             .toString();
     }
 

diff --git a/modules/minigl/src/main/java/org/jpos/gl/GLSession.java b/modules/minigl/src/main/java/org/jpos/gl/GLSession.java
@@ -1083,7 +1083,7 @@ else if (acct.isFinalAccount()) {
                 Checkpoint chkp = getRecentCheckpoint (journal, acct, date, inclusive, layersCopy);
                 if (chkp != null) {
                     balance[0] = chkp.getBalance();
-                    txnCrit.add (Restrictions.gt ("postDate", chkp.getDate()));
+                    txnCrit.add (Restrictions.ge ("postDate", chkp.getDate()));
                 }
             } else if (!ignoreBalanceCache) {
                 BalanceCache bcache = getBalanceCache (journal, acct, layersCopy);

diff --git a/modules/minigl/src/test/java/org/jpos/gl/BalanceTest.java b/modules/minigl/src/test/java/org/jpos/gl/BalanceTest.java
@@ -64,9 +64,11 @@ public void testBalancesByPostDate() throws Exception {
     @Test
     @Order(3)
     public void testCheckpoints() throws Exception {
+        final Transaction tx1 = gls.beginTransaction();
         gls.createCheckpoint (tj, root, Util.parseDate ("20041231"), 1);
         gls.createCheckpoint (tj, root, Util.parseDate ("20050101"), 1);
         gls.createCheckpoint (tj, root, Util.parseDate ("20050102"), 1);
+        tx1.commit();
     }
     @Test
     @Order(4)
@@ -278,6 +280,11 @@ private void checkBalancesByPostDate () throws Exception {
             new BigDecimal("15000.00"),
             gls.getBalance (tj, cashUS, Util.parseDate ("20050101"))
         );
+        short[] zeroOnly = {0};
+        assertEquals (
+                new BigDecimal("25000.00"),
+                gls.getBalancesORM (tj, cashUS, Util.parseDate ("20050102"), true, zeroOnly, 0)[0]
+        );
         assertEquals (
             new BigDecimal("25000.00"),
             gls.getBalance (tj, cashUS, Util.parseDate ("20050102"))