From 67c013799dcf532aa29c64d1c32f0fb8846c8b0a Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Thu, 3 Mar 2022 10:44:50 +0000
Subject: [PATCH 01/16] Calculate available balance locally

---
 web/src/pages/Budgeting.vue      | 5 +++--
 web/src/stores/budget-account.ts | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/src/pages/Budgeting.vue b/web/src/pages/Budgeting.vue
index ef235fe..77c1535 100644
--- a/web/src/pages/Budgeting.vue
+++ b/web/src/pages/Budgeting.vue
@@ -4,6 +4,7 @@ import Currency from "../components/Currency.vue";
 import { useBudgetsStore } from "../stores/budget";
 import { useAccountStore } from "../stores/budget-account";
 import { useSessionStore } from "../stores/session";
+import Input from "../components/Input.vue";
 
 const props = defineProps<{
     budgetid: string,
@@ -92,9 +93,9 @@ function getGroupState(group: { Name: string, Expand: boolean }): boolean {
             <template v-for="category in GetCategories(group.Name)" v-if="getGroupState(group)">
                 <span class="whitespace-nowrap overflow-hidden">{{ category.Name }}</span>
                 <Currency :value="category.AvailableLastMonth" class="hidden lg:block" />
-                <Currency :value="category.Assigned" class="hidden sm:block" />
+                <Input type="number" v-model="category.Assigned" class="hidden sm:block mx-2 text-right" />
                 <Currency :value="category.Activity" class="hidden sm:block" />
-                <Currency :value="category.Available" />
+                <Currency :value="accountStore.GetCategoryAvailable(category)" />
             </template>
         </template>
     </div>
diff --git a/web/src/stores/budget-account.ts b/web/src/stores/budget-account.ts
index 4c6d71e..0360411 100644
--- a/web/src/stores/budget-account.ts
+++ b/web/src/stores/budget-account.ts
@@ -31,7 +31,6 @@ export interface Category {
     AvailableLastMonth: number
     Assigned: number
     Activity: number
-    Available: number
 }
 
 export const useAccountStore = defineStore("budget/account", {
@@ -51,6 +50,11 @@ export const useAccountStore = defineStore("budget/account", {
             const monthMap = yearMap?.get(month);
             return [...monthMap?.values() || []];
         },
+        GetCategoryAvailable(state) {
+            return (category : Category) : number => {
+                return category.AvailableLastMonth + Number(category.Assigned) + category.Activity;
+            }
+        },
         CategoryGroupsForMonth(state) {
             return (year: number, month: number) => {
                 const categories = this.AllCategoriesForMonth(year, month);
-- 
2.47.2


From 37951505087adb0c686616cca2510afabb76d353 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 20:54:23 +0000
Subject: [PATCH 02/16] Implement numeric operations in-place

---
 postgres/numeric/numeric.go | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/postgres/numeric/numeric.go b/postgres/numeric/numeric.go
index 8d0cc5e..4988f9e 100644
--- a/postgres/numeric/numeric.go
+++ b/postgres/numeric/numeric.go
@@ -53,6 +53,13 @@ func (n Numeric) IsZero() bool {
 	return float == 0
 }
 
+func (n *Numeric) MatchExpI(exp int32) {
+	diffExp := n.Exp - exp
+	factor := big.NewInt(0).Exp(big.NewInt(10), big.NewInt(int64(diffExp)), nil) //nolint:gomnd
+	n.Exp = exp
+	n.Int = big.NewInt(0).Mul(n.Int, factor)
+}
+
 func (n Numeric) MatchExp(exp int32) Numeric {
 	diffExp := n.Exp - exp
 	factor := big.NewInt(0).Exp(big.NewInt(10), big.NewInt(int64(diffExp)), nil) //nolint:gomnd
@@ -64,6 +71,22 @@ func (n Numeric) MatchExp(exp int32) Numeric {
 	}}
 }
 
+func (n *Numeric) SubI(other Numeric) *Numeric {
+	right := other
+	if n.Exp < other.Exp {
+		right = other.MatchExp(n.Exp)
+	} else if n.Exp > other.Exp {
+		n.MatchExpI(other.Exp)
+	}
+
+	if n.Exp == right.Exp {
+		n.Int = big.NewInt(0).Sub(n.Int, right.Int)
+		return n
+	}
+
+	panic("Cannot subtract with different exponents")
+}
+
 func (n Numeric) Sub(other Numeric) Numeric {
 	left := n
 	right := other
@@ -106,6 +129,22 @@ func (n Numeric) Add(other Numeric) Numeric {
 	panic("Cannot add with different exponents")
 }
 
+func (n *Numeric) AddI(other Numeric) *Numeric {
+	right := other
+	if n.Exp < other.Exp {
+		right = other.MatchExp(n.Exp)
+	} else if n.Exp > other.Exp {
+		n.MatchExpI(other.Exp)
+	}
+
+	if n.Exp == right.Exp {
+		n.Int = big.NewInt(0).Add(n.Int, right.Int)
+		return n
+	}
+
+	panic("Cannot add with different exponents")
+}
+
 func (n Numeric) String() string {
 	if n.Int == nil || n.Int.Int64() == 0 {
 		return "0"
-- 
2.47.2


From d89e702669da2b08b1c6219a1a36ca24eca91e5b Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 20:55:14 +0000
Subject: [PATCH 03/16] Move sidebar layout to BudgetSidebar

---
 web/src/App.vue                 | 10 +---
 web/src/pages/BudgetSidebar.vue | 99 +++++++++++++++++++--------------
 2 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/web/src/App.vue b/web/src/App.vue
index 2345236..057c1f2 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -8,7 +8,6 @@ import { useSettingsStore } from "./stores/settings";
 export default defineComponent({
     computed: {
         ...mapState(useBudgetsStore, ["CurrentBudgetName"]),
-        ...mapState(useSettingsStore, ["Menu"]),
         ...mapState(useSessionStore, ["LoggedIn"]),
     },
     methods: {
@@ -27,15 +26,10 @@ export default defineComponent({
 </script>
 
 <template>
-    <div class="flex flex-col md:flex-row flex-1">
-        <div
-            :class="[Menu.Expand ? 'md:w-72' : 'md:w-36', Menu.Show ? '' : 'hidden']"
-            class="md:block flex-shrink-0 w-full bg-gray-500 border-r-4 border-black"
-        >
+    <div class="flex flex-col md:flex-row flex-1 h-screen">
             <router-view name="sidebar"></router-view>
-        </div>
 
-        <div class="flex-1">
+        <div class="flex-1 overflow-auto">
             <div class="flex bg-gray-400 dark:bg-gray-600 p-4 fixed md:static top-0 left-0 w-full h-14">
                 <span
                     class="flex-1 font-bold text-5xl -my-3 hidden md:inline"
diff --git a/web/src/pages/BudgetSidebar.vue b/web/src/pages/BudgetSidebar.vue
index 302c15b..e3e2045 100644
--- a/web/src/pages/BudgetSidebar.vue
+++ b/web/src/pages/BudgetSidebar.vue
@@ -5,7 +5,9 @@ import { useBudgetsStore } from "../stores/budget"
 import { Account, useAccountStore } from "../stores/budget-account"
 import { useSettingsStore } from "../stores/settings"
 
-const ExpandMenu = computed(() => useSettingsStore().Menu.Expand);
+const settings = useSettingsStore();
+const ExpandMenu = computed(() => settings.Menu.Expand);
+const ShowMenu = computed(() => settings.Menu.Show);
 
 const budgetStore = useBudgetsStore();
 const CurrentBudgetName = computed(() => budgetStore.CurrentBudgetName);
@@ -17,63 +19,76 @@ const OffBudgetAccounts = computed(() => accountStore.OffBudgetAccounts);
 const OnBudgetAccountsBalance = computed(() => accountStore.OnBudgetAccountsBalance);
 const OffBudgetAccountsBalance = computed(() => accountStore.OffBudgetAccountsBalance);
 
-function isRecentlyReconciled(account : Account) {
+function isRecentlyReconciled(account: Account) {
   const now = new Date().getTime();
   const recently = 7 * 24 * 60 * 60 * 1000;
   return new Date(now - recently).getTime() < account.LastReconciled.getTime();
 }
 
-function getAccountName(account : Account) {
+function getAccountName(account: Account) {
   const reconciledMarker = isRecentlyReconciled(account) ? "" : " *";
   return account.Name + reconciledMarker;
 }
 </script>
 
 <template>
-  <div class="flex flex-col mt-14 md:mt-0">
-    <span class="m-2 p-1 px-3 h-10 overflow-hidden" :class="[ExpandMenu ? 'text-2xl' : 'text-md']">
-      <router-link to="/dashboard" style="font-size:150%">⌂</router-link>
-      {{CurrentBudgetName}}
-    </span>
-    <span class="bg-gray-100 dark:bg-gray-700 p-2 px-3 flex flex-col">
-      <router-link :to="'/budget/'+CurrentBudgetID+'/budgeting'">Budget</router-link><br />
-      <!--<router-link :to="'/budget/'+CurrentBudgetID+'/reports'">Reports</router-link>-->
-      <!--<router-link :to="'/budget/'+CurrentBudgetID+'/all-accounts'">All Accounts</router-link>-->
-    </span>
-    <li class="bg-slate-200 dark:bg-slate-700 my-2 p-2 px-3">
-      <div class="flex flex-row justify-between font-bold">
-        <span>On-Budget Accounts</span>
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="OnBudgetAccountsBalance" />
-      </div>
-      <div v-for="account in OnBudgetAccounts" class="flex flex-row justify-between">
-        <router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{getAccountName(account)}}</router-link>
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.ClearedBalance" />
-      </div>
-    </li>
-    <li class="bg-slate-200 dark:bg-slate-700 my-2 p-2 px-3">
-      <div class="flex flex-row justify-between font-bold">
-        <span>Off-Budget Accounts</span>
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="OffBudgetAccountsBalance" />
-      </div>
-      <div v-for="account in OffBudgetAccounts" class="flex flex-row justify-between">
-        <router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{getAccountName(account)}}</router-link>
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.ClearedBalance" />
-      </div>
-    </li>
-    <!--
+  <div
+    :class="[ExpandMenu ? 'md:w-72' : 'md:w-36', ShowMenu ? '' : 'hidden']"
+    class="md:block flex-shrink-0 w-full bg-gray-500 border-r-4 border-black"
+  >
+    <div class="flex flex-col mt-14 md:mt-0">
+      <span
+        class="m-2 p-1 px-3 h-10 overflow-hidden"
+        :class="[ExpandMenu ? 'text-2xl' : 'text-md']"
+      >
+        <router-link to="/dashboard" style="font-size:150%">⌂</router-link>
+        {{ CurrentBudgetName }}
+      </span>
+      <span class="bg-gray-100 dark:bg-gray-700 p-2 px-3 flex flex-col">
+        <router-link :to="'/budget/' + CurrentBudgetID + '/budgeting'">Budget</router-link>
+        <br />
+        <!--<router-link :to="'/budget/'+CurrentBudgetID+'/reports'">Reports</router-link>-->
+        <!--<router-link :to="'/budget/'+CurrentBudgetID+'/all-accounts'">All Accounts</router-link>-->
+      </span>
+      <li class="bg-slate-200 dark:bg-slate-700 my-2 p-2 px-3">
+        <div class="flex flex-row justify-between font-bold">
+          <span>On-Budget Accounts</span>
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" :value="OnBudgetAccountsBalance" />
+        </div>
+        <div v-for="account in OnBudgetAccounts" class="flex flex-row justify-between">
+          <router-link
+            :to="'/budget/' + CurrentBudgetID + '/account/' + account.ID"
+          >{{ getAccountName(account) }}</router-link>
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" :value="account.ClearedBalance" />
+        </div>
+      </li>
+      <li class="bg-slate-200 dark:bg-slate-700 my-2 p-2 px-3">
+        <div class="flex flex-row justify-between font-bold">
+          <span>Off-Budget Accounts</span>
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" :value="OffBudgetAccountsBalance" />
+        </div>
+        <div v-for="account in OffBudgetAccounts" class="flex flex-row justify-between">
+          <router-link
+            :to="'/budget/' + CurrentBudgetID + '/account/' + account.ID"
+          >{{ getAccountName(account) }}</router-link>
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" :value="account.ClearedBalance" />
+        </div>
+      </li>
+      <!--
     <li class="bg-slate-100 dark:bg-slate-800 my-2 p-2 px-3">
       <div class="flex flex-row justify-between font-bold">
         <span>Closed Accounts</span>
       </div>
       + Add Account
     </li>
-    -->
-    <!--<li>
+      -->
+      <!--<li>
       <router-link :to="'/budget/'+CurrentBudgetID+'/accounts'">Edit accounts</router-link>
-    </li>-->
-    <li class="bg-red-100 dark:bg-slate-600 my-2 p-2 px-3">
-      <router-link :to="'/budget/'+CurrentBudgetID+'/settings'">Budget-Settings</router-link>
-    </li>
-    <!--<li><router-link to="/admin">Admin</router-link></li>-->
-  </div>        
+      </li>-->
+      <li class="bg-red-100 dark:bg-slate-600 my-2 p-2 px-3">
+        <router-link :to="'/budget/' + CurrentBudgetID + '/settings'">Budget-Settings</router-link>
+      </li>
+      <!--<li><router-link to="/admin">Admin</router-link></li>-->
+    </div>
+  </div>
 </template>
-- 
2.47.2


From 8ecfd6b87a71251412b080050a23bfa34a9d5e12 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 20:55:38 +0000
Subject: [PATCH 04/16] Use in-place calculations

---
 server/budgeting.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/budgeting.go b/server/budgeting.go
index a421dbc..3e6b249 100644
--- a/server/budgeting.go
+++ b/server/budgeting.go
@@ -171,12 +171,13 @@ func (h *Handler) calculateBalances(budget postgres.Budget,
 	cumultativeBalances []postgres.GetCumultativeBalancesRow) ([]CategoryWithBalance, numeric.Numeric) {
 	categoriesWithBalance := []CategoryWithBalance{}
 
-	moneyUsed := numeric.Zero()
+	moneyUsed2 := numeric.Zero()
+	moneyUsed := &moneyUsed2
 	for i := range categories {
 		cat := &categories[i]
 		// do not show hidden categories
 		categoryWithBalance := h.CalculateCategoryBalances(cat, cumultativeBalances,
-			firstOfNextMonth, &moneyUsed, firstOfMonth, budget)
+			firstOfNextMonth, moneyUsed, firstOfMonth, budget)
 
 		if cat.ID == budget.IncomeCategoryID {
 			continue
@@ -185,7 +186,7 @@ func (h *Handler) calculateBalances(budget postgres.Budget,
 		categoriesWithBalance = append(categoriesWithBalance, categoryWithBalance)
 	}
 
-	return categoriesWithBalance, moneyUsed
+	return categoriesWithBalance, *moneyUsed
 }
 
 func (*Handler) CalculateCategoryBalances(cat *postgres.GetCategoriesRow,
@@ -202,11 +203,11 @@ func (*Handler) CalculateCategoryBalances(cat *postgres.GetCategoriesRow,
 			continue
 		}
 
-		*moneyUsed = moneyUsed.Sub(bal.Assignments)
+		moneyUsed.SubI(bal.Assignments)
 		categoryWithBalance.Available = categoryWithBalance.Available.Add(bal.Assignments)
 		categoryWithBalance.Available = categoryWithBalance.Available.Add(bal.Transactions)
 		if !categoryWithBalance.Available.IsPositive() && bal.Date.Before(firstOfMonth) {
-			*moneyUsed = moneyUsed.Add(categoryWithBalance.Available)
+			moneyUsed.Add(categoryWithBalance.Available)
 			categoryWithBalance.Available = numeric.Zero()
 		}
 
-- 
2.47.2


From fc29b1409d51cb31402d1bc4e84727fae4dd8430 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 21:13:38 +0000
Subject: [PATCH 05/16] Use in-place additions more

---
 server/budgeting.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/budgeting.go b/server/budgeting.go
index 3e6b249..8a77950 100644
--- a/server/budgeting.go
+++ b/server/budgeting.go
@@ -204,10 +204,10 @@ func (*Handler) CalculateCategoryBalances(cat *postgres.GetCategoriesRow,
 		}
 
 		moneyUsed.SubI(bal.Assignments)
-		categoryWithBalance.Available = categoryWithBalance.Available.Add(bal.Assignments)
-		categoryWithBalance.Available = categoryWithBalance.Available.Add(bal.Transactions)
+		categoryWithBalance.Available.AddI(bal.Assignments)
+		categoryWithBalance.Available.AddI(bal.Transactions)
 		if !categoryWithBalance.Available.IsPositive() && bal.Date.Before(firstOfMonth) {
-			moneyUsed.Add(categoryWithBalance.Available)
+			moneyUsed.AddI(categoryWithBalance.Available)
 			categoryWithBalance.Available = numeric.Zero()
 		}
 
-- 
2.47.2


From 1e495a5e47902422b9570ad842eda7bf867d7acb Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 21:13:50 +0000
Subject: [PATCH 06/16] Remove unneeded loop

---
 server/budgeting.go | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/server/budgeting.go b/server/budgeting.go
index 8a77950..01f15d9 100644
--- a/server/budgeting.go
+++ b/server/budgeting.go
@@ -97,8 +97,7 @@ func (h *Handler) budgetingForMonth(c *gin.Context) {
 
 	categoriesWithBalance, moneyUsed := h.calculateBalances(
 		budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances)
-
-	availableBalance := h.getAvailableBalance(categories, budget, moneyUsed, cumultativeBalances, firstOfNextMonth)
+	availableBalance := h.getAvailableBalance(budget, moneyUsed, cumultativeBalances, firstOfNextMonth)
 
 	data := struct {
 		Categories       []CategoryWithBalance
@@ -107,27 +106,23 @@ func (h *Handler) budgetingForMonth(c *gin.Context) {
 	c.JSON(http.StatusOK, data)
 }
 
-func (*Handler) getAvailableBalance(categories []postgres.GetCategoriesRow, budget postgres.Budget,
+func (*Handler) getAvailableBalance(budget postgres.Budget,
 	moneyUsed numeric.Numeric, cumultativeBalances []postgres.GetCumultativeBalancesRow,
 	firstOfNextMonth time.Time) numeric.Numeric {
-	availableBalance := numeric.Zero()
-	for _, cat := range categories {
-		if cat.ID != budget.IncomeCategoryID {
+	availableBalance := moneyUsed
+	fmt.Printf("%s: %f\n", "INC", moneyUsed.GetFloat64())
+
+	for _, bal := range cumultativeBalances {
+		if bal.CategoryID != budget.IncomeCategoryID {
 			continue
 		}
-		availableBalance = moneyUsed
 
-		for _, bal := range cumultativeBalances {
-			if bal.CategoryID != cat.ID {
-				continue
-			}
-
-			if !bal.Date.Before(firstOfNextMonth) {
-				continue
-			}
-
-			availableBalance = availableBalance.Add(bal.Transactions)
+		if !bal.Date.Before(firstOfNextMonth) {
+			continue
 		}
+
+		availableBalance.AddI(bal.Transactions)
+		availableBalance.AddI(bal.Assignments)
 	}
 	return availableBalance
 }
-- 
2.47.2


From 34bbdf48b7d6e3376d29c5c72b5d1063fca76bd7 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 21:13:59 +0000
Subject: [PATCH 07/16] Also return income category

---
 server/budgeting.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server/budgeting.go b/server/budgeting.go
index 01f15d9..bc83a3c 100644
--- a/server/budgeting.go
+++ b/server/budgeting.go
@@ -174,10 +174,6 @@ func (h *Handler) calculateBalances(budget postgres.Budget,
 		categoryWithBalance := h.CalculateCategoryBalances(cat, cumultativeBalances,
 			firstOfNextMonth, moneyUsed, firstOfMonth, budget)
 
-		if cat.ID == budget.IncomeCategoryID {
-			continue
-		}
-
 		categoriesWithBalance = append(categoriesWithBalance, categoryWithBalance)
 	}
 
-- 
2.47.2


From 0dde94f8551c08648820c414a9d8c0592b9f4a1b Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 21:15:24 +0000
Subject: [PATCH 08/16] Remove logging

---
 server/budgeting.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/budgeting.go b/server/budgeting.go
index bc83a3c..f4dd4af 100644
--- a/server/budgeting.go
+++ b/server/budgeting.go
@@ -110,7 +110,6 @@ func (*Handler) getAvailableBalance(budget postgres.Budget,
 	moneyUsed numeric.Numeric, cumultativeBalances []postgres.GetCumultativeBalancesRow,
 	firstOfNextMonth time.Time) numeric.Numeric {
 	availableBalance := moneyUsed
-	fmt.Printf("%s: %f\n", "INC", moneyUsed.GetFloat64())
 
 	for _, bal := range cumultativeBalances {
 		if bal.CategoryID != budget.IncomeCategoryID {
-- 
2.47.2


From caf39fe5ea503244dcea746865c29265206368ef Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 21:18:44 +0000
Subject: [PATCH 09/16] Set Available balance of income category

---
 server/budgeting.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server/budgeting.go b/server/budgeting.go
index f4dd4af..5778c6b 100644
--- a/server/budgeting.go
+++ b/server/budgeting.go
@@ -98,6 +98,15 @@ func (h *Handler) budgetingForMonth(c *gin.Context) {
 	categoriesWithBalance, moneyUsed := h.calculateBalances(
 		budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances)
 	availableBalance := h.getAvailableBalance(budget, moneyUsed, cumultativeBalances, firstOfNextMonth)
+	for i := range categoriesWithBalance {
+		cat := &categoriesWithBalance[i]
+		if cat.ID != budget.IncomeCategoryID {
+			continue
+		}
+
+		cat.Available = availableBalance
+		cat.AvailableLastMonth = availableBalance
+	}
 
 	data := struct {
 		Categories       []CategoryWithBalance
-- 
2.47.2


From 442e87234c2becfbc281843e242df4ad47af5585 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 21:31:13 +0000
Subject: [PATCH 10/16] Show available income in Budgeting header

---
 web/src/pages/Budgeting.vue      |  1 +
 web/src/stores/budget-account.ts | 13 +++++++++++++
 web/src/stores/session.ts        |  1 +
 web/src/stores/transactions.ts   |  2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/web/src/pages/Budgeting.vue b/web/src/pages/Budgeting.vue
index 77c1535..aef067e 100644
--- a/web/src/pages/Budgeting.vue
+++ b/web/src/pages/Budgeting.vue
@@ -68,6 +68,7 @@ function getGroupState(group: { Name: string, Expand: boolean }): boolean {
 
 <template>
     <h1>Budget for {{ selected.Month + 1 }}/{{ selected.Year }}</h1>
+    <span>Available balance: <Currency :value="accountStore.GetIncomeAvailable(selected.Year, selected.Month)" /></span>
     <div>
         <router-link
             :to="'/budget/' + CurrentBudgetID + '/budgeting/' + previous.Year + '/' + previous.Month"
diff --git a/web/src/stores/budget-account.ts b/web/src/stores/budget-account.ts
index 0360411..1de29ba 100644
--- a/web/src/stores/budget-account.ts
+++ b/web/src/stores/budget-account.ts
@@ -55,12 +55,25 @@ export const useAccountStore = defineStore("budget/account", {
                 return category.AvailableLastMonth + Number(category.Assigned) + category.Activity;
             }
         },
+        GetIncomeCategoryID(state) {
+            const budget = useBudgetsStore();
+            return budget.CurrentBudget?.IncomeCategoryID;
+        },
+        GetIncomeAvailable(state) {
+            return (year: number, month: number) => {
+                const categories = this.AllCategoriesForMonth(year, month);
+                return categories.filter(x => x.ID == this.GetIncomeCategoryID)[0].AvailableLastMonth;
+            }
+        },
         CategoryGroupsForMonth(state) {
             return (year: number, month: number) => {
                 const categories = this.AllCategoriesForMonth(year, month);
                 const categoryGroups = [];
                 let prev = undefined;
                 for (const category of categories) {
+                    if (category.ID == this.GetIncomeCategoryID)
+                        continue;
+                        
                     if (category.Group != prev)
                         categoryGroups.push({
                             Name: category.Group,
diff --git a/web/src/stores/session.ts b/web/src/stores/session.ts
index cf61e2f..5b8d690 100644
--- a/web/src/stores/session.ts
+++ b/web/src/stores/session.ts
@@ -16,6 +16,7 @@ export interface Budget {
     ID: string
     Name: string
     AvailableBalance: number
+    IncomeCategoryID: string
 }
 
 export const useSessionStore = defineStore('session', {
diff --git a/web/src/stores/transactions.ts b/web/src/stores/transactions.ts
index 121cebb..e8c9825 100644
--- a/web/src/stores/transactions.ts
+++ b/web/src/stores/transactions.ts
@@ -39,7 +39,7 @@ export const useTransactionsStore = defineStore("budget/transactions", {
             return reconciledBalance;
         },
         TransactionsList(state): Transaction[] {
-                const accountsStore = useAccountStore()
+            const accountsStore = useAccountStore()
             return accountsStore.CurrentAccount!.Transactions.map(x => {
                 return this.Transactions.get(x)!
             });
-- 
2.47.2


From fd6b77f1542aec52346248dbfe3d1e27cb4255de Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 21:56:12 +0000
Subject: [PATCH 11/16] Replace id column with natural PK

---
 postgres/assignments.sql.go                   | 22 +++++++++++++++++--
 postgres/models.go                            |  1 -
 postgres/queries/assignments.sql              |  9 +++++++-
 .../schema/0017_natural-key-assignments.sql   |  6 +++++
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 postgres/schema/0017_natural-key-assignments.sql

diff --git a/postgres/assignments.sql.go b/postgres/assignments.sql.go
index 8602e7a..52bd45d 100644
--- a/postgres/assignments.sql.go
+++ b/postgres/assignments.sql.go
@@ -17,7 +17,7 @@ INSERT INTO assignments (
 ) VALUES (
         $1, $2, $3
 )
-RETURNING id, category_id, date, memo, amount
+RETURNING category_id, date, memo, amount
 `
 
 type CreateAssignmentParams struct {
@@ -30,7 +30,6 @@ func (q *Queries) CreateAssignment(ctx context.Context, arg CreateAssignmentPara
 	row := q.db.QueryRowContext(ctx, createAssignment, arg.Date, arg.Amount, arg.CategoryID)
 	var i Assignment
 	err := row.Scan(
-		&i.ID,
 		&i.CategoryID,
 		&i.Date,
 		&i.Memo,
@@ -130,3 +129,22 @@ func (q *Queries) GetAssignmentsByMonthAndCategory(ctx context.Context, budgetID
 	}
 	return items, nil
 }
+
+const updateAssignment = `-- name: UpdateAssignment :exec
+INSERT INTO assignments (category_id, date, amount)
+VALUES($1, $2, $3) 
+ON CONFLICT (category_id, date) 
+DO 
+   UPDATE SET amount = $3
+`
+
+type UpdateAssignmentParams struct {
+	CategoryID uuid.UUID
+	Date       time.Time
+	Amount     numeric.Numeric
+}
+
+func (q *Queries) UpdateAssignment(ctx context.Context, arg UpdateAssignmentParams) error {
+	_, err := q.db.ExecContext(ctx, updateAssignment, arg.CategoryID, arg.Date, arg.Amount)
+	return err
+}
diff --git a/postgres/models.go b/postgres/models.go
index 4e33e88..7ff33e8 100644
--- a/postgres/models.go
+++ b/postgres/models.go
@@ -40,7 +40,6 @@ type Account struct {
 }
 
 type Assignment struct {
-	ID         uuid.UUID
 	CategoryID uuid.UUID
 	Date       time.Time
 	Memo       sql.NullString
diff --git a/postgres/queries/assignments.sql b/postgres/queries/assignments.sql
index 56975ef..cb0687d 100644
--- a/postgres/queries/assignments.sql
+++ b/postgres/queries/assignments.sql
@@ -22,4 +22,11 @@ SELECT assignments.date, categories.name as category, category_groups.name as gr
 FROM assignments
 INNER JOIN categories ON categories.id = assignments.category_id
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id
-WHERE category_groups.budget_id = @budget_id;
\ No newline at end of file
+WHERE category_groups.budget_id = @budget_id;
+
+-- name: UpdateAssignment :exec
+INSERT INTO assignments (category_id, date, amount)
+VALUES($1, $2, $3) 
+ON CONFLICT (category_id, date) 
+DO 
+   UPDATE SET amount = $3;
\ No newline at end of file
diff --git a/postgres/schema/0017_natural-key-assignments.sql b/postgres/schema/0017_natural-key-assignments.sql
new file mode 100644
index 0000000..27c1096
--- /dev/null
+++ b/postgres/schema/0017_natural-key-assignments.sql
@@ -0,0 +1,6 @@
+-- +goose Up
+ALTER TABLE assignments DROP id;
+ALTER TABLE assignments ADD PRIMARY KEY (category_id, date);
+
+-- +goose Down
+ALTER TABLE assignments ADD COLUMN id uuid DEFAULT uuid_generate_v4() PRIMARY KEY;
\ No newline at end of file
-- 
2.47.2


From ecb801b2f261e777dc63a080bc05054ce48fa875 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 21:56:24 +0000
Subject: [PATCH 12/16] Move getDate to util file

---
 server/budgeting.go | 22 ----------------------
 server/util.go      | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 server/util.go

diff --git a/server/budgeting.go b/server/budgeting.go
index 5778c6b..9c65d85 100644
--- a/server/budgeting.go
+++ b/server/budgeting.go
@@ -3,7 +3,6 @@ package server
 import (
 	"fmt"
 	"net/http"
-	"strconv"
 	"time"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
@@ -41,27 +40,6 @@ func NewCategoryWithBalance(category *postgres.GetCategoriesRow) CategoryWithBal
 	}
 }
 
-func getDate(c *gin.Context) (time.Time, error) {
-	var year, month int
-	yearString := c.Param("year")
-	monthString := c.Param("month")
-	if yearString == "" && monthString == "" {
-		return getFirstOfMonthTime(time.Now()), nil
-	}
-
-	year, err := strconv.Atoi(yearString)
-	if err != nil {
-		return time.Time{}, fmt.Errorf("parse year: %w", err)
-	}
-
-	month, err = strconv.Atoi(monthString)
-	if err != nil {
-		return time.Time{}, fmt.Errorf("parse month: %w", err)
-	}
-
-	return getFirstOfMonth(year, month, time.Now().Location()), nil
-}
-
 func (h *Handler) budgetingForMonth(c *gin.Context) {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)
diff --git a/server/util.go b/server/util.go
new file mode 100644
index 0000000..ffb63a4
--- /dev/null
+++ b/server/util.go
@@ -0,0 +1,30 @@
+package server
+
+import (
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func getDate(c *gin.Context) (time.Time, error) {
+	var year, month int
+	yearString := c.Param("year")
+	monthString := c.Param("month")
+	if yearString == "" && monthString == "" {
+		return getFirstOfMonthTime(time.Now()), nil
+	}
+
+	year, err := strconv.Atoi(yearString)
+	if err != nil {
+		return time.Time{}, fmt.Errorf("parse year: %w", err)
+	}
+
+	month, err = strconv.Atoi(monthString)
+	if err != nil {
+		return time.Time{}, fmt.Errorf("parse month: %w", err)
+	}
+
+	return getFirstOfMonth(year, month, time.Now().Location()), nil
+}
-- 
2.47.2


From db96fddde258aad0383b283a9785075523a0ad51 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 22:24:38 +0000
Subject: [PATCH 13/16] Implement update Assignment on backend

---
 server/category.go | 55 ++++++++++++++++++++++++++++++++++++++++++++++
 server/http.go     |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 server/category.go

diff --git a/server/category.go b/server/category.go
new file mode 100644
index 0000000..ab4676c
--- /dev/null
+++ b/server/category.go
@@ -0,0 +1,55 @@
+package server
+
+import (
+	"fmt"
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type SetCategoryAssignmentRequest struct {
+	Assigned string
+}
+
+func (h *Handler) setCategoryAssignment(c *gin.Context) {
+	categoryID := c.Param("categoryid")
+	categoryUUID, err := uuid.Parse(categoryID)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"categoryid missing from URL"})
+		return
+	}
+
+	var request SetCategoryAssignmentRequest
+	err = c.BindJSON(&request)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("invalid payload: %w", err))
+		return
+	}
+
+	date, err := getDate(c)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("date invalid: %w", err))
+		return
+	}
+
+	var amount numeric.Numeric
+	err = amount.Set(request.Assigned)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("parse amount: %w", err))
+		return
+	}
+
+	updateArgs := postgres.UpdateAssignmentParams{
+		CategoryID: categoryUUID,
+		Date:       date,
+		Amount:     amount,
+	}
+	err = h.Service.UpdateAssignment(c.Request.Context(), updateArgs)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("update assignment: %w", err))
+		return
+	}
+}
diff --git a/server/http.go b/server/http.go
index e3fcfc9..e958687 100644
--- a/server/http.go
+++ b/server/http.go
@@ -64,6 +64,7 @@ func (h *Handler) LoadRoutes(router *gin.Engine) {
 	budget.POST("/new", h.newBudget)
 	budget.GET("/:budgetid", h.budgeting)
 	budget.GET("/:budgetid/:year/:month", h.budgetingForMonth)
+	budget.POST("/:budgetid/category/:categoryid/:year/:month", h.setCategoryAssignment)
 	budget.GET("/:budgetid/autocomplete/payees", h.autocompletePayee)
 	budget.GET("/:budgetid/autocomplete/categories", h.autocompleteCategories)
 	budget.DELETE("/:budgetid", h.deleteBudget)
-- 
2.47.2


From 3856e8a8a5bb6a4a15b32c847a101baccfeb7b5d Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 4 Mar 2022 22:24:50 +0000
Subject: [PATCH 14/16] Update assignment on modification

---
 web/src/pages/Budgeting.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/src/pages/Budgeting.vue b/web/src/pages/Budgeting.vue
index aef067e..c796090 100644
--- a/web/src/pages/Budgeting.vue
+++ b/web/src/pages/Budgeting.vue
@@ -2,9 +2,10 @@
 import { computed, defineProps, onMounted, ref, watchEffect } from "vue";
 import Currency from "../components/Currency.vue";
 import { useBudgetsStore } from "../stores/budget";
-import { useAccountStore } from "../stores/budget-account";
+import { Category, useAccountStore } from "../stores/budget-account";
 import { useSessionStore } from "../stores/session";
 import Input from "../components/Input.vue";
+import { POST } from "../api";
 
 const props = defineProps<{
     budgetid: string,
@@ -64,6 +65,13 @@ function toggleGroup(group: { Name: string, Expand: boolean }) {
 function getGroupState(group: { Name: string, Expand: boolean }): boolean {
     return expandedGroups.value.get(group.Name) ?? group.Expand;
 }
+
+function assignedChanged(e : Event, category : Category){
+    const target = e.target as HTMLInputElement;
+    const value = target.valueAsNumber;
+    POST("/budget/"+CurrentBudgetID.value+"/category/" + category.ID + "/" + selected.value.Year + "/" + (selected.value.Month+1), 
+    JSON.stringify({Assigned: category.Assigned}));
+}
 </script>
 
 <template>
@@ -94,7 +102,7 @@ function getGroupState(group: { Name: string, Expand: boolean }): boolean {
             <template v-for="category in GetCategories(group.Name)" v-if="getGroupState(group)">
                 <span class="whitespace-nowrap overflow-hidden">{{ category.Name }}</span>
                 <Currency :value="category.AvailableLastMonth" class="hidden lg:block" />
-                <Input type="number" v-model="category.Assigned" class="hidden sm:block mx-2 text-right" />
+                <Input type="number" v-model="category.Assigned" @input="(evt) => assignedChanged(evt, category)" class="hidden sm:block mx-2 text-right" />
                 <Currency :value="category.Activity" class="hidden sm:block" />
                 <Currency :value="accountStore.GetCategoryAvailable(category)" />
             </template>
-- 
2.47.2


From 67ef4745a0645ac8105dbdea7cc8a742495baeb9 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Sat, 5 Mar 2022 20:48:27 +0000
Subject: [PATCH 15/16] Handle login redirect

---
 web/src/main.ts         | 46 ++++++++++++++++++++++++++++++++++++++++-
 web/src/router/index.ts | 15 +++++++-------
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/web/src/main.ts b/web/src/main.ts
index bf051f4..7fdd123 100644
--- a/web/src/main.ts
+++ b/web/src/main.ts
@@ -6,6 +6,7 @@ import { createPinia } from 'pinia'
 import { useBudgetsStore } from './stores/budget';
 import { useAccountStore } from './stores/budget-account'
 import PiniaLogger from './pinia-logger'
+import { useSessionStore } from './stores/session'
 
 const app = createApp(App)
 app.use(router)
@@ -25,4 +26,47 @@ router.beforeEach(async (to, from, next) => {
   const accountStore = useAccountStore();
   await accountStore.SetCurrentAccount((<string>to.params.budgetid), (<string>to.params.accountid));
   next();
-})
\ No newline at end of file
+})
+
+router.beforeEach((to, from, next) => {
+  const sessionStore = useSessionStore();
+  const token = sessionStore.Session?.Token;
+  let loggedIn = false;
+
+  if (token != null) {
+    const jwt = parseJwt(token);
+    if (jwt.exp > Date.now() / 1000)
+      loggedIn = true;
+  }
+
+  if (to.matched.some(record => record.meta.requiresAuth)) {
+    if (!loggedIn) {
+      next({ path: '/login' });
+    } else {
+      next();
+    }
+
+  } else if (to.matched.some(record => record.meta.hideForAuth)) {
+    if (loggedIn) {
+      next({ path: '/dashboard' });
+    } else {
+      next();
+    }
+  } else {
+    next();
+  }
+});
+
+function parseJwt(token: string) {
+  var base64Url = token.split('.')[1];
+  var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+  var jsonPayload = decodeURIComponent(atob(base64).split('').map(function (c) {
+    return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+  }).join(''));
+
+  return JSON.parse(jsonPayload);
+};
+
+
+1646426130
+1646512855755
\ No newline at end of file
diff --git a/web/src/router/index.ts b/web/src/router/index.ts
index bfa0501..03b9870 100644
--- a/web/src/router/index.ts
+++ b/web/src/router/index.ts
@@ -10,15 +10,16 @@ import BudgetSidebar from '../pages/BudgetSidebar.vue';
 
 const routes = [
   { path: "/", name: "Index", component: Index },
-  { path: "/dashboard", name: "Dashboard", component: Dashboard },
-  { path: "/login", name: "Login", component: Login },
-  { path: "/register", name: "Register", component: Register },
+  { path: "/dashboard", name: "Dashboard", component: Dashboard, meta: { requiresAuth: true } },
+  { path: "/login", name: "Login", component: Login, meta: { hideForAuth: true } },
+  { path: "/register", name: "Register", component: Register, meta: { hideForAuth: true } },
   { path: "/budget/:budgetid/budgeting", name: "Budget", redirect: (to : RouteLocationNormalized) => 
-    '/budget/' + to.params.budgetid + '/budgeting/' + new Date().getFullYear() + '/' + new Date().getMonth() 
+    '/budget/' + to.params.budgetid + '/budgeting/' + new Date().getFullYear() + '/' + new Date().getMonth(), 
+    meta: { requiresAuth: true } 
   },
-  { path: "/budget/:budgetid/budgeting/:year/:month", name: "Budget with date", components: { default: Budgeting, sidebar: BudgetSidebar }, props: true },
-  { path: "/budget/:budgetid/Settings", name: "Budget Settings", components: { default: Settings, sidebar: BudgetSidebar }, props: true },
-  { path: "/budget/:budgetid/account/:accountid", name: "Account", components: { default: Account, sidebar: BudgetSidebar }, props: true },
+  { path: "/budget/:budgetid/budgeting/:year/:month", name: "Budget with date", components: { default: Budgeting, sidebar: BudgetSidebar }, props: true, meta: { requiresAuth: true } },
+  { path: "/budget/:budgetid/Settings", name: "Budget Settings", components: { default: Settings, sidebar: BudgetSidebar }, props: true, meta: { requiresAuth: true } },
+  { path: "/budget/:budgetid/account/:accountid", name: "Account", components: { default: Account, sidebar: BudgetSidebar }, props: true, meta: { requiresAuth: true } },
 ]
 
 const router = createRouter({
-- 
2.47.2


From 244333adbce84ece2e71af6e2a228a1dbe51e497 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Sat, 5 Mar 2022 20:48:36 +0000
Subject: [PATCH 16/16] Fix null reference in GetIncomeAvailable

---
 web/src/stores/budget-account.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/src/stores/budget-account.ts b/web/src/stores/budget-account.ts
index 1de29ba..becea06 100644
--- a/web/src/stores/budget-account.ts
+++ b/web/src/stores/budget-account.ts
@@ -61,8 +61,15 @@ export const useAccountStore = defineStore("budget/account", {
         },
         GetIncomeAvailable(state) {
             return (year: number, month: number) => {
+                const IncomeCategoryID = this.GetIncomeCategoryID;
+                if(IncomeCategoryID == null)
+                    return 0;
+
                 const categories = this.AllCategoriesForMonth(year, month);
-                return categories.filter(x => x.ID == this.GetIncomeCategoryID)[0].AvailableLastMonth;
+                const category = categories.filter(x => x.ID == IncomeCategoryID)[0];
+                if (category == null)
+                    return 0;
+                return category.AvailableLastMonth;
             }
         },
         CategoryGroupsForMonth(state) {
-- 
2.47.2