Send Content-Type on POST

.golangci.yml

@@ -14,7 +14,6 @@ linters:
     - gci # not working, shows errors on freshly formatted file
     - varnamelen
     - lll
-
 linters-settings:
   errcheck:
     exclude-functions:
@@ -26,18 +25,3 @@ linters-settings:
   varnamelen:
     ignore-decls:
       - c *gin.Context
-  wrapcheck:
-    ignoreSigs:
-      - .JSON(
-      - .Redirect(
-      - .String(
-      - .Errorf(
-      - errors.New(
-      - errors.Unwrap(
-      - .Wrap(
-      - .Wrapf(
-      - .WithMessage(
-      - .WithMessagef(
-      - .WithStack(
-    ignorePackageGlobs:
-      - git.javil.eu/jacob1123/budgeteer/postgres

README.md

@@ -1,18 +1,20 @@
 # Budgeteer
 
-Budgeting Web-Application written in Go and inspired by [YNAB](https://youneedabudget.com).
+Budgeting Web-Application
 
-## Getting started
+## Data structure
 
-The fastest way to get up and running quickly, is using docker-compose. Just download the [docker-compose.yml](https://git.javil.eu/jacob1123/budgeteer/src/branch/master/docker/docker-compose.yml) to some empty directory and run `docker-compose up -d`. This starts budgeteer, a postgres database and an adminer instance. The latter is optional and can be removed from the docker-compose.yml.
+1 User
+N Budgets
+        AccountID[]
+        CategoryID[]
+        PayeeID[]
 
-## Known issues
+N Accounts
+        TransactionID[]
+N Categories
+        AssignmentID[]
+N Payees
 
-Currently the application is usable when importing from YNAB via their CSV export. All balances should match the balances from YNAB. There are even unit-tests that confirm that using my personal budget.
-
-For people wishing to start fresh in Budgeteer, there currently are some blockers though:
-- The ability to create new accounts and categories is missing (#59)
-
-## Contributing
-
-If you're willing to help, please check the issues for [help-wanted labels](https://git.javil.eu/jacob1123/budgeteer/issues?labels=4). Just using Budgeteer and reporting any issues is although very helpful. 
+N Transactions
+N Assignments

bass.build

@@ -1,12 +0,0 @@
-(def go
-    (from (linux/alpine)
-        ($ apk add go)))
-
-(-> ($ go mod download)
-    (with-image go)
-    (with-mount *dir*/go.mod ./go.mod)
-    (with-mount *dir*/go.sum ./go.sum))
-
-(def go-mods
-  (from go
-    ($ go mod download)))

server/account.go

@@ -10,11 +10,11 @@ import (
 )
 
 type FilterTransactionsRequest struct {
-	CategoryID string    `json:"categoryId"`
-	PayeeID    string    `json:"payeeId"`
-	AccountID  string    `json:"accountId"`
-	FromDate   time.Time `json:"fromDate"`
-	ToDate     time.Time `json:"toDate"`
+	CategoryID string    `json:"category_id"`
+	PayeeID    string    `json:"payee_id"`
+	AccountID  string    `json:"account_id"`
+	FromDate   time.Time `json:"from_date"`
+	ToDate     time.Time `json:"to_date"`
 }
 
 func (h *Handler) filteredTransactions(c echo.Context) error {
@@ -58,7 +58,7 @@ func parseEmptyUUID(value string) (uuid.NullUUID, bool) {
 		return uuid.NullUUID{}, false
 	}
 
-	return uuid.NullUUID{UUID: val, Valid: true}, true
+	return uuid.NullUUID{val, true}, true
 }
 
 func (h *Handler) problematicTransactions(c echo.Context) error {

server/account_test.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -36,23 +35,17 @@ func TestRegisterUser(t *testing.T) {
 
 	t.Run("RegisterUser", func(t *testing.T) {
 		t.Parallel()
-		request, err := http.NewRequestWithContext(context.Background(),
+		request, err := http.NewRequest(
 			http.MethodPost,
 			"/api/v1/user/register",
 			strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
-		request.Header.Set("Content-Type", "application/json")
 		context := engine.NewContext(request, recorder)
 		if err != nil {
 			t.Errorf("error creating request: %s", err)
 			return
 		}
 
-		err = h.registerPost(context)
-		if err != nil {
-			t.Error(err.Error())
-			t.Error("Error registering")
-			return
-		}
+		h.registerPost(context)
 
 		if recorder.Code != http.StatusOK {
 			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)

server/budgeting.go

@@ -41,7 +41,7 @@ func (h *Handler) budgetingForMonth(c echo.Context) error {
 
 	month, err := getDate(c)
 	if err != nil {
-		return c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String())
+		c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String())
 	}
 
 	data, err := h.getBudgetingViewForMonth(c.Request().Context(), budget, month)

server/session.go

@@ -35,7 +35,7 @@ func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, error) { //nolin
 	tokenString = tokenString[7:]
 	token, err := h.TokenVerifier.VerifyToken(tokenString)
 	if err != nil {
-		return nil, fmt.Errorf("verify token '%s': %w", tokenString, err)
+		return nil, fmt.Errorf("verify token '%s': %s", tokenString, err)
 	}
 
 	return token, nil
@@ -63,7 +63,7 @@ func (h *Handler) loginPost(c echo.Context) error {
 	var login loginInformation
 	err := c.Bind(&login)
 	if err != nil {
-		return fmt.Errorf("parse payload: %w", err)
+		return err
 	}
 
 	user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User)
@@ -72,12 +72,12 @@ func (h *Handler) loginPost(c echo.Context) error {
 	}
 
 	if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil {
-		return fmt.Errorf("verify password: %w", err)
+		return err
 	}
 
 	token, err := h.TokenVerifier.CreateToken(&user)
 	if err != nil {
-		return fmt.Errorf("create token: %w", err)
+		return err
 	}
 
 	go h.UpdateLastLogin(user.ID)
@@ -120,7 +120,7 @@ func (h *Handler) registerPost(c echo.Context) error {
 
 	hash, err := h.CredentialsVerifier.Hash(register.Password)
 	if err != nil {
-		return fmt.Errorf("hash password: %w", err)
+		return err
 	}
 
 	createUser := postgres.CreateUserParams{
@@ -135,7 +135,7 @@ func (h *Handler) registerPost(c echo.Context) error {
 
 	token, err := h.TokenVerifier.CreateToken(&user)
 	if err != nil {
-		return fmt.Errorf("create token: %w", err)
+		return err
 	}
 
 	go h.UpdateLastLogin(user.ID)

server/ynab-import.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"fmt"
 	"net/http"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
@@ -27,12 +26,12 @@ func (h *Handler) importYNAB(c echo.Context) error {
 
 	transactionsFile, err := c.FormFile("transactions")
 	if err != nil {
-		return fmt.Errorf("get transactions: %w", err)
+		return err
 	}
 
 	transactions, err := transactionsFile.Open()
 	if err != nil {
-		return fmt.Errorf("open transactions: %w", err)
+		return err
 	}
 
 	err = ynab.ImportTransactions(c.Request().Context(), transactions)
@@ -42,12 +41,12 @@ func (h *Handler) importYNAB(c echo.Context) error {
 
 	assignmentsFile, err := c.FormFile("assignments")
 	if err != nil {
-		return fmt.Errorf("get assignments: %w", err)
+		return err
 	}
 
 	assignments, err := assignmentsFile.Open()
 	if err != nil {
-		return fmt.Errorf("open assignments: %w", err)
+		return err
 	}
 
 	err = ynab.ImportAssignments(c.Request().Context(), assignments)

web/src/components/Autocomplete.vue

@@ -11,10 +11,10 @@ export interface Suggestion {
 }
 
 const props = defineProps<{
-    text: string | null,
-    id: string | null,
+    text: string,
+    id: string | undefined,
     model: string,
-    type?: string | null,
+    type?: string | undefined,
 }>();
 
 const SearchQuery = ref(props.text || "");

web/src/components/TransactionInputRow.vue

@@ -16,9 +16,9 @@ const TX = ref<Transaction>({
     Memo: "",
     Amount: 0,
     Payee: "",
-    PayeeID: null,
+    PayeeID: undefined,
     Category: "",
-    CategoryID: null,
+    CategoryID: undefined,
     CategoryGroup: "",
     GroupID: "",
     ID: "",

web/src/pages/AllAccounts.vue

@@ -42,7 +42,7 @@ const filters = ref({
   ToDate: new Date(2999,11,32),
 });
 
-watch(() => (filters.value.AccountID ?? "")
+watch(() => filters.value.AccountID 
   + filters.value.PayeeID 
   + filters.value.CategoryID
   + filters.value.FromDate?.toISOString()

web/src/stores/budget-account.ts

@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
 import { GET, POST } from "../api";
 import { useBudgetsStore } from "./budget";
 import { useSessionStore } from "./session";
-import { Transaction, useTransactionsStore } from "./transactions";
+import { useTransactionsStore } from "./transactions";
 
 interface State {
     Accounts: Map<string, Account>;
@@ -200,7 +200,6 @@ export const useAccountStore = defineStore("budget/account", {
             transactionsStore.AddTransactions(
                 response.Transactions
             );
-            account.Transactions = response.Transactions.map((x : Transaction) =>x.ID);
         },
         async FetchMonthBudget(budgetid: string, year: number, month: number) {
             const result = await GET(

web/src/stores/transactions.ts

@@ -17,12 +17,12 @@ export interface Transaction {
     TransferAccount: string;
     CategoryGroup: string;
     Category: string;
-    CategoryID: string | null;
+    CategoryID: string | undefined;
     Memo: string;
     Status: string;
     GroupID: string;
     Payee: string;
-    PayeeID: string | null;
+    PayeeID: string | undefined;
     Amount: number;
     Reconciled: boolean;
     Account: string;
@@ -47,12 +47,10 @@ export const useTransactionsStore = defineStore("budget/transactions", {
             }
             return reconciledBalance;
         },
-        TransactionsByDate(state) : Record<string, Transaction[]>|undefined{
+        TransactionsByDate(state) : Record<string, Transaction[]> {
             const accountsStore = useAccountStore();
-            const account = accountsStore.CurrentAccount;
-            if(account === undefined)
-              return undefined;
-            const allTransactions = account!.Transactions.map(x => this.Transactions.get(x) ?? {} as Transaction);
+            const accountID = accountsStore.CurrentAccountID;
+            const allTransactions = [...this.Transactions.values()].filter(x => x.AccountID == accountID);
             return groupBy(allTransactions, x => formatDate(x.Date));
         },
         TransactionsList(state) : Transaction[] {
@@ -95,11 +93,11 @@ export const useTransactionsStore = defineStore("budget/transactions", {
         async GetFilteredTransactions(accountID : string | null, categoryID : string | null, payeeID : string | null, fromDate : string, toDate : string) {
             const budgetStore = useBudgetsStore();
             const payload = JSON.stringify({
-              categoryId: categoryID,
-              payeeId: payeeID,
-              accountId: accountID,
-              fromDate: fromDate,
-              toDate: toDate,
+              category_id: categoryID,
+              payee_id: payeeID,
+              account_id: accountID,
+              from_date: fromDate,
+              to_date: toDate,
             });
             const result = await POST("/budget/" + budgetStore.CurrentBudgetID + "/filtered-transactions", payload);
             const response = await result.json();