Fixed infinite loop in case of holidays for weekly investment plans

Issue: #4374 Issue: #4347 Signed-off-by: mierin12 <[email protected]> [added test case] Signed-off-by: Andreas Buchen <[email protected]>
portfolio-performance · Nov 30, 2024 · fe1f7c3 · fe1f7c3
1 parent 93051e1
commit fe1f7c3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/model/InvestmentPlanTest.java b/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/model/InvestmentPlanTest.java
@@ -359,4 +359,25 @@ public void testGenerationOfWeeklyBuyTransaction() throws IOException
         assertThat(newlyGenerated.get(2).getTransaction().getDateTime(), is(LocalDateTime.parse("2016-04-08T00:00")));
     }
 
+    @Test
+    public void testWeeklyFrom18March2024() throws IOException
+    {
+        investmentPlan.setType(InvestmentPlan.Type.PURCHASE_OR_DELIVERY);
+
+        investmentPlan.setAccount(account);
+        investmentPlan.setPortfolio(portfolio);
+        investmentPlan.setSecurity(security);
+        investmentPlan.setStart(LocalDateTime.parse("2024-03-18T00:00:00"));
+
+        investmentPlan.setInterval(101); // 101 is weekly, 201 bi-weekly
+
+        investmentPlan.generateTransactions(new TestCurrencyConverter());
+
+        var tx = investmentPlan.getTransactions().stream().toList();
+        assertThat(tx.get(0).getDateTime(), is(LocalDateTime.parse("2024-03-18T00:00")));
+        assertThat(tx.get(1).getDateTime(), is(LocalDateTime.parse("2024-03-25T00:00")));
+        assertThat(tx.get(2).getDateTime(), is(LocalDateTime.parse("2024-04-02T00:00")));
+        assertThat(tx.get(3).getDateTime(), is(LocalDateTime.parse("2024-04-08T00:00")));
+    }
+
 }
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/model/InvestmentPlan.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/model/InvestmentPlan.java
@@ -365,8 +365,9 @@ private LocalDate next(LocalDate transactionDate)
 
             if (transactionDate.getDayOfWeek() != start.getDayOfWeek())
             {
-                previousDate = transactionDate.minusDays(
-                                transactionDate.getDayOfWeek().getValue() + 7L - start.getDayOfWeek().getValue());
+                int offset = transactionDate.getDayOfWeek().getValue() - start.getDayOfWeek().getValue();
+                offset = offset > 0 ? offset : offset + 7;
+                previousDate = transactionDate.minusDays(offset);
             }
 
             next = previousDate.plusWeeks((long) interval - WEEKS_THRESHOLD);