From 8fbdd78cb3532a6f4ccf1f843e6a360a8e230fb5 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Tue, 15 Feb 2022 09:13:14 +0000
Subject: [PATCH] Add Transaction to list after saving

---
 http/transaction.go                        |  5 ++--
 web/src/components/TransactionInputRow.vue | 30 ++++++++++++----------
 web/src/pages/Account.vue                  |  1 -
 web/src/stores/budget-account.ts           | 15 +++++++----
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/http/transaction.go b/http/transaction.go
index c047e0d..bcf0618 100644
--- a/http/transaction.go
+++ b/http/transaction.go
@@ -71,12 +71,13 @@ func (h *Handler) newTransaction(c *gin.Context) {
 		CategoryID: payload.Category.ID, //TODO handle new category
 		Status:     postgres.TransactionStatus(payload.State),
 	}
-	_, err = h.Service.CreateTransaction(c.Request.Context(), new)
+	transaction, err := h.Service.CreateTransaction(c.Request.Context(), new)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err))
+		return
 	}
 
-	return
+	c.JSON(http.StatusOK, transaction)
 	//	}
 	/*
 		_, delete := c.GetPostForm("delete")
diff --git a/web/src/components/TransactionInputRow.vue b/web/src/components/TransactionInputRow.vue
index 1724dc3..d493689 100644
--- a/web/src/components/TransactionInputRow.vue
+++ b/web/src/components/TransactionInputRow.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { ref } from "vue";
-import { POST } from "../api";
+import { computed, ref } from "vue";
 import Autocomplete, { Suggestion } from '../components/Autocomplete.vue'
+import { useAccountStore } from '../stores/budget-account'
 
 const props = defineProps<{
     budgetid: string
@@ -12,21 +12,23 @@ const TransactionDate = ref(new Date().toISOString().substring(0, 10));
 const Payee = ref<Suggestion | undefined>(undefined);
 const Category = ref<Suggestion | undefined>(undefined);
 const Memo = ref("");
-const Amount = ref("");
+const Amount = ref("0");
 
+const payload = computed(() => JSON.stringify({
+    budget_id: props.budgetid,
+    account_id: props.accountid,
+    date: TransactionDate.value,
+    payee: Payee.value,
+    category: Category.value,
+    memo: Memo.value,
+    amount: Amount.value,
+    state: "Uncleared"
+}));
+
+const accountStore = useAccountStore();
 function saveTransaction(e: MouseEvent) {
     e.preventDefault();
-    POST("/transaction/new", JSON.stringify({
-        budget_id: props.budgetid,
-        account_id: props.accountid,
-        date: TransactionDate.value,
-        payee: Payee.value,
-        category: Category.value,
-        memo: Memo.value,
-        amount: Amount.value,
-        state: "Uncleared"
-    }))
-        .then(x => x.json());
+    accountStore.saveTransaction(payload.value);
 }
 </script>
 
diff --git a/web/src/pages/Account.vue b/web/src/pages/Account.vue
index d38b6b1..af169bf 100644
--- a/web/src/pages/Account.vue
+++ b/web/src/pages/Account.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { computed, ref } from "vue"
-import Autocomplete, { Suggestion } from '../components/Autocomplete.vue'
 import Currency from "../components/Currency.vue";
 import TransactionRow from "../components/TransactionRow.vue";
 import TransactionInputRow from "../components/TransactionInputRow.vue";
diff --git a/web/src/stores/budget-account.ts b/web/src/stores/budget-account.ts
index a56f0fc..d0903fe 100644
--- a/web/src/stores/budget-account.ts
+++ b/web/src/stores/budget-account.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia"
-import { GET } from "../api";
+import { GET, POST } from "../api";
 import { useSessionStore } from "./session";
 
 interface State {
@@ -7,7 +7,7 @@ interface State {
     CurrentAccountID: string | null,
     Categories: Map<string, Category>,
     Months: Map<number, Map<number, Map<string, Category>>>,
-    Transactions: [],
+    Transactions: any[],
     Assignments: []
 }
 
@@ -16,7 +16,7 @@ export interface Transaction {
     Date: string,
     TransferAccount: string,
     CategoryGroup: string,
-    Category:string,
+    Category: string,
     Memo: string,
     Status: string,
     GroupID: string,
@@ -69,13 +69,13 @@ export const useAccountStore = defineStore("budget/account", {
         OnBudgetAccounts(state) {
             return [...state.Accounts.values()].filter(x => x.OnBudget);
         },
-        OnBudgetAccountsBalance(state) : number {
+        OnBudgetAccountsBalance(state): number {
             return this.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0);
         },
         OffBudgetAccounts(state) {
             return [...state.Accounts.values()].filter(x => !x.OnBudget);
         },
-        OffBudgetAccountsBalance(state) : number {
+        OffBudgetAccountsBalance(state): number {
             return this.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0);
         },
         TransactionsList(state) {
@@ -119,6 +119,11 @@ export const useAccountStore = defineStore("budget/account", {
         logout() {
             this.$reset()
         },
+        async saveTransaction(payload: string) {
+            const result = await POST("/transaction/new", payload);
+            const response = await result.json();
+            this.Transactions.unshift(response);
+        }
     }
 
 })