From efda6e1b65822d2aa1f7753322598d1f2d2f3460 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 22 Apr 2022 20:50:52 +0000
Subject: [PATCH] Group transactions by date to simplify grouping in UI

---
 web/src/components/TransactionRow.vue | 20 --------------------
 web/src/date.ts                       |  9 +++++++++
 web/src/pages/Account.vue             | 22 ++++++++++++++++------
 web/src/stores/budget-account.ts      |  3 +--
 web/src/stores/transactions.ts        | 19 ++++++++++++-------
 5 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/web/src/components/TransactionRow.vue b/web/src/components/TransactionRow.vue
index 82320e4..48799e1 100644
--- a/web/src/components/TransactionRow.vue
+++ b/web/src/components/TransactionRow.vue
@@ -21,19 +21,6 @@ const Reconciling = computed(() => useTransactionsStore().Reconciling);
 const transactionsStore = useTransactionsStore();
 const TX = transactionsStore.Transactions.get(props.transactionid)!;
 
-function dateChanged() {
-    const currentAccount = useAccountStore().CurrentAccount;
-    if (currentAccount == null)
-        return true;
-    const transactionIndex = currentAccount.Transactions.indexOf(props.transactionid);
-    if(transactionIndex<=0)
-        return true;
-
-    const previousTransactionId = currentAccount.Transactions[transactionIndex-1];
-    const previousTransaction = transactionsStore.Transactions.get(previousTransactionId);
-    return TX.Date.getTime() != previousTransaction?.Date.getTime();
-}
-
 function getStatusSymbol() {
     if(TX.Status == "Reconciled")
         return "✔";
@@ -46,13 +33,6 @@ function getStatusSymbol() {
 </script>
 
 <template>
-  <tr v-if="dateChanged()" class="table-row md:hidden">
-    <td class="py-2" colspan="5">
-      <span class="bg-gray-400 dark:bg-slate-600 rounded-lg p-1 px-2 w-full block">
-        {{ formatDate(TX.Date) }}
-      </span>
-    </td>
-  </tr>
   <tr
     v-if="!edit"
     class="{{new Date(TX.Date) > new Date() ? 'future' : ''}}"
diff --git a/web/src/date.ts b/web/src/date.ts
index 1382440..7ca8696 100644
--- a/web/src/date.ts
+++ b/web/src/date.ts
@@ -6,3 +6,12 @@ export function formatDate(date: Date): string {
         day: "2-digit",
     });
 }
+
+export function groupBy<T, K extends keyof any>(list: T[], getKey: (item: T) => K) {
+  return list.reduce((previous, currentItem) => {
+    const group = getKey(currentItem);
+    if (!previous[group]) previous[group] = [];
+    previous[group].push(currentItem);
+    return previous;
+  }, {} as Record<K, T[]>);
+}
\ No newline at end of file
diff --git a/web/src/pages/Account.vue b/web/src/pages/Account.vue
index db4fad3..c93ad1a 100644
--- a/web/src/pages/Account.vue
+++ b/web/src/pages/Account.vue
@@ -10,6 +10,7 @@ import { useTransactionsStore } from "../stores/transactions";
 import Modal from "../components/Modal.vue";
 import Input from "../components/Input.vue";
 import Checkbox from "../components/Checkbox.vue";
+import { formatDate } from "../date";
 
 defineProps<{
     budgetid: string
@@ -144,12 +145,21 @@ function createReconcilationTransaction() {
       :budgetid="budgetid"
       :accountid="accountid"
     />
-    <TransactionRow
-      v-for="(transaction, index) in transactions.TransactionsList"
-      :key="transaction.ID"
-      :transactionid="transaction.ID"
-      :index="index"
-    />
+    <template v-for="(dayTransactions, index) in transactions.TransactionsByDate">
+      <tr class="table-row md:hidden">
+        <td class="py-2" colspan="5">
+          <span class="bg-gray-400 dark:bg-slate-600 rounded-lg p-1 px-2 w-full block">
+            {{ index }}
+          </span>
+        </td>
+      </tr>
+      <TransactionRow
+        v-for="(transaction, index) in dayTransactions"
+        :key="transaction.ID"
+        :transactionid="transaction.ID"
+        :index="index"
+      />
+    </template>
   </table>
   <div class="md:hidden">
     <Modal @submit="submitModal">
diff --git a/web/src/stores/budget-account.ts b/web/src/stores/budget-account.ts
index 0259e80..57a3671 100644
--- a/web/src/stores/budget-account.ts
+++ b/web/src/stores/budget-account.ts
@@ -201,10 +201,9 @@ export const useAccountStore = defineStore("budget/account", {
             );
             const response = await result.json();
             const transactionsStore = useTransactionsStore();
-            const transactions = transactionsStore.AddTransactions(
+            transactionsStore.AddTransactions(
                 response.Transactions
             );
-            account.Transactions = transactions;
         },
         async FetchMonthBudget(budgetid: string, year: number, month: number) {
             const result = await GET(
diff --git a/web/src/stores/transactions.ts b/web/src/stores/transactions.ts
index c9c8d58..7ce27ab 100644
--- a/web/src/stores/transactions.ts
+++ b/web/src/stores/transactions.ts
@@ -1,5 +1,6 @@
 import { defineStore } from "pinia";
 import { POST } from "../api";
+import { formatDate, groupBy } from "../date";
 import { useAccountStore } from "./budget-account";
 
 interface State {
@@ -21,6 +22,7 @@ export interface Transaction {
     PayeeID: string | undefined;
     Amount: number;
     Reconciled: boolean;
+    AccountID: string;
 }
 
 export const useTransactionsStore = defineStore("budget/transactions", {
@@ -39,24 +41,27 @@ export const useTransactionsStore = defineStore("budget/transactions", {
             }
             return reconciledBalance;
         },
-        TransactionsList(state): Transaction[] {
+        TransactionsByDate(state) : Record<string, Transaction[]> {
             const accountsStore = useAccountStore();
-            return accountsStore.CurrentAccount!.Transactions.map((x) => {
-                return this.Transactions.get(x)!;
-            });
+            const accountID = accountsStore.CurrentAccountID;
+            const allTransactions = [...this.Transactions.values()];
+            return groupBy(allTransactions.filter(x => x.AccountID == accountID), x => formatDate(x.Date));
+        },
+        TransactionsList(state) : Transaction[] {
+            const accountsStore = useAccountStore();
+            const accountID = accountsStore.CurrentAccountID;
+            const allTransactions = [...this.Transactions.values()];
+            return allTransactions.filter(x => x.AccountID == accountID);
         },
     },
     actions: {
         AddTransactions(transactions: Array<Transaction>) {
-            const transactionIds = [] as Array<string>;
             this.$patch(() => {
                 for (const transaction of transactions) {
                     transaction.Date = new Date(transaction.Date);
                     this.Transactions.set(transaction.ID, transaction);
-                    transactionIds.push(transaction.ID);
                 }
             });
-            return transactionIds;
         },
         SetReconciledForAllTransactions(value: boolean) {
             for (const transaction of this.TransactionsList) {