Merge pull request 'Fix GroupID not being set for original transaction' (#27) from hotfix-transfers into master

Reviewed-on: #27

.drone.yml

@@ -4,11 +4,23 @@ type: docker
 name: budgeteer
 
 steps:
+- name: Taskfile.dev PR
+  image: hub.javil.eu/budgeteer:dev
+  commands:
+    - task ci
+  when:
+    event:
+    - pull_request
+
 - name: Taskfile.dev
   image: hub.javil.eu/budgeteer:dev
-  pull: true
+  pull: always
   commands:
-    - task
+    - task ci
+  when:
+    event:
+      exclude:
+      - pull_request
 
 - name: docker  
   image: plugins/docker
@@ -24,10 +36,26 @@ steps:
     tags: 
       - latest
   when:
+    branch:
+    - master
     event:
-      exclude:
-      - pull_request
+    - push
 
+- name: docker tag
+  image: plugins/docker
+  settings:
+    registry: hub.javil.eu
+    username: 
+      from_secret: docker_user
+    password:
+      from_secret: docker_password
+    repo: hub.javil.eu/budgeteer
+    context: build
+    dockerfile: build/Dockerfile
+    auto_tag: true
+  when:
+    event:
+    - tag
 
 image_pull_secrets:
 - hub.javil.eu 

.golangci.yml

@@ -0,0 +1,27 @@
+linters:
+  enable-all: true
+  disable:
+    - golint
+    - scopelint
+    - maligned
+    - interfacer
+    - wsl
+    - forbidigo
+    - nlreturn
+    - testpackage
+    - ifshort
+    - exhaustivestruct
+    - gci # not working, shows errors on freshly formatted file
+    - varnamelen
+    - lll
+linters-settings:
+  errcheck:
+    exclude-functions:
+      - io/ioutil.ReadFile
+      - io.Copy(*bytes.Buffer)
+      - (*github.com/gin-gonic/gin.Context).AbortWithError
+      - (*github.com/gin-gonic/gin.Context).AbortWithError
+      - io.Copy(os.Stdout)
+  varnamelen:
+    ignore-decls:
+      - c *gin.Context

.vscode/settings.json

@@ -2,5 +2,8 @@
         "files.exclude": {
                 "**/node_modules": true,
                 "**/vendor": true
+        },
+        "gopls": {
+                "formatting.gofumpt": true,
         }
 }

.woodpecker.yml

@@ -4,7 +4,7 @@ pipeline:
     image: hub.javil.eu/budgeteer:dev
     pull: true
     commands:
-      - task
+      - task ci
 
   docker:
     image: plugins/docker

Taskfile.yml

@@ -33,12 +33,7 @@ tasks:
     sources:
       - ./go.mod
       - ./go.sum
-      - ./cmd/budgeteer/*.go
-      - ./*.go
-      - ./config/*.go
-      - ./http/*.go
-      - ./jwt/*.go
-      - ./postgres/*.go
+      - ./**/*.go
       - ./web/dist/**/*
       - ./postgres/schema/*
     generates:
@@ -52,14 +47,26 @@ tasks:
     desc: Build budgeteer in dev mode
     deps: [gomod, sqlc]
     cmds:
+      - go vet
+      - go fmt
+      - golangci-lint run
       - task: build
 
   build-prod:
     desc: Build budgeteer in prod mode
     deps: [gomod, sqlc, frontend]
     cmds:
+      - go vet
+      - go fmt
+      - golangci-lint run
       - task: build
 
+  ci:
+    desc: Run CI build
+    cmds:
+      - task: build-prod
+      - go test ./...
+
   frontend:
     desc: Build vue frontend
     dir: web
@@ -85,6 +92,8 @@ tasks:
     desc: Build budgeeter:dev
     sources:
       - ./docker/Dockerfile
+      - ./docker/build.sh
+      - ./web/package.json
     cmds:
       - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile
       - docker push {{.IMAGE_NAME}}:dev

bcrypt/verifier.go

@@ -1,23 +1,30 @@
-package bcrypt
-
-import "golang.org/x/crypto/bcrypt"
-
-// Verifier verifys passwords using Bcrypt
-type Verifier struct {
-	cost int
-}
-
-// Verify verifys a Password
-func (bv *Verifier) Verify(password string, hashOnDb string) error {
-	return bcrypt.CompareHashAndPassword([]byte(hashOnDb), []byte(password))
-}
-
-// Hash calculates a hash to be stored on the database
-func (bv *Verifier) Hash(password string) (string, error) {
-	hash, err := bcrypt.GenerateFromPassword([]byte(password), bv.cost)
-	if err != nil {
-		return "", err
-	}
-
-	return string(hash[:]), nil
-}
+package bcrypt
+
+import (
+	"fmt"
+
+	"golang.org/x/crypto/bcrypt"
+)
+
+// Verifier verifys passwords using Bcrypt.
+type Verifier struct{}
+
+// Verify verifys a Password.
+func (bv *Verifier) Verify(password string, hashOnDB string) error {
+	err := bcrypt.CompareHashAndPassword([]byte(hashOnDB), []byte(password))
+	if err != nil {
+		return fmt.Errorf("verify password: %w", err)
+	}
+
+	return nil
+}
+
+// Hash calculates a hash to be stored on the database.
+func (bv *Verifier) Hash(password string) (string, error) {
+	hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	if err != nil {
+		return "", fmt.Errorf("hash password: %w", err)
+	}
+
+	return string(hash), nil
+}

cmd/budgeteer/main.go

@@ -1,13 +1,16 @@
 package main
 
 import (
+	"io/fs"
 	"log"
+	"net/http"
 
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/config"
-	"git.javil.eu/jacob1123/budgeteer/http"
 	"git.javil.eu/jacob1123/budgeteer/jwt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/server"
+	"git.javil.eu/jacob1123/budgeteer/web"
 )
 
 func main() {
@@ -16,16 +19,24 @@ func main() {
 		log.Fatalf("Could not load config: %v", err)
 	}
 
-	q, err := postgres.Connect("pgx", cfg.DatabaseConnection)
+	queries, err := postgres.Connect("pgx", cfg.DatabaseConnection)
 	if err != nil {
 		log.Fatalf("Failed connecting to DB: %v", err)
 	}
 
-	h := &http.Handler{
-		Service:             q,
-		TokenVerifier:       &jwt.TokenVerifier{},
-		CredentialsVerifier: &bcrypt.Verifier{},
+	static, err := fs.Sub(web.Static, "dist")
+	if err != nil {
+		panic("couldn't open static files")
 	}
 
-	h.Serve()
+	handler := &server.Handler{
+		Service: queries,
+		TokenVerifier: &jwt.TokenVerifier{
+			Secret: cfg.SessionSecret,
+		},
+		CredentialsVerifier: &bcrypt.Verifier{},
+		StaticFS:            http.FS(static),
+	}
+
+	handler.Serve()
 }

config/config.go

@@ -1,19 +1,21 @@
-package config
-
-import (
-	"os"
-)
-
-// Config contains all needed configurations
-type Config struct {
-	DatabaseConnection string
-}
-
-// LoadConfig from path
-func LoadConfig() (*Config, error) {
-	configuration := Config{
-		DatabaseConnection: os.Getenv("BUDGETEER_DB"),
-	}
-
-	return &configuration, nil
-}
+package config
+
+import (
+	"os"
+)
+
+// Config contains all needed configurations.
+type Config struct {
+	DatabaseConnection string
+	SessionSecret      string
+}
+
+// LoadConfig from path.
+func LoadConfig() (*Config, error) {
+	configuration := Config{
+		DatabaseConnection: os.Getenv("BUDGETEER_DB"),
+		SessionSecret:      os.Getenv("BUDGETEER_SESSION_SECRET"),
+	}
+
+	return &configuration, nil
+}

docker-compose.dev.yml

@@ -17,6 +17,7 @@ services:
                         - ~/.cache:/.cache
                 environment:
                         BUDGETEER_DB: postgres://budgeteer:budgeteer@db:5432/budgeteer
+                        BUDGETEER_SESSION_SECRET: random string for JWT authorization
                 depends_on:
                         - db
 

docker/Dockerfile

@@ -1,16 +1,17 @@
 FROM alpine as godeps
-RUN apk add go
+RUN apk --no-cache add go
 RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
 RUN go install github.com/go-task/task/v3/cmd/task@latest
+RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 
 FROM alpine
-RUN apk add go
-RUN apk add nodejs yarn bash curl git git-perl tmux
+RUN apk --no-cache add go nodejs yarn bash curl git git-perl tmux
 ADD docker/build.sh /
-COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /usr/local/bin/
 RUN yarn global add @vue/cli
 ENV PATH="/root/.yarn/bin/:${PATH}"
-WORKDIR /src
-ADD web/package.json /src/web/
+WORKDIR /src/web
+ADD web/package.json web/yarn.lock /src/web/
 RUN yarn
+WORKDIR /src
+COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/
 CMD /build.sh

http/account.go

@@ -1,37 +0,0 @@
-package http
-
-import (
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-func (h *Handler) transactionsForAccount(c *gin.Context) {
-	accountID := c.Param("accountid")
-	accountUUID, err := uuid.Parse(accountID)
-	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
-		return
-	}
-
-	account, err := h.Service.GetAccount(c.Request.Context(), accountUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusNotFound, err)
-		return
-	}
-
-	transactions, err := h.Service.GetTransactionsForAccount(c.Request.Context(), accountUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusNotFound, err)
-		return
-	}
-
-	c.JSON(http.StatusOK, TransactionsResponse{account, transactions})
-}
-
-type TransactionsResponse struct {
-	Account      postgres.Account
-	Transactions []postgres.GetTransactionsForAccountRow
-}

http/autocomplete.go

@@ -1,54 +0,0 @@
-package http
-
-import (
-	"fmt"
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-func (h *Handler) autocompleteCategories(c *gin.Context) {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("budgetid missing from URL"))
-		return
-	}
-
-	query := c.Request.URL.Query().Get("s")
-	searchParams := postgres.SearchCategoriesParams{
-		BudgetID: budgetUUID,
-		Search:   "%" + query + "%",
-	}
-	categories, err := h.Service.SearchCategories(c.Request.Context(), searchParams)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	c.JSON(http.StatusOK, categories)
-}
-
-func (h *Handler) autocompletePayee(c *gin.Context) {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("budgetid missing from URL"))
-		return
-	}
-
-	query := c.Request.URL.Query().Get("s")
-	searchParams := postgres.SearchPayeesParams{
-		BudgetID: budgetUUID,
-		Search:   query + "%",
-	}
-	payees, err := h.Service.SearchPayees(c.Request.Context(), searchParams)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	c.JSON(http.StatusOK, payees)
-}

http/budgeting.go

@@ -1,216 +0,0 @@
-package http
-
-import (
-	"fmt"
-	"net/http"
-	"strconv"
-	"time"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-func getFirstOfMonth(year, month int, location *time.Location) time.Time {
-	return time.Date(year, time.Month(month), 1, 0, 0, 0, 0, location)
-}
-
-func getFirstOfMonthTime(date time.Time) time.Time {
-	var monthM time.Month
-	year, monthM, _ := date.Date()
-	month := int(monthM)
-	return getFirstOfMonth(year, month, date.Location())
-}
-
-type CategoryWithBalance struct {
-	*postgres.GetCategoriesRow
-	Available          postgres.Numeric
-	AvailableLastMonth postgres.Numeric
-	Activity           postgres.Numeric
-	Assigned           postgres.Numeric
-}
-
-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)
-	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("budgetid missing from URL"))
-		return
-	}
-
-	budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
-		return
-	}
-
-	firstOfMonth, err := getDate(c)
-	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budgetUUID.String())
-		return
-	}
-
-	categories, err := h.Service.GetCategories(c.Request.Context(), budgetUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	firstOfNextMonth := firstOfMonth.AddDate(0, 1, 0)
-	cumultativeBalances, err := h.Service.GetCumultativeBalances(c.Request.Context(), budgetUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("load balances: %w", err))
-		return
-	}
-
-	// skip everything in the future
-	categoriesWithBalance, moneyUsed, err := h.calculateBalances(c, budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances)
-	if err != nil {
-		return
-	}
-
-	availableBalance := postgres.NewZeroNumeric()
-	for _, cat := range categories {
-		if cat.ID != 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)
-		}
-	}
-
-	data := struct {
-		Categories       []CategoryWithBalance
-		AvailableBalance postgres.Numeric
-	}{categoriesWithBalance, availableBalance}
-	c.JSON(http.StatusOK, data)
-
-}
-
-func (h *Handler) budgeting(c *gin.Context) {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("budgetid missing from URL"))
-		return
-	}
-
-	budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusNotFound, err)
-		return
-	}
-
-	accounts, err := h.Service.GetAccountsWithBalance(c.Request.Context(), budgetUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	data := struct {
-		Accounts []postgres.GetAccountsWithBalanceRow
-		Budget   postgres.Budget
-	}{accounts, budget}
-
-	c.JSON(http.StatusOK, data)
-}
-
-func (h *Handler) calculateBalances(c *gin.Context, budget postgres.Budget, firstOfNextMonth time.Time, firstOfMonth time.Time, categories []postgres.GetCategoriesRow, cumultativeBalances []postgres.GetCumultativeBalancesRow) ([]CategoryWithBalance, postgres.Numeric, error) {
-	categoriesWithBalance := []CategoryWithBalance{}
-	hiddenCategory := CategoryWithBalance{
-		GetCategoriesRow: &postgres.GetCategoriesRow{
-			Name:  "",
-			Group: "Hidden Categories",
-		},
-		Available:          postgres.NewZeroNumeric(),
-		AvailableLastMonth: postgres.NewZeroNumeric(),
-		Activity:           postgres.NewZeroNumeric(),
-		Assigned:           postgres.NewZeroNumeric(),
-	}
-
-	moneyUsed := postgres.NewZeroNumeric()
-	for i := range categories {
-		cat := &categories[i]
-		categoryWithBalance := CategoryWithBalance{
-			GetCategoriesRow:   cat,
-			Available:          postgres.NewZeroNumeric(),
-			AvailableLastMonth: postgres.NewZeroNumeric(),
-			Activity:           postgres.NewZeroNumeric(),
-			Assigned:           postgres.NewZeroNumeric(),
-		}
-		for _, bal := range cumultativeBalances {
-			if bal.CategoryID != cat.ID {
-				continue
-			}
-
-			if !bal.Date.Before(firstOfNextMonth) {
-				continue
-			}
-
-			moneyUsed = moneyUsed.Sub(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)
-				categoryWithBalance.Available = postgres.NewZeroNumeric()
-			}
-
-			if bal.Date.Before(firstOfMonth) {
-				categoryWithBalance.AvailableLastMonth = categoryWithBalance.Available
-			} else if bal.Date.Before(firstOfNextMonth) {
-				categoryWithBalance.Activity = bal.Transactions
-				categoryWithBalance.Assigned = bal.Assignments
-			}
-		}
-
-		// do not show hidden categories
-		if cat.Group == "Hidden Categories" {
-			hiddenCategory.Available = hiddenCategory.Available.Add(categoryWithBalance.Available)
-			hiddenCategory.AvailableLastMonth = hiddenCategory.AvailableLastMonth.Add(categoryWithBalance.AvailableLastMonth)
-			hiddenCategory.Activity = hiddenCategory.Activity.Add(categoryWithBalance.Activity)
-			hiddenCategory.Assigned = hiddenCategory.Assigned.Add(categoryWithBalance.Assigned)
-			continue
-		}
-
-		if cat.ID == budget.IncomeCategoryID {
-			continue
-		}
-
-		categoriesWithBalance = append(categoriesWithBalance, categoryWithBalance)
-	}
-
-	categoriesWithBalance = append(categoriesWithBalance, hiddenCategory)
-
-	return categoriesWithBalance, moneyUsed, nil
-}

http/transaction.go

@@ -1,89 +0,0 @@
-package http
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-type NewTransactionPayload struct {
-	Date  JSONDate `json:"date"`
-	Payee struct {
-		ID   uuid.NullUUID
-		Name string
-	} `json:"payee"`
-	Category struct {
-		ID   uuid.NullUUID
-		Name string
-	} `json:"category"`
-	Memo      string    `json:"memo"`
-	Amount    string    `json:"amount"`
-	BudgetID  uuid.UUID `json:"budget_id"`
-	AccountID uuid.UUID `json:"account_id"`
-	State     string    `json:"state"`
-}
-
-func (h *Handler) newTransaction(c *gin.Context) {
-	var payload NewTransactionPayload
-	err := c.BindJSON(&payload)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	fmt.Printf("%v\n", payload)
-
-	amount := postgres.Numeric{}
-	amount.Set(payload.Amount)
-
-	/*transactionUUID, err := getNullUUIDFromParam(c, "transactionid")
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("parse transaction id: %w", err))
-		return
-	}*/
-
-	//if !transactionUUID.Valid {
-	new := postgres.CreateTransactionParams{
-		Memo:       payload.Memo,
-		Date:       time.Time(payload.Date),
-		Amount:     amount,
-		AccountID:  payload.AccountID,
-		PayeeID:    payload.Payee.ID,    //TODO handle new payee
-		CategoryID: payload.Category.ID, //TODO handle new category
-		Status:     postgres.TransactionStatus(payload.State),
-	}
-	_, err = h.Service.CreateTransaction(c.Request.Context(), new)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err))
-	}
-
-	return
-	//	}
-	/*
-		_, delete := c.GetPostForm("delete")
-		if delete {
-			err = h.Service.DeleteTransaction(c.Request.Context(), transactionUUID.UUID)
-			if err != nil {
-				c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err))
-			}
-			return
-		}
-
-		update := postgres.UpdateTransactionParams{
-			ID:         transactionUUID.UUID,
-			Memo:       payload.Memo,
-			Date:       time.Time(payload.Date),
-			Amount:     amount,
-			AccountID:  transactionAccountID,
-			PayeeID:    payload.Payee.ID,    //TODO handle new payee
-			CategoryID: payload.Category.ID, //TODO handle new category
-		}
-		err = h.Service.UpdateTransaction(c.Request.Context(), update)
-		if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("update transaction: %w", err))
-		}*/
-}

http/util.go

@@ -1,56 +0,0 @@
-package http
-
-import (
-	"fmt"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-func getUUID(c *gin.Context, name string) (uuid.UUID, error) {
-	value, succ := c.GetPostForm(name)
-	if !succ {
-		return uuid.UUID{}, fmt.Errorf("not set")
-	}
-
-	id, err := uuid.Parse(value)
-	if err != nil {
-		return uuid.UUID{}, fmt.Errorf("not a valid uuid: %w", err)
-	}
-
-	return id, nil
-}
-
-func getNullUUIDFromParam(c *gin.Context, name string) (uuid.NullUUID, error) {
-	value := c.Param(name)
-	if value == "" {
-		return uuid.NullUUID{}, nil
-	}
-
-	id, err := uuid.Parse(value)
-	if err != nil {
-		return uuid.NullUUID{}, fmt.Errorf("not a valid uuid: %w", err)
-	}
-
-	return uuid.NullUUID{
-		UUID:  id,
-		Valid: true,
-	}, nil
-}
-
-func getNullUUIDFromForm(c *gin.Context, name string) (uuid.NullUUID, error) {
-	value, succ := c.GetPostForm(name)
-	if !succ || value == "" {
-		return uuid.NullUUID{}, nil
-	}
-
-	id, err := uuid.Parse(value)
-	if err != nil {
-		return uuid.NullUUID{}, fmt.Errorf("not a valid uuid: %w", err)
-	}
-
-	return uuid.NullUUID{
-		UUID:  id,
-		Valid: true,
-	}, nil
-}

http/ynab-import.go

@@ -1,66 +0,0 @@
-package http
-
-import (
-	"fmt"
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-func (h *Handler) importYNAB(c *gin.Context) {
-	budgetID, succ := c.Params.Get("budgetid")
-	if !succ {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("no budget_id specified"))
-		return
-	}
-
-	budgetUUID, err := uuid.Parse(budgetID)
-	if !succ {
-		c.AbortWithError(http.StatusBadRequest, err)
-		return
-	}
-
-	ynab, err := postgres.NewYNABImport(c.Request.Context(), h.Service.Queries, budgetUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	transactionsFile, err := c.FormFile("transactions")
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	transactions, err := transactionsFile.Open()
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	err = ynab.ImportTransactions(transactions)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	assignmentsFile, err := c.FormFile("assignments")
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	assignments, err := assignmentsFile.Open()
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-
-	err = ynab.ImportAssignments(assignments)
-	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
-		return
-	}
-}

jwt/login.go

@@ -10,11 +10,12 @@ import (
 	"github.com/google/uuid"
 )
 
-// TokenVerifier verifies Tokens
+// TokenVerifier verifies Tokens.
 type TokenVerifier struct {
+	Secret string
 }
 
-// Token contains everything to authenticate a user
+// Token contains everything to authenticate a user.
 type Token struct {
 	username string
 	name     string
@@ -24,10 +25,9 @@ type Token struct {
 
 const (
 	expiration = 72
-	secret     = "uditapbzuditagscwxuqdflgzpbu´ßiaefnlmzeßtrubiadern"
 )
 
-// CreateToken creates a new token from username and name
+// CreateToken creates a new token from username and name.
 func (tv *TokenVerifier) CreateToken(user *postgres.User) (string, error) {
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"usr":  user.Email,
@@ -37,21 +37,27 @@ func (tv *TokenVerifier) CreateToken(user *postgres.User) (string, error) {
 	})
 
 	// Generate encoded token and send it as response.
-	t, err := token.SignedString([]byte(secret))
+	t, err := token.SignedString([]byte(tv.Secret))
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("create token: %w", err)
 	}
 
 	return t, nil
 }
 
-// VerifyToken verifys a given string-token
-func (tv *TokenVerifier) VerifyToken(tokenString string) (budgeteer.Token, error) {
+var (
+	ErrUnexpectedSigningMethod = fmt.Errorf("unexpected signing method")
+	ErrInvalidToken            = fmt.Errorf("token is invalid")
+	ErrTokenExpired            = fmt.Errorf("token has expired")
+)
+
+// VerifyToken verifys a given string-token.
+func (tv *TokenVerifier) VerifyToken(tokenString string) (budgeteer.Token, error) { //nolint:ireturn
 	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
 		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
+			return nil, fmt.Errorf("method '%v': %w", token.Header["alg"], ErrUnexpectedSigningMethod)
 		}
-		return []byte(secret), nil
+		return []byte(tv.Secret), nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("parse jwt: %w", err)
@@ -62,7 +68,7 @@ func (tv *TokenVerifier) VerifyToken(tokenString string) (budgeteer.Token, error
 		return nil, fmt.Errorf("verify jwt: %w", err)
 	}
 
-	tkn := &Token{
+	tkn := &Token{ //nolint:forcetypeassert
 		username: claims["usr"].(string),
 		name:     claims["name"].(string),
 		expiry:   claims["exp"].(float64),
@@ -73,16 +79,16 @@ func (tv *TokenVerifier) VerifyToken(tokenString string) (budgeteer.Token, error
 
 func verifyToken(token *jwt.Token) (jwt.MapClaims, error) {
 	if !token.Valid {
-		return nil, fmt.Errorf("Token is not valid")
+		return nil, ErrInvalidToken
 	}
 
 	claims, ok := token.Claims.(jwt.MapClaims)
 	if !ok {
-		return nil, fmt.Errorf("Claims are not of Type MapClaims")
+		return nil, ErrInvalidToken
 	}
 
 	if !claims.VerifyExpiresAt(time.Now().Unix(), true) {
-		return nil, fmt.Errorf("Claims have expired")
+		return nil, ErrTokenExpired
 	}
 
 	return claims, nil

postgres/accounts.sql.go

@@ -6,6 +6,7 @@ package postgres
 import (
 	"context"
 
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
@@ -85,19 +86,22 @@ func (q *Queries) GetAccounts(ctx context.Context, budgetID uuid.UUID) ([]Accoun
 }
 
 const getAccountsWithBalance = `-- name: GetAccountsWithBalance :many
-SELECT accounts.id, accounts.name, accounts.on_budget, SUM(transactions.amount)::decimal(12,2) as balance
+SELECT accounts.id, accounts.name, accounts.on_budget, 
+        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW())::decimal(12,2) as working_balance,
+        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status IN ('Cleared', 'Reconciled'))::decimal(12,2) as cleared_balance,
+        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status = 'Reconciled')::decimal(12,2) as reconciled_balance
 FROM accounts
-LEFT JOIN transactions ON transactions.account_id = accounts.id AND transactions.date < NOW()
 WHERE accounts.budget_id = $1
-GROUP BY accounts.id, accounts.name
 ORDER BY accounts.name
 `
 
 type GetAccountsWithBalanceRow struct {
-	ID       uuid.UUID
-	Name     string
-	OnBudget bool
-	Balance  Numeric
+	ID                uuid.UUID
+	Name              string
+	OnBudget          bool
+	WorkingBalance    numeric.Numeric
+	ClearedBalance    numeric.Numeric
+	ReconciledBalance numeric.Numeric
 }
 
 func (q *Queries) GetAccountsWithBalance(ctx context.Context, budgetID uuid.UUID) ([]GetAccountsWithBalanceRow, error) {
@@ -113,7 +117,9 @@ func (q *Queries) GetAccountsWithBalance(ctx context.Context, budgetID uuid.UUID
 			&i.ID,
 			&i.Name,
 			&i.OnBudget,
-			&i.Balance,
+			&i.WorkingBalance,
+			&i.ClearedBalance,
+			&i.ReconciledBalance,
 		); err != nil {
 			return nil, err
 		}
@@ -127,3 +133,76 @@ func (q *Queries) GetAccountsWithBalance(ctx context.Context, budgetID uuid.UUID
 	}
 	return items, nil
 }
+
+const searchAccounts = `-- name: SearchAccounts :many
+SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts
+WHERE accounts.budget_id = $1
+AND accounts.name LIKE $2
+ORDER BY accounts.name
+`
+
+type SearchAccountsParams struct {
+	BudgetID uuid.UUID
+	Search   string
+}
+
+type SearchAccountsRow struct {
+	ID       uuid.UUID
+	BudgetID uuid.UUID
+	Name     string
+	Type     interface{}
+}
+
+func (q *Queries) SearchAccounts(ctx context.Context, arg SearchAccountsParams) ([]SearchAccountsRow, error) {
+	rows, err := q.db.QueryContext(ctx, searchAccounts, arg.BudgetID, arg.Search)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []SearchAccountsRow
+	for rows.Next() {
+		var i SearchAccountsRow
+		if err := rows.Scan(
+			&i.ID,
+			&i.BudgetID,
+			&i.Name,
+			&i.Type,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const updateAccount = `-- name: UpdateAccount :one
+UPDATE accounts
+SET name = $1,
+    on_budget = $2
+WHERE accounts.id = $3
+RETURNING id, budget_id, name, on_budget
+`
+
+type UpdateAccountParams struct {
+	Name     string
+	OnBudget bool
+	ID       uuid.UUID
+}
+
+func (q *Queries) UpdateAccount(ctx context.Context, arg UpdateAccountParams) (Account, error) {
+	row := q.db.QueryRowContext(ctx, updateAccount, arg.Name, arg.OnBudget, arg.ID)
+	var i Account
+	err := row.Scan(
+		&i.ID,
+		&i.BudgetID,
+		&i.Name,
+		&i.OnBudget,
+	)
+	return i, err
+}

postgres/assignments.sql.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"time"
 
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
@@ -21,7 +22,7 @@ RETURNING id, category_id, date, memo, amount
 
 type CreateAssignmentParams struct {
 	Date       time.Time
-	Amount     Numeric
+	Amount     numeric.Numeric
 	CategoryID uuid.UUID
 }
 
@@ -53,6 +54,49 @@ func (q *Queries) DeleteAllAssignments(ctx context.Context, budgetID uuid.UUID)
 	return result.RowsAffected()
 }
 
+const getAllAssignments = `-- name: GetAllAssignments :many
+SELECT assignments.date, categories.name as category, category_groups.name as group, assignments.amount
+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 = $1
+`
+
+type GetAllAssignmentsRow struct {
+	Date     time.Time
+	Category string
+	Group    string
+	Amount   numeric.Numeric
+}
+
+func (q *Queries) GetAllAssignments(ctx context.Context, budgetID uuid.UUID) ([]GetAllAssignmentsRow, error) {
+	rows, err := q.db.QueryContext(ctx, getAllAssignments, budgetID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []GetAllAssignmentsRow
+	for rows.Next() {
+		var i GetAllAssignmentsRow
+		if err := rows.Scan(
+			&i.Date,
+			&i.Category,
+			&i.Group,
+			&i.Amount,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const getAssignmentsByMonthAndCategory = `-- name: GetAssignmentsByMonthAndCategory :many
 SELECT date, category_id, budget_id, amount
 FROM assignments_by_month

postgres/budgetservice.go

@@ -8,11 +8,15 @@ import (
 	"github.com/google/uuid"
 )
 
-// NewBudget creates a budget and adds it to the current user
+// NewBudget creates a budget and adds it to the current user.
 func (s *Database) NewBudget(context context.Context, name string, userID uuid.UUID) (*Budget, error) {
 	tx, err := s.BeginTx(context, &sql.TxOptions{})
-	q := s.WithTx(tx)
-	budget, err := q.CreateBudget(context, CreateBudgetParams{
+	if err != nil {
+		return nil, fmt.Errorf("begin transaction: %w", err)
+	}
+
+	transaction := s.WithTx(tx)
+	budget, err := transaction.CreateBudget(context, CreateBudgetParams{
 		Name:             name,
 		IncomeCategoryID: uuid.New(),
 	})
@@ -21,12 +25,12 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U
 	}
 
 	ub := LinkBudgetToUserParams{UserID: userID, BudgetID: budget.ID}
-	_, err = q.LinkBudgetToUser(context, ub)
+	_, err = transaction.LinkBudgetToUser(context, ub)
 	if err != nil {
 		return nil, fmt.Errorf("link budget to user: %w", err)
 	}
 
-	group, err := q.CreateCategoryGroup(context, CreateCategoryGroupParams{
+	group, err := transaction.CreateCategoryGroup(context, CreateCategoryGroupParams{
 		Name:     "Inflow",
 		BudgetID: budget.ID,
 	})
@@ -34,7 +38,7 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U
 		return nil, fmt.Errorf("create inflow category_group: %w", err)
 	}
 
-	cat, err := q.CreateCategory(context, CreateCategoryParams{
+	cat, err := transaction.CreateCategory(context, CreateCategoryParams{
 		Name:            "Ready to Assign",
 		CategoryGroupID: group.ID,
 	})
@@ -42,7 +46,7 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U
 		return nil, fmt.Errorf("create ready to assign category: %w", err)
 	}
 
-	err = q.SetInflowCategory(context, SetInflowCategoryParams{
+	err = transaction.SetInflowCategory(context, SetInflowCategoryParams{
 		IncomeCategoryID: cat.ID,
 		ID:               budget.ID,
 	})
@@ -50,7 +54,10 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U
 		return nil, fmt.Errorf("set inflow category: %w", err)
 	}
 
-	tx.Commit()
+	err = tx.Commit()
+	if err != nil {
+		return nil, fmt.Errorf("commit: %w", err)
+	}
 
 	return &budget, nil
 }

postgres/categories.sql.go

@@ -118,7 +118,8 @@ func (q *Queries) GetCategoryGroups(ctx context.Context, budgetID uuid.UUID) ([]
 }
 
 const searchCategories = `-- name: SearchCategories :many
-SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id FROM categories
+SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id, 'category' as type
+FROM categories
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id
 WHERE category_groups.budget_id = $1
 AND categories.name LIKE $2
@@ -133,6 +134,7 @@ type SearchCategoriesParams struct {
 type SearchCategoriesRow struct {
 	Name interface{}
 	ID   uuid.UUID
+	Type interface{}
 }
 
 func (q *Queries) SearchCategories(ctx context.Context, arg SearchCategoriesParams) ([]SearchCategoriesRow, error) {
@@ -144,7 +146,7 @@ func (q *Queries) SearchCategories(ctx context.Context, arg SearchCategoriesPara
 	var items []SearchCategoriesRow
 	for rows.Next() {
 		var i SearchCategoriesRow
-		if err := rows.Scan(&i.Name, &i.ID); err != nil {
+		if err := rows.Scan(&i.Name, &i.ID, &i.Type); err != nil {
 			return nil, err
 		}
 		items = append(items, i)

postgres/conn.go

@@ -5,7 +5,7 @@ import (
 	"embed"
 	"fmt"
 
-	_ "github.com/jackc/pgx/v4/stdlib"
+	_ "github.com/jackc/pgx/v4/stdlib" // needed for pg connection
 	"github.com/pressly/goose/v3"
 )
 
@@ -17,7 +17,7 @@ type Database struct {
 	*sql.DB
 }
 
-// Connect to a database
+// Connect connects to a database.
 func Connect(typ string, connString string) (*Database, error) {
 	conn, err := sql.Open(typ, connString)
 	if err != nil {

postgres/cumultative-balances.sql.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"time"
 
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
@@ -23,10 +24,10 @@ ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id
 type GetCumultativeBalancesRow struct {
 	Date            time.Time
 	CategoryID      uuid.UUID
-	Assignments     Numeric
-	AssignmentsCum  Numeric
-	Transactions    Numeric
-	TransactionsCum Numeric
+	Assignments     numeric.Numeric
+	AssignmentsCum  numeric.Numeric
+	Transactions    numeric.Numeric
+	TransactionsCum numeric.Numeric
 }
 
 func (q *Queries) GetCumultativeBalances(ctx context.Context, budgetID uuid.UUID) ([]GetCumultativeBalancesRow, error) {

postgres/models.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"time"
 
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
@@ -42,7 +43,7 @@ type Assignment struct {
 	CategoryID uuid.UUID
 	Date       time.Time
 	Memo       sql.NullString
-	Amount     Numeric
+	Amount     numeric.Numeric
 }
 
 type AssignmentsByMonth struct {
@@ -71,6 +72,24 @@ type CategoryGroup struct {
 	Name     string
 }
 
+type DisplayTransaction struct {
+	ID              uuid.UUID
+	Date            time.Time
+	Memo            string
+	Amount          numeric.Numeric
+	GroupID         uuid.NullUUID
+	Status          TransactionStatus
+	Account         string
+	PayeeID         uuid.NullUUID
+	CategoryID      uuid.NullUUID
+	Payee           string
+	CategoryGroup   string
+	Category        string
+	TransferAccount string
+	BudgetID        uuid.UUID
+	AccountID       uuid.UUID
+}
+
 type Payee struct {
 	ID       uuid.UUID
 	BudgetID uuid.UUID
@@ -81,7 +100,7 @@ type Transaction struct {
 	ID         uuid.UUID
 	Date       time.Time
 	Memo       string
-	Amount     Numeric
+	Amount     numeric.Numeric
 	AccountID  uuid.UUID
 	CategoryID uuid.NullUUID
 	PayeeID    uuid.NullUUID

postgres/numeric.go

@@ -1,129 +0,0 @@
-package postgres
-
-import (
-	"fmt"
-	"math/big"
-
-	"github.com/jackc/pgtype"
-)
-
-type Numeric struct {
-	pgtype.Numeric
-}
-
-func NewZeroNumeric() Numeric {
-	return Numeric{pgtype.Numeric{Exp: 0, Int: big.NewInt(0), Status: pgtype.Present, NaN: false}}
-}
-
-func (n Numeric) GetFloat64() float64 {
-	if n.Status != pgtype.Present {
-		return 0
-	}
-	var balance float64
-	err := n.AssignTo(&balance)
-	if err != nil {
-		panic(err)
-	}
-	return balance
-}
-
-func (n Numeric) IsPositive() bool {
-	if n.Status != pgtype.Present {
-		return true
-	}
-	float := n.GetFloat64()
-	return float >= 0
-}
-
-func (n Numeric) IsZero() bool {
-	if n.Status != pgtype.Present {
-		return true
-	}
-	float := n.GetFloat64()
-	return float == 0
-}
-
-func (n Numeric) MatchExp(exp int32) Numeric {
-	diffExp := n.Exp - exp
-	factor := big.NewInt(0).Exp(big.NewInt(10), big.NewInt(int64(diffExp)), nil)
-	return Numeric{pgtype.Numeric{
-		Exp:    exp,
-		Int:    big.NewInt(0).Mul(n.Int, factor),
-		Status: n.Status,
-		NaN:    n.NaN,
-	}}
-}
-
-func (n Numeric) Sub(o Numeric) Numeric {
-	left := n
-	right := o
-	if n.Exp < o.Exp {
-		right = o.MatchExp(n.Exp)
-	} else if n.Exp > o.Exp {
-		left = n.MatchExp(o.Exp)
-	}
-
-	if left.Exp == right.Exp {
-		return Numeric{pgtype.Numeric{
-			Exp: left.Exp,
-			Int: big.NewInt(0).Sub(left.Int, right.Int),
-		}}
-	}
-
-	panic("Cannot subtract with different exponents")
-}
-func (n Numeric) Add(o Numeric) Numeric {
-	left := n
-	right := o
-	if n.Exp < o.Exp {
-		right = o.MatchExp(n.Exp)
-	} else if n.Exp > o.Exp {
-		left = n.MatchExp(o.Exp)
-	}
-
-	if left.Exp == right.Exp {
-		return Numeric{pgtype.Numeric{
-			Exp: left.Exp,
-			Int: big.NewInt(0).Add(left.Int, right.Int),
-		}}
-	}
-
-	panic("Cannot add with different exponents")
-}
-
-func (n Numeric) MarshalJSON() ([]byte, error) {
-	if n.Int.Int64() == 0 {
-		return []byte("\"0\""), nil
-	}
-
-	s := fmt.Sprintf("%d", n.Int)
-	bytes := []byte(s)
-
-	exp := n.Exp
-	for exp > 0 {
-		bytes = append(bytes, byte('0'))
-		exp--
-	}
-
-	if exp == 0 {
-		return bytes, nil
-	}
-
-	length := int32(len(bytes))
-	var bytesWithSeparator []byte
-
-	exp = -exp
-	for length <= exp {
-		bytes = append(bytes, byte('0'))
-		length++
-	}
-
-	split := length - exp
-	bytesWithSeparator = append(bytesWithSeparator, bytes[:split]...)
-	if split == 1 && n.Int.Int64() < 0 {
-		bytesWithSeparator = append(bytesWithSeparator, byte('0'))
-	}
-	bytesWithSeparator = append(bytesWithSeparator, byte('.'))
-	bytesWithSeparator = append(bytesWithSeparator, bytes[split:]...)
-	return bytesWithSeparator, nil
-}

postgres/numeric/numeric.go

@@ -0,0 +1,226 @@
+package numeric
+
+import (
+	"fmt"
+	"math/big"
+	"strings"
+	"unicode/utf8"
+
+	"github.com/jackc/pgtype"
+)
+
+type Numeric struct {
+	pgtype.Numeric
+}
+
+func Zero() Numeric {
+	return Numeric{pgtype.Numeric{Exp: 0, Int: big.NewInt(0), Status: pgtype.Present, NaN: false}}
+}
+
+func FromInt64(value int64) Numeric {
+	return Numeric{Numeric: pgtype.Numeric{Int: big.NewInt(value), Status: pgtype.Present}}
+}
+
+func FromInt64WithExp(value int64, exp int32) Numeric {
+	return Numeric{Numeric: pgtype.Numeric{Int: big.NewInt(value), Exp: exp, Status: pgtype.Present}}
+}
+
+func (n Numeric) GetFloat64() float64 {
+	if n.Status != pgtype.Present {
+		return 0
+	}
+	var balance float64
+	err := n.AssignTo(&balance)
+	if err != nil {
+		panic(err)
+	}
+	return balance
+}
+
+func (n Numeric) IsPositive() bool {
+	if n.Status != pgtype.Present {
+		return true
+	}
+	float := n.GetFloat64()
+	return float >= 0
+}
+
+func (n Numeric) IsZero() bool {
+	if n.Status != pgtype.Present {
+		return true
+	}
+	float := n.GetFloat64()
+	return float == 0
+}
+
+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
+	return Numeric{pgtype.Numeric{
+		Exp:    exp,
+		Int:    big.NewInt(0).Mul(n.Int, factor),
+		Status: n.Status,
+		NaN:    n.NaN,
+	}}
+}
+
+func (n Numeric) Sub(other Numeric) Numeric {
+	left := n
+	right := other
+	if n.Exp < other.Exp {
+		right = other.MatchExp(n.Exp)
+	} else if n.Exp > other.Exp {
+		left = n.MatchExp(other.Exp)
+	}
+
+	if left.Exp == right.Exp {
+		return Numeric{pgtype.Numeric{
+			Exp: left.Exp,
+			Int: big.NewInt(0).Sub(left.Int, right.Int),
+		}}
+	}
+
+	panic("Cannot subtract with different exponents")
+}
+
+func (n Numeric) Neg() Numeric {
+	return Numeric{pgtype.Numeric{Exp: n.Exp, Int: big.NewInt(-1 * n.Int.Int64()), Status: n.Status}}
+}
+
+func (n Numeric) Add(other Numeric) Numeric {
+	left := n
+	right := other
+	if n.Exp < other.Exp {
+		right = other.MatchExp(n.Exp)
+	} else if n.Exp > other.Exp {
+		left = n.MatchExp(other.Exp)
+	}
+
+	if left.Exp == right.Exp {
+		return Numeric{pgtype.Numeric{
+			Exp: left.Exp,
+			Int: big.NewInt(0).Add(left.Int, right.Int),
+		}}
+	}
+
+	panic("Cannot add with different exponents")
+}
+
+func (n Numeric) String() string {
+	if n.Int == nil || n.Int.Int64() == 0 {
+		return "0"
+	}
+
+	s := fmt.Sprintf("%d", n.Int)
+	bytes := []byte(s)
+
+	exp := n.Exp
+	for exp > 0 {
+		bytes = append(bytes, byte('0'))
+		exp--
+	}
+
+	if exp == 0 {
+		return string(bytes)
+	}
+
+	length := int32(len(bytes))
+	var bytesWithSeparator []byte
+
+	exp = -exp
+	for length <= exp {
+		if n.Int.Int64() < 0 {
+			bytes = append([]byte{bytes[0], byte('0')}, bytes[1:]...)
+		} else {
+			bytes = append([]byte{byte('0')}, bytes...)
+		}
+		length++
+	}
+
+	split := length - exp
+	bytesWithSeparator = append(bytesWithSeparator, bytes[:split]...)
+	if split == 1 && n.Int.Int64() < 0 {
+		bytesWithSeparator = append(bytesWithSeparator, byte('0'))
+	}
+	bytesWithSeparator = append(bytesWithSeparator, byte('.'))
+	bytesWithSeparator = append(bytesWithSeparator, bytes[split:]...)
+	return string(bytesWithSeparator)
+}
+
+func (n Numeric) MarshalJSON() ([]byte, error) {
+	if n.Int == nil || n.Int.Int64() == 0 {
+		return []byte("0"), nil
+	}
+
+	s := fmt.Sprintf("%d", n.Int)
+	bytes := []byte(s)
+
+	exp := n.Exp
+	for exp > 0 {
+		bytes = append(bytes, byte('0'))
+		exp--
+	}
+
+	if exp == 0 {
+		return bytes, nil
+	}
+
+	length := int32(len(bytes))
+	var bytesWithSeparator []byte
+
+	exp = -exp
+	for length <= exp {
+		if n.Int.Int64() < 0 {
+			bytes = append([]byte{bytes[0], byte('0')}, bytes[1:]...)
+		} else {
+			bytes = append([]byte{byte('0')}, bytes...)
+		}
+		length++
+	}
+
+	split := length - exp
+	bytesWithSeparator = append(bytesWithSeparator, bytes[:split]...)
+	if split == 1 && n.Int.Int64() < 0 {
+		bytesWithSeparator = append(bytesWithSeparator, byte('0'))
+	}
+	bytesWithSeparator = append(bytesWithSeparator, byte('.'))
+	bytesWithSeparator = append(bytesWithSeparator, bytes[split:]...)
+	return bytesWithSeparator, nil
+}
+
+func MustParse(text string) Numeric {
+	num, err := Parse(text)
+	if err != nil {
+		panic(err)
+	}
+
+	return num
+}
+
+func Parse(text string) (Numeric, error) {
+	// Unify decimal separator
+	text = strings.Replace(text, ",", ".", 1)
+
+	num := Numeric{}
+	err := num.Set(text)
+	if err != nil {
+		return num, fmt.Errorf("parse numeric %s: %w", text, err)
+	}
+
+	return num, nil
+}
+
+func ParseCurrency(text string) (Numeric, error) {
+	// Remove trailing currency
+	text = trimLastChar(text)
+
+	return Parse(text)
+}
+
+func trimLastChar(s string) string {
+	r, size := utf8.DecodeLastRuneInString(s)
+	if r == utf8.RuneError && (size == 0 || size == 1) {
+		size = 0
+	}
+	return s[:len(s)-size]
+}

postgres/numeric/numeric_test.go

@@ -0,0 +1,118 @@
+package numeric_test
+
+import (
+	"testing"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+)
+
+type TestCaseMarshalJSON struct {
+	Value  numeric.Numeric
+	Result string
+}
+
+func TestMarshalJSON(t *testing.T) {
+	t.Parallel()
+	tests := []TestCaseMarshalJSON{
+		{numeric.Zero(), `0`},
+		{numeric.MustParse("1.23"), "1.23"},
+		{numeric.MustParse("1,24"), "1.24"},
+		{numeric.MustParse("1"), "1"},
+		{numeric.MustParse("10"), "10"},
+		{numeric.MustParse("100"), "100"},
+		{numeric.MustParse("1000"), "1000"},
+		{numeric.MustParse("0.1"), "0.1"},
+		{numeric.MustParse("0.01"), "0.01"},
+		{numeric.MustParse("0.001"), "0.001"},
+		{numeric.MustParse("0.0001"), "0.0001"},
+		{numeric.MustParse("-1"), "-1"},
+		{numeric.MustParse("-10"), "-10"},
+		{numeric.MustParse("-100"), "-100"},
+		{numeric.MustParse("-1000"), "-1000"},
+		{numeric.MustParse("-0.1"), "-0.1"},
+		{numeric.MustParse("-0.01"), "-0.01"},
+		{numeric.MustParse("-0.001"), "-0.001"},
+		{numeric.MustParse("-0.0001"), "-0.0001"},
+		{numeric.MustParse("123456789.12345"), "123456789.12345"},
+		{numeric.MustParse("123456789.12345"), "123456789.12345"},
+		{numeric.MustParse("-1.23"), "-1.23"},
+		{numeric.MustParse("-1,24"), "-1.24"},
+		{numeric.MustParse("-123456789.12345"), "-123456789.12345"},
+	}
+	for i := range tests {
+		test := tests[i]
+		t.Run(test.Result, func(t *testing.T) {
+			t.Parallel()
+			z := test.Value
+			result, err := z.MarshalJSON()
+			if err != nil {
+				t.Error(err)
+				return
+			}
+
+			if string(result) != test.Result {
+				t.Errorf("Expected %s, got %s", test.Result, string(result))
+				return
+			}
+		})
+	}
+}
+
+type TestCaseParse struct {
+	Result numeric.Numeric
+	Value  string
+}
+
+func TestParse(t *testing.T) {
+	t.Parallel()
+	tests := []TestCaseParse{
+		{numeric.FromInt64WithExp(0, 0), `0`},
+		{numeric.FromInt64WithExp(1, 0), `1`},
+		{numeric.FromInt64WithExp(1, 1), `10`},
+		{numeric.FromInt64WithExp(1, 2), `100`},
+		{numeric.FromInt64WithExp(1, 3), `1000`},
+		{numeric.FromInt64WithExp(1, -1), `0.1`},
+		{numeric.FromInt64WithExp(1, -2), `0.01`},
+		{numeric.FromInt64WithExp(1, -3), `0.001`},
+		{numeric.FromInt64WithExp(1, -4), `0.0001`},
+		{numeric.FromInt64WithExp(-1, 0), `-1`},
+		{numeric.FromInt64WithExp(-1, 1), `-10`},
+		{numeric.FromInt64WithExp(-1, 2), `-100`},
+		{numeric.FromInt64WithExp(-1, 3), `-1000`},
+		{numeric.FromInt64WithExp(-1, -1), `-0.1`},
+		{numeric.FromInt64WithExp(-1, -2), `-0.01`},
+		{numeric.FromInt64WithExp(-1, -3), `-0.001`},
+		{numeric.FromInt64WithExp(-1, -4), `-0.0001`},
+		{numeric.FromInt64WithExp(123, -2), "1.23"},
+		{numeric.FromInt64WithExp(124, -2), "1,24"},
+		{numeric.FromInt64WithExp(12345678912345, -5), "123456789.12345"},
+		{numeric.FromInt64WithExp(0, 0), `-0`},
+		{numeric.FromInt64WithExp(-1, 0), `-1`},
+		{numeric.FromInt64WithExp(-1, 1), `-10`},
+		{numeric.FromInt64WithExp(-1, 2), `-100`},
+		{numeric.FromInt64WithExp(-123, -2), "-1.23"},
+		{numeric.FromInt64WithExp(-124, -2), "-1,24"},
+		{numeric.FromInt64WithExp(-12345678912345, -5), "-123456789.12345"},
+	}
+	for i := range tests {
+		test := tests[i]
+		t.Run(test.Value, func(t *testing.T) {
+			t.Parallel()
+			result, err := numeric.Parse(test.Value)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+
+			if test.Result.Int.Int64() != result.Int.Int64() {
+				t.Errorf("Expected int %d, got %d", test.Result.Int, result.Int)
+				return
+			}
+
+			if test.Result.Exp != result.Exp {
+				t.Errorf("Expected exp %d, got %d", test.Result.Exp, result.Exp)
+				return
+			}
+		})
+	}
+}

postgres/payees.sql.go

@@ -58,7 +58,7 @@ func (q *Queries) GetPayees(ctx context.Context, budgetID uuid.UUID) ([]Payee, e
 }
 
 const searchPayees = `-- name: SearchPayees :many
-SELECT payees.id, payees.budget_id, payees.name FROM payees 
+SELECT payees.id, payees.budget_id, payees.name, 'payee' as type FROM payees 
 WHERE payees.budget_id = $1
 AND payees.name LIKE $2
 ORDER BY payees.name
@@ -69,16 +69,28 @@ type SearchPayeesParams struct {
 	Search   string
 }
 
-func (q *Queries) SearchPayees(ctx context.Context, arg SearchPayeesParams) ([]Payee, error) {
+type SearchPayeesRow struct {
+	ID       uuid.UUID
+	BudgetID uuid.UUID
+	Name     string
+	Type     interface{}
+}
+
+func (q *Queries) SearchPayees(ctx context.Context, arg SearchPayeesParams) ([]SearchPayeesRow, error) {
 	rows, err := q.db.QueryContext(ctx, searchPayees, arg.BudgetID, arg.Search)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []Payee
+	var items []SearchPayeesRow
 	for rows.Next() {
-		var i Payee
-		if err := rows.Scan(&i.ID, &i.BudgetID, &i.Name); err != nil {
+		var i SearchPayeesRow
+		if err := rows.Scan(
+			&i.ID,
+			&i.BudgetID,
+			&i.Name,
+			&i.Type,
+		); err != nil {
 			return nil, err
 		}
 		items = append(items, i)

postgres/queries/accounts.sql

@@ -14,9 +14,23 @@ WHERE accounts.budget_id = $1
 ORDER BY accounts.name;
 
 -- name: GetAccountsWithBalance :many
-SELECT accounts.id, accounts.name, accounts.on_budget, SUM(transactions.amount)::decimal(12,2) as balance
+SELECT accounts.id, accounts.name, accounts.on_budget, 
+        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW())::decimal(12,2) as working_balance,
+        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status IN ('Cleared', 'Reconciled'))::decimal(12,2) as cleared_balance,
+        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status = 'Reconciled')::decimal(12,2) as reconciled_balance
 FROM accounts
-LEFT JOIN transactions ON transactions.account_id = accounts.id AND transactions.date < NOW()
 WHERE accounts.budget_id = $1
-GROUP BY accounts.id, accounts.name
-ORDER BY accounts.name;
+ORDER BY accounts.name;
+
+-- name: SearchAccounts :many
+SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts
+WHERE accounts.budget_id = @budget_id
+AND accounts.name LIKE @search
+ORDER BY accounts.name;
+
+-- name: UpdateAccount :one
+UPDATE accounts
+SET name = $1,
+    on_budget = $2
+WHERE accounts.id = $3
+RETURNING *;

postgres/queries/assignments.sql

@@ -15,4 +15,11 @@ WHERE categories.id = assignments.category_id AND category_groups.budget_id = @b
 -- name: GetAssignmentsByMonthAndCategory :many
 SELECT *
 FROM assignments_by_month
-WHERE assignments_by_month.budget_id = @budget_id;
+WHERE assignments_by_month.budget_id = @budget_id;
+
+-- name: GetAllAssignments :many
+SELECT assignments.date, categories.name as category, category_groups.name as group, assignments.amount
+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;

postgres/queries/categories.sql

@@ -21,7 +21,8 @@ WHERE category_groups.budget_id = $1
 ORDER BY category_groups.name, categories.name;
 
 -- name: SearchCategories :many
-SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id FROM categories
+SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id, 'category' as type
+FROM categories
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id
 WHERE category_groups.budget_id = @budget_id
 AND categories.name LIKE @search

postgres/queries/payees.sql

@@ -10,7 +10,7 @@ WHERE payees.budget_id = $1
 ORDER BY name;
 
 -- name: SearchPayees :many
-SELECT payees.* FROM payees 
+SELECT payees.*, 'payee' as type FROM payees 
 WHERE payees.budget_id = @budget_id
 AND payees.name LIKE @search
 ORDER BY payees.name;

postgres/queries/transactions.sql

@@ -1,60 +1,40 @@
 -- name: GetTransaction :one
-SELECT * FROM transactions
+SELECT * FROM display_transactions
 WHERE id = $1;
 
 -- name: CreateTransaction :one
 INSERT INTO transactions
 (date, memo, amount, account_id, payee_id, category_id, group_id, status)
 VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-RETURNING *;
+RETURNING id;
 
 -- name: UpdateTransaction :exec
 UPDATE transactions
 SET date = $1,
     memo = $2,
     amount = $3,
-    account_id = $4,
-    payee_id = $5,
-    category_id = $6
-WHERE id = $7;
+    payee_id = $4,
+    category_id = $5
+WHERE id = $6;
+
+-- name: SetTransactionReconciled :exec
+UPDATE transactions
+SET status = 'Reconciled'
+WHERE id = $1;
 
 -- name: DeleteTransaction :exec
 DELETE FROM transactions
 WHERE id = $1;
 
--- name: GetTransactionsForBudget :many
-SELECT  transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status,
-        accounts.name as account, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category
-FROM transactions 
-INNER JOIN accounts ON accounts.id = transactions.account_id
-LEFT JOIN payees ON payees.id = transactions.payee_id
-LEFT JOIN categories ON categories.id = transactions.category_id
-LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
-WHERE accounts.budget_id = $1
-ORDER BY transactions.date DESC
-LIMIT 200;
+-- name: GetAllTransactionsForBudget :many
+SELECT  t.*
+FROM display_transactions AS t
+WHERE t.budget_id = $1;
 
 -- name: GetTransactionsForAccount :many
-SELECT  transactions.id, transactions.date, transactions.memo, 
-        transactions.amount, transactions.group_id, transactions.status,
-        accounts.name as account, 
-        COALESCE(payees.name, '') as payee, 
-        COALESCE(category_groups.name, '') as category_group, 
-        COALESCE(categories.name, '') as category,
-        (
-            SELECT CONCAT(otherAccounts.name) 
-            FROM transactions otherTransactions 
-            LEFT JOIN accounts otherAccounts ON otherAccounts.id = otherTransactions.account_id
-            WHERE otherTransactions.group_id = transactions.group_id 
-            AND otherTransactions.id != transactions.id
-        ) as transfer_account
-FROM transactions 
-INNER JOIN accounts ON accounts.id = transactions.account_id
-LEFT JOIN payees ON payees.id = transactions.payee_id
-LEFT JOIN categories ON categories.id = transactions.category_id
-LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
-WHERE transactions.account_id = $1
-ORDER BY transactions.date DESC
+SELECT  t.*
+FROM display_transactions AS t
+WHERE t.account_id = $1
 LIMIT 200;
 
 -- name: DeleteAllTransactions :execrows

postgres/schema/0015_transactions-view.sql

@@ -0,0 +1,25 @@
+-- +goose Up
+CREATE VIEW display_transactions AS 
+        SELECT  transactions.id, transactions.date, transactions.memo, 
+                transactions.amount, transactions.group_id, transactions.status,
+                accounts.name as account, transactions.payee_id, transactions.category_id,
+                COALESCE(payees.name, '') as payee, 
+                COALESCE(category_groups.name, '') as category_group, 
+                COALESCE(categories.name, '') as category,
+                COALESCE((
+                SELECT CONCAT(otherAccounts.name) 
+                FROM transactions otherTransactions 
+                LEFT JOIN accounts otherAccounts ON otherAccounts.id = otherTransactions.account_id
+                WHERE otherTransactions.group_id = transactions.group_id 
+                AND otherTransactions.id != transactions.id
+                ), '')::text as transfer_account,
+                accounts.budget_id, transactions.account_id
+        FROM transactions 
+        INNER JOIN accounts ON accounts.id = transactions.account_id
+        LEFT JOIN payees ON payees.id = transactions.payee_id
+        LEFT JOIN categories ON categories.id = transactions.category_id
+        LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
+        ORDER BY transactions.date DESC;
+
+-- +goose Down
+DROP VIEW display_transactions;

postgres/transactions.sql.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"time"
 
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
@@ -14,13 +15,13 @@ const createTransaction = `-- name: CreateTransaction :one
 INSERT INTO transactions
 (date, memo, amount, account_id, payee_id, category_id, group_id, status)
 VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-RETURNING id, date, memo, amount, account_id, category_id, payee_id, group_id, status
+RETURNING id
 `
 
 type CreateTransactionParams struct {
 	Date       time.Time
 	Memo       string
-	Amount     Numeric
+	Amount     numeric.Numeric
 	AccountID  uuid.UUID
 	PayeeID    uuid.NullUUID
 	CategoryID uuid.NullUUID
@@ -28,7 +29,7 @@ type CreateTransactionParams struct {
 	Status     TransactionStatus
 }
 
-func (q *Queries) CreateTransaction(ctx context.Context, arg CreateTransactionParams) (Transaction, error) {
+func (q *Queries) CreateTransaction(ctx context.Context, arg CreateTransactionParams) (uuid.UUID, error) {
 	row := q.db.QueryRowContext(ctx, createTransaction,
 		arg.Date,
 		arg.Memo,
@@ -39,19 +40,9 @@ func (q *Queries) CreateTransaction(ctx context.Context, arg CreateTransactionPa
 		arg.GroupID,
 		arg.Status,
 	)
-	var i Transaction
-	err := row.Scan(
-		&i.ID,
-		&i.Date,
-		&i.Memo,
-		&i.Amount,
-		&i.AccountID,
-		&i.CategoryID,
-		&i.PayeeID,
-		&i.GroupID,
-		&i.Status,
-	)
-	return i, err
+	var id uuid.UUID
+	err := row.Scan(&id)
+	return id, err
 }
 
 const deleteAllTransactions = `-- name: DeleteAllTransactions :execrows
@@ -79,24 +70,75 @@ func (q *Queries) DeleteTransaction(ctx context.Context, id uuid.UUID) error {
 	return err
 }
 
+const getAllTransactionsForBudget = `-- name: GetAllTransactionsForBudget :many
+SELECT  t.id, t.date, t.memo, t.amount, t.group_id, t.status, t.account, t.payee_id, t.category_id, t.payee, t.category_group, t.category, t.transfer_account, t.budget_id, t.account_id
+FROM display_transactions AS t
+WHERE t.budget_id = $1
+`
+
+func (q *Queries) GetAllTransactionsForBudget(ctx context.Context, budgetID uuid.UUID) ([]DisplayTransaction, error) {
+	rows, err := q.db.QueryContext(ctx, getAllTransactionsForBudget, budgetID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []DisplayTransaction
+	for rows.Next() {
+		var i DisplayTransaction
+		if err := rows.Scan(
+			&i.ID,
+			&i.Date,
+			&i.Memo,
+			&i.Amount,
+			&i.GroupID,
+			&i.Status,
+			&i.Account,
+			&i.PayeeID,
+			&i.CategoryID,
+			&i.Payee,
+			&i.CategoryGroup,
+			&i.Category,
+			&i.TransferAccount,
+			&i.BudgetID,
+			&i.AccountID,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const getTransaction = `-- name: GetTransaction :one
-SELECT id, date, memo, amount, account_id, category_id, payee_id, group_id, status FROM transactions
+SELECT id, date, memo, amount, group_id, status, account, payee_id, category_id, payee, category_group, category, transfer_account, budget_id, account_id FROM display_transactions
 WHERE id = $1
 `
 
-func (q *Queries) GetTransaction(ctx context.Context, id uuid.UUID) (Transaction, error) {
+func (q *Queries) GetTransaction(ctx context.Context, id uuid.UUID) (DisplayTransaction, error) {
 	row := q.db.QueryRowContext(ctx, getTransaction, id)
-	var i Transaction
+	var i DisplayTransaction
 	err := row.Scan(
 		&i.ID,
 		&i.Date,
 		&i.Memo,
 		&i.Amount,
-		&i.AccountID,
-		&i.CategoryID,
-		&i.PayeeID,
 		&i.GroupID,
 		&i.Status,
+		&i.Account,
+		&i.PayeeID,
+		&i.CategoryID,
+		&i.Payee,
+		&i.CategoryGroup,
+		&i.Category,
+		&i.TransferAccount,
+		&i.BudgetID,
+		&i.AccountID,
 	)
 	return i, err
 }
@@ -136,52 +178,21 @@ func (q *Queries) GetTransactionsByMonthAndCategory(ctx context.Context, budgetI
 }
 
 const getTransactionsForAccount = `-- name: GetTransactionsForAccount :many
-SELECT  transactions.id, transactions.date, transactions.memo, 
-        transactions.amount, transactions.group_id, transactions.status,
-        accounts.name as account, 
-        COALESCE(payees.name, '') as payee, 
-        COALESCE(category_groups.name, '') as category_group, 
-        COALESCE(categories.name, '') as category,
-        (
-            SELECT CONCAT(otherAccounts.name) 
-            FROM transactions otherTransactions 
-            LEFT JOIN accounts otherAccounts ON otherAccounts.id = otherTransactions.account_id
-            WHERE otherTransactions.group_id = transactions.group_id 
-            AND otherTransactions.id != transactions.id
-        ) as transfer_account
-FROM transactions 
-INNER JOIN accounts ON accounts.id = transactions.account_id
-LEFT JOIN payees ON payees.id = transactions.payee_id
-LEFT JOIN categories ON categories.id = transactions.category_id
-LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
-WHERE transactions.account_id = $1
-ORDER BY transactions.date DESC
+SELECT  t.id, t.date, t.memo, t.amount, t.group_id, t.status, t.account, t.payee_id, t.category_id, t.payee, t.category_group, t.category, t.transfer_account, t.budget_id, t.account_id
+FROM display_transactions AS t
+WHERE t.account_id = $1
 LIMIT 200
 `
 
-type GetTransactionsForAccountRow struct {
-	ID              uuid.UUID
-	Date            time.Time
-	Memo            string
-	Amount          Numeric
-	GroupID         uuid.NullUUID
-	Status          TransactionStatus
-	Account         string
-	Payee           string
-	CategoryGroup   string
-	Category        string
-	TransferAccount interface{}
-}
-
-func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid.UUID) ([]GetTransactionsForAccountRow, error) {
+func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid.UUID) ([]DisplayTransaction, error) {
 	rows, err := q.db.QueryContext(ctx, getTransactionsForAccount, accountID)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []GetTransactionsForAccountRow
+	var items []DisplayTransaction
 	for rows.Next() {
-		var i GetTransactionsForAccountRow
+		var i DisplayTransaction
 		if err := rows.Scan(
 			&i.ID,
 			&i.Date,
@@ -190,10 +201,14 @@ func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid.
 			&i.GroupID,
 			&i.Status,
 			&i.Account,
+			&i.PayeeID,
+			&i.CategoryID,
 			&i.Payee,
 			&i.CategoryGroup,
 			&i.Category,
 			&i.TransferAccount,
+			&i.BudgetID,
+			&i.AccountID,
 		); err != nil {
 			return nil, err
 		}
@@ -208,64 +223,15 @@ func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid.
 	return items, nil
 }
 
-const getTransactionsForBudget = `-- name: GetTransactionsForBudget :many
-SELECT  transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status,
-        accounts.name as account, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category
-FROM transactions 
-INNER JOIN accounts ON accounts.id = transactions.account_id
-LEFT JOIN payees ON payees.id = transactions.payee_id
-LEFT JOIN categories ON categories.id = transactions.category_id
-LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
-WHERE accounts.budget_id = $1
-ORDER BY transactions.date DESC
-LIMIT 200
+const setTransactionReconciled = `-- name: SetTransactionReconciled :exec
+UPDATE transactions
+SET status = 'Reconciled'
+WHERE id = $1
 `
 
-type GetTransactionsForBudgetRow struct {
-	ID            uuid.UUID
-	Date          time.Time
-	Memo          string
-	Amount        Numeric
-	GroupID       uuid.NullUUID
-	Status        TransactionStatus
-	Account       string
-	Payee         string
-	CategoryGroup string
-	Category      string
-}
-
-func (q *Queries) GetTransactionsForBudget(ctx context.Context, budgetID uuid.UUID) ([]GetTransactionsForBudgetRow, error) {
-	rows, err := q.db.QueryContext(ctx, getTransactionsForBudget, budgetID)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []GetTransactionsForBudgetRow
-	for rows.Next() {
-		var i GetTransactionsForBudgetRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.Date,
-			&i.Memo,
-			&i.Amount,
-			&i.GroupID,
-			&i.Status,
-			&i.Account,
-			&i.Payee,
-			&i.CategoryGroup,
-			&i.Category,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
+func (q *Queries) SetTransactionReconciled(ctx context.Context, id uuid.UUID) error {
+	_, err := q.db.ExecContext(ctx, setTransactionReconciled, id)
+	return err
 }
 
 const updateTransaction = `-- name: UpdateTransaction :exec
@@ -273,17 +239,15 @@ UPDATE transactions
 SET date = $1,
     memo = $2,
     amount = $3,
-    account_id = $4,
-    payee_id = $5,
-    category_id = $6
-WHERE id = $7
+    payee_id = $4,
+    category_id = $5
+WHERE id = $6
 `
 
 type UpdateTransactionParams struct {
 	Date       time.Time
 	Memo       string
-	Amount     Numeric
-	AccountID  uuid.UUID
+	Amount     numeric.Numeric
 	PayeeID    uuid.NullUUID
 	CategoryID uuid.NullUUID
 	ID         uuid.UUID
@@ -294,7 +258,6 @@ func (q *Queries) UpdateTransaction(ctx context.Context, arg UpdateTransactionPa
 		arg.Date,
 		arg.Memo,
 		arg.Amount,
-		arg.AccountID,
 		arg.PayeeID,
 		arg.CategoryID,
 		arg.ID,

postgres/ynab-export.go

@@ -0,0 +1,144 @@
+package postgres
+
+import (
+	"context"
+	"encoding/csv"
+	"fmt"
+	"io"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+	"github.com/google/uuid"
+)
+
+type YNABExport struct {
+	queries  *Queries
+	budgetID uuid.UUID
+}
+
+func NewYNABExport(context context.Context, queries *Queries, budgetID uuid.UUID) (*YNABExport, error) {
+	return &YNABExport{
+		queries:  queries,
+		budgetID: budgetID,
+	}, nil
+}
+
+// ImportAssignments expects a TSV-file as exported by YNAB in the following format:
+// "Month"	"Category Group/Category"	"Category Group"	"Category"	"Budgeted"	"Activity"	"Available"
+// "Apr 2019"	"Income: Next Month"	"Income"	"Next Month"	0,00€	0,00€	0,00€
+//
+// Activity and Available are not imported, since they are determined by the transactions and historic assignments.
+func (ynab *YNABExport) ExportAssignments(context context.Context, w io.Writer) error {
+	csv := csv.NewWriter(w)
+	csv.Comma = '\t'
+
+	assignments, err := ynab.queries.GetAllAssignments(context, ynab.budgetID)
+	if err != nil {
+		return fmt.Errorf("load assignments: %w", err)
+	}
+
+	count := 0
+	for _, assignment := range assignments {
+		row := []string{
+			assignment.Date.Format("Jan 2006"),
+			assignment.Group + ": " + assignment.Category,
+			assignment.Group,
+			assignment.Category,
+			assignment.Amount.String() + "€",
+			numeric.Zero().String() + "€",
+			numeric.Zero().String() + "€",
+		}
+
+		err := csv.Write(row)
+		if err != nil {
+			return fmt.Errorf("write assignment: %w", err)
+		}
+		count++
+	}
+	csv.Flush()
+
+	fmt.Printf("Exported %d assignments\n", count)
+
+	return nil
+}
+
+// ImportTransactions expects a TSV-file as exported by YNAB in the following format:
+// "Account"	"Flag"	"Date"	"Payee"	"Category Group/Category"	"Category Group"	"Category"	"Memo"	"Outflow"	"Inflow"	"Cleared"
+// "Cash"	""	"11.12.2021"	"Transfer : Checking"	""	""	""	"Brought to bank"	500,00€	0,00€	"Cleared".
+func (ynab *YNABExport) ExportTransactions(context context.Context, w io.Writer) error {
+	csv := csv.NewWriter(w)
+	csv.Comma = '\t'
+
+	transactions, err := ynab.queries.GetAllTransactionsForBudget(context, ynab.budgetID)
+	if err != nil {
+		return fmt.Errorf("load transactions: %w", err)
+	}
+
+	header := []string{
+		"Account",
+		"Flag",
+		"Date",
+		"Payee",
+		"Category Group/Category",
+		"Category Group",
+		"Category",
+		"Memo",
+		"Outflow",
+		"Inflow",
+		"Cleared",
+	}
+
+	err = csv.Write(header)
+	if err != nil {
+		return fmt.Errorf("write transaction: %w", err)
+	}
+
+	count := 0
+	for _, transaction := range transactions {
+		row := GetTransactionRow(transaction)
+
+		err := csv.Write(row)
+		if err != nil {
+			return fmt.Errorf("write transaction: %w", err)
+		}
+		count++
+	}
+
+	csv.Flush()
+
+	fmt.Printf("Exported %d transactions\n", count)
+
+	return nil
+}
+
+func GetTransactionRow(transaction DisplayTransaction) []string {
+	row := []string{
+		transaction.Account,
+		"", // Flag
+		transaction.Date.Format("02.01.2006"),
+	}
+
+	if transaction.TransferAccount != "" {
+		row = append(row, "Transfer : "+transaction.TransferAccount)
+	} else {
+		row = append(row, transaction.Payee)
+	}
+
+	if transaction.CategoryGroup != "" && transaction.Category != "" {
+		row = append(row,
+			transaction.CategoryGroup+": "+transaction.Category,
+			transaction.CategoryGroup,
+			transaction.Category)
+	} else {
+		row = append(row, "", "", "")
+	}
+
+	row = append(row, transaction.Memo)
+
+	if transaction.Amount.IsPositive() {
+		row = append(row, numeric.Zero().String()+"€", transaction.Amount.String()+"€")
+	} else {
+		row = append(row, transaction.Amount.String()[1:]+"€", numeric.Zero().String()+"€")
+	}
+
+	return append(row, string(transaction.Status))
+}

postgres/ynab-import.go

@@ -7,13 +7,12 @@ import (
 	"io"
 	"strings"
 	"time"
-	"unicode/utf8"
 
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
 type YNABImport struct {
-	Context        context.Context
 	accounts       []Account
 	payees         []Payee
 	categories     []GetCategoriesRow
@@ -22,73 +21,70 @@ type YNABImport struct {
 	budgetID       uuid.UUID
 }
 
-func NewYNABImport(context context.Context, q *Queries, budgetID uuid.UUID) (*YNABImport, error) {
-	accounts, err := q.GetAccounts(context, budgetID)
+func NewYNABImport(context context.Context, queries *Queries, budgetID uuid.UUID) (*YNABImport, error) {
+	accounts, err := queries.GetAccounts(context, budgetID)
 	if err != nil {
 		return nil, err
 	}
 
-	payees, err := q.GetPayees(context, budgetID)
+	payees, err := queries.GetPayees(context, budgetID)
 	if err != nil {
 		return nil, err
 	}
 
-	categories, err := q.GetCategories(context, budgetID)
+	categories, err := queries.GetCategories(context, budgetID)
 	if err != nil {
 		return nil, err
 	}
 
-	categoryGroups, err := q.GetCategoryGroups(context, budgetID)
+	categoryGroups, err := queries.GetCategoryGroups(context, budgetID)
 	if err != nil {
 		return nil, err
 	}
 
 	return &YNABImport{
-		Context:        context,
 		accounts:       accounts,
 		payees:         payees,
 		categories:     categories,
 		categoryGroups: categoryGroups,
-		queries:        q,
+		queries:        queries,
 		budgetID:       budgetID,
 	}, nil
-
 }
 
 // ImportAssignments expects a TSV-file as exported by YNAB in the following format:
-//"Month"	"Category Group/Category"	"Category Group"	"Category"	"Budgeted"	"Activity"	"Available"
-//"Apr 2019"	"Income: Next Month"	"Income"	"Next Month"	0,00€	0,00€	0,00€
+// "Month"	"Category Group/Category"	"Category Group"	"Category"	"Budgeted"	"Activity"	"Available"
+// "Apr 2019"	"Income: Next Month"	"Income"	"Next Month"	0,00€	0,00€	0,00€
 //
-// Activity and Available are not imported, since they are determined by the transactions and historic assignments
-func (ynab *YNABImport) ImportAssignments(r io.Reader) error {
+// Activity and Available are not imported, since they are determined by the transactions and historic assignments.
+func (ynab *YNABImport) ImportAssignments(context context.Context, r io.Reader) error {
 	csv := csv.NewReader(r)
 	csv.Comma = '\t'
 	csv.LazyQuotes = true
 
 	csvData, err := csv.ReadAll()
 	if err != nil {
-		return fmt.Errorf("could not read from tsv: %w", err)
+		return fmt.Errorf("read from tsv: %w", err)
 	}
 
 	count := 0
 	for _, record := range csvData[1:] {
-
 		dateString := record[0]
 		date, err := time.Parse("Jan 2006", dateString)
 		if err != nil {
-			return fmt.Errorf("could not parse date %s: %w", dateString, err)
+			return fmt.Errorf("parse date %s: %w", dateString, err)
 		}
 
-		categoryGroup, categoryName := record[2], record[3] //also in 1 joined by :
-		category, err := ynab.GetCategory(categoryGroup, categoryName)
+		categoryGroup, categoryName := record[2], record[3] // also in 1 joined by :
+		category, err := ynab.GetCategory(context, categoryGroup, categoryName)
 		if err != nil {
-			return fmt.Errorf("could not get category %s/%s: %w", categoryGroup, categoryName, err)
+			return fmt.Errorf("get category %s/%s: %w", categoryGroup, categoryName, err)
 		}
 
 		amountString := record[4]
 		amount, err := GetAmount(amountString, "0,00€")
 		if err != nil {
-			return fmt.Errorf("could not parse amount %s: %w", amountString, err)
+			return fmt.Errorf("parse amount %s: %w", amountString, err)
 		}
 
 		if amount.Int.Int64() == 0 {
@@ -100,9 +96,9 @@ func (ynab *YNABImport) ImportAssignments(r io.Reader) error {
 			CategoryID: category.UUID,
 			Amount:     amount,
 		}
-		_, err = ynab.queries.CreateAssignment(ynab.Context, assignment)
+		_, err = ynab.queries.CreateAssignment(context, assignment)
 		if err != nil {
-			return fmt.Errorf("could not save assignment %v: %w", assignment, err)
+			return fmt.Errorf("save assignment %v: %w", assignment, err)
 		}
 
 		count++
@@ -121,188 +117,210 @@ type Transfer struct {
 }
 
 // ImportTransactions expects a TSV-file as exported by YNAB in the following format:
-
-func (ynab *YNABImport) ImportTransactions(r io.Reader) error {
+// "Account"	"Flag"	"Date"	"Payee"	"Category Group/Category"	"Category Group"	"Category"	"Memo"	"Outflow"	"Inflow"	"Cleared"
+// "Cash"	""	"11.12.2021"	"Transfer : Checking"	""	""	""	"Brought to bank"	500,00€	0,00€	"Cleared".
+func (ynab *YNABImport) ImportTransactions(context context.Context, r io.Reader) error {
 	csv := csv.NewReader(r)
 	csv.Comma = '\t'
 	csv.LazyQuotes = true
 
 	csvData, err := csv.ReadAll()
 	if err != nil {
-		return fmt.Errorf("could not read from tsv: %w", err)
+		return fmt.Errorf("read from tsv: %w", err)
 	}
 
 	var openTransfers []Transfer
 
 	count := 0
 	for _, record := range csvData[1:] {
-		accountName := record[0]
-		account, err := ynab.GetAccount(accountName)
+		transaction, err := ynab.GetTransaction(context, record)
 		if err != nil {
-			return fmt.Errorf("could not get account %s: %w", accountName, err)
-		}
-
-		//flag := record[1]
-
-		dateString := record[2]
-		date, err := time.Parse("02.01.2006", dateString)
-		if err != nil {
-			return fmt.Errorf("could not parse date %s: %w", dateString, err)
-		}
-
-		categoryGroup, categoryName := record[5], record[6] //also in 4 joined by :
-		category, err := ynab.GetCategory(categoryGroup, categoryName)
-		if err != nil {
-			return fmt.Errorf("could not get category %s/%s: %w", categoryGroup, categoryName, err)
-		}
-
-		memo := record[7]
-
-		outflow := record[8]
-		inflow := record[9]
-		amount, err := GetAmount(inflow, outflow)
-		if err != nil {
-			return fmt.Errorf("could not parse amount from (%s/%s): %w", inflow, outflow, err)
-		}
-
-		statusEnum := TransactionStatusUncleared
-		status := record[10]
-		switch status {
-		case "Cleared":
-			statusEnum = TransactionStatusCleared
-		case "Reconciled":
-			statusEnum = TransactionStatusReconciled
-		case "Uncleared":
-		}
-
-		transaction := CreateTransactionParams{
-			Date:       date,
-			Memo:       memo,
-			AccountID:  account.ID,
-			CategoryID: category,
-			Amount:     amount,
-			Status:     statusEnum,
+			return err
 		}
 
 		payeeName := record[3]
+		// Transaction is a transfer
 		if strings.HasPrefix(payeeName, "Transfer : ") {
-			// Transaction is a transfer to
-			transferToAccountName := payeeName[11:]
-			transferToAccount, err := ynab.GetAccount(transferToAccountName)
-			if err != nil {
-				return fmt.Errorf("Could not get transfer account %s: %w", transferToAccountName, err)
-			}
-
-			transfer := Transfer{
-				transaction,
-				transferToAccount,
-				accountName,
-				transferToAccountName,
-			}
-
-			found := false
-			for i, openTransfer := range openTransfers {
-				if openTransfer.TransferToAccount.ID != transfer.AccountID {
-					continue
-				}
-				if openTransfer.AccountID != transfer.TransferToAccount.ID {
-					continue
-				}
-				if openTransfer.Amount.GetFloat64() != -1*transfer.Amount.GetFloat64() {
-					continue
-				}
-
-				fmt.Printf("Matched transfers from %s to %s over %f\n", account.Name, transferToAccount.Name, amount.GetFloat64())
-				openTransfers[i] = openTransfers[len(openTransfers)-1]
-				openTransfers = openTransfers[:len(openTransfers)-1]
-				found = true
-
-				groupID := uuid.New()
-				transfer.GroupID = uuid.NullUUID{UUID: groupID, Valid: true}
-				openTransfer.GroupID = uuid.NullUUID{UUID: groupID, Valid: true}
-
-				_, err = ynab.queries.CreateTransaction(ynab.Context, transfer.CreateTransactionParams)
-				if err != nil {
-					return fmt.Errorf("could not save transaction %v: %w", transfer.CreateTransactionParams, err)
-				}
-				_, err = ynab.queries.CreateTransaction(ynab.Context, openTransfer.CreateTransactionParams)
-				if err != nil {
-					return fmt.Errorf("could not save transaction %v: %w", openTransfer.CreateTransactionParams, err)
-				}
-				break
-			}
-
-			if !found {
-				openTransfers = append(openTransfers, transfer)
-			}
+			err = ynab.ImportTransferTransaction(context, payeeName, transaction.CreateTransactionParams,
+				&openTransfers, transaction.Account, transaction.Amount)
 		} else {
-			payeeID, err := ynab.GetPayee(payeeName)
-			if err != nil {
-				return fmt.Errorf("could not get payee %s: %w", payeeName, err)
-			}
-			transaction.PayeeID = payeeID
-
-			_, err = ynab.queries.CreateTransaction(ynab.Context, transaction)
-			if err != nil {
-				return fmt.Errorf("could not save transaction %v: %w", transaction, err)
-			}
+			err = ynab.ImportRegularTransaction(context, payeeName, transaction.CreateTransactionParams)
+		}
+		if err != nil {
+			return err
 		}
 
 		count++
 	}
 
 	for _, openTransfer := range openTransfers {
-		fmt.Printf("Saving unmatched transfer from %s to %s on %s over %f as regular transaction\n", openTransfer.FromAccount, openTransfer.ToAccount, openTransfer.Date, openTransfer.Amount.GetFloat64())
-		_, err = ynab.queries.CreateTransaction(ynab.Context, openTransfer.CreateTransactionParams)
+		fmt.Printf("Saving unmatched transfer from %s to %s on %s over %f as regular transaction\n",
+			openTransfer.FromAccount, openTransfer.ToAccount, openTransfer.Date, openTransfer.Amount.GetFloat64())
+		_, err = ynab.queries.CreateTransaction(context, openTransfer.CreateTransactionParams)
 		if err != nil {
-			return fmt.Errorf("could not save transaction %v: %w", openTransfer.CreateTransactionParams, err)
+			return fmt.Errorf("save transaction %v: %w", openTransfer.CreateTransactionParams, err)
 		}
-
 	}
+
 	fmt.Printf("Imported %d transactions\n", count)
 
 	return nil
 }
 
-func trimLastChar(s string) string {
-	r, size := utf8.DecodeLastRuneInString(s)
-	if r == utf8.RuneError && (size == 0 || size == 1) {
-		size = 0
-	}
-	return s[:len(s)-size]
+type NewTransaction struct {
+	CreateTransactionParams
+	Account *Account
 }
 
-func GetAmount(inflow string, outflow string) (Numeric, error) {
-	// Remove trailing currency
-	inflow = strings.Replace(trimLastChar(inflow), ",", ".", 1)
-	outflow = strings.Replace(trimLastChar(outflow), ",", ".", 1)
-
-	num := Numeric{}
-	err := num.Set(inflow)
+func (ynab *YNABImport) GetTransaction(context context.Context, record []string) (NewTransaction, error) {
+	accountName := record[0]
+	account, err := ynab.GetAccount(context, accountName)
 	if err != nil {
-		return num, fmt.Errorf("Could not parse inflow %s: %w", inflow, err)
+		return NewTransaction{}, fmt.Errorf("get account %s: %w", accountName, err)
+	}
+
+	// flag := record[1]
+
+	dateString := record[2]
+	date, err := time.Parse("02.01.2006", dateString)
+	if err != nil {
+		return NewTransaction{}, fmt.Errorf("parse date %s: %w", dateString, err)
+	}
+
+	categoryGroup, categoryName := record[5], record[6] // also in 4 joined by :
+	category, err := ynab.GetCategory(context, categoryGroup, categoryName)
+	if err != nil {
+		return NewTransaction{}, fmt.Errorf("get category %s/%s: %w", categoryGroup, categoryName, err)
+	}
+
+	memo := record[7]
+
+	outflow := record[8]
+	inflow := record[9]
+	amount, err := GetAmount(inflow, outflow)
+	if err != nil {
+		return NewTransaction{}, fmt.Errorf("parse amount from (%s/%s): %w", inflow, outflow, err)
+	}
+
+	statusEnum := TransactionStatusUncleared
+	status := record[10]
+	switch status {
+	case "Cleared":
+		statusEnum = TransactionStatusCleared
+	case "Reconciled":
+		statusEnum = TransactionStatusReconciled
+	case "Uncleared":
+	}
+
+	return NewTransaction{
+		CreateTransactionParams: CreateTransactionParams{
+			Date:       date,
+			Memo:       memo,
+			AccountID:  account.ID,
+			CategoryID: category,
+			Amount:     amount,
+			Status:     statusEnum,
+		},
+		Account: account,
+	}, nil
+}
+
+func (ynab *YNABImport) ImportRegularTransaction(context context.Context, payeeName string,
+	transaction CreateTransactionParams) error {
+	payeeID, err := ynab.GetPayee(context, payeeName)
+	if err != nil {
+		return fmt.Errorf("get payee %s: %w", payeeName, err)
+	}
+	transaction.PayeeID = payeeID
+
+	_, err = ynab.queries.CreateTransaction(context, transaction)
+	if err != nil {
+		return fmt.Errorf("save transaction %v: %w", transaction, err)
+	}
+	return nil
+}
+
+func (ynab *YNABImport) ImportTransferTransaction(context context.Context, payeeName string,
+	transaction CreateTransactionParams, openTransfers *[]Transfer,
+	account *Account, amount numeric.Numeric) error {
+	transferToAccountName := payeeName[11:]
+	transferToAccount, err := ynab.GetAccount(context, transferToAccountName)
+	if err != nil {
+		return fmt.Errorf("get transfer account %s: %w", transferToAccountName, err)
+	}
+
+	transfer := Transfer{
+		transaction,
+		transferToAccount,
+		account.Name,
+		transferToAccountName,
+	}
+
+	found := false
+	for i, openTransfer := range *openTransfers {
+		if openTransfer.TransferToAccount.ID != transfer.AccountID {
+			continue
+		}
+		if openTransfer.AccountID != transfer.TransferToAccount.ID {
+			continue
+		}
+		if openTransfer.Amount.GetFloat64() != -1*transfer.Amount.GetFloat64() {
+			continue
+		}
+
+		fmt.Printf("Matched transfers from %s to %s over %f\n", account.Name, transferToAccount.Name, amount.GetFloat64())
+		transfers := *openTransfers
+		transfers[i] = transfers[len(transfers)-1]
+		*openTransfers = transfers[:len(transfers)-1]
+		found = true
+
+		groupID := uuid.New()
+		transfer.GroupID = uuid.NullUUID{UUID: groupID, Valid: true}
+		openTransfer.GroupID = uuid.NullUUID{UUID: groupID, Valid: true}
+
+		_, err = ynab.queries.CreateTransaction(context, transfer.CreateTransactionParams)
+		if err != nil {
+			return fmt.Errorf("save transaction %v: %w", transfer.CreateTransactionParams, err)
+		}
+		_, err = ynab.queries.CreateTransaction(context, openTransfer.CreateTransactionParams)
+		if err != nil {
+			return fmt.Errorf("save transaction %v: %w", openTransfer.CreateTransactionParams, err)
+		}
+		break
+	}
+
+	if !found {
+		*openTransfers = append(*openTransfers, transfer)
+	}
+	return nil
+}
+
+func GetAmount(inflow string, outflow string) (numeric.Numeric, error) {
+	in, err := numeric.ParseCurrency(inflow)
+	if err != nil {
+		return in, fmt.Errorf("parse inflow: %w", err)
+	}
+
+	if !in.IsZero() {
+		return in, nil
 	}
 
 	// if inflow is zero, use outflow
-	if num.Int.Int64() != 0 {
-		return num, nil
-	}
-
-	err = num.Set("-" + outflow)
+	out, err := numeric.ParseCurrency("-" + outflow)
 	if err != nil {
-		return num, fmt.Errorf("Could not parse outflow %s: %w", inflow, err)
+		return out, fmt.Errorf("parse outflow: %w", err)
 	}
-	return num, nil
+	return out, nil
 }
 
-func (ynab *YNABImport) GetAccount(name string) (*Account, error) {
+func (ynab *YNABImport) GetAccount(context context.Context, name string) (*Account, error) {
 	for _, acc := range ynab.accounts {
 		if acc.Name == name {
 			return &acc, nil
 		}
 	}
 
-	account, err := ynab.queries.CreateAccount(ynab.Context, CreateAccountParams{Name: name, BudgetID: ynab.budgetID})
+	account, err := ynab.queries.CreateAccount(context, CreateAccountParams{Name: name, BudgetID: ynab.budgetID})
 	if err != nil {
 		return nil, err
 	}
@@ -311,7 +329,7 @@ func (ynab *YNABImport) GetAccount(name string) (*Account, error) {
 	return &account, nil
 }
 
-func (ynab *YNABImport) GetPayee(name string) (uuid.NullUUID, error) {
+func (ynab *YNABImport) GetPayee(context context.Context, name string) (uuid.NullUUID, error) {
 	if name == "" {
 		return uuid.NullUUID{}, nil
 	}
@@ -322,7 +340,7 @@ func (ynab *YNABImport) GetPayee(name string) (uuid.NullUUID, error) {
 		}
 	}
 
-	payee, err := ynab.queries.CreatePayee(ynab.Context, CreatePayeeParams{Name: name, BudgetID: ynab.budgetID})
+	payee, err := ynab.queries.CreatePayee(context, CreatePayeeParams{Name: name, BudgetID: ynab.budgetID})
 	if err != nil {
 		return uuid.NullUUID{}, err
 	}
@@ -331,7 +349,7 @@ func (ynab *YNABImport) GetPayee(name string) (uuid.NullUUID, error) {
 	return uuid.NullUUID{UUID: payee.ID, Valid: true}, nil
 }
 
-func (ynab *YNABImport) GetCategory(group string, name string) (uuid.NullUUID, error) {
+func (ynab *YNABImport) GetCategory(context context.Context, group string, name string) (uuid.NullUUID, error) { //nolint
 	if group == "" || name == "" {
 		return uuid.NullUUID{}, nil
 	}
@@ -342,32 +360,25 @@ func (ynab *YNABImport) GetCategory(group string, name string) (uuid.NullUUID, e
 		}
 	}
 
-	for _, categoryGroup := range ynab.categoryGroups {
-		if categoryGroup.Name == group {
-			createCategory := CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID}
-			category, err := ynab.queries.CreateCategory(ynab.Context, createCategory)
-			if err != nil {
-				return uuid.NullUUID{}, err
-			}
-
-			getCategory := GetCategoriesRow{
-				ID:              category.ID,
-				CategoryGroupID: category.CategoryGroupID,
-				Name:            category.Name,
-				Group:           categoryGroup.Name,
-			}
-			ynab.categories = append(ynab.categories, getCategory)
-			return uuid.NullUUID{UUID: category.ID, Valid: true}, nil
+	var categoryGroup CategoryGroup
+	for _, existingGroup := range ynab.categoryGroups {
+		if existingGroup.Name == group {
+			categoryGroup = existingGroup
 		}
 	}
 
-	categoryGroup, err := ynab.queries.CreateCategoryGroup(ynab.Context, CreateCategoryGroupParams{Name: group, BudgetID: ynab.budgetID})
-	if err != nil {
-		return uuid.NullUUID{}, err
+	if categoryGroup.Name == "" {
+		newGroup := CreateCategoryGroupParams{Name: group, BudgetID: ynab.budgetID}
+		var err error
+		categoryGroup, err = ynab.queries.CreateCategoryGroup(context, newGroup)
+		if err != nil {
+			return uuid.NullUUID{}, err
+		}
+		ynab.categoryGroups = append(ynab.categoryGroups, categoryGroup)
 	}
-	ynab.categoryGroups = append(ynab.categoryGroups, categoryGroup)
 
-	category, err := ynab.queries.CreateCategory(ynab.Context, CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID})
+	newCategory := CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID}
+	category, err := ynab.queries.CreateCategory(context, newCategory)
 	if err != nil {
 		return uuid.NullUUID{}, err
 	}

server/account.go

@@ -0,0 +1,71 @@
+package server
+
+import (
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+func (h *Handler) transactionsForAccount(c *gin.Context) {
+	accountID := c.Param("accountid")
+	accountUUID, err := uuid.Parse(accountID)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	account, err := h.Service.GetAccount(c.Request.Context(), accountUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusNotFound, err)
+		return
+	}
+
+	transactions, err := h.Service.GetTransactionsForAccount(c.Request.Context(), accountUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusNotFound, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, TransactionsResponse{account, transactions})
+}
+
+type TransactionsResponse struct {
+	Account      postgres.Account
+	Transactions []postgres.DisplayTransaction
+}
+
+type EditAccountRequest struct {
+	Name     string `json:"name"`
+	OnBudget bool   `json:"onBudget"`
+}
+
+func (h *Handler) editAccount(c *gin.Context) {
+	accountID := c.Param("accountid")
+	accountUUID, err := uuid.Parse(accountID)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	var request EditAccountRequest
+	err = c.BindJSON(&request)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	updateParams := postgres.UpdateAccountParams{
+		Name:     request.Name,
+		OnBudget: request.OnBudget,
+		ID:       accountUUID,
+	}
+	account, err := h.Service.UpdateAccount(c.Request.Context(), updateParams)
+	if err != nil {
+		c.AbortWithError(http.StatusNotFound, err)
+		return
+	}
+
+	h.returnBudgetingData(c, account.BudgetID)
+}

server/account_test.go

@@ -1,7 +1,8 @@
-package http
+package server
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -10,47 +11,54 @@ import (
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/jwt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
-
 	txdb "github.com/DATA-DOG/go-txdb"
+	"github.com/gin-gonic/gin"
 )
 
-func init() {
+func init() { //nolint:gochecknoinits
 	txdb.Register("pgtx", "pgx", "postgres://budgeteer_test:budgeteer_test@localhost:5432/budgeteer_test")
 }
 
-func TestListTimezonesHandler(t *testing.T) {
-	db, err := postgres.Connect("pgtx", "example")
+func TestRegisterUser(t *testing.T) { //nolint:funlen
+	t.Parallel()
+	database, err := postgres.Connect("pgtx", "example")
 	if err != nil {
-		t.Errorf("could not connect to db: %s", err)
+		fmt.Printf("could not connect to db: %s\n", err)
+		t.Skip()
 		return
 	}
 
 	h := Handler{
-		Service:             db,
-		TokenVerifier:       &jwt.TokenVerifier{},
+		Service: database,
+		TokenVerifier: &jwt.TokenVerifier{
+			Secret: "this_is_my_demo_secret_for_unit_tests",
+		},
 		CredentialsVerifier: &bcrypt.Verifier{},
 	}
 
-	rr := httptest.NewRecorder()
-	c, engine := gin.CreateTestContext(rr)
+	recorder := httptest.NewRecorder()
+	context, engine := gin.CreateTestContext(recorder)
 	h.LoadRoutes(engine)
 
 	t.Run("RegisterUser", func(t *testing.T) {
-		c.Request, err = http.NewRequest(http.MethodPost, "/api/v1/user/register", strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
+		t.Parallel()
+		context.Request, err = http.NewRequest(
+			http.MethodPost,
+			"/api/v1/user/register",
+			strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
 		if err != nil {
 			t.Errorf("error creating request: %s", err)
 			return
 		}
 
-		h.registerPost(c)
+		h.registerPost(context)
 
-		if rr.Code != http.StatusOK {
-			t.Errorf("handler returned wrong status code: got %v want %v", rr.Code, http.StatusOK)
+		if recorder.Code != http.StatusOK {
+			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
 		}
 
 		var response LoginResponse
-		err = json.NewDecoder(rr.Body).Decode(&response)
+		err = json.NewDecoder(recorder.Body).Decode(&response)
 		if err != nil {
 			t.Error(err.Error())
 			t.Error("Error registering")
@@ -61,13 +69,14 @@ func TestListTimezonesHandler(t *testing.T) {
 	})
 
 	t.Run("GetTransactions", func(t *testing.T) {
-		c.Request, err = http.NewRequest(http.MethodGet, "/account/accountid/transactions", nil)
-		if rr.Code != http.StatusOK {
-			t.Errorf("handler returned wrong status code: got %v want %v", rr.Code, http.StatusOK)
+		t.Parallel()
+		context.Request, err = http.NewRequest(http.MethodGet, "/account/accountid/transactions", nil)
+		if recorder.Code != http.StatusOK {
+			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
 		}
 
 		var response TransactionsResponse
-		err = json.NewDecoder(rr.Body).Decode(&response)
+		err = json.NewDecoder(recorder.Body).Decode(&response)
 		if err != nil {
 			t.Error(err.Error())
 			t.Error("Error retreiving list of transactions.")

server/admin.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"fmt"

server/autocomplete.go

@@ -0,0 +1,72 @@
+package server
+
+import (
+	"net/http"
+	"strings"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+func (h *Handler) autocompleteCategories(c *gin.Context) {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
+		return
+	}
+
+	query := c.Request.URL.Query().Get("s")
+	searchParams := postgres.SearchCategoriesParams{
+		BudgetID: budgetUUID,
+		Search:   "%" + query + "%",
+	}
+	categories, err := h.Service.SearchCategories(c.Request.Context(), searchParams)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, categories)
+}
+
+func (h *Handler) autocompletePayee(c *gin.Context) {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
+		return
+	}
+
+	query := c.Request.URL.Query().Get("s")
+
+	transferPrefix := "Transfer"
+	if strings.HasPrefix(query, transferPrefix) {
+		searchParams := postgres.SearchAccountsParams{
+			BudgetID: budgetUUID,
+			Search:   "%" + strings.Trim(query[len(transferPrefix):], " \t\n:") + "%",
+		}
+
+		accounts, err := h.Service.SearchAccounts(c.Request.Context(), searchParams)
+		if err != nil {
+			c.AbortWithError(http.StatusInternalServerError, err)
+			return
+		}
+
+		c.JSON(http.StatusOK, accounts)
+	} else {
+		searchParams := postgres.SearchPayeesParams{
+			BudgetID: budgetUUID,
+			Search:   query + "%",
+		}
+
+		payees, err := h.Service.SearchPayees(c.Request.Context(), searchParams)
+		if err != nil {
+			c.AbortWithError(http.StatusInternalServerError, err)
+			return
+		}
+
+		c.JSON(http.StatusOK, payees)
+	}
+}

server/budget.go

@@ -1,10 +1,8 @@
-package http
+package server
 
 import (
-	"fmt"
 	"net/http"
 
-	"git.javil.eu/jacob1123/budgeteer"
 	"github.com/gin-gonic/gin"
 )
 
@@ -14,18 +12,17 @@ type newBudgetInformation struct {
 
 func (h *Handler) newBudget(c *gin.Context) {
 	var newBudget newBudgetInformation
-	err := c.BindJSON(&newBudget)
-	if err != nil {
+	if err := c.BindJSON(&newBudget); err != nil {
 		c.AbortWithError(http.StatusNotAcceptable, err)
 		return
 	}
 
 	if newBudget.Name == "" {
-		c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("Budget name is needed"))
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budget name is required"})
 		return
 	}
 
-	userID := c.MustGet("token").(budgeteer.Token).GetID()
+	userID := MustGetToken(c).GetID()
 	budget, err := h.Service.NewBudget(c.Request.Context(), newBudget.Name, userID)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)

server/budgeting.go

@@ -0,0 +1,222 @@
+package server
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+func getFirstOfMonth(year, month int, location *time.Location) time.Time {
+	return time.Date(year, time.Month(month), 1, 0, 0, 0, 0, location)
+}
+
+func getFirstOfMonthTime(date time.Time) time.Time {
+	var monthM time.Month
+	year, monthM, _ := date.Date()
+	month := int(monthM)
+	return getFirstOfMonth(year, month, date.Location())
+}
+
+type CategoryWithBalance struct {
+	*postgres.GetCategoriesRow
+	Available          numeric.Numeric
+	AvailableLastMonth numeric.Numeric
+	Activity           numeric.Numeric
+	Assigned           numeric.Numeric
+}
+
+func NewCategoryWithBalance(category *postgres.GetCategoriesRow) CategoryWithBalance {
+	return CategoryWithBalance{
+		GetCategoriesRow:   category,
+		Available:          numeric.Zero(),
+		AvailableLastMonth: numeric.Zero(),
+		Activity:           numeric.Zero(),
+		Assigned:           numeric.Zero(),
+	}
+}
+
+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)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
+		return
+	}
+
+	budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	firstOfMonth, err := getDate(c)
+	if err != nil {
+		c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budgetUUID.String())
+		return
+	}
+
+	categories, err := h.Service.GetCategories(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	firstOfNextMonth := firstOfMonth.AddDate(0, 1, 0)
+	cumultativeBalances, err := h.Service.GetCumultativeBalances(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusInternalServerError, ErrorResponse{fmt.Sprintf("error loading balances: %s", err)})
+		return
+	}
+
+	categoriesWithBalance, moneyUsed := h.calculateBalances(
+		budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances)
+
+	availableBalance := h.getAvailableBalance(categories, budget, moneyUsed, cumultativeBalances, firstOfNextMonth)
+
+	data := struct {
+		Categories       []CategoryWithBalance
+		AvailableBalance numeric.Numeric
+	}{categoriesWithBalance, availableBalance}
+	c.JSON(http.StatusOK, data)
+}
+
+func (*Handler) getAvailableBalance(categories []postgres.GetCategoriesRow, 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 {
+			continue
+		}
+		availableBalance = moneyUsed
+
+		for _, bal := range cumultativeBalances {
+			if bal.CategoryID != cat.ID {
+				continue
+			}
+
+			if !bal.Date.Before(firstOfNextMonth) {
+				continue
+			}
+
+			availableBalance = availableBalance.Add(bal.Transactions)
+		}
+	}
+	return availableBalance
+}
+
+type BudgetingResponse struct {
+	Accounts []postgres.GetAccountsWithBalanceRow
+	Budget   postgres.Budget
+}
+
+func (h *Handler) budgeting(c *gin.Context) {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
+		return
+	}
+
+	h.returnBudgetingData(c, budgetUUID)
+}
+
+func (h *Handler) returnBudgetingData(c *gin.Context, budgetUUID uuid.UUID) {
+	budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusNotFound, err)
+		return
+	}
+
+	accounts, err := h.Service.GetAccountsWithBalance(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	data := BudgetingResponse{accounts, budget}
+
+	c.JSON(http.StatusOK, data)
+}
+
+func (h *Handler) calculateBalances(budget postgres.Budget,
+	firstOfNextMonth time.Time, firstOfMonth time.Time, categories []postgres.GetCategoriesRow,
+	cumultativeBalances []postgres.GetCumultativeBalancesRow) ([]CategoryWithBalance, numeric.Numeric) {
+	categoriesWithBalance := []CategoryWithBalance{}
+
+	moneyUsed := numeric.Zero()
+	for i := range categories {
+		cat := &categories[i]
+		// do not show hidden categories
+		categoryWithBalance := h.CalculateCategoryBalances(cat, cumultativeBalances,
+			firstOfNextMonth, &moneyUsed, firstOfMonth, budget)
+
+		if cat.ID == budget.IncomeCategoryID {
+			continue
+		}
+
+		categoriesWithBalance = append(categoriesWithBalance, categoryWithBalance)
+	}
+
+	return categoriesWithBalance, moneyUsed
+}
+
+func (*Handler) CalculateCategoryBalances(cat *postgres.GetCategoriesRow,
+	cumultativeBalances []postgres.GetCumultativeBalancesRow, firstOfNextMonth time.Time,
+	moneyUsed *numeric.Numeric, firstOfMonth time.Time, budget postgres.Budget) CategoryWithBalance {
+	categoryWithBalance := NewCategoryWithBalance(cat)
+	for _, bal := range cumultativeBalances {
+		if bal.CategoryID != cat.ID {
+			continue
+		}
+
+		// skip everything in the future
+		if !bal.Date.Before(firstOfNextMonth) {
+			continue
+		}
+
+		*moneyUsed = moneyUsed.Sub(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)
+			categoryWithBalance.Available = numeric.Zero()
+		}
+
+		if bal.Date.Before(firstOfMonth) {
+			categoryWithBalance.AvailableLastMonth = categoryWithBalance.Available
+		} else if bal.Date.Before(firstOfNextMonth) {
+			categoryWithBalance.Activity = bal.Transactions
+			categoryWithBalance.Assigned = bal.Assignments
+		}
+	}
+
+	return categoryWithBalance
+}

server/dashboard.go

@@ -1,15 +1,14 @@
-package http
+package server
 
 import (
 	"net/http"
 
-	"git.javil.eu/jacob1123/budgeteer"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
 	"github.com/gin-gonic/gin"
 )
 
 func (h *Handler) dashboard(c *gin.Context) {
-	userID := c.MustGet("token").(budgeteer.Token).GetID()
+	userID := MustGetToken(c).GetID()
 	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), userID)
 	if err != nil {
 		return

server/http.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"errors"
@@ -11,12 +11,10 @@ import (
 	"git.javil.eu/jacob1123/budgeteer"
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"git.javil.eu/jacob1123/budgeteer/web"
-
 	"github.com/gin-gonic/gin"
 )
 
-// Handler handles incoming requests
+// Handler handles incoming requests.
 type Handler struct {
 	Service             *postgres.Database
 	TokenVerifier       budgeteer.TokenVerifier
@@ -24,63 +22,62 @@ type Handler struct {
 	StaticFS            http.FileSystem
 }
 
-const (
-	expiration = 72
-)
-
-// Serve starts the http server
+// Serve starts the http server.
 func (h *Handler) Serve() {
 	router := gin.Default()
 	h.LoadRoutes(router)
-	router.Run(":1323")
+
+	if err := router.Run(":1323"); err != nil {
+		panic(err)
+	}
 }
 
-// LoadRoutes initializes all the routes
-func (h *Handler) LoadRoutes(router *gin.Engine) {
-	static, err := fs.Sub(web.Static, "dist")
-	if err != nil {
-		panic("couldn't open static files")
-	}
-	h.StaticFS = http.FS(static)
+type ErrorResponse struct {
+	Message string
+}
 
+type SuccessResponse struct {
+	Message string
+}
+
+// LoadRoutes initializes all the routes.
+func (h *Handler) LoadRoutes(router *gin.Engine) {
 	router.Use(enableCachingForStaticFiles())
 	router.NoRoute(h.ServeStatic)
 
-	withLogin := router.Group("")
-	withLogin.Use(h.verifyLoginWithRedirect)
-
-	withBudget := router.Group("")
-	withBudget.Use(h.verifyLoginWithForbidden)
-	withBudget.GET("/budget/:budgetid/:year/:month", h.budgeting)
-	withBudget.GET("/budget/:budgetid/settings/clean-negative", h.cleanNegativeBudget)
-
 	api := router.Group("/api/v1")
 
-	unauthenticated := api.Group("/user")
-	unauthenticated.GET("/login", func(c *gin.Context) { c.Redirect(http.StatusPermanentRedirect, "/login") })
-	unauthenticated.POST("/login", h.loginPost)
-	unauthenticated.POST("/register", h.registerPost)
+	anonymous := api.Group("/user")
+	anonymous.GET("/login", func(c *gin.Context) { c.Redirect(http.StatusPermanentRedirect, "/login") })
+	anonymous.POST("/login", h.loginPost)
+	anonymous.POST("/register", h.registerPost)
 
 	authenticated := api.Group("")
 	authenticated.Use(h.verifyLoginWithForbidden)
 	authenticated.GET("/dashboard", h.dashboard)
 	authenticated.GET("/account/:accountid/transactions", h.transactionsForAccount)
+	authenticated.POST("/account/:accountid/reconcile", h.reconcileTransactions)
+	authenticated.POST("/account/:accountid", h.editAccount)
 	authenticated.GET("/admin/clear-database", h.clearDatabase)
-	authenticated.GET("/budget/:budgetid", h.budgeting)
-	authenticated.GET("/budget/:budgetid/:year/:month", h.budgetingForMonth)
-	authenticated.GET("/budget/:budgetid/autocomplete/payees", h.autocompletePayee)
-	authenticated.GET("/budget/:budgetid/autocomplete/categories", h.autocompleteCategories)
-	authenticated.DELETE("/budget/:budgetid", h.deleteBudget)
-	authenticated.POST("/budget/:budgetid/import/ynab", h.importYNAB)
-	authenticated.POST("/budget/:budgetid/settings/clear", h.clearBudget)
 
 	budget := authenticated.Group("/budget")
 	budget.POST("/new", h.newBudget)
+	budget.GET("/:budgetid", h.budgeting)
+	budget.GET("/:budgetid/:year/:month", h.budgetingForMonth)
+	budget.GET("/:budgetid/autocomplete/payees", h.autocompletePayee)
+	budget.GET("/:budgetid/autocomplete/categories", h.autocompleteCategories)
+	budget.DELETE("/:budgetid", h.deleteBudget)
+	budget.POST("/:budgetid/import/ynab", h.importYNAB)
+	budget.POST("/:budgetid/export/ynab/transactions", h.exportYNABTransactions)
+	budget.POST("/:budgetid/export/ynab/assignments", h.exportYNABAssignments)
+	budget.POST("/:budgetid/settings/clear", h.clearBudget)
+	budget.POST("/:budgetid/settings/clean-negative", h.cleanNegativeBudget)
 
 	transaction := authenticated.Group("/transaction")
 	transaction.POST("/new", h.newTransaction)
 	transaction.POST("/:transactionid", h.newTransaction)
 }
+
 func (h *Handler) ServeStatic(c *gin.Context) {
 	h.ServeStaticFile(c, c.Request.URL.Path)
 }
@@ -108,7 +105,11 @@ func (h *Handler) ServeStaticFile(c *gin.Context, fullPath string) {
 		return
 	}
 
-	http.ServeContent(c.Writer, c.Request, stat.Name(), stat.ModTime(), file.(io.ReadSeeker))
+	if file, ok := file.(io.ReadSeeker); ok {
+		http.ServeContent(c.Writer, c.Request, stat.Name(), stat.ModTime(), file)
+	} else {
+		panic("File does not implement ReadSeeker")
+	}
 }
 
 func enableCachingForStaticFiles() gin.HandlerFunc {

server/json-date.go

@@ -1,29 +1,36 @@
-package http
+package server
 
 import (
 	"encoding/json"
+	"fmt"
 	"strings"
 	"time"
 )
 
 type JSONDate time.Time
 
-// Implement Marshaler and Unmarshaler interface
+// UnmarshalJSON parses the JSONDate from a JSON input.
 func (j *JSONDate) UnmarshalJSON(b []byte) error {
 	s := strings.Trim(string(b), "\"")
 	t, err := time.Parse("2006-01-02", s)
 	if err != nil {
-		return err
+		return fmt.Errorf("parse date: %w", err)
 	}
 	*j = JSONDate(t)
 	return nil
 }
 
+// MarshalJSON converts the JSONDate to a JSON in ISO format.
 func (j JSONDate) MarshalJSON() ([]byte, error) {
-	return json.Marshal(time.Time(j))
+	result, err := json.Marshal(time.Time(j))
+	if err != nil {
+		return nil, fmt.Errorf("marshal date: %w", err)
+	}
+
+	return result, nil
 }
 
-// Maybe a Format function for printing your date
+// Format formats the time using the regular time.Time mechanics..
 func (j JSONDate) Format(s string) string {
 	t := time.Time(j)
 	return t.Format(s)

server/reconcile.go

@@ -0,0 +1,103 @@
+package server
+
+import (
+	"database/sql"
+	"fmt"
+	"net/http"
+	"time"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type ReconcileTransactionsRequest struct {
+	TransactionIDs                 []uuid.UUID `json:"transactionIds"`
+	ReconcilationTransactionAmount string      `json:"reconciliationTransactionAmount"`
+}
+
+type ReconcileTransactionsResponse struct {
+	Message                   string
+	ReconciliationTransaction *postgres.DisplayTransaction
+}
+
+func (h *Handler) reconcileTransactions(c *gin.Context) {
+	accountID := c.Param("accountid")
+	accountUUID, err := uuid.Parse(accountID)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	var request ReconcileTransactionsRequest
+	err = c.BindJSON(&request)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err))
+		return
+	}
+
+	var amount numeric.Numeric
+	err = amount.Set(request.ReconcilationTransactionAmount)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err))
+		return
+	}
+
+	tx, err := h.Service.BeginTx(c.Request.Context(), &sql.TxOptions{})
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("begin tx: %w", err))
+		return
+	}
+
+	db := h.Service.WithTx(tx)
+	for _, transactionID := range request.TransactionIDs {
+		err := db.SetTransactionReconciled(c.Request.Context(), transactionID)
+		if err != nil {
+			c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("update transaction: %w", err))
+			return
+		}
+	}
+
+	reconciliationTransaction, err := h.CreateReconcilationTransaction(amount, accountUUID, db, c)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("insert new transaction: %w", err))
+		return
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("commit: %w", err))
+		return
+	}
+
+	c.JSON(http.StatusOK, ReconcileTransactionsResponse{
+		Message:                   fmt.Sprintf("Set status for %d transactions", len(request.TransactionIDs)),
+		ReconciliationTransaction: reconciliationTransaction,
+	})
+}
+
+func (*Handler) CreateReconcilationTransaction(amount numeric.Numeric, accountUUID uuid.UUID, db *postgres.Queries, c *gin.Context) (*postgres.DisplayTransaction, error) {
+	if amount.IsZero() {
+		return nil, nil //nolint: nilnil
+	}
+
+	createTransaction := postgres.CreateTransactionParams{
+		Date:      time.Now(),
+		Memo:      "Reconciliation Transaction",
+		Amount:    amount,
+		AccountID: accountUUID,
+		Status:    "Reconciled",
+	}
+	transactionUUID, err := db.CreateTransaction(c.Request.Context(), createTransaction)
+	if err != nil {
+		return nil, fmt.Errorf("insert new transaction: %w", err)
+	}
+
+	transaction, err := db.GetTransaction(c.Request.Context(), transactionUUID)
+	if err != nil {
+		return nil, fmt.Errorf("get created transaction: %w", err)
+	}
+
+	return &transaction, nil
+}

server/session.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"context"
@@ -8,18 +8,34 @@ import (
 	"git.javil.eu/jacob1123/budgeteer"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
 	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 )
 
-func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, error) {
-	tokenString := c.GetHeader("Authorization")
-	if len(tokenString) < 8 {
-		return nil, fmt.Errorf("no authorization header supplied")
+const (
+	HeaderName = "Authorization"
+	Bearer     = "Bearer "
+	ParamName  = "token"
+)
+
+func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn
+	token := c.MustGet(ParamName)
+	if token, ok := token.(budgeteer.Token); ok {
+		return token
+	}
+
+	panic("Token is not a valid Token")
+}
+
+func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, *ErrorResponse) { //nolint:ireturn
+	tokenString := c.GetHeader(HeaderName)
+	if len(tokenString) <= len(Bearer) {
+		return nil, &ErrorResponse{"no authorization header supplied"}
 	}
 
 	tokenString = tokenString[7:]
 	token, err := h.TokenVerifier.VerifyToken(tokenString)
 	if err != nil {
-		return nil, fmt.Errorf("verify token '%s': %w", tokenString, err)
+		return nil, &ErrorResponse{fmt.Sprintf("verify token '%s': %s", tokenString, err)}
 	}
 
 	return token, nil
@@ -28,24 +44,12 @@ func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, error) {
 func (h *Handler) verifyLoginWithForbidden(c *gin.Context) {
 	token, err := h.verifyLogin(c)
 	if err != nil {
-		//c.Header("WWW-Authenticate", "Bearer")
-		c.AbortWithError(http.StatusForbidden, err)
+		// c.Header("WWW-Authenticate", "Bearer")
+		c.AbortWithStatusJSON(http.StatusForbidden, err)
 		return
 	}
 
-	c.Set("token", token)
-	c.Next()
-}
-
-func (h *Handler) verifyLoginWithRedirect(c *gin.Context) {
-	token, err := h.verifyLogin(c)
-	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/login")
-		c.Abort()
-		return
-	}
-
-	c.Set("token", token)
+	c.Set(ParamName, token)
 	c.Next()
 }
 
@@ -72,19 +76,19 @@ func (h *Handler) loginPost(c *gin.Context) {
 		return
 	}
 
-	t, err := h.TokenVerifier.CreateToken(&user)
+	token, err := h.TokenVerifier.CreateToken(&user)
 	if err != nil {
 		c.AbortWithError(http.StatusUnauthorized, err)
 	}
 
-	go h.Service.UpdateLastLogin(context.Background(), user.ID)
+	go h.UpdateLastLogin(user.ID)
 
 	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
 	if err != nil {
 		return
 	}
 
-	c.JSON(http.StatusOK, LoginResponse{t, user, budgets})
+	c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
 }
 
 type LoginResponse struct {
@@ -101,16 +105,20 @@ type registerInformation struct {
 
 func (h *Handler) registerPost(c *gin.Context) {
 	var register registerInformation
-	c.BindJSON(&register)
-
-	if register.Email == "" || register.Password == "" || register.Name == "" {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("e-mail, password and name are required"))
+	err := c.BindJSON(&register)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"error parsing body"})
 		return
 	}
 
-	_, err := h.Service.GetUserByUsername(c.Request.Context(), register.Email)
+	if register.Email == "" || register.Password == "" || register.Name == "" {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"e-mail, password and name are required"})
+		return
+	}
+
+	_, err = h.Service.GetUserByUsername(c.Request.Context(), register.Email)
 	if err == nil {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("email is already taken"))
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"email is already taken"})
 		return
 	}
 
@@ -130,17 +138,24 @@ func (h *Handler) registerPost(c *gin.Context) {
 		c.AbortWithError(http.StatusInternalServerError, err)
 	}
 
-	t, err := h.TokenVerifier.CreateToken(&user)
+	token, err := h.TokenVerifier.CreateToken(&user)
 	if err != nil {
 		c.AbortWithError(http.StatusUnauthorized, err)
 	}
 
-	go h.Service.UpdateLastLogin(context.Background(), user.ID)
+	go h.UpdateLastLogin(user.ID)
 
 	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
 	if err != nil {
 		return
 	}
 
-	c.JSON(http.StatusOK, LoginResponse{t, user, budgets})
+	c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
+}
+
+func (h *Handler) UpdateLastLogin(userID uuid.UUID) {
+	_, err := h.Service.UpdateLastLogin(context.Background(), userID)
+	if err != nil {
+		fmt.Printf("Error updating last login: %s", err)
+	}
 }

server/transaction.go

@@ -0,0 +1,159 @@
+package server
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"time"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type NewTransactionPayload struct {
+	Date  JSONDate `json:"date"`
+	Payee struct {
+		ID   uuid.NullUUID
+		Name string
+		Type string
+	} `json:"payee"`
+	CategoryID uuid.NullUUID `json:"categoryId"`
+	Memo       string        `json:"memo"`
+	Amount     string        `json:"amount"`
+	BudgetID   uuid.UUID     `json:"budgetId"`
+	AccountID  uuid.UUID     `json:"accountId"`
+	State      string        `json:"state"`
+}
+
+func (h *Handler) newTransaction(c *gin.Context) {
+	var payload NewTransactionPayload
+	err := c.BindJSON(&payload)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	amount, err := numeric.Parse(payload.Amount)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("amount: %w", err))
+		return
+	}
+
+	transactionID := c.Param("transactionid")
+	if transactionID != "" {
+		h.UpdateTransaction(payload, amount, transactionID, c)
+		return
+	}
+
+	newTransaction := postgres.CreateTransactionParams{
+		Memo:       payload.Memo,
+		Date:       time.Time(payload.Date),
+		Amount:     amount,
+		Status:     postgres.TransactionStatus(payload.State),
+		CategoryID: payload.CategoryID,
+		AccountID:  payload.AccountID,
+	}
+
+	if payload.Payee.Type == "account" {
+		groupID, err := h.CreateTransferForOtherAccount(newTransaction, amount, payload, c)
+		if err != nil {
+			c.AbortWithError(http.StatusInternalServerError, err)
+			return
+		}
+
+		newTransaction.GroupID = groupID
+	} else {
+		payeeID, err := GetPayeeID(c.Request.Context(), payload, h)
+		if err != nil {
+			c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create payee: %w", err))
+		}
+		newTransaction.PayeeID = payeeID
+	}
+
+	transactionUUID, err := h.Service.CreateTransaction(c.Request.Context(), newTransaction)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err))
+		return
+	}
+
+	transaction, err := h.Service.GetTransaction(c.Request.Context(), transactionUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err))
+		return
+	}
+
+	c.JSON(http.StatusOK, transaction)
+}
+
+func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeric.Numeric, transactionID string, c *gin.Context) {
+	transactionUUID := uuid.MustParse(transactionID)
+	if amount.IsZero() {
+		err := h.Service.DeleteTransaction(c.Request.Context(), transactionUUID)
+		if err != nil {
+			c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err))
+		}
+		return
+	}
+
+	editTransaction := postgres.UpdateTransactionParams{
+		Memo:       payload.Memo,
+		Date:       time.Time(payload.Date),
+		Amount:     amount,
+		PayeeID:    payload.Payee.ID,
+		CategoryID: payload.CategoryID,
+		ID:         transactionUUID,
+	}
+
+	err := h.Service.UpdateTransaction(c.Request.Context(), editTransaction)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("edit transaction: %w", err))
+		return
+	}
+
+	transaction, err := h.Service.GetTransaction(c.Request.Context(), transactionUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err))
+		return
+	}
+
+	c.JSON(http.StatusOK, transaction)
+}
+
+func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTransactionParams, amount numeric.Numeric, payload NewTransactionPayload, c *gin.Context) (uuid.NullUUID, error) {
+	newTransaction.GroupID = uuid.NullUUID{UUID: uuid.New(), Valid: true}
+	newTransaction.Amount = amount.Neg()
+	newTransaction.AccountID = payload.Payee.ID.UUID
+
+	// transfer does not need category. Either it's account is off-budget or no category was supplied.
+	newTransaction.CategoryID = uuid.NullUUID{}
+
+	_, err := h.Service.CreateTransaction(c.Request.Context(), newTransaction)
+	if err != nil {
+		return uuid.NullUUID{}, fmt.Errorf("create transfer transaction: %w", err)
+	}
+	return newTransaction.GroupID, nil
+}
+
+func GetPayeeID(context context.Context, payload NewTransactionPayload, h *Handler) (uuid.NullUUID, error) {
+	payeeID := payload.Payee.ID
+	if payeeID.Valid {
+		return payeeID, nil
+	}
+
+	if payload.Payee.Name == "" {
+		return uuid.NullUUID{}, nil
+	}
+
+	newPayee := postgres.CreatePayeeParams{
+		Name:     payload.Payee.Name,
+		BudgetID: payload.BudgetID,
+	}
+	payee, err := h.Service.CreatePayee(context, newPayee)
+	if err != nil {
+		return uuid.NullUUID{}, fmt.Errorf("create payee: %w", err)
+	}
+
+	return uuid.NullUUID{UUID: payee.ID, Valid: true}, nil
+}

server/ynab-import.go

@@ -0,0 +1,117 @@
+package server
+
+import (
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+func (h *Handler) importYNAB(c *gin.Context) {
+	budgetID, succ := c.Params.Get("budgetid")
+	if !succ {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"})
+		return
+	}
+
+	budgetUUID, err := uuid.Parse(budgetID)
+	if !succ {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	ynab, err := postgres.NewYNABImport(c.Request.Context(), h.Service.Queries, budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	transactionsFile, err := c.FormFile("transactions")
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	transactions, err := transactionsFile.Open()
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	err = ynab.ImportTransactions(c.Request.Context(), transactions)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	assignmentsFile, err := c.FormFile("assignments")
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	assignments, err := assignmentsFile.Open()
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	err = ynab.ImportAssignments(c.Request.Context(), assignments)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+}
+
+func (h *Handler) exportYNABTransactions(c *gin.Context) {
+	budgetID, succ := c.Params.Get("budgetid")
+	if !succ {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"})
+		return
+	}
+
+	budgetUUID, err := uuid.Parse(budgetID)
+	if !succ {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	ynab, err := postgres.NewYNABExport(c.Request.Context(), h.Service.Queries, budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	err = ynab.ExportTransactions(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+}
+
+func (h *Handler) exportYNABAssignments(c *gin.Context) {
+	budgetID, succ := c.Params.Get("budgetid")
+	if !succ {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"})
+		return
+	}
+
+	budgetUUID, err := uuid.Parse(budgetID)
+	if !succ {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	ynab, err := postgres.NewYNABExport(c.Request.Context(), h.Service.Queries, budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	err = ynab.ExportAssignments(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+}

sqlc.yaml

@@ -7,9 +7,11 @@ packages:
     queries: "postgres/queries/"
 overrides:
   - go_type: 
-      type: "Numeric"
+      import: "git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+      type: Numeric
     db_type: "pg_catalog.numeric"
   - go_type: 
-      type: "Numeric"
+      import: "git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+      type: Numeric
     db_type: "pg_catalog.numeric"
     nullable: true

token.go

@@ -5,7 +5,7 @@ import (
 	"github.com/google/uuid"
 )
 
-// Token contains data that authenticates a user
+// Token contains data that authenticates a user.
 type Token interface {
 	GetUsername() string
 	GetName() string
@@ -13,7 +13,7 @@ type Token interface {
 	GetID() uuid.UUID
 }
 
-// TokenVerifier verifies a Token
+// TokenVerifier verifies a Token.
 type TokenVerifier interface {
 	VerifyToken(string) (Token, error)
 	CreateToken(*postgres.User) (string, error)

web/package.json

@@ -11,6 +11,7 @@
     "@mdi/font": "5.9.55",
     "@vueuse/core": "^7.6.1",
     "autoprefixer": "^10.4.2",
+    "file-saver": "^2.0.5",
     "pinia": "^2.0.11",
     "postcss": "^8.4.6",
     "tailwindcss": "^3.0.18",
@@ -18,6 +19,7 @@
     "vue-router": "^4.0.12"
   },
   "devDependencies": {
+    "@types/file-saver": "^2.0.5",
     "@vitejs/plugin-vue": "^2.0.0",
     "@vue/cli-plugin-babel": "5.0.0-beta.7",
     "@vue/cli-plugin-typescript": "~4.5.0",

web/src/components/Autocomplete.vue

@@ -1,101 +1,96 @@
-<script lang="ts">
-import { defineComponent, PropType } from "vue"
+<script lang="ts" setup>
+import { ref, watch } from "vue"
 import { GET } from "../api";
 import { useBudgetsStore } from "../stores/budget";
 
 export interface Suggestion {
-    ID : string
-    Name : string
+    ID: string
+    Name: string
+    Type: string
 }
 
-interface Data {
-    Selected: Suggestion | undefined
-    SearchQuery: String
-    Suggestions: Suggestion[]
-}
+const props = defineProps<{
+    text: String,
+    id: String | undefined,
+    model: String,
+    type?: string | undefined,
+}>();
 
-export default defineComponent({
-    data() {
-        return {
-            Selected: undefined,
-            SearchQuery: this.modelValue || "",
-            Suggestions: new Array<Suggestion>(),
-        } as Data
-    },
-    props: {
-        modelValue: Object as PropType<Suggestion>,
-        type: String
-    },
-    watch: {
-        SearchQuery() {
-            this.load(this.$data.SearchQuery);
-        }
-    },
-    methods: {
-        saveTransaction(e : MouseEvent) {
-            e.preventDefault();
-        },
-        load(text : String) {
-            this.$emit('update:modelValue', {ID: null, Name: text});
-            if (text == ""){
-                this.$data.Suggestions = [];
-                return;
-            }
-            
-            const budgetStore = useBudgetsStore();
-            GET("/budget/" + budgetStore.CurrentBudgetID + "/autocomplete/" + this.type + "?s=" + text)
-                .then(x=>x.json())
-                .then(x => {
-                    let suggestions = x || [];
-                    if(suggestions.length > 10){
-                        suggestions = suggestions.slice(0, 10);
-                    }
-                    this.$data.Suggestions = suggestions;
-                });
-        },
-        keypress(e : KeyboardEvent) {
-            console.log(e.key);
-            if(e.key == "Enter") {
-                const selected = this.$data.Suggestions[0];
-                this.selectElement(selected);
-                const el = (<HTMLInputElement>e.target);
-                const inputElements = Array.from(el.ownerDocument.querySelectorAll('input:not([disabled]):not([readonly])'));
-                const currentIndex = inputElements.indexOf(el);
-                const nextElement = inputElements[currentIndex < inputElements.length - 1 ? currentIndex + 1 : 0];
-                (<HTMLInputElement>nextElement).focus();
-
-            }
-        },
-        selectElement(element : Suggestion) {
-            this.$data.Selected = element;
-            this.$data.Suggestions = [];
-            this.$emit('update:modelValue', element);
-        },
-        select(e : MouseEvent) {
-            const target = (<HTMLInputElement>e.target);
-            const valueAttribute = target.attributes.getNamedItem("value");
-            let selectedID = "";
-            if(valueAttribute != null)
-                selectedID = valueAttribute.value;
-            const selected = this.$data.Suggestions.filter(x => x.ID == selectedID)[0];
-            this.selectElement(selected);
-        },
-        clear() {
-            this.$data.Selected = undefined;
-            this.$emit('update:modelValue', {ID: null, Name: this.$data.SearchQuery});
-        }
+const SearchQuery = ref(props.text || "");
+const Suggestions = ref<Array<Suggestion>>([]);
+const emit = defineEmits(["update:id", "update:text", "update:type"]);
+watch(SearchQuery, () => {
+    load(SearchQuery.value);
+});
+function load(text: String) {
+    emit('update:id', null);
+    emit('update:text', text);
+    emit('update:type', undefined);
+    if (text == "") {
+        Suggestions.value = [];
+        return;
     }
-})
+
+    const budgetStore = useBudgetsStore();
+    GET("/budget/" + budgetStore.CurrentBudgetID + "/autocomplete/" + props.model + "?s=" + text)
+        .then(x => x.json())
+        .then(x => {
+            let suggestions = x || [];
+            if (suggestions.length > 10) {
+                suggestions = suggestions.slice(0, 10);
+            }
+            Suggestions.value = suggestions;
+        });
+};
+function keypress(e: KeyboardEvent) {
+    if (e.key == "Enter") {
+        const selected = Suggestions.value[0];
+        selectElement(selected);
+        const el = (<HTMLInputElement>e.target);
+        const inputElements = Array.from(el.ownerDocument.querySelectorAll('input:not([disabled]):not([readonly])'));
+        const currentIndex = inputElements.indexOf(el);
+        const nextElement = inputElements[currentIndex < inputElements.length - 1 ? currentIndex + 1 : 0];
+        (<HTMLInputElement>nextElement).focus();
+    }
+};
+function selectElement(element: Suggestion) {
+    emit('update:id', element.ID);
+    emit('update:text', element.Name);
+    emit('update:type', element.Type);
+    Suggestions.value = [];
+};
+function select(e: MouseEvent) {
+    const target = (<HTMLInputElement>e.target);
+    const valueAttribute = target.attributes.getNamedItem("value");
+    let selectedID = "";
+    if (valueAttribute != null)
+        selectedID = valueAttribute.value;
+    const selected = Suggestions.value.filter(x => x.ID == selectedID)[0];
+    selectElement(selected);
+};
+function clear() {
+    emit('update:id', null);
+    emit('update:text', SearchQuery.value);
+    emit('update:type', undefined);
+};
 </script>
 
 <template>
     <div>
-        <input class="border-b-2 border-black" @keypress="keypress" v-if="Selected == undefined" v-model="SearchQuery" />
-        <span @click="clear" v-if="Selected != undefined" class="bg-gray-300">{{Selected.Name}}</span>
+        <input
+            class="border-b-2 border-black"
+            @keypress="keypress"
+            v-if="id == undefined"
+            v-model="SearchQuery"
+        />
+        <span @click="clear" v-if="id != undefined" class="bg-gray-300">{{ text }}</span>
         <div v-if="Suggestions.length > 0" class="absolute bg-gray-400 w-64 p-2">
-            <span v-for="suggestion in Suggestions" class="block" @click="select" :value="suggestion.ID">
-                {{suggestion.Name}}
-            </span>
+            <span
+                v-for="suggestion in Suggestions"
+                class="block"
+                @click="select"
+                :value="suggestion.ID"
+            >{{ suggestion.Name }}</span>
         </div>
     </div>
 </template>

web/src/components/Button.vue

@@ -0,0 +1,10 @@
+<script lang="ts" setup>
+</script>
+
+<template>
+    <button
+        class="px-4 py-2 text-base font-medium rounded-md shadow-sm focus:outline-none focus:ring-2"
+    >
+        <slot></slot>
+    </button>
+</template>

web/src/components/Card.vue

@@ -1,9 +1,4 @@
-<script lang="ts">
-import { defineComponent } from "vue";
-
-export default defineComponent({
-
-})
+<script lang="ts" setup>
 </script>
 
 <template>

web/src/components/Currency.vue

@@ -1,19 +1,15 @@
-<script lang="ts">
-import { defineComponent } from "vue";
+<script lang="ts" setup>
+import { computed } from 'vue';
 
-export default defineComponent({
-    props: ["value"],
-    computed: {
-        formattedValue() {
-            return Number(this.value).toLocaleString(undefined, {
-                minimumFractionDigits: 2,
-            });
-        }
-    }
-})
+const props = defineProps<{ value: number | undefined }>();
 
+const internalValue = computed(() => Number(props.value ?? 0));
+
+const formattedValue = computed(() => internalValue.value.toLocaleString(undefined, {
+    minimumFractionDigits: 2,
+}));
 </script>
 
 <template>
-    <span class="text-right" :class="value < 0 ? 'negative' : ''">{{formattedValue}} €</span>
+    <span class="text-right" :class="internalValue < 0 ? 'negative' : ''">{{ formattedValue }} €</span>
 </template>

web/src/components/DateInput.vue

@@ -0,0 +1,33 @@
+<script lang="ts" setup>
+const props = defineProps(["modelValue"]);
+const emit = defineEmits(['update:modelValue']);
+
+function dateToYYYYMMDD(d: Date) : string {
+  // alternative implementations in https://stackoverflow.com/q/23593052/1850609
+  //return new Date(d.getTime() - (d.getTimezoneOffset() * 60 * 1000)).toISOString().split('T')[0];
+  return d.toISOString().split('T')[0];
+}
+
+function updateValue(event: Event) {
+  const target = event.target as HTMLInputElement;
+  emit('update:modelValue', target.valueAsDate);
+}
+function selectAll(event: FocusEvent) {
+  // Workaround for Safari bug
+  // http://stackoverflow.com/questions/1269722/selecting-text-on-focus-using-jquery-not-working-in-safari-and-chrome
+  setTimeout(function () {
+    const target = event.target as HTMLInputElement;
+    target.select()
+  }, 0)
+}
+</script>
+
+<template>
+  <input
+    type="date"
+    ref="input"
+    v-bind:value="dateToYYYYMMDD(modelValue)"
+    @input="updateValue"
+    @focus="selectAll"
+  />
+</template>

web/src/components/Modal.vue

@@ -0,0 +1,58 @@
+<script lang="ts" setup>
+import Card from '../components/Card.vue';
+import { ref } from "vue";
+
+const props = defineProps<{
+    buttonText: string,
+}>();
+
+const emit = defineEmits<{
+    (e: 'submit'): void,
+    (e: 'open'): void,
+}>();
+
+const visible = ref(false);
+function closeDialog() {
+    visible.value = false;
+};
+function openDialog() {
+    emit("open");
+    visible.value = true;
+};
+function submitDialog() {
+    visible.value = false;
+    emit("submit");
+}
+</script>
+
+<template>
+    <button @click="openDialog">
+        <slot name="placeholder">
+            <Card>
+                <p class="w-24 text-center text-6xl">+</p>
+                <span class="text-lg" dark>{{ buttonText }}</span>
+            </Card>
+        </slot>
+    </button>
+    <div
+        v-if="visible"
+        class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full"
+    >
+        <div class="relative top-20 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white">
+            <div class="mt-3 text-center">
+                <h3 class="mt-3 text-lg leading-6 font-medium text-gray-900">{{ buttonText }}</h3>
+                <slot></slot>
+                <div class="grid grid-cols-2 gap-6">
+                    <button
+                        @click="closeDialog"
+                        class="px-4 py-2 bg-red-500 text-white text-base font-medium rounded-md shadow-sm hover:bg-green-600 focus:outline-none focus:ring-2 focus:ring-green-300"
+                    >Close</button>
+                    <button
+                        @click="submitDialog"
+                        class="px-4 py-2 bg-green-500 text-white text-base font-medium rounded-md shadow-sm hover:bg-green-600 focus:outline-none focus:ring-2 focus:ring-green-300"
+                    >Save</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>

web/src/components/TransactionEditRow.vue

@@ -0,0 +1,63 @@
+<script lang="ts" setup>
+import { computed, ref } from "vue";
+import Autocomplete from './Autocomplete.vue'
+import { useAccountStore } from '../stores/budget-account'
+import DateInput from "./DateInput.vue";
+
+const props = defineProps<{
+    transactionid: string
+}>()
+
+const emit = defineEmits(["save"]);
+
+const accountStore = useAccountStore();
+const TX = accountStore.Transactions.get(props.transactionid)!;
+const payeeType = ref<string|undefined>(undefined);
+
+const payload = computed(() => JSON.stringify({
+    date: TX.Date.toISOString().split("T")[0],
+    payee: {
+        Name: TX.Payee,
+        ID: TX.PayeeID,
+        Type: payeeType.value,
+    },
+    categoryId: TX.CategoryID,
+    memo: TX.Memo,
+    amount: TX.Amount.toString(),
+    state: "Uncleared"
+}));
+
+function saveTransaction(e: MouseEvent) {
+    e.preventDefault();
+    accountStore.editTransaction(TX.ID, payload.value);
+    emit('save');
+}
+</script>
+
+<template>
+    <tr>
+        <td style="width: 90px;" class="text-sm">
+            <DateInput class="border-b-2 border-black" v-model="TX.Date" />
+        </td>
+        <td style="max-width: 150px;">
+            <Autocomplete v-model:text="TX.Payee" v-model:id="TX.PayeeID" v-model:type="payeeType" model="payees" />
+        </td>
+        <td style="max-width: 200px;">
+            <Autocomplete v-model:text="TX.Category" v-model:id="TX.CategoryID" model="categories" />
+        </td>
+        <td>
+            <input class="block w-full border-b-2 border-black" type="text" v-model="TX.Memo" />
+        </td>
+        <td style="width: 80px;" class="text-right">
+            <input
+                class="text-right block w-full border-b-2 border-black"
+                type="currency"
+                v-model="TX.Amount"
+            />
+        </td>
+        <td style="width: 20px;">
+            <input type="submit" @click="saveTransaction" value="Save" />
+        </td>
+        <td style="width: 20px;"></td>
+    </tr>
+</template>

web/src/components/TransactionInputRow.vue

@@ -0,0 +1,77 @@
+<script lang="ts" setup>
+import { computed, ref } from "vue";
+import Autocomplete, { Suggestion } from '../components/Autocomplete.vue'
+import { Transaction, useAccountStore } from '../stores/budget-account'
+import DateInput from "./DateInput.vue";
+
+const props = defineProps<{
+    budgetid: string
+    accountid: string
+}>()
+
+const TX = ref<Transaction>({
+    Date: new Date(),
+    Memo: "",
+    Amount: 0,
+    Payee: "",
+    PayeeID: undefined,
+    Category: "",
+    CategoryID: undefined,
+    CategoryGroup: "",
+    GroupID: "",
+    ID: "",
+    Status: "Uncleared",
+    TransferAccount: "",
+});
+
+const payeeType = ref<string|undefined>(undefined);
+
+const payload = computed(() => JSON.stringify({
+    budgetId: props.budgetid,
+    accountId: props.accountid,
+    date: TX.value.Date.toISOString().split("T")[0],
+    payee: {
+        Name: TX.value.Payee,
+        ID: TX.value.PayeeID,
+        Type: payeeType.value,
+    },
+    categoryId: TX.value.CategoryID,
+    memo: TX.value.Memo,
+    amount: TX.value.Amount.toString(),
+    state: "Uncleared"
+}));
+
+const accountStore = useAccountStore();
+function saveTransaction(e: MouseEvent) {
+    e.preventDefault();
+    accountStore.saveTransaction(payload.value);
+}
+</script>
+
+<template>
+    <tr>
+        <td style="width: 90px;" class="text-sm">
+            <DateInput class="border-b-2 border-black" v-model="TX.Date" />
+        </td>
+        <td style="max-width: 150px;">
+            <Autocomplete v-model:text="TX.Payee" v-model:id="TX.PayeeID" v-model:type="payeeType" model="payees" />
+        </td>
+        <td style="max-width: 200px;">
+            <Autocomplete v-model:text="TX.Category" v-model:id="TX.CategoryID" model="categories" />
+        </td>
+        <td>
+            <input class="block w-full border-b-2 border-black" type="text" v-model="TX.Memo" />
+        </td>
+        <td style="width: 80px;" class="text-right">
+            <input
+                class="text-right block w-full border-b-2 border-black"
+                type="currency"
+                v-model="TX.Amount"
+            />
+        </td>
+        <td style="width: 20px;">
+            <input type="submit" @click="saveTransaction" value="Save" />
+        </td>
+        <td style="width: 20px;"></td>
+    </tr>
+</template>

web/src/components/TransactionRow.vue

@@ -1,40 +1,50 @@
-<script lang="ts">
-import { mapState } from "pinia";
-import { defineComponent } from "vue";
+<script lang="ts" setup>
+import { computed, ref } from "vue";
 import { useBudgetsStore } from "../stores/budget";
+import { Transaction, useAccountStore } from "../stores/budget-account";
 import Currency from "./Currency.vue";
+import TransactionEditRow from "./TransactionEditRow.vue";
+import { formatDate } from "../date";
 
-export default defineComponent({
-    props: [ "transaction", "index" ],
-    components: { Currency },
-    computed: {
-        ...mapState(useBudgetsStore, ["CurrentBudgetID"])
-    }
-})
+const props = defineProps<{
+    transaction: Transaction,
+    index: number,
+}>();
+
+const edit = ref(false);
+
+const CurrentBudgetID = computed(() => useBudgetsStore().CurrentBudgetID);
+const Reconciling = computed(() => useAccountStore().Reconciling);
 </script>
 
 <template>
-    <tr class="{{transaction.Date.After now ? 'future' : ''}}"
-        :class="[index % 6 < 3 ? 'bg-gray-300' : 'bg-gray-100']">
+    <tr
+        v-if="!edit"
+        class="{{new Date(transaction.Date) > new Date() ? 'future' : ''}}"
+        :class="[index % 6 < 3 ? 'bg-gray-300' : 'bg-gray-100']"
+    >
         <!--:class="[index % 6 < 3 ? index % 6 === 1 ? 'bg-gray-400' : 'bg-gray-300' : index % 6 !== 4 ? 'bg-gray-100' : '']">-->
-        <td style="width: 90px;">{{ transaction.Date.substring(0, 10) }}</td>
-        <td style="max-width: 150px;">{{ transaction.TransferAccount ? "Transfer : " + transaction.TransferAccount : transaction.Payee }}</td>
-        <td style="max-width: 200px;">
-            {{ transaction.CategoryGroup ? transaction.CategoryGroup + " : " + transaction.Category : "" }}
-        </td>
+        <td>{{ formatDate(transaction.Date) }}</td>
+        <td>{{ transaction.TransferAccount ? "Transfer : " + transaction.TransferAccount : transaction.Payee }}</td>
+        <td>{{ transaction.CategoryGroup ? transaction.CategoryGroup + " : " + transaction.Category : "" }}</td>
         <td>
-            <a :href="'/budget/' + CurrentBudgetID + '/transaction/' + transaction.ID">
-                {{ transaction.Memo }}
-            </a>
+            <a
+                :href="'/budget/' + CurrentBudgetID + '/transaction/' + transaction.ID"
+            >{{ transaction.Memo }}</a>
         </td>
         <td>
             <Currency class="block" :value="transaction.Amount" />
         </td>
-        <td style="width: 20px;">
-            {{ transaction.Status == "Reconciled" ? "✔" : (transaction.Status == "Uncleared" ? "" : "*") }}
+        <td>{{ transaction.Status == "Reconciled" ? "✔" : (transaction.Status == "Uncleared" ? "" : "*") }}</td>
+        <td class="text-right">
+            {{ transaction.GroupID ? "☀" : "" }}
+            <a @click="edit = true;">✎</a>
+        </td>
+        <td v-if="Reconciling && transaction.Status != 'Reconciled'">
+            <input type="checkbox" v-model="transaction.Reconciled" />
         </td>
-        <td style="width: 20px;">{{ transaction.GroupID ? "☀" : "" }}</td>
     </tr>
+    <TransactionEditRow v-if="edit" :transactionid="transaction.ID" @save="edit = false" />
 </template>
 
 <style>

web/src/date.ts

@@ -0,0 +1,7 @@
+export function formatDate(date: Date): string {
+    return date.toLocaleDateString(undefined, { // you can use undefined as first argument
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit",
+    });
+}

web/src/dialogs/EditAccount.vue

@@ -0,0 +1,44 @@
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import Modal from '../components/Modal.vue';
+import { useAccountStore } from '../stores/budget-account';
+
+const accountStore = useAccountStore();
+const CurrentAccount = computed(() => accountStore.CurrentAccount);
+
+const accountName = ref("");
+const accountOnBudget = ref(true);
+
+function editAccount(e : any) {
+    accountStore.EditAccount(CurrentAccount.value?.ID ?? "", accountName.value, accountOnBudget.value);
+}
+
+function openEditAccount(e : any) {
+    accountName.value = CurrentAccount.value?.Name ?? "";
+    accountOnBudget.value = CurrentAccount.value?.OnBudget ?? true;
+}
+</script>
+
+<template>
+    <Modal button-text="Edit Account" @open="openEditAccount" @submit="editAccount">
+        <template v-slot:placeholder>✎</template>
+        <div class="mt-2 px-7 py-3">
+            <input
+                class="border-2"
+                type="text"
+                v-model="accountName"
+                placeholder="Account name"
+                required
+            />
+        </div>
+        <div class="mt-2 px-7 py-3">
+            <input
+                class="border-2"
+                type="checkbox"
+                v-model="accountOnBudget"
+                required
+            />
+            <label>On Budget</label>
+        </div>
+    </Modal>
+</template>

web/src/dialogs/NewBudget.vue

@@ -1,45 +1,18 @@
-<script lang="ts">
-import Card from '../components/Card.vue';
-import { defineComponent } from "vue";
+<script lang="ts" setup>
+import Modal from '../components/Modal.vue';
+import { ref } from "vue";
 import { useBudgetsStore } from '../stores/budget';
 
-export default defineComponent({
-  data() {
-    return {
-      dialog: false,
-      budgetName: ""
-    }
-  },
-  components: { Card },
-  methods: {
-    saveBudget() {
-      useBudgetsStore().NewBudget(this.$data.budgetName);
-      this.$data.dialog = false;
-    },
-    newBudget() {
-      this.$data.dialog = true;
-    }
-  }
-})
+const budgetName = ref("");
+function saveBudget() {
+  useBudgetsStore().NewBudget(budgetName.value);
+};
 </script>
 
 <template>
-  <Card>
-    <p class="w-24 text-center text-6xl">+</p>
-    <button class="text-lg" dark @click="newBudget">New Budget</button>
-  </Card>
-  <div v-if="dialog" justify="center">
-    <div>
-      <div>
-        <span class="text-h5">New Budget</span>
-      </div>
-      <div>
-        <input type="text" v-model="budgetName" label="Budget name" required />
-      </div>
-      <div>
-        <button @click="dialog = false">Close</button>
-        <button @click="saveBudget">Save</button>
-      </div>
+  <Modal button-text="New Budget" @submit="saveBudget">
+    <div class="mt-2 px-7 py-3">
+      <input class="border-2" type="text" v-model="budgetName" placeholder="Budget name" required />
     </div>
-  </div>
+  </Modal>
 </template>

web/src/pages/Account.vue

@@ -1,48 +1,81 @@
 <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 { POST } from "../api";
+import TransactionInputRow from "../components/TransactionInputRow.vue";
 import { useAccountStore } from "../stores/budget-account";
+import EditAccount from "../dialogs/EditAccount.vue";
+import Button from "../components/Button.vue";
 
-const props = defineProps<{
-  budgetid: string
-  accountid: string
+defineProps<{
+    budgetid: string
+    accountid: string
 }>()
 
-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(0);
+const accounts = useAccountStore();
+const TargetReconcilingBalance = ref(0);
 
-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,
-        state: "Uncleared"
-    }))
-        .then(x => x.json());
+function setReconciled(event: Event) {
+    const target = event.target as HTMLInputElement;
+    accounts.SetReconciledForAllTransactions(target.checked);
 }
 
-const accountStore = useAccountStore();
-const CurrentAccount = accountStore.CurrentAccount;
-const TransactionsList = accountStore.TransactionsList;
+function cancelReconcilation() {
+    accounts.SetReconciledForAllTransactions(false);
+    accounts.Reconciling = false;
+}
+
+function submitReconcilation() {
+    accounts.SubmitReconcilation(0);
+    accounts.Reconciling = false;
+}
+
+function createReconcilationTransaction() {
+    const diff = TargetReconcilingBalance.value - accounts.ReconcilingBalance ;
+    accounts.SubmitReconcilation(diff);
+    accounts.Reconciling = false;
+}
 </script>
 
 <template>
-    <h1>{{ CurrentAccount?.Name }}</h1>
-    <p>
+    <h1 class="inline">{{ accounts.CurrentAccount?.Name }}</h1>
+    <EditAccount />
+    <br />
+
+    <span>
         Current Balance:
-        <Currency :value="CurrentAccount?.Balance" />
-    </p>
+        <Currency :value="accounts.CurrentAccount?.WorkingBalance" />
+    </span>
+
+    <span>
+        Cleared Balance:
+        <Currency :value="accounts.CurrentAccount?.ClearedBalance" />
+    </span>
+
+    <span v-if="accounts.Reconciling" class="border-2 block bg-gray-200 rounded-lg p-2">
+        Is <Currency :value="accounts.ReconcilingBalance" /> your current balance? 
+        <Button
+            class="bg-blue-500 mx-3"
+            @click="submitReconcilation">Yes!</Button>
+            <br />
+
+        No, it's: <input class="text-right" type="number" v-model="TargetReconcilingBalance" />
+        Difference: <Currency :value="accounts.ReconcilingBalance - TargetReconcilingBalance" />
+        <Button
+            class="bg-orange-500 mx-3"
+            v-if="Math.abs(accounts.ReconcilingBalance - TargetReconcilingBalance) > 0.01"
+            @click="createReconcilationTransaction"
+        >Create reconciling Transaction</Button>
+        <Button
+            class="bg-red-500 mx-3"
+            @click="cancelReconcilation"
+        >Cancel</Button>
+    </span>
+    <span v-if="!accounts.Reconciling">
+        Reconciled Balance:
+        <Currency :value="accounts.CurrentAccount?.ReconciledBalance" />
+        <Button class="bg-blue-500" @click="accounts.Reconciling = true" v-if="!accounts.Reconciling">Reconcile</Button>
+    </span>
     <table>
         <tr class="font-bold">
             <td style="width: 90px;">Date</td>
@@ -51,35 +84,14 @@ const TransactionsList = accountStore.TransactionsList;
             <td>Memo</td>
             <td class="text-right">Amount</td>
             <td style="width: 20px;"></td>
-            <td style="width: 20px;"></td>
-        </tr>
-        <tr>
-            <td style="width: 90px;" class="text-sm">
-                <input class="border-b-2 border-black" type="date" v-model="TransactionDate" />
-            </td>
-            <td style="max-width: 150px;">
-                <Autocomplete v-model="Payee" type="payees" />
-            </td>
-            <td style="max-width: 200px;">
-                <Autocomplete v-model="Category" type="categories" />
-            </td>
-            <td>
-                <input class="block w-full border-b-2 border-black" type="text" v-model="Memo" />
-            </td>
-            <td style="width: 80px;" class="text-right">
-                <input
-                    class="text-right block w-full border-b-2 border-black"
-                    type="currency"
-                    v-model="Amount"
-                />
-            </td>
-            <td style="width: 20px;">
-                <input type="submit" @click="saveTransaction" value="Save" />
-            </td>
-            <td style="width: 20px;"></td>
+            <td style="width: 40px;"></td>
+            <td style="width: 20px;" v-if="accounts.Reconciling">
+                <input type="checkbox" @input="setReconciled" />
+            </td>
         </tr>
+        <TransactionInputRow :budgetid="budgetid" :accountid="accountid" />
         <TransactionRow
-            v-for="(transaction, index) in TransactionsList"
+            v-for="(transaction, index) in accounts.TransactionsList" :key="transaction.ID"
             :transaction="transaction"
             :index="index"
         />

web/src/pages/Admin.vue

@@ -1,8 +1,9 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
+import { useSessionStore } from '../stores/session';
 
 onMounted(() => {
-    document.title = "Budgeteer - Admin";
+    useSessionStore().setTitle("Admin");
 })
 </script>
 

web/src/pages/BudgetSidebar.vue

@@ -1,25 +1,21 @@
 <script lang="ts" setup>
+import { computed } from "vue";
 import Currency from "../components/Currency.vue"
 import { useBudgetsStore } from "../stores/budget"
 import { useAccountStore } from "../stores/budget-account"
 import { useSettingsStore } from "../stores/settings"
 
-const props = defineProps<{
-  budgetid: string,
-  accountid: string,
-}>();
-
-const ExpandMenu = useSettingsStore().Menu.Expand;
+const ExpandMenu = computed(() => useSettingsStore().Menu.Expand);
 
 const budgetStore = useBudgetsStore();
-const CurrentBudgetName = budgetStore.CurrentBudgetName;
-const CurrentBudgetID = budgetStore.CurrentBudgetID;
+const CurrentBudgetName = computed(() => budgetStore.CurrentBudgetName);
+const CurrentBudgetID = computed(() => budgetStore.CurrentBudgetID);
 
 const accountStore = useAccountStore();
-const OnBudgetAccounts = accountStore.OnBudgetAccounts;
-const OffBudgetAccounts = accountStore.OffBudgetAccounts;
-const OnBudgetAccountsBalance = accountStore.OnBudgetAccountsBalance;
-const OffBudgetAccountsBalance = accountStore.OffBudgetAccountsBalance;
+const OnBudgetAccounts = computed(() => accountStore.OnBudgetAccounts);
+const OffBudgetAccounts = computed(() => accountStore.OffBudgetAccounts);
+const OnBudgetAccountsBalance = computed(() => accountStore.OnBudgetAccountsBalance);
+const OffBudgetAccountsBalance = computed(() => accountStore.OffBudgetAccountsBalance);
 </script>
 
 <template>
@@ -29,7 +25,7 @@ const OffBudgetAccountsBalance = accountStore.OffBudgetAccountsBalance;
       {{CurrentBudgetName}}
     </span>
     <span class="bg-orange-200 rounded-lg m-1 p-1 px-3 flex flex-col">
-      <router-link :to="'/budget/'+budgetid+'/budgeting'">Budget</router-link><br />
+      <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>
@@ -39,8 +35,8 @@ const OffBudgetAccountsBalance = accountStore.OffBudgetAccountsBalance;
         <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/'+budgetid+'/account/'+account.ID">{{account.Name}}</router-link>
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.Balance" />
+        <router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{account.Name}}</router-link>
+        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.ClearedBalance" />
       </div>
     </li>
     <li class="bg-red-200 rounded-lg m-1 p-1 px-3">
@@ -49,8 +45,8 @@ const OffBudgetAccountsBalance = accountStore.OffBudgetAccountsBalance;
         <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/'+budgetid+'/account/'+account.ID">{{account.Name}}</router-link>
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.Balance" />
+        <router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{account.Name}}</router-link>
+        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.ClearedBalance" />
       </div>
     </li>
     <li class="bg-red-200 rounded-lg m-1 p-1 px-3">

web/src/pages/Budgeting.vue

@@ -1,13 +1,9 @@
 <script lang="ts" setup>
-import { computed, defineProps, onMounted, PropType, watch, watchEffect } from "vue";
+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";
-
-interface Date {
-    Year: number,
-    Month: number,
-}
+import { useSessionStore } from "../stores/session";
 
 const props = defineProps<{
     budgetid: string,
@@ -18,10 +14,19 @@ const props = defineProps<{
 const budgetsStore = useBudgetsStore();
 const CurrentBudgetID = computed(() => budgetsStore.CurrentBudgetID);
 
-const categoriesForMonth = useAccountStore().CategoriesForMonth;
-const Categories = computed(() => {
-    return [...categoriesForMonth(selected.value.Year, selected.value.Month)];
+const accountStore = useAccountStore();
+const categoriesForMonth = accountStore.CategoriesForMonthAndGroup;
+
+function GetCategories(group : string) {
+    return [...categoriesForMonth(selected.value.Year, selected.value.Month, group)];
+};
+
+const groupsForMonth = accountStore.CategoryGroupsForMonth;
+const GroupsForMonth = computed(() => {
+    return [...groupsForMonth(selected.value.Year, selected.value.Month)];
 });
+
+
 const previous = computed(() => ({
         Year: new Date(selected.value.Year, selected.value.Month - 1, 1).getFullYear(),
         Month: new Date(selected.value.Year, selected.value.Month - 1, 1).getMonth(),
@@ -44,9 +49,21 @@ watchEffect(() => {
         return useAccountStore().FetchMonthBudget(props.budgetid ?? "", Number(props.year), Number(props.month));
 });
 
-/*{{define "title"}}
-    {{printf "Budget for %s %d" .Date.Month .Date.Year}}
-{{end}}*/
+onMounted(() => {
+    useSessionStore().setTitle("Budget for " + selected.value.Month + "/" + selected.value.Year);
+})
+
+
+const expandedGroups = ref<Map<string, boolean>>(new Map<string, boolean>())
+
+function toggleGroup(group : {Name : string, Expand: boolean}) {
+    console.log(expandedGroups.value);
+    expandedGroups.value.set(group.Name, !(expandedGroups.value.get(group.Name) ?? group.Expand))
+}
+
+function getGroupState(group : {Name : string, Expand: boolean}) : boolean {
+    return expandedGroups.value.get(group.Name) ?? group.Expand;
+}
 </script>
 
 <template>
@@ -64,7 +81,6 @@ watchEffect(() => {
     </div>
     <table class="container col-lg-12" id="content">
         <tr>
-            <th>Group</th>
             <th>Category</th>
             <th></th>
             <th></th>
@@ -73,23 +89,25 @@ watchEffect(() => {
             <th>Activity</th>
             <th>Available</th>
         </tr>
-        <tr v-for="category in Categories">
-            <td>{{ category.Group }}</td>
-            <td>{{ category.Name }}</td>
-            <td></td>
-            <td></td>
-            <td class="text-right">
-                <Currency :value="category.AvailableLastMonth" />
-            </td>
-            <td class="text-right">
-                <Currency :value="category.Assigned" />
-            </td>
-            <td class="text-right">
-                <Currency :value="category.Activity" />
-            </td>
-            <td class="text-right">
-                <Currency :value="category.Available" />
-            </td>
-        </tr>
+        <tbody v-for="group in GroupsForMonth">
+            <a class="text-lg font-bold" @click="toggleGroup(group)">{{ (getGroupState(group) ? "−" : "+") + " " + group.Name }}</a>
+            <tr v-for="category in GetCategories(group.Name)" v-if="getGroupState(group)">
+                <td>{{ category.Name }}</td>
+                <td></td>
+                <td></td>
+                <td class="text-right">
+                    <Currency :value="category.AvailableLastMonth" />
+                </td>
+                <td class="text-right">
+                    <Currency :value="category.Assigned" />
+                </td>
+                <td class="text-right">
+                    <Currency :value="category.Activity" />
+                </td>
+                <td class="text-right">
+                    <Currency :value="category.Available" />
+                </td>
+            </tr>
+        </tbody>
     </table>
-</template>
+</template>

web/src/pages/Login.vue

@@ -5,17 +5,19 @@ import { useSessionStore } from "../stores/session";
 
 const error = ref("");
 const login = ref({ user: "", password: "" });
+const router = useRouter(); // has to be called in setup
 
 onMounted(() => {
-    document.title = "Budgeteer - Login";
+    useSessionStore().setTitle("Login");
 });
 
 function formSubmit(e: MouseEvent) {
     e.preventDefault();
-    useSessionStore().login(login)
+    useSessionStore().login(login.value)
         .then(x => {
             error.value = "";
-            useRouter().replace("/dashboard");
+            router.replace("/dashboard");
+            return x;
         })
         .catch(x => error.value = "The entered credentials are invalid!");
 
@@ -26,23 +28,17 @@ function formSubmit(e: MouseEvent) {
 
 <template>
     <div>
-        <input
-            type="text"
-            v-model="login.user"
+        <input type="text" v-model="login.user"
             placeholder="Username"
-            class="border-2 border-black rounded-lg block px-2 my-2 w-48"
-        />
-        <input
-            type="password"
-            v-model="login.password"
+            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+        <input type="password" v-model="login.password"
             placeholder="Password"
-            class="border-2 border-black rounded-lg block px-2 my-2 w-48"
-        />
+            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
     </div>
     <div>{{ error }}</div>
     <button type="submit" @click="formSubmit" class="bg-blue-300 rounded-lg p-2 w-48">Login</button>
     <p>
         New user?
-        <router-link to="/register">Register</router-link>instead!
+        <router-link to="/register">Register</router-link> instead!
     </p>
 </template>

web/src/pages/Register.vue

@@ -1,16 +1,25 @@
 <script lang="ts" setup>
-import { ref } from 'vue';
-import { useSessionStore } from '../stores/session';
+import { onMounted, ref } from "vue";
+import { useRouter } from "vue-router";
+import { useSessionStore } from "../stores/session";
 
 const error = ref("");
 const login = ref({ email: "", password: "", name: "" });
-const showPassword = ref(false);
+const router = useRouter(); // has to be called in setup
 
-function formSubmit(e: FormDataEvent) {
+onMounted(() => {
+    useSessionStore().setTitle("Login");
+});
+
+function formSubmit(e: MouseEvent) {
     e.preventDefault();
-    useSessionStore().register(login)
-        .then(() => error.value = "")
-        .catch(() => error.value = "Something went wrong!");
+    useSessionStore().register(login.value)
+        .then(x => {
+            error.value = "";
+            router.replace("/dashboard");
+            return x;
+        })
+        .catch(x => error.value = "The entered credentials are invalid!");
 
     // TODO display invalidCredentials
     // TODO redirect to dashboard on success
@@ -18,44 +27,21 @@ function formSubmit(e: FormDataEvent) {
 </script>
 
 <template>
-    <v-container>
-        <v-row>
-            <v-col cols="12">
-                <v-text-field v-model="login.email" type="text" label="E-Mail" />
-            </v-col>
-            <v-col cols="12">
-                <v-text-field v-model="login.name" type="text" label="Name" />
-            </v-col>
-            <v-col cols="6">
-                <v-text-field
-                    v-model="login.password"
-                    label="Password"
-                    :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
-                    :type="showPassword ? 'text' : 'password'"
-                    @click:append="showPassword = showPassword"
-                    :error-message="error"
-                    error-count="2"
-                    error
-                />
-            </v-col>
-            <v-col cols="6">
-                <v-text-field
-                    v-model="login.password"
-                    label="Repeat password"
-                    :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
-                    :type="showPassword ? 'text' : 'password'"
-                    @click:append="showPassword = showPassword"
-                    :error-message="error"
-                    error-count="2"
-                    error
-                />
-            </v-col>
-        </v-row>
-        <div class="form-group">{{ error }}</div>
-        <v-btn type="submit" @click="formSubmit">Register</v-btn>
-        <p>
-            Existing user?
-            <router-link to="/login">Login</router-link>instead!
-        </p>
-    </v-container>
-</template>
+    <div>
+        <input type="text" v-model="login.name"
+            placeholder="Name"
+            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+        <input type="text" v-model="login.email"
+            placeholder="Email"
+            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+        <input type="password" v-model="login.password"
+            placeholder="Password"
+            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+    </div>
+    <div>{{ error }}</div>
+    <button type="submit" @click="formSubmit" class="bg-blue-300 rounded-lg p-2 w-48">Register</button>
+    <p>
+        Existing user?
+        <router-link to="/login">Login</router-link> instead!
+    </p>
+</template>

web/src/pages/Settings.vue

@@ -4,15 +4,22 @@ import { useRouter } from "vue-router";
 import { DELETE, POST } from "../api";
 import { useBudgetsStore } from "../stores/budget";
 import { useSessionStore } from "../stores/session";
+import Card from "../components/Card.vue";
+import Button from "../components/Button.vue";
+import { saveAs } from 'file-saver';
 
 const transactionsFile = ref<File | undefined>(undefined);
 const assignmentsFile = ref<File | undefined>(undefined);
 
 const filesIncomplete = computed(() => transactionsFile.value == undefined || assignmentsFile.value == undefined);
 onMounted(() => {
-    document.title = "Budgeteer - Settings";
+    useSessionStore().setTitle("Settings");
 });
 
+const budgetStore = useBudgetsStore();
+const CurrentBudgetID = computed(() => budgetStore.CurrentBudgetID);
+const CurrentBudgetName = computed(() => budgetStore.CurrentBudgetName);
+
 function gotAssignments(e: Event) {
     const input = (<HTMLInputElement>e.target);
     if (input.files != null)
@@ -24,19 +31,17 @@ function gotTransactions(e: Event) {
         transactionsFile.value = input.files[0];
 };
 function deleteBudget() {
-    const currentBudgetID = useBudgetsStore().CurrentBudgetID;
-    if (currentBudgetID == null)
+    if (CurrentBudgetID.value == null)
         return;
 
-    DELETE("/budget/" + currentBudgetID);
+    DELETE("/budget/" + CurrentBudgetID.value);
 
     const budgetStore = useSessionStore();
-    budgetStore.Budgets.delete(currentBudgetID);
+    budgetStore.Budgets.delete(CurrentBudgetID.value);
     useRouter().push("/")
 };
 function clearBudget() {
-    const currentBudgetID = useBudgetsStore().CurrentBudgetID;
-    POST("/budget/" + currentBudgetID + "/settings/clear", null)
+    POST("/budget/" + CurrentBudgetID.value + "/settings/clear", null)
 };
 function cleanNegative() {
     // <a href="/budget/{{.Budget.ID}}/settings/clean-negative">Fix all historic negative category-balances</a>
@@ -51,75 +56,70 @@ function ynabImport() {
     const budgetStore = useBudgetsStore();
     budgetStore.ImportYNAB(formData);
 };
+function ynabExport() {
+    const timeStamp = new Date().toISOString();
+    POST("/budget/"+CurrentBudgetID.value+"/export/ynab/assignments", "")
+        .then(x => x.text())
+        .then(x => {
+            var blob = new Blob([x], {type: "text/plain;charset=utf-8"});
+            saveAs(blob, timeStamp + " " + CurrentBudgetName.value + " - Budget.tsv");
+        })
+    POST("/budget/"+CurrentBudgetID.value+"/export/ynab/transactions", "")
+        .then(x => x.text())
+        .then(x => {
+            var blob = new Blob([x], {type: "text/plain;charset=utf-8"});
+            saveAs(blob, timeStamp + " " + CurrentBudgetName.value + " - Transactions.tsv");
+        })
+}
+
 </script>
 
 <template>
-    <v-container>
+    <div>
         <h1>Danger Zone</h1>
-        <v-row>
-            <v-col cols="12" md="6" xl="3">
-                <v-card>
-                    <v-card-header>
-                        <v-card-header-text>
-                            <v-card-title>Clear Budget</v-card-title>
-                            <v-card-subtitle>This removes transactions and assignments to start from scratch. Accounts and categories are kept. Not undoable!</v-card-subtitle>
-                        </v-card-header-text>
-                    </v-card-header>
-                    <v-card-actions class="justify-center">
-                        <v-btn @click="clearBudget">Clear budget</v-btn>
-                    </v-card-actions>
-                </v-card>
-            </v-col>
-            <v-col cols="12" md="6" xl="3">
-                <v-card>
-                    <v-card-header>
-                        <v-card-header-text>
-                            <v-card-title>Delete Budget</v-card-title>
-                            <v-card-subtitle>This deletes the whole bugdet including all transactions, assignments, accounts and categories. Not undoable!</v-card-subtitle>
-                        </v-card-header-text>
-                    </v-card-header>
-                    <v-card-actions class="justify-center">
-                        <v-btn @click="deleteBudget">Delete budget</v-btn>
-                    </v-card-actions>
-                </v-card>
-            </v-col>
-            <v-col cols="12" md="6" xl="3">
-                <v-card>
-                    <v-card-header>
-                        <v-card-header-text>
-                            <v-card-title>Fix all historic negative category-balances</v-card-title>
-                            <v-card-subtitle>This restores YNABs functionality, that would substract any overspent categories' balances from next months inflows.</v-card-subtitle>
-                        </v-card-header-text>
-                    </v-card-header>
-                    <v-card-actions class="justify-center">
-                        <v-btn @click="cleanNegative">Fix negative</v-btn>
-                    </v-card-actions>
-                </v-card>
-            </v-col>
-            <v-col cols="12" xl="6">
-                <v-card>
-                    <v-card-header>
-                        <v-card-header-text>
-                            <v-card-title>Import YNAB Budget</v-card-title>
-                        </v-card-header-text>
-                    </v-card-header>
+        <div class="grid md:grid-cols-2 gap-6">
+            <Card class="flex-col p-3">
+                <h2 class="text-lg font-bold">Clear Budget</h2>
+                <p>This removes transactions and assignments to start from scratch. Accounts and categories are kept. Not undoable!</p>
 
-                    <label for="transactions_file">
-                        Transaktionen:
-                        <input type="file" @change="gotTransactions" accept="text/*" />
-                    </label>
-                    <br />
-                    <label for="assignments_file">
-                        Budget:
-                        <input type="file" @change="gotAssignments" accept="text/*" />
-                    </label>
+                <Button class="bg-red-500" @click="clearBudget">Clear budget</Button>
+            </Card>
+            <Card class="flex-col p-3">
+                <h2 class="text-lg font-bold">Delete Budget</h2>
+                <p>This deletes the whole bugdet including all transactions, assignments, accounts and categories. Not undoable!</p>
+                <Button class="bg-red-500" @click="deleteBudget">Delete budget</button>
+            </Card>
+            <Card class="flex-col p-3">
+                <h2 class="text-lg font-bold">Fix all historic negative category-balances</h2>
+                <p>This restores YNABs functionality, that would substract any overspent categories' balances from next months inflows.</p>
+                <Button class="bg-orange-500" @click="cleanNegative">Fix negative</button>
+            </Card>
+            <Card class="flex-col p-3">
+                <h2 class="text-lg font-bold">Import YNAB Budget</h2>
+                
+                <div class="flex flex-row">
+                    <div>
+                        <label for="transactions_file">
+                            Transaktionen:
+                            <input type="file" @change="gotTransactions" accept="text/*" />
+                        </label>
+                        <br />
+                        <label for="assignments_file">
+                            Budget:
+                            <input type="file" @change="gotAssignments" accept="text/*" />
+                        </label>
+                    </div>
 
-                    <v-card-actions class="justify-center">
-                        <v-btn :disabled="filesIncomplete" @click="ynabImport">Importieren</v-btn>
-                    </v-card-actions>
-                </v-card>
-            </v-col>
-        </v-row>
-        <v-card></v-card>
-    </v-container>
+                    <Button class="bg-blue-500" :disabled="filesIncomplete" @click="ynabImport">Importieren</Button>
+                </div>
+            </Card>
+            <Card class="flex-col p-3">
+                <h2 class="text-lg font-bold">Export as YNAB TSV</h2>
+
+                <div class="flex flex-row">
+                    <Button class="bg-blue-500" @click="ynabExport">Export</Button>
+                </div>
+            </Card>
+        </div>
+    </div>
 </template>

web/src/stores/budget-account.ts

@@ -1,21 +1,42 @@
 import { defineStore } from "pinia"
-import { GET } from "../api";
+import { GET, POST } from "../api";
+import { useBudgetsStore } from "./budget";
 import { useSessionStore } from "./session";
 
 interface State {
-    Accounts: Map<string, Account>,
-    CurrentAccountID: string | null,
-    Categories: Map<string, Category>,
-    Months: Map<number, Map<number, Map<string, Category>>>,
-    Transactions: [],
+    Accounts: Map<string, Account>
+    CurrentAccountID: string | null
+    Categories: Map<string, Category>
+    Months: Map<number, Map<number, Map<string, Category>>>
+    Transactions: Map<string, Transaction>
     Assignments: []
+    Reconciling: boolean
+}
+
+export interface Transaction {
+    ID: string
+    Date: Date
+    TransferAccount: string
+    CategoryGroup: string
+    Category: string
+    CategoryID: string | undefined
+    Memo: string
+    Status: string
+    GroupID: string
+    Payee: string
+    PayeeID: string | undefined
+    Amount: number
+    Reconciled: boolean
 }
 
 export interface Account {
     ID: string
     Name: string
     OnBudget: boolean
-    Balance: Number
+    ClearedBalance: number
+    WorkingBalance: number
+    ReconciledBalance: number
+    Transactions: string[]
 }
 
 export interface Category {
@@ -34,76 +55,165 @@ export const useAccountStore = defineStore("budget/account", {
         CurrentAccountID: null,
         Months: new Map<number, Map<number, Map<string, Category>>>(),
         Categories: new Map<string, Category>(),
-        Transactions: [],
-        Assignments: []
+        Transactions: new Map<string, Transaction>(),
+        Assignments: [],
+        Reconciling: false,
     }),
     getters: {
         AccountsList(state) {
-            return [ ...state.Accounts.values() ];
+            return [...state.Accounts.values()];
         },
-        CategoriesForMonth: (state) => (year : number, month : number) => {
-            console.log("MTH", state.Months)
+        AllCategoriesForMonth: (state) => (year: number, month: number) => {
             const yearMap = state.Months.get(year);
-            return [ ...yearMap?.get(month)?.values() || [] ];
+            const monthMap = yearMap?.get(month);
+            return [...monthMap?.values() || []];
         },
-        CurrentAccount(state) : Account | undefined {
+        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.Group != prev)
+                        categoryGroups.push({
+                            Name: category.Group,
+                            Expand: category.Group != "Hidden Categories",
+                        });
+                    prev = category.Group;
+                }
+                return categoryGroups;
+            }
+        },
+        CategoriesForMonthAndGroup(state) {
+            return (year: number, month: number, group: string) => {
+                const categories = this.AllCategoriesForMonth(year, month);
+                return categories.filter(x => x.Group == group);
+            }
+        },
+        CurrentAccount(state): Account | undefined {
             if (state.CurrentAccountID == null)
                 return undefined;
 
             return state.Accounts.get(state.CurrentAccountID);
         },
-        OnBudgetAccounts(state) {
-            return [ ...state.Accounts.values() ].filter(x => x.OnBudget);
+        ReconcilingBalance(state): number {
+            let reconciledBalance = this.CurrentAccount!.ReconciledBalance;
+            for (const transaction of this.TransactionsList) {
+                if (transaction.Reconciled)
+                    reconciledBalance += transaction.Amount;
+            }
+            return reconciledBalance;
         },
-        OnBudgetAccountsBalance(state) : Number {
-            return this.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0);
+        OnBudgetAccounts(state) {
+            return [...state.Accounts.values()].filter(x => x.OnBudget);
+        },
+        OnBudgetAccountsBalance(state): number {
+            return this.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.ClearedBalance), 0);
         },
         OffBudgetAccounts(state) {
-            return [ ...state.Accounts.values() ].filter(x => !x.OnBudget);
+            return [...state.Accounts.values()].filter(x => !x.OnBudget);
         },
-        OffBudgetAccountsBalance(state) : Number {
-            return this.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0);
+        OffBudgetAccountsBalance(state): number {
+            return this.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.ClearedBalance), 0);
+        },
+        TransactionsList(state): Transaction[] {
+            return this.CurrentAccount!.Transactions.map(x => {
+                return this.Transactions.get(x)!
+            });
         },
-        TransactionsList(state) {
-            return (state.Transactions || []);
-        }
     },
     actions: {
-        async SetCurrentAccount(budgetid : string, accountid : string) {
+        async SetCurrentAccount(budgetid: string, accountid: string) {
             if (budgetid == null)
                 return
 
             this.CurrentAccountID = accountid;
-            if (this.CurrentAccount == undefined)
+            const account = this.CurrentAccount;
+            if (account == undefined)
                 return
 
-            useSessionStore().setTitle(this.CurrentAccount.Name);
-            await this.FetchAccount(accountid);
+            useSessionStore().setTitle(account.Name);
+            await this.FetchAccount(account);
         },
-        async FetchAccount(accountid : string) {
-            const result = await GET("/account/" + accountid + "/transactions");
+        AddTransaction(account: Account, transaction: any) {
+            transaction.Date = new Date(transaction.Date);
+            this.Transactions.set(transaction.ID, transaction);
+        },
+        async FetchAccount(account: Account) {
+            const result = await GET("/account/" + account.ID + "/transactions");
             const response = await result.json();
-            this.Transactions = response.Transactions;
+            account.Transactions = [];
+            for (const transaction of response.Transactions) {
+                this.AddTransaction(account, transaction);
+                account.Transactions.push(transaction.ID);
+            }
         },
-        async FetchMonthBudget(budgetid : string, year : number, month : number) {
+        async FetchMonthBudget(budgetid: string, year: number, month: number) {
             const result = await GET("/budget/" + budgetid + "/" + year + "/" + month);
             const response = await result.json();
+            if (response.Categories == undefined || response.Categories.length <= 0)
+                return;
             this.addCategoriesForMonth(year, month, response.Categories);
         },
-        addCategoriesForMonth(year : number, month : number, categories : Category[]) : void {
-            const yearMap = this.Months.get(year) || new Map<number, Map<string, Category>>();
-            this.Months.set(year, yearMap);
+        async EditAccount(accountid: string, name: string, onBudget: boolean) {
+            const result = await POST("/account/" + accountid, JSON.stringify({ name: name, onBudget: onBudget }));
+            const response = await result.json();
+            useBudgetsStore().MergeBudgetingData(response);
+        },
+        addCategoriesForMonth(year: number, month: number, categories: Category[]): void {
+            this.$patch((state) => {
+                const yearMap = state.Months.get(year) || new Map<number, Map<string, Category>>();
+                const monthMap = yearMap.get(month) || new Map<string, Category>();
+                for (const category of categories) {
+                    monthMap.set(category.ID, category);
+                }
 
-            const monthMap = yearMap.get(month) || new Map<string, Category>();
-            yearMap.set(month, monthMap);
+                yearMap.set(month, monthMap);
+                state.Months.set(year, yearMap);
+            });
+        },
+        SetReconciledForAllTransactions(value: boolean) {
+            for (const transaction of this.TransactionsList) {
+                if (transaction.Status == "Reconciled")
+                    continue;
 
-            for (const category of categories){
-                monthMap.set(category.ID, category);
+                transaction.Reconciled = value;
             }
         },
+        async SubmitReconcilation(reconciliationTransactionAmount: number) {
+            const account = this.CurrentAccount!;
+            const reconciledTransactions = this.TransactionsList.filter(x => x.Reconciled);
+            for (const transaction of reconciledTransactions) {
+                account.ReconciledBalance += transaction.Amount;
+                transaction.Status = "Reconciled";
+                transaction.Reconciled = false;
+            }
+            const result = await POST("/account/" + this.CurrentAccountID + "/reconcile", JSON.stringify({
+                transactionIDs: reconciledTransactions.map(x => x.ID),
+                reconciliationTransactionAmount: reconciliationTransactionAmount.toString(),
+            }));
+            const response = await result.json();
+            const recTrans = response.ReconciliationTransaction;
+            if (recTrans) {
+                this.AddTransaction(account, recTrans);
+                account.Transactions.unshift(recTrans.ID);
+            }
+            console.log("Reconcile: " + response.message);
+        },
         logout() {
             this.$reset()
         },
+        async saveTransaction(payload: string) {
+            const result = await POST("/transaction/new", payload);
+            const response = await result.json();
+            this.AddTransaction(this.CurrentAccount!, response);
+            this.CurrentAccount?.Transactions.unshift(response.ID);
+        },
+        async editTransaction(transactionid: string, payload: string) {
+            const result = await POST("/transaction/" + transactionid, payload);
+            const response = await result.json();
+            this.AddTransaction(this.CurrentAccount!, response);
+        }
     }
 
-})
+})

web/src/stores/budget.ts

@@ -51,6 +51,9 @@ export const useBudgetsStore = defineStore('budget', {
         async FetchBudget(budgetid: string) {
             const result = await GET("/budget/" + budgetid);
             const response = await result.json();
+            this.MergeBudgetingData(response);
+        },
+        MergeBudgetingData(response : any) {
             for (const account of response.Accounts || []) {
                 useAccountStore().Accounts.set(account.ID, account);
             }

web/src/stores/session.ts

@@ -20,12 +20,12 @@ export interface Budget {
 
 export const useSessionStore = defineStore('session', {
     state: () => ({
-        Session: useStorage<Session>('session', null, undefined, { serializer: StorageSerializers.object }),
+        Session: useStorage<Session | null>('session', null, undefined, { serializer: StorageSerializers.object }),
         Budgets: useStorage<Map<string, Budget>>('budgets', new Map<string, Budget>(), undefined, { serializer: StorageSerializers.map }),
     }),
     getters: {
         BudgetsList: (state) => [ ...state.Budgets.values() ],
-        AuthHeaders: (state) => ({'Authorization': 'Bearer ' + state.Session.Token}),
+        AuthHeaders: (state) => ({'Authorization': 'Bearer ' + state.Session?.Token}),
         LoggedIn: (state) => state.Session != null,
     },
     actions: {
@@ -36,21 +36,26 @@ export const useSessionStore = defineStore('session', {
             this.Session = {
                 User: x.User,
                 Token: x.Token,
-            },
-            this.Budgets = x.Budgets;
+            }
+            for (const budget of x.Budgets) {
+                this.Budgets.set(budget.ID, budget);
+            }
         },
         async login(login: any) {
             const response = await POST("/user/login", JSON.stringify(login));
             const result = await response.json();
-            return this.loginSuccess(result);
+            this.loginSuccess(result);
+            return result;
         },
         async register(login : any) {
             const response = await POST("/user/register", JSON.stringify(login));
             const result = await response.json();
-            return this.loginSuccess(result);
+            this.loginSuccess(result);
+            return result;
         },
         logout() {
-            this.$reset()
+            this.Session = null;
+            this.Budgets.clear();
         },
     }
 })

web/yarn.lock

@@ -1141,6 +1141,11 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/file-saver@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.5.tgz#9ee342a5d1314bb0928375424a2f162f97c310c7"
+  integrity sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==
+
 "@types/glob@^7.1.1":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
@@ -4137,6 +4142,11 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+file-saver@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
+  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"