FIN-349 fix any testing issues after budget changes.

Author: gjong

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/user/ParseUserConfigurationDelegate.java

@@ -53,12 +53,16 @@ public void execute(DelegateExecution execution) throws Exception {
             execution.setVariableLocal("ruleStorageToken", null);
         }
 
-        var sortedBudgets = profileJson.getBudgetPeriods().stream()
-                .sorted(Comparator.comparing(BudgetJson::getStart))
-                .toList();
+        if (profileJson.getBudgetPeriods() != null) {
+            var sortedBudgets = profileJson.getBudgetPeriods().stream()
+                    .sorted(Comparator.comparing(BudgetJson::getStart))
+                    .toList();
+            execution.setVariableLocal("budgetPeriods", serialize(sortedBudgets));
+        } else {
+            execution.setVariableLocal("budgetPeriods", List.of());
+        }
 
         execution.setVariableLocal("accounts", serialize(profileJson.getAccounts()));
-        execution.setVariableLocal("budgetPeriods", serialize(sortedBudgets));
         execution.setVariableLocal("contracts", serialize(profileJson.getContracts()));
         execution.setVariableLocal("categories", serialize(profileJson.getCategories()));
         execution.setVariableLocal("tags", Control.Option(profileJson.getTags()).getOrSupply(List::of));

bpmn-process/src/test/java/com/jongsoft/finance/bpmn/delegate/budget/ProcessBudgetCreateDelegateTest.java

@@ -5,8 +5,10 @@
 import com.jongsoft.finance.domain.user.Role;
 import com.jongsoft.finance.domain.user.UserAccount;
 import com.jongsoft.finance.messaging.EventBus;
+import com.jongsoft.finance.messaging.commands.budget.CloseBudgetCommand;
 import com.jongsoft.finance.messaging.commands.budget.CreateBudgetCommand;
 import com.jongsoft.finance.messaging.commands.budget.CreateExpenseCommand;
+import com.jongsoft.finance.messaging.commands.budget.UpdateExpenseCommand;
 import com.jongsoft.finance.providers.BudgetProvider;
 import com.jongsoft.finance.security.CurrentUserProvider;
 import com.jongsoft.finance.serialized.BudgetJson;
@@ -67,7 +69,13 @@ void setup() {
 
     @Test
     void execute_initial() {
-        Mockito.when(budgetProvider.lookup(2019, 1)).thenReturn(Control.Option());
+        Mockito.when(budgetProvider.lookup(2019, 1))
+                .thenReturn(Control.Option())
+                .thenReturn(Control.Option(Budget.builder()
+                        .id(1L)
+                        .expectedIncome(1200)
+                        .expenses(Collections.List())
+                        .build()));
 
         subject.execute(execution);
 
@@ -95,9 +103,10 @@ void execute_indexation() {
 
         subject.execute(execution);
 
+        Mockito.verify(eventPublisher).publishEvent(Mockito.any(CloseBudgetCommand.class));
         Mockito.verify(eventPublisher).publishEvent(Mockito.any(CreateBudgetCommand.class));
-        Mockito.verify(initial).indexBudget(LocalDate.of(2019, 1, 1), 1200);
         Mockito.verify(eventPublisher).publishEvent(Mockito.any(CreateExpenseCommand.class));
+        Mockito.verify(eventPublisher).publishEvent(Mockito.any(UpdateExpenseCommand.class));
     }
 
 }

jpa-repository/src/main/java/com/jongsoft/finance/jpa/budget/BudgetProviderJpa.java

@@ -47,7 +47,7 @@ public Optional<Budget> lookup(int year, int month) {
                 select b from BudgetJpa b
                 where b.user.username = :username
                     and b.from <= :start
-                    and (b.until is null or b.until > :end)""";
+                    and (b.until is null or b.until >= :end)""";
 
         return reactiveEntityManager.<BudgetJpa>blocking()
                 .hql(hql)

jpa-repository/src/test/java/com/jongsoft/finance/jpa/budget/BudgetProviderJpaIT.java

@@ -38,7 +38,8 @@ void lookup() throws IOException {
 
     @Test
     void lookup_201901() throws IOException {
-        var check = budgetProvider.lookup(2019, 1).get();
+        var check = budgetProvider.lookup(2019, 1)
+                .get();
 
         Assertions.assertThat(check.getExpenses()).hasSize(2);
         Assertions.assertThat(check.getExpectedIncome()).isEqualTo(2500);

jpa-repository/src/test/resources/sql/user/budget-provider.sql

@@ -5,8 +5,7 @@ values (1, 'Groceries', 1),
 
 insert into budget (id, expected_income, user_id, b_from, b_until)
 values (1, 2500, 1, '2019-01-01', '2019-02-01'),
-       (2, 2800, 1, '2019-02-01', null),
-       (3, 3000, 2, '2019-01-01', null);
+       (2, 2800, 1, '2019-02-01', null);
 
 insert into budget_period (id, bp_lower_bound, bp_upper_bound, expense_id, budget_id)
 values (1, 200, 300, 1, 1),