Update data type handling and field mappings in JPA queries (#108)

* Update data type handling and field mappings in JPA queries
* Fix inconsistent transaction data and improve error handling
* Update expected values in TransactionProviderJpaIT tests

Author: gjong

domain/src/main/java/com/jongsoft/finance/domain/transaction/Transaction.java

@@ -269,14 +269,14 @@ public Account computeFrom() {
         return transactions
                 .first(FROM_PREDICATE)
                 .map(Part::getAccount)
-                .get();
+                .getOrThrow(() -> new IllegalStateException("Transaction has no from account."));
     }
 
     public Account computeTo() {
         return transactions
                 .first(TO_PREDICATE)
                 .map(Part::getAccount)
-                .get();
+                .getOrThrow(() -> new IllegalStateException("Transaction has no to account."));
     }
 
     public Account computeCounter(Account account) {

jpa-repository/src/main/java/com/jongsoft/finance/jpa/rule/CreateRuleGroupHandler.java

@@ -32,12 +32,12 @@ public void handle(CreateRuleGroupCommand command) {
         var currentMax = entityManager.from(RuleGroupJpa.class)
                 .fieldEq("user.username", authenticationFacade.authenticated())
                 .fieldEq("archived", false)
-                .projectSingleValue(Long.class, "max(sort)");
+                .projectSingleValue(Integer.class, "max(sort)");
 
         var jpaEntity = RuleGroupJpa.builder()
                 .name(command.name())
                 .user(entityManager.currentUser())
-                .sort(currentMax.map(Integer.class::cast).getOrSupply(() -> 1))
+                .sort(currentMax.getOrSupply(() -> 1))
                 .build();
 
         entityManager.persist(jpaEntity);

jpa-repository/src/main/java/com/jongsoft/finance/jpa/rule/TransactionRuleProviderJpa.java

@@ -84,8 +84,7 @@ public void save(TransactionRule rule) {
             sortOrder = entityManager.from(RuleJpa.class)
                     .fieldEq("user.username", authenticationFacade.authenticated())
                     .fieldEq("group.name", rule.getGroup())
-                    .projectSingleValue(Long.class, "max(sort)")
-                    .map(Long::intValue)
+                    .projectSingleValue(Integer.class, "max(sort)")
                     .getOrSupply(() -> 1);
         }
 
@@ -161,8 +160,8 @@ private UserAccountJpa activeUser() {
 
     private RuleGroupJpa group(String group) {
         return entityManager.from(RuleGroupJpa.class)
-                .fieldEq("username", authenticationFacade.authenticated())
-                .fieldEq("group", group)
+                .fieldEq("user.username", authenticationFacade.authenticated())
+                .fieldEq("name", group)
                 .singleResult()
                 .getOrSupply(() -> {
                     EventBus.getBus().send(new CreateRuleGroupCommand(group));

jpa-repository/src/test/java/com/jongsoft/finance/jpa/transaction/TransactionProviderJpaIT.java

@@ -65,15 +65,15 @@ void lookup_currency() {
                 .currency("EUR");
 
         var check = transactionProvider.lookup(filter);
-        Assertions.assertThat(check.content()).hasSize(2);
+        Assertions.assertThat(check.content()).hasSize(3);
     }
 
     @Test
     void daily() {
         var check = transactionProvider.daily(filterFactory.transaction().ownAccounts());
         Assertions.assertThat(check).hasSize(2);
         Assertions.assertThat(check).containsOnly(
-                new DailySummaryImpl(LocalDate.of(2019, 1, 1), BigDecimal.valueOf(20.2D)),
+                new DailySummaryImpl(LocalDate.of(2019, 1, 1), BigDecimal.valueOf(30.2D)),
                 new DailySummaryImpl(LocalDate.of(2019, 1, 2), BigDecimal.valueOf(20.2D)));
     }
 
@@ -82,15 +82,15 @@ void monthly() {
         var check = transactionProvider.monthly(filterFactory.transaction().ownAccounts());
         Assertions.assertThat(check).hasSize(1);
         Assertions.assertThat(check).containsOnly(
-                new DailySummaryImpl(LocalDate.of(2019, 1, 1), BigDecimal.valueOf(40.4D)));
+                new DailySummaryImpl(LocalDate.of(2019, 1, 1), BigDecimal.valueOf(50.4D)));
     }
 
     @Test
     void balance() {
         var check = transactionProvider.balance(filterFactory.transaction().ownAccounts());
 
         Assertions.assertThat(check.isPresent()).isTrue();
-        Assertions.assertThat(check.get()).isEqualByComparingTo(BigDecimal.valueOf(40.4));
+        Assertions.assertThat(check.get()).isEqualByComparingTo(BigDecimal.valueOf(50.4));
     }
 
     @Test

jpa-repository/src/test/resources/sql/base-setup.sql

@@ -1,6 +1,6 @@
 
 insert into currency (id, name, symbol, code, decimal_places, enabled, archived)
-values (1, 'Euro', '?', 'EUR', default, default, default),
+values (1, 'Euro', '?', 'EUR', default, true, false),
        (2, 'US Dollar', '$', 'USD', default, default, default),
        (3, 'British Pound', '�', 'GBP', default, default, default);
 

jpa-repository/src/test/resources/sql/transaction/transaction-provider.sql

@@ -27,7 +27,7 @@ values (1, '2019-01-01', '2019-01-01', null, 1, 1, 20.2),
        (4, '2019-01-02', '2019-01-05', '2019-01-05', 2, 4, -20.2),
        (5, '2019-01-05', '2019-01-05', null, 2, 4, -10.2),
        (6, '2019-01-05', '2019-01-05', null, 2, 4, -10.0),
-       (7, '2019-01-05', '2019-01-05', null, 3, 4, -10.2),
+       (7, '2019-01-05', '2019-01-05', null, 3, 3, 10.0),
        (8, '2019-01-05', '2019-01-05', null, 3, 4, -10.0);
 
 insert into transaction_tag (tag_id, transaction_id)