Fix filters

Reviewed-on: #53

.drone.yml

@@ -4,6 +4,11 @@ type: docker
 name: budgeteer
 
 steps:
+- name: submodules
+  image: alpine/git
+  commands:
+  - git submodule update --recursive --init
+
 - name: Taskfile.dev PR
   image: hub.javil.eu/budgeteer:dev
   commands:
@@ -18,9 +23,10 @@ steps:
   commands:
     - task ci
   when:
+    branch:
+    - master
     event:
-      exclude:
-      - pull_request
+    - push
 
 - name: docker  
   image: plugins/docker
@@ -57,5 +63,13 @@ steps:
     event:
     - tag
 
+services:
+- name: db
+  image: postgres:alpine
+  environment:
+    POSTGRES_USER: budgeteer
+    POSTGRES_PASSWORD: budgeteer
+    POSTGRES_DB: budgeteer_test
+
 image_pull_secrets:
 - hub.javil.eu 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "testdata"]
+	path = testdata
+	url = https://git.javil.eu/jacob1123/budgeteer-testdata.git

.vscode/settings.json

@@ -9,5 +9,7 @@
         },
         "gopls": {
                 "formatting.gofumpt": true,
-        }
+        },
+        "editor.detectIndentation": false,
+        "editor.tabSize": 2
 }

Taskfile.yml

@@ -5,30 +5,31 @@ vars:
 
 tasks:
   default:
+    desc: Build budgeteer in production mode
+    deps: [frontend, go-mod, go-sqlc]
     cmds:
-      - task: build-prod
+      - task: backend
 
-  sqlc:
-    desc: sqlc code generation
-    sources:
-      - ./sqlc.yaml
-      - ./postgres/schema/*
-      - ./postgres/queries/*
-    generates:
-      - ./postgres/*.sql.go
+  run:
+    desc: Start budgeteer
+    deps: [backend, go-mod, go-sqlc]
     cmds:
-      - sqlc generate
+      - ./build/budgeteer{{exeExt}}
 
-  gomod:
-    desc: Go modules
-    sources:
-      - ./go.mod
-      - ./go.sum
-    method: checksum
+  dev:
+    desc: Build budgeteer in dev mode (without frontend)
+    deps: [go-mod, go-sqlc]
     cmds:
-      - go mod download
+      - task: backend
 
-  build:
+  ci:
+    desc: Run CI build
+    deps: [default, static]
+
+  static:
+    deps: [go-lint, go-vet, go-fmt, js-tsc, js-lint, cover]
+
+  backend:
     desc: Build budgeteer
     sources:
       - ./go.mod
@@ -43,71 +44,99 @@ tasks:
     cmds:
       - go build -o ./build/budgeteer{{exeExt}} ./cmd/budgeteer
 
-  build-dev:
-    desc: Build budgeteer in dev mode
-    deps: [gomod, sqlc]
+  go-vet:
     cmds:
       - go vet
-      - go fmt
-      - golangci-lint run
-      - task: build
 
-  build-prod:
-    desc: Build budgeteer in prod mode
-    deps: [gomod, sqlc, frontend]
+  go-fmt:
     cmds:
-      - go vet
       - go fmt
-      - golangci-lint run
-      - task: build
 
-  ci:
-    desc: Run CI build
+  go-lint:
     cmds:
-      - task: build-prod
-      - go test ./...
+      - golangci-lint run
+
+  go-sqlc:
+    desc: sqlc code generation
+    sources:
+      - ./sqlc.yaml
+      - ./postgres/schema/*
+      - ./postgres/queries/*
+    generates:
+      - ./postgres/*.sql.go
+    cmds:
+      - sqlc generate
+
+  go-mod:
+    desc: Go modules
+    sources:
+      - ./go.mod
+      - ./go.sum
+    method: checksum
+    cmds:
+      - go mod download
+
+  cover:
+    desc: Run test and analyze coverage
+    cmds:
+      - go test ./... -coverprofile=coverage.out -covermode=atomic
+      - go tool cover -html=coverage.out -o=coverage.html 
 
   frontend:
     desc: Build vue frontend
-    dir: web
+    deps: [js-build]
     sources:
       - web/src/**/*
     generates:
       - web/dist/**/*
+
+  frontend-dev:
+    desc: Run dev-server for frontend
+    dir: web
+    cmds:
+      - yarn run dev
+
+  js-build:
+    dir: web
+    deps: [js-mod]
+    cmds:
+      - yarn build
+
+  js-mod:
+    run: once
+    sources:
+      - web/src/package.json
+      - web/src/yarn.lock
+    generates:
+      - web/node_modules/**/*
+    dir: web
     cmds:
       - yarn
-      - yarn build
-      - yarn run vue-tsc --noEmit
-      - yarn run eslint "./src/**"
-
-  docker:
-    desc: Build budgeeter:latest
-    deps: [build-prod]
-    sources:
-      - ./build/budgeteer{{exeExt}}
-      - ./build/Dockerfile
+  
+  js-tsc:
+    dir: web
+    deps: [js-mod]
     cmds:
-      - docker build -t {{.IMAGE_NAME}}:latest ./build
-      - docker push {{.IMAGE_NAME}}:latest
+      - yarn run vue-tsc --noEmit
+
+  js-lint:
+    dir: web
+    deps: [js-mod]
+    cmds:
+      - yarn run eslint "./src/**"
 
   dev-docker:
     desc: Build budgeeter:dev
     sources:
-      - ./docker/Dockerfile
-      - ./docker/build.sh
+      - ./docker/Dockerfile.dev
       - ./web/package.json
+      - ./web/yarn.lock
     cmds:
-      - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile.dev
-      - docker push {{.IMAGE_NAME}}:dev
-
-  run:
-    desc: Start budgeteer
-    deps: [build-dev]
+    - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile.dev
+    - docker push {{.IMAGE_NAME}}:dev
+  
+  run-dev:
+    desc: Run dev environment in docker
+    deps: [dev-docker]
     cmds:
-      - ./build/budgeteer{{exeExt}}
-
-  rundocker:
-    desc: Start docker-compose
-    deps: [docker]
-    cmds:
-      - docker-compose up -d
+      - docker-compose -f docker/docker-compose.dev.yml -p budgeteer up -d

cmd/budgeteer/main.go

@@ -17,22 +17,22 @@ import (
 func main() {
 	cfg, err := config.LoadConfig()
 	if err != nil {
-		log.Fatalf("Could not load config: %v", err)
+		log.Fatalf("load config: %v", err)
 	}
 
 	queries, err := postgres.Connect("pgx", cfg.DatabaseConnection)
 	if err != nil {
-		log.Fatalf("Failed connecting to DB: %v", err)
+		log.Fatalf("connect to database: %v", err)
 	}
 
 	static, err := fs.Sub(web.Static, "dist")
 	if err != nil {
-		panic("couldn't open static files")
+		panic("open static files")
 	}
 
 	tokenVerifier, err := jwt.NewTokenVerifier(cfg.SessionSecret)
 	if err != nil {
-		panic(fmt.Errorf("couldn't create token verifier: %w", err))
+		panic(fmt.Errorf("create token verifier: %w", err))
 	}
 
 	handler := &server.Handler{

docker/Dockerfile.dev

@@ -5,13 +5,11 @@ 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 --no-cache add go nodejs yarn bash curl git git-perl tmux
-ADD docker/dev.sh /
-RUN yarn global add @vue/cli
+RUN apk --no-cache add go nodejs yarn bash curl git git-perl
 ENV PATH="/root/.yarn/bin/:${PATH}"
 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 /dev.sh
+VOLUME /go
+VOLUME /.cache
+COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/

docker/docker-compose.dev.yml

@@ -1,26 +1,31 @@
 version: '3.7'
 
 services:
-        app:
+        backend:
                 image: hub.javil.eu/budgeteer:dev
-                container_name: budgeteer
-                stdin_open: true # docker run -i
-                tty: true        # docker run -t
+                command: task -w run
                 ports:
                         - 1323:1323
-                        - 3000:3000
-                user: '1000' 
                 volumes:
                         - ~/budgeteer:/src
-                        - ~/.gitconfig:/.gitconfig
-                        - ~/.go:/go
-                        - ~/.cache:/.cache
+                        - go-cache:/go
+                        - yarn-cache:/.cache
                 environment:
                         BUDGETEER_DB: postgres://budgeteer:budgeteer@db:5432/budgeteer
                         BUDGETEER_SESSION_SECRET: random string for JWT authorization
                 depends_on:
                         - db
 
+        frontend:
+                image: hub.javil.eu/budgeteer:dev
+                command: task frontend-dev
+                ports:
+                        - 3000:3000
+                volumes:
+                        - ~/budgeteer:/src
+                depends_on:
+                        - backend
+
         db:
                 image: postgres:14
                 ports:
@@ -41,3 +46,5 @@ services:
                 
 volumes:
         db:
+        go-cache:
+        yarn-cache:

postgres/accounts.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: accounts.sql
 
 package postgres

postgres/assignments.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: assignments.sql
 
 package postgres

postgres/budgets.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: budgets.sql
 
 package postgres

postgres/budgetservice.go

@@ -59,5 +59,6 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U
 		return nil, fmt.Errorf("commit: %w", err)
 	}
 
+	budget.IncomeCategoryID = cat.ID
 	return &budget, nil
 }

postgres/categories.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: categories.sql
 
 package postgres

postgres/cumultative-balances.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: cumultative-balances.sql
 
 package postgres
@@ -13,21 +15,19 @@ import (
 
 const getCumultativeBalances = `-- name: GetCumultativeBalances :many
 SELECT COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id),
-       COALESCE(ass.amount, 0)::decimal(12,2) as assignments, SUM(ass.amount) OVER (PARTITION BY ass.category_id ORDER BY ass.date)::decimal(12,2) as assignments_cum,
-       COALESCE(tra.amount, 0)::decimal(12,2) as transactions, SUM(tra.amount) OVER (PARTITION BY tra.category_id ORDER BY tra.date)::decimal(12,2) as transactions_cum
+       COALESCE(ass.amount, 0)::decimal(12,2) as assignments,
+       COALESCE(tra.amount, 0)::decimal(12,2) as transactions
 FROM assignments_by_month as ass
 FULL OUTER JOIN transactions_by_month as tra ON ass.date = tra.date AND ass.category_id = tra.category_id
-WHERE (ass.budget_id IS NULL OR ass.budget_id = $1) AND (tra.budget_id IS NULL OR tra.budget_id = $1)
-ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id)
+WHERE COALESCE(ass.budget_id, tra.budget_id) = $1
+ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.amount, tra.amount)
 `
 
 type GetCumultativeBalancesRow struct {
-	Date            time.Time
-	CategoryID      uuid.UUID
-	Assignments     numeric.Numeric
-	AssignmentsCum  numeric.Numeric
-	Transactions    numeric.Numeric
-	TransactionsCum numeric.Numeric
+	Date         time.Time
+	CategoryID   uuid.UUID
+	Assignments  numeric.Numeric
+	Transactions numeric.Numeric
 }
 
 func (q *Queries) GetCumultativeBalances(ctx context.Context, budgetID uuid.UUID) ([]GetCumultativeBalancesRow, error) {
@@ -43,9 +43,7 @@ func (q *Queries) GetCumultativeBalances(ctx context.Context, budgetID uuid.UUID
 			&i.Date,
 			&i.CategoryID,
 			&i.Assignments,
-			&i.AssignmentsCum,
 			&i.Transactions,
-			&i.TransactionsCum,
 		); err != nil {
 			return nil, err
 		}

postgres/db.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 
 package postgres
 

postgres/models.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 
 package postgres
 

postgres/numeric/numeric.go

@@ -25,6 +25,13 @@ func FromInt64WithExp(value int64, exp int32) Numeric {
 	return Numeric{Numeric: pgtype.Numeric{Int: big.NewInt(value), Exp: exp, Status: pgtype.Present}}
 }
 
+func (n *Numeric) SetZero() {
+	n.Exp = 0
+	n.Int = big.NewInt(0)
+	n.Status = pgtype.Present
+	n.NaN = false
+}
+
 func (n Numeric) GetFloat64() float64 {
 	if n.Status != pgtype.Present {
 		return 0

postgres/payees.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: payees.sql
 
 package postgres

postgres/queries/cumultative-balances.sql

@@ -1,8 +1,8 @@
 -- name: GetCumultativeBalances :many
 SELECT COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id),
-       COALESCE(ass.amount, 0)::decimal(12,2) as assignments, SUM(ass.amount) OVER (PARTITION BY ass.category_id ORDER BY ass.date)::decimal(12,2) as assignments_cum,
-       COALESCE(tra.amount, 0)::decimal(12,2) as transactions, SUM(tra.amount) OVER (PARTITION BY tra.category_id ORDER BY tra.date)::decimal(12,2) as transactions_cum
+       COALESCE(ass.amount, 0)::decimal(12,2) as assignments,
+       COALESCE(tra.amount, 0)::decimal(12,2) as transactions
 FROM assignments_by_month as ass
 FULL OUTER JOIN transactions_by_month as tra ON ass.date = tra.date AND ass.category_id = tra.category_id
-WHERE (ass.budget_id IS NULL OR ass.budget_id = @budget_id) AND (tra.budget_id IS NULL OR tra.budget_id = @budget_id)
-ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id);
+WHERE COALESCE(ass.budget_id, tra.budget_id) = @budget_id
+ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.amount, tra.amount);

postgres/queries/transactions.sql

@@ -11,10 +11,10 @@ RETURNING id;
 -- name: UpdateTransaction :exec
 UPDATE transactions
 SET date = $1,
-    memo = $2,
-    amount = $3,
-    payee_id = $4,
-    category_id = $5
+  memo = $2,
+  amount = $3,
+  payee_id = $4,
+  category_id = $5
 WHERE id = $6;
 
 -- name: SetTransactionReconciled :exec
@@ -34,8 +34,7 @@ WHERE t.budget_id = $1;
 -- name: GetTransactionsForAccount :many
 SELECT  t.*
 FROM display_transactions AS t
-WHERE t.account_id = $1
-LIMIT 200;
+WHERE t.account_id = $1;
 
 -- name: DeleteAllTransactions :execrows
 DELETE FROM transactions
@@ -46,4 +45,29 @@ AND accounts.id = transactions.account_id;
 -- name: GetTransactionsByMonthAndCategory :many
 SELECT *
 FROM transactions_by_month
-WHERE transactions_by_month.budget_id = @budget_id;
+WHERE transactions_by_month.budget_id = @budget_id;
+
+-- name: GetProblematicTransactions :many
+SELECT transactions.*
+FROM display_transactions AS transactions
+LEFT JOIN accounts 
+        ON transactions.account_id = accounts.id
+LEFT JOIN transactions AS otherGroupTransaction 
+        ON transactions.group_id = otherGroupTransaction.group_id 
+        AND transactions.id != otherGroupTransaction.id 
+        AND transactions.account_id != otherGroupTransaction.account_id
+LEFT JOIn accounts AS otherGroupAccount 
+        ON otherGroupTransaction.account_id = otherGroupAccount.id
+WHERE transactions.category_id IS NULL
+AND accounts.on_budget
+AND (otherGroupAccount.id IS NULL OR NOT otherGroupAccount.on_budget)
+AND accounts.budget_id = $1;
+
+-- name: GetFilteredTransactions :many
+SELECT transactions.*
+FROM display_transactions AS transactions
+WHERE (NOT @filter_category::boolean OR transactions.category_id = @category_id) 
+AND (NOT @filter_account::boolean OR transactions.account_id = @account_id) 
+AND (NOT @filter_payee::boolean OR transactions.payee_id = @payee_id)
+AND transactions.date BETWEEN @from_date AND @to_date
+AND transactions.budget_id = @budget_id;

postgres/schema/0019_ignore-off-budget-in-transactions-by-month.sql

@@ -0,0 +1,13 @@
+-- +goose Up
+CREATE OR REPLACE VIEW transactions_by_month AS 
+        SELECT date_trunc('month', transactions.date)::date as date, transactions.category_id, accounts.budget_id, SUM(amount) as amount
+        FROM transactions
+        INNER JOIN accounts ON accounts.id = transactions.account_id AND accounts.on_budget
+        GROUP BY date_trunc('month', transactions.date), transactions.category_id, accounts.budget_id;
+
+-- +goose Down
+CREATE OR REPLACE VIEW transactions_by_month AS 
+        SELECT date_trunc('month', transactions.date)::date as date, transactions.category_id, accounts.budget_id, SUM(amount) as amount
+        FROM transactions
+        INNER JOIN accounts ON accounts.id = transactions.account_id
+        GROUP BY date_trunc('month', transactions.date), transactions.category_id, accounts.budget_id;

postgres/transactions.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: transactions.sql
 
 package postgres
@@ -115,6 +117,133 @@ func (q *Queries) GetAllTransactionsForBudget(ctx context.Context, budgetID uuid
 	return items, nil
 }
 
+const getFilteredTransactions = `-- name: GetFilteredTransactions :many
+SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status, transactions.account, transactions.payee_id, transactions.category_id, transactions.payee, transactions.category_group, transactions.category, transactions.transfer_account, transactions.budget_id, transactions.account_id
+FROM display_transactions AS transactions
+WHERE (NOT $1::boolean OR transactions.category_id = $2) 
+AND (NOT $3::boolean OR transactions.account_id = $4) 
+AND (NOT $5::boolean OR transactions.payee_id = $6)
+AND transactions.date BETWEEN $7 AND $8
+AND transactions.budget_id = $9
+`
+
+type GetFilteredTransactionsParams struct {
+	FilterCategory bool
+	CategoryID     uuid.NullUUID
+	FilterAccount  bool
+	AccountID      uuid.UUID
+	FilterPayee    bool
+	PayeeID        uuid.NullUUID
+	FromDate       time.Time
+	ToDate         time.Time
+	BudgetID       uuid.UUID
+}
+
+func (q *Queries) GetFilteredTransactions(ctx context.Context, arg GetFilteredTransactionsParams) ([]DisplayTransaction, error) {
+	rows, err := q.db.QueryContext(ctx, getFilteredTransactions,
+		arg.FilterCategory,
+		arg.CategoryID,
+		arg.FilterAccount,
+		arg.AccountID,
+		arg.FilterPayee,
+		arg.PayeeID,
+		arg.FromDate,
+		arg.ToDate,
+		arg.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 getProblematicTransactions = `-- name: GetProblematicTransactions :many
+SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status, transactions.account, transactions.payee_id, transactions.category_id, transactions.payee, transactions.category_group, transactions.category, transactions.transfer_account, transactions.budget_id, transactions.account_id
+FROM display_transactions AS transactions
+LEFT JOIN accounts 
+        ON transactions.account_id = accounts.id
+LEFT JOIN transactions AS otherGroupTransaction 
+        ON transactions.group_id = otherGroupTransaction.group_id 
+        AND transactions.id != otherGroupTransaction.id 
+        AND transactions.account_id != otherGroupTransaction.account_id
+LEFT JOIn accounts AS otherGroupAccount 
+        ON otherGroupTransaction.account_id = otherGroupAccount.id
+WHERE transactions.category_id IS NULL
+AND accounts.on_budget
+AND (otherGroupAccount.id IS NULL OR NOT otherGroupAccount.on_budget)
+AND accounts.budget_id = $1
+`
+
+func (q *Queries) GetProblematicTransactions(ctx context.Context, budgetID uuid.UUID) ([]DisplayTransaction, error) {
+	rows, err := q.db.QueryContext(ctx, getProblematicTransactions, 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, group_id, status, account, payee_id, category_id, payee, category_group, category, transfer_account, budget_id, account_id FROM display_transactions
 WHERE id = $1
@@ -181,7 +310,6 @@ const getTransactionsForAccount = `-- name: GetTransactionsForAccount :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.account_id = $1
-LIMIT 200
 `
 
 func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid.UUID) ([]DisplayTransaction, error) {
@@ -237,10 +365,10 @@ func (q *Queries) SetTransactionReconciled(ctx context.Context, id uuid.UUID) er
 const updateTransaction = `-- name: UpdateTransaction :exec
 UPDATE transactions
 SET date = $1,
-    memo = $2,
-    amount = $3,
-    payee_id = $4,
-    category_id = $5
+  memo = $2,
+  amount = $3,
+  payee_id = $4,
+  category_id = $5
 WHERE id = $6
 `
 

postgres/user_budgets.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: user_budgets.sql
 
 package postgres

postgres/users.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: users.sql
 
 package postgres

server/account.go

@@ -2,12 +2,85 @@ package server
 
 import (
 	"net/http"
+	"time"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 )
 
+type FilterTransactionsRequest struct {
+	CategoryID string    `json:"category_id"`
+	PayeeID    string    `json:"payee_id"`
+	AccountID  string    `json:"account_id"`
+	FromDate   time.Time `json:"from_date"`
+	ToDate     time.Time `json:"to_date"`
+}
+
+func (h *Handler) filteredTransactions(c *gin.Context) {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	var request FilterTransactionsRequest
+	err = c.BindJSON(&request)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	params := postgres.GetFilteredTransactionsParams{
+		BudgetID: budgetUUID,
+		FromDate: request.FromDate,
+		ToDate:   request.ToDate,
+	}
+	params.CategoryID, params.FilterCategory = parseEmptyUUID(request.CategoryID)
+	accountID, filterAccount := parseEmptyUUID(request.AccountID)
+	params.AccountID, params.FilterAccount = accountID.UUID, filterAccount
+	params.PayeeID, params.FilterPayee = parseEmptyUUID(request.PayeeID)
+
+	transactions, err := h.Service.GetFilteredTransactions(c.Request.Context(), params)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
+}
+
+func parseEmptyUUID(value string) (uuid.NullUUID, bool) {
+	if value == "" {
+		return uuid.NullUUID{}, false
+	}
+
+	val, err := uuid.Parse(value)
+	if err != nil {
+		return uuid.NullUUID{}, false
+	}
+
+	return uuid.NullUUID{val, true}, true
+}
+
+func (h *Handler) problematicTransactions(c *gin.Context) {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	transactions, err := h.Service.GetProblematicTransactions(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
+}
+
 func (h *Handler) transactionsForAccount(c *gin.Context) {
 	accountID := c.Param("accountid")
 	accountUUID, err := uuid.Parse(accountID)
@@ -28,11 +101,11 @@ func (h *Handler) transactionsForAccount(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, TransactionsResponse{account, transactions})
+	c.JSON(http.StatusOK, TransactionsResponse{&account, transactions})
 }
 
 type TransactionsResponse struct {
-	Account      postgres.Account
+	Account      *postgres.Account
 	Transactions []postgres.DisplayTransaction
 }
 
@@ -69,5 +142,5 @@ func (h *Handler) editAccount(c *gin.Context) {
 		return
 	}
 
-	h.returnBudgetingData(c, account.BudgetID)
+	h.getBudget(c, account.BudgetID)
 }

server/account_test.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -11,24 +10,18 @@ import (
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/jwt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	txdb "github.com/DATA-DOG/go-txdb"
 	"github.com/gin-gonic/gin"
 )
 
-func init() { //nolint:gochecknoinits
-	txdb.Register("pgtx", "pgx", "postgres://budgeteer_test:budgeteer_test@localhost:5432/budgeteer_test")
-}
-
-func TestRegisterUser(t *testing.T) { //nolint:funlen
+func TestRegisterUser(t *testing.T) {
 	t.Parallel()
-	database, err := postgres.Connect("pgtx", "example")
+	database, err := postgres.Connect("pgtx", cfg.DatabaseConnection)
 	if err != nil {
-		fmt.Printf("could not connect to db: %s\n", err)
-		t.Skip()
+		t.Errorf("connect to DB: %v", err)
 		return
 	}
 
-	tokenVerifier, _ := jwt.NewTokenVerifier("this_is_my_demo_secret_for_unit_tests")
+	tokenVerifier, _ := jwt.NewTokenVerifier(cfg.SessionSecret)
 	h := Handler{
 		Service:             database,
 		TokenVerifier:       tokenVerifier,
@@ -66,22 +59,4 @@ func TestRegisterUser(t *testing.T) { //nolint:funlen
 			t.Error("Did not get a token")
 		}
 	})
-
-	t.Run("GetTransactions", func(t *testing.T) {
-		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(recorder.Body).Decode(&response)
-		if err != nil {
-			t.Error(err.Error())
-			t.Error("Error retreiving list of transactions.")
-		}
-		if len(response.Transactions) == 0 {
-			t.Error("Did not get any transactions.")
-		}
-	})
 }

server/admin.go

@@ -64,49 +64,3 @@ func (h *Handler) clearBudget(c *gin.Context) {
 
 	h.clearBudgetData(c, budgetUUID)
 }
-
-func (h *Handler) cleanNegativeBudget(c *gin.Context) {
-	/*budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/login")
-		return
-	}*/
-
-	/*min_date, err := h.Service.GetFirstActivity(c.Request.Context(), budgetUUID)
-	date := getFirstOfMonthTime(min_date)
-	for {
-		nextDate := date.AddDate(0, 1, 0)
-		params := postgres.GetCategoriesWithBalanceParams{
-			BudgetID: budgetUUID,
-			ToDate:   nextDate,
-			FromDate: date,
-		}
-		categories, err := h.Service.GetCategoriesWithBalance(c.Request.Context(), params)
-		if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, err)
-			return
-		}
-
-		for _, category := range categories {
-			available := category.Available.GetFloat64()
-			if available >= 0 {
-				continue
-			}
-			var negativeAvailable postgres.Numeric
-			negativeAvailable.Set(-available)
-			createAssignment := postgres.CreateAssignmentParams{
-				Date:       nextDate.AddDate(0, 0, -1),
-				Amount:     negativeAvailable,
-				CategoryID: category.ID,
-			}
-			h.Service.CreateAssignment(c.Request.Context(), createAssignment)
-		}
-
-		if nextDate.Before(time.Now()) {
-			date = nextDate
-		} else {
-			break
-		}
-	}*/
-}

server/autocomplete.go

@@ -9,6 +9,28 @@ import (
 	"github.com/google/uuid"
 )
 
+func (h *Handler) autocompleteAccounts(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.SearchAccountsParams{
+		BudgetID: budgetUUID,
+		Search:   "%" + query + "%",
+	}
+	categories, err := h.Service.SearchAccounts(c.Request.Context(), searchParams)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, categories)
+}
+
 func (h *Handler) autocompleteCategories(c *gin.Context) {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)

server/budgeting.go

@@ -1,9 +1,9 @@
 package server
 
 import (
+	"context"
 	"fmt"
 	"net/http"
-	"time"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
 	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
@@ -11,20 +11,8 @@ import (
 	"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
@@ -33,7 +21,6 @@ type CategoryWithBalance struct {
 func NewCategoryWithBalance(category *postgres.GetCategoriesRow) CategoryWithBalance {
 	return CategoryWithBalance{
 		GetCategoriesRow:   category,
-		Available:          numeric.Zero(),
 		AvailableLastMonth: numeric.Zero(),
 		Activity:           numeric.Zero(),
 		Assigned:           numeric.Zero(),
@@ -54,48 +41,47 @@ func (h *Handler) budgetingForMonth(c *gin.Context) {
 		return
 	}
 
-	firstOfMonth, err := getDate(c)
+	month, err := getDate(c)
 	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budgetUUID.String())
+		c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String())
 		return
 	}
 
-	categories, err := h.Service.GetCategories(c.Request.Context(), budgetUUID)
+	data, err := h.getBudgetingViewForMonth(c.Request.Context(), budget, month)
 	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(budget, moneyUsed, cumultativeBalances, firstOfNextMonth)
-	for i := range categoriesWithBalance {
-		cat := &categoriesWithBalance[i]
-		if cat.ID != budget.IncomeCategoryID {
-			continue
-		}
-
-		cat.Available = availableBalance
-		cat.AvailableLastMonth = availableBalance
-	}
-
-	data := struct {
-		Categories       []CategoryWithBalance
-		AvailableBalance numeric.Numeric
-	}{categoriesWithBalance, availableBalance}
 	c.JSON(http.StatusOK, data)
 }
 
-func (*Handler) getAvailableBalance(budget postgres.Budget,
+func (h *Handler) getBudgetingViewForMonth(ctx context.Context, budget postgres.Budget, month Month) (BudgetingForMonthResponse, error) {
+	categories, err := h.Service.GetCategories(ctx, budget.ID)
+	if err != nil {
+		return BudgetingForMonthResponse{}, fmt.Errorf("error loading categories: %w", err)
+	}
+
+	cumultativeBalances, err := h.Service.GetCumultativeBalances(ctx, budget.ID)
+	if err != nil {
+		return BudgetingForMonthResponse{}, fmt.Errorf("error loading balances: %w", err)
+	}
+
+	categoriesWithBalance, moneyUsed, overspentLastMonth := h.calculateBalances(budget, month, categories, cumultativeBalances)
+	availableBalance := h.getAvailableBalance(budget, month, moneyUsed, cumultativeBalances)
+
+	data := BudgetingForMonthResponse{categoriesWithBalance, availableBalance, overspentLastMonth}
+	return data, nil
+}
+
+type BudgetingForMonthResponse struct {
+	Categories         []CategoryWithBalance
+	AvailableBalance   numeric.Numeric
+	OverspentLastMonth numeric.Numeric
+}
+
+func (*Handler) getAvailableBalance(budget postgres.Budget, month Month,
 	moneyUsed numeric.Numeric, cumultativeBalances []postgres.GetCumultativeBalancesRow,
-	firstOfNextMonth time.Time) numeric.Numeric {
+) numeric.Numeric {
 	availableBalance := moneyUsed
 
 	for _, bal := range cumultativeBalances {
@@ -103,13 +89,14 @@ func (*Handler) getAvailableBalance(budget postgres.Budget,
 			continue
 		}
 
-		if !bal.Date.Before(firstOfNextMonth) {
+		if month.InFuture(bal.Date) {
 			continue
 		}
 
 		availableBalance.AddI(bal.Transactions)
-		availableBalance.AddI(bal.Assignments)
+		availableBalance.AddI(bal.Assignments) // should be zero, but who knows
 	}
+
 	return availableBalance
 }
 
@@ -118,7 +105,7 @@ type BudgetingResponse struct {
 	Budget   postgres.Budget
 }
 
-func (h *Handler) budgeting(c *gin.Context) {
+func (h *Handler) budget(c *gin.Context) {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)
 	if err != nil {
@@ -126,10 +113,10 @@ func (h *Handler) budgeting(c *gin.Context) {
 		return
 	}
 
-	h.returnBudgetingData(c, budgetUUID)
+	h.getBudget(c, budgetUUID)
 }
 
-func (h *Handler) returnBudgetingData(c *gin.Context, budgetUUID uuid.UUID) {
+func (h *Handler) getBudget(c *gin.Context, budgetUUID uuid.UUID) {
 	budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
 	if err != nil {
 		c.AbortWithError(http.StatusNotFound, err)
@@ -147,54 +134,55 @@ func (h *Handler) returnBudgetingData(c *gin.Context, budgetUUID uuid.UUID) {
 	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) {
+func (h *Handler) calculateBalances(budget postgres.Budget, month Month,
+	categories []postgres.GetCategoriesRow, cumultativeBalances []postgres.GetCumultativeBalancesRow,
+) ([]CategoryWithBalance, numeric.Numeric, numeric.Numeric) {
 	categoriesWithBalance := []CategoryWithBalance{}
 
-	moneyUsed2 := numeric.Zero()
-	moneyUsed := &moneyUsed2
+	moneyUsed := numeric.Zero()
+	overspentLastMonth := numeric.Zero()
+	categories = append(categories, postgres.GetCategoriesRow{
+		Group: "Income",
+		Name:  "No Category",
+		ID:    uuid.UUID{},
+	})
 	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
+		}
+
+		categoryWithBalance := NewCategoryWithBalance(cat)
+		for _, bal := range cumultativeBalances {
+			if bal.CategoryID != cat.ID {
+				continue
+			}
+
+			// skip everything in the future
+			if month.InFuture(bal.Date) {
+				continue
+			}
+
+			moneyUsed.SubI(bal.Assignments)
+			if month.InPresent(bal.Date) {
+				categoryWithBalance.Activity = bal.Transactions
+				categoryWithBalance.Assigned = bal.Assignments
+				continue
+			}
+
+			categoryWithBalance.AvailableLastMonth.AddI(bal.Assignments)
+			categoryWithBalance.AvailableLastMonth.AddI(bal.Transactions)
+			if !categoryWithBalance.AvailableLastMonth.IsPositive() {
+				moneyUsed.AddI(categoryWithBalance.AvailableLastMonth)
+				if month.Previous().InPresent(bal.Date) {
+					overspentLastMonth.AddI(categoryWithBalance.AvailableLastMonth)
+				}
+				categoryWithBalance.AvailableLastMonth = numeric.Zero()
+			}
+		}
 
 		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.SubI(bal.Assignments)
-		categoryWithBalance.Available.AddI(bal.Assignments)
-		categoryWithBalance.Available.AddI(bal.Transactions)
-		if !categoryWithBalance.Available.IsPositive() && bal.Date.Before(firstOfMonth) {
-			moneyUsed.AddI(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
+	return categoriesWithBalance, moneyUsed, overspentLastMonth
 }

server/category.go

@@ -11,7 +11,7 @@ import (
 )
 
 type SetCategoryAssignmentRequest struct {
-	Assigned string
+	Assigned float64
 }
 
 func (h *Handler) setCategoryAssignment(c *gin.Context) {
@@ -44,7 +44,7 @@ func (h *Handler) setCategoryAssignment(c *gin.Context) {
 
 	updateArgs := postgres.UpdateAssignmentParams{
 		CategoryID: categoryUUID,
-		Date:       date,
+		Date:       date.FirstOfMonth(),
 		Amount:     amount,
 	}
 	err = h.Service.UpdateAssignment(c.Request.Context(), updateArgs)

server/dashboard.go

@@ -1,25 +0,0 @@
-package server
-
-import (
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
-)
-
-func (h *Handler) dashboard(c *gin.Context) {
-	userID := MustGetToken(c).GetID()
-	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), userID)
-	if err != nil {
-		return
-	}
-
-	d := DashboardData{
-		Budgets: budgets,
-	}
-	c.JSON(http.StatusOK, d)
-}
-
-type DashboardData struct {
-	Budgets []postgres.Budget
-}

server/http.go

@@ -48,35 +48,37 @@ func (h *Handler) LoadRoutes(router *gin.Engine) {
 	api := router.Group("/api/v1")
 
 	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.Use(h.verifyLoginWithForbidden)
+		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)
 
-	budget := authenticated.Group("/budget")
-	budget.POST("/new", h.newBudget)
-	budget.GET("/:budgetid", h.budgeting)
-	budget.GET("/:budgetid/:year/:month", h.budgetingForMonth)
-	budget.POST("/:budgetid/category/:categoryid/:year/:month", h.setCategoryAssignment)
-	budget.GET("/:budgetid/autocomplete/payees", h.autocompletePayee)
-	budget.GET("/:budgetid/autocomplete/categories", h.autocompleteCategories)
-	budget.DELETE("/:budgetid", h.deleteBudget)
-	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)
+		budget := authenticated.Group("/budget")
+		budget.POST("/new", h.newBudget)
+		budget.GET("/:budgetid", h.budget)
+		budget.GET("/:budgetid/:year/:month", h.budgetingForMonth)
+		budget.POST("/:budgetid/category/:categoryid/:year/:month", h.setCategoryAssignment)
+		budget.GET("/:budgetid/autocomplete/payees", h.autocompletePayee)
+		budget.GET("/:budgetid/autocomplete/accounts", h.autocompleteAccounts)
+		budget.GET("/:budgetid/autocomplete/categories", h.autocompleteCategories)
+		budget.GET("/:budgetid/problematic-transactions", h.problematicTransactions)
+		budget.POST("/:budgetid/filtered-transactions", h.filteredTransactions)
+		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)
 
-	transaction := authenticated.Group("/transaction")
-	transaction.POST("/new", h.newTransaction)
-	transaction.POST("/:transactionid", h.newTransaction)
+		transaction := authenticated.Group("/transaction")
+		transaction.POST("/new", h.newTransaction)
+		transaction.POST("/:transactionid", h.updateTransaction)
+	}
 }
 
 func (h *Handler) ServeStatic(c *gin.Context) {

server/main_test.go

@@ -0,0 +1,305 @@
+package server
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io/fs"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"testing"
+	"time"
+
+	"git.javil.eu/jacob1123/budgeteer/bcrypt"
+	"git.javil.eu/jacob1123/budgeteer/config"
+	"git.javil.eu/jacob1123/budgeteer/jwt"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/web"
+
+	txdb "github.com/DATA-DOG/go-txdb"
+)
+
+var cfg = config.Config{ //nolint:gochecknoglobals
+	DatabaseConnection: "postgres://budgeteer:budgeteer@db:5432/budgeteer_test",
+	SessionSecret:      "this_is_my_demo_secret_for_unit_tests",
+}
+
+func init() { //nolint:gochecknoinits
+	_, err := postgres.Connect("pgx", cfg.DatabaseConnection)
+	if err != nil {
+		panic("failed connecting to DB for migrations: " + err.Error())
+	}
+
+	txdb.Register("pgtx", "pgx", cfg.DatabaseConnection)
+}
+
+func TestMain(t *testing.T) {
+	t.Parallel()
+
+	queries, err := postgres.Connect("pgtx", cfg.DatabaseConnection)
+	if err != nil {
+		t.Errorf("connect to DB: %v", err)
+	}
+
+	static, err := fs.Sub(web.Static, "dist")
+	if err != nil {
+		panic("couldn't open static files")
+	}
+
+	tokenVerifier, err := jwt.NewTokenVerifier(cfg.SessionSecret)
+	if err != nil {
+		panic(fmt.Errorf("couldn't create token verifier: %w", err))
+	}
+
+	handler := &Handler{
+		Service:             queries,
+		TokenVerifier:       tokenVerifier,
+		CredentialsVerifier: &bcrypt.Verifier{},
+		StaticFS:            http.FS(static),
+	}
+
+	ctx := context.Background()
+
+	createUserParams := postgres.CreateUserParams{
+		Email:    "test@example.com",
+		Name:     "test@example.com",
+		Password: "this is my dumb password",
+	}
+	user, err := handler.Service.CreateUser(ctx, createUserParams)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	budget, err := handler.Service.NewBudget(ctx, "My nice Budget", user.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	handler.DoYNABImport(ctx, t, budget)
+
+	loc := time.Now().Location()
+
+	AssertCategoriesAndAvailableEqual(ctx, t, loc, handler, budget)
+
+	AssertAccountsEqual(ctx, t, handler, budget)
+}
+
+func AssertAccountsEqual(ctx context.Context, t *testing.T, handler *Handler, budget *postgres.Budget) {
+	t.Helper()
+
+	t.Run("account balances", func(t *testing.T) {
+		t.Parallel()
+		resultDir := "../testdata/production-export/results"
+		files, err := os.ReadDir(resultDir)
+		if err != nil {
+			t.Errorf("could not load results: %s", err)
+			return
+		}
+
+		for _, file := range files {
+			if file.IsDir() {
+				continue
+			}
+
+			name := file.Name()[0 : len(file.Name())-5]
+			if name != "accounts" {
+				continue
+			}
+
+			testCaseFile := filepath.Join(resultDir, file.Name())
+			handler.CheckAccountBalance(ctx, t, testCaseFile, budget)
+		}
+	})
+}
+
+func (h Handler) CheckAccountBalance(ctx context.Context, t *testing.T, testCaseFile string, budget *postgres.Budget) {
+	t.Helper()
+
+	accounts, err := h.Service.GetAccountsWithBalance(ctx, budget.ID)
+	if err != nil {
+		t.Errorf("get accounts: %s", err)
+		return
+	}
+
+	testDataFile, err := os.Open(testCaseFile)
+	if err != nil {
+		t.Errorf("could not load category test data: %s", err)
+		return
+	}
+
+	var testData map[string]float64
+	dec := json.NewDecoder(testDataFile)
+	err = dec.Decode(&testData)
+	if err != nil {
+		t.Errorf("could not decode category test data: %s", err)
+		return
+	}
+
+	for accountName, accountBalance := range testData {
+		found := false
+		for _, account := range accounts {
+			if account.Name == accountName {
+				assertEqual(t, accountBalance, account.WorkingBalance.GetFloat64(), "balance for "+accountName)
+				found = true
+			}
+		}
+
+		if !found {
+			t.Errorf("account " + accountName + " was not found in result")
+		}
+	}
+}
+
+func AssertCategoriesAndAvailableEqual(ctx context.Context, t *testing.T, loc *time.Location, handler *Handler, budget *postgres.Budget) {
+	t.Helper()
+
+	t.Run("Categories and available balance", func(t *testing.T) {
+		t.Parallel()
+		resultDir := "../testdata/production-export/results"
+		files, err := os.ReadDir(resultDir)
+		if err != nil {
+			t.Errorf("could not load results: %s", err)
+			return
+		}
+
+		for _, file := range files {
+			if file.IsDir() {
+				continue
+			}
+
+			name := file.Name()[0 : len(file.Name())-5]
+			parts := strings.Split(name, "-")
+			if len(parts) != 2 {
+				continue
+			}
+			year, _ := strconv.Atoi(parts[0])
+			month, _ := strconv.Atoi(parts[1])
+			testCaseFile := filepath.Join(resultDir, file.Name())
+			handler.CheckAvailableBalance(ctx, t, testCaseFile, budget, Month{year, month})
+		}
+	})
+}
+
+type TestData struct {
+	AvailableBalance float64
+	Categories       map[string]CategoryTestData
+}
+
+type CategoryTestData struct {
+	Available float64
+	Activity  float64
+	Assigned  float64
+}
+
+func (h Handler) CheckAvailableBalance(ctx context.Context, t *testing.T, testCaseFile string, budget *postgres.Budget, month Month) {
+	t.Helper()
+
+	t.Run(month.String(), func(t *testing.T) {
+		t.Parallel()
+		data, err := h.getBudgetingViewForMonth(ctx, *budget, month)
+		if err != nil {
+			t.Errorf("prepare budgeting: %s", err)
+			return
+		}
+
+		testDataFile, err := os.Open(testCaseFile)
+		if err != nil {
+			t.Errorf("could not load category test data: %s", err)
+			return
+		}
+
+		var testData TestData
+		dec := json.NewDecoder(testDataFile)
+		err = dec.Decode(&testData)
+		if err != nil {
+			t.Errorf("could not decode category test data: %s", err)
+			return
+		}
+
+		assertEqual(t, testData.AvailableBalance, data.AvailableBalance.GetFloat64(), "available balance")
+
+		for categoryName, categoryTestData := range testData.Categories {
+			found := false
+			for _, category := range data.Categories {
+				name := category.Group + " : " + category.Name
+
+				if name == categoryName {
+					assertEqual(t, categoryTestData.Activity, category.Activity.GetFloat64(), "activity for "+categoryName)
+					assertEqual(t, categoryTestData.Assigned, category.Assigned.GetFloat64(), "assigned for "+categoryName)
+					available := category.AvailableLastMonth
+					available.AddI(category.Activity).AddI(category.Assigned)
+					assertEqual(t, categoryTestData.Available, available.GetFloat64(), "available for "+categoryName)
+					found = true
+				}
+			}
+
+			if !found {
+				t.Errorf("category " + categoryName + " was not found in result")
+			}
+		}
+	})
+}
+
+func AssertEqualBool(t *testing.T, expected, actual bool, message string) {
+	t.Helper()
+	if expected == actual {
+		return
+	}
+
+	t.Errorf("%s: expected %v, got %v", message, expected, actual)
+}
+
+func assertEqual(t *testing.T, expected, actual float64, message string) {
+	t.Helper()
+	if expected == actual {
+		return
+	}
+
+	t.Errorf("%s: expected %f, got %f", message, expected, actual)
+}
+
+func (h Handler) DoYNABImport(ctx context.Context, t *testing.T, budget *postgres.Budget) {
+	t.Helper()
+	budgetID := budget.ID
+	ynab, err := postgres.NewYNABImport(ctx, h.Service.Queries, budgetID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	transactions, err := os.Open("../testdata/production-export/Register.tsv")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	assignments, err := os.Open("../testdata/production-export/Budget.tsv")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	err = ynab.ImportTransactions(ctx, transactions)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	err = ynab.ImportAssignments(ctx, assignments)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+}

server/month.go

@@ -0,0 +1,71 @@
+package server
+
+import (
+	"fmt"
+	"time"
+)
+
+type Month struct {
+	Year  int
+	Month int
+}
+
+func NewFromTime(date time.Time) Month {
+	return Month{date.Year(), int(date.Month())}
+}
+
+func (m Month) String() string {
+	return fmt.Sprintf("%d-%d", m.Year, m.Month)
+}
+
+func (m Month) FirstOfMonth() time.Time {
+	return time.Date(m.Year, time.Month(m.Month), 1, 0, 0, 0, 0, time.Now().Location())
+}
+
+func (m Month) Previous() Month {
+	if m.Month == int(time.January) {
+		return Month{Year: m.Year - 1, Month: int(time.December)}
+	}
+
+	return Month{Year: m.Year, Month: m.Month - 1}
+}
+
+func (m Month) Next() Month {
+	if m.Month == int(time.December) {
+		return Month{Year: m.Year + 1, Month: int(time.January)}
+	}
+
+	return Month{Year: m.Year, Month: m.Month + 1}
+}
+
+func (m Month) InFuture(date time.Time) bool {
+	if m.Year < date.Year() {
+		return true
+	}
+
+	if m.Year > date.Year() {
+		return false
+	}
+
+	return time.Month(m.Month) < date.Month()
+}
+
+func (m Month) InPast(date time.Time) bool {
+	if m.Year > date.Year() {
+		return true
+	}
+
+	if m.Year < date.Year() {
+		return false
+	}
+
+	return time.Month(m.Month) > date.Month()
+}
+
+func (m Month) InPresent(date time.Time) bool {
+	if date.Year() != m.Year {
+		return false
+	}
+
+	return date.Month() == time.Month(m.Month)
+}

server/month_test.go

@@ -0,0 +1,46 @@
+package server_test
+
+import (
+	"testing"
+	"time"
+
+	"git.javil.eu/jacob1123/budgeteer/server"
+)
+
+type TestCaseCompare struct {
+	Value     server.Month
+	Date      time.Time
+	InPast    bool
+	InPresent bool
+	InFuture  bool
+}
+
+func TestComparisons(t *testing.T) {
+	t.Parallel()
+
+	loc := time.Now().Location()
+	tests := []TestCaseCompare{
+		{server.Month{2022, 2}, time.Date(2022, 3, 1, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2022, 3}, time.Date(2022, 3, 1, 0, 0, 0, 0, loc), false, true, false},
+		{server.Month{2022, 4}, time.Date(2022, 3, 1, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2022, 2}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2022, 3}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, true, false},
+		{server.Month{2022, 4}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2021, 2}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2021, 3}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2021, 4}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2023, 2}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2023, 3}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2023, 4}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2021, 11}, time.Date(2021, 12, 1, 0, 0, 0, 0, loc), false, false, true},
+	}
+	for i := range tests { //nolint:paralleltest
+		test := tests[i]
+		t.Run(test.Date.Format("2006-01-02")+" is in of "+test.Value.String(), func(t *testing.T) {
+			t.Parallel()
+			server.AssertEqualBool(t, test.InPast, test.Value.InPast(test.Date), "in past")
+			server.AssertEqualBool(t, test.InPresent, test.Value.InPresent(test.Date), "in present")
+			server.AssertEqualBool(t, test.InFuture, test.Value.InFuture(test.Date), "in future")
+		})
+	}
+}

server/transaction.go

@@ -27,7 +27,7 @@ type NewTransactionPayload struct {
 	State      string        `json:"state"`
 }
 
-func (h *Handler) newTransaction(c *gin.Context) {
+func (h *Handler) updateTransaction(c *gin.Context) {
 	var payload NewTransactionPayload
 	err := c.BindJSON(&payload)
 	if err != nil {
@@ -42,8 +42,26 @@ func (h *Handler) newTransaction(c *gin.Context) {
 	}
 
 	transactionID := c.Param("transactionid")
-	if transactionID != "" {
-		h.UpdateTransaction(payload, amount, transactionID, c)
+	transactionUUID, err := uuid.Parse(transactionID)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"transactionid missing from URL"})
+		return
+	}
+
+	h.UpdateTransaction(payload, amount, transactionUUID, c)
+}
+
+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
 	}
 
@@ -87,8 +105,7 @@ func (h *Handler) newTransaction(c *gin.Context) {
 	c.JSON(http.StatusOK, transaction)
 }
 
-func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeric.Numeric, transactionID string, c *gin.Context) {
-	transactionUUID := uuid.MustParse(transactionID)
+func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeric.Numeric, transactionUUID uuid.UUID, c *gin.Context) {
 	if amount.IsZero() {
 		err := h.Service.DeleteTransaction(c.Request.Context(), transactionUUID)
 		if err != nil {

server/util.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func getDate(c *gin.Context) (time.Time, error) {
+func getDate(c *gin.Context) (Month, error) {
 	var year, month int
 	yearString := c.Param("year")
 	monthString := c.Param("month")
@@ -18,13 +18,20 @@ func getDate(c *gin.Context) (time.Time, error) {
 
 	year, err := strconv.Atoi(yearString)
 	if err != nil {
-		return time.Time{}, fmt.Errorf("parse year: %w", err)
+		return Month{}, fmt.Errorf("parse year: %w", err)
 	}
 
 	month, err = strconv.Atoi(monthString)
 	if err != nil {
-		return time.Time{}, fmt.Errorf("parse month: %w", err)
+		return Month{}, fmt.Errorf("parse month: %w", err)
 	}
 
-	return getFirstOfMonth(year, month, time.Now().Location()), nil
+	return Month{year, month}, nil
+}
+
+func getFirstOfMonthTime(date time.Time) Month {
+	var monthM time.Month
+	year, monthM, _ := date.Date()
+	month := int(monthM)
+	return Month{year, month}
 }

web/.eslintrc.js

@@ -7,6 +7,10 @@ module.exports = {
     ],
     rules: {
         // override/add rules settings here, such as:
+        'vue/max-attributes-per-line': 'off',
+        'vue/singleline-html-element-content-newline': 'off',
+        'vue/first-attribute-linebreak': 'off',
+        'vue/html-closing-bracket-newline': 'off',
         // 'vue/no-unused-vars': 'error'
     },
     parser: "vue-eslint-parser",

web/package.json

@@ -22,9 +22,6 @@
         "@types/file-saver": "^2.0.5",
         "@typescript-eslint/parser": "^5.13.0",
         "@vitejs/plugin-vue": "^2.0.0",
-        "@vue/cli-plugin-babel": "5.0.0-beta.7",
-        "@vue/cli-plugin-typescript": "~4.5.0",
-        "@vue/cli-service": "5.0.0-beta.7",
         "eslint": "^8.10.0",
         "eslint-plugin-vue": "^8.5.0",
         "prettier": "2.5.1",

web/src/App.vue

@@ -1,28 +1,5 @@
-<script lang="ts">
-import { mapState } from "pinia";
-import { defineComponent } from "vue";
-import { useBudgetsStore } from "./stores/budget";
-import { useSessionStore } from "./stores/session";
-import { useSettingsStore } from "./stores/settings";
-
-export default defineComponent({
-    computed: {
-        ...mapState(useBudgetsStore, ["CurrentBudgetName"]),
-        ...mapState(useSessionStore, ["LoggedIn"]),
-    },
-    methods: {
-        logout() {
-            useSessionStore().logout();
-            this.$router.push("/login");
-        },
-        toggleMenu() {
-            useSettingsStore().toggleMenu();
-        },
-        toggleMenuSize() {
-            useSettingsStore().toggleMenuSize();
-        }
-    },
-})
+<script lang="ts" setup>
+import MainMenu from "./components/MainMenu.vue";
 </script>
 
 <template>
@@ -30,42 +7,7 @@ export default defineComponent({
     <router-view name="sidebar" />
 
     <div class="flex-1 overflow-auto">
-      <div
-        class="flex bg-gray-400 dark:bg-gray-600 p-4 fixed md:static top-0 left-0 w-full h-14"
-      >
-        <span
-          class="flex-1 font-bold text-5xl -my-3 hidden md:inline"
-          @click="toggleMenuSize"
-        >≡</span>
-        <span
-          class="flex-1 font-bold text-5xl -my-3 md:hidden"
-          @click="toggleMenu"
-        >≡</span>
-
-        <span class="flex-1">{{ CurrentBudgetName }}</span>
-
-        <div class="flex flex-1 flex-row justify-end -mx-4">
-          <router-link
-            v-if="LoggedIn"
-            class="mx-4"
-            to="/dashboard"
-          >
-            Dashboard
-          </router-link>
-          <router-link
-            v-if="!LoggedIn"
-            class="mx-4"
-            to="/login"
-          >
-            Login
-          </router-link>
-          <a
-            v-if="LoggedIn"
-            class="mx-4"
-            @click="logout"
-          >Logout</a>
-        </div>
-      </div>
+      <MainMenu />
 
       <div class="p-3 pl-6">
         <router-view />

web/src/components/Autocomplete.vue

@@ -86,7 +86,7 @@ function clear() {
       v-if="id == undefined"
       v-model="SearchQuery"
       type="text"
-      class="border-b-2 border-black"
+      class="border-b-2 border-black block w-full border-b-2 border-black"
       @keypress="keypress"
     />
     <span

web/src/components/Input.vue

@@ -1,17 +1,26 @@
 <script lang="ts" setup>
 const props = defineProps<{
-  modelValue?: number | string
+  modelValue?: number | string,
+  type: string,
 }>();
 
 const emits = defineEmits<{
   (e: "update:modelValue", value: number | string): void
 }>();
+
+function valueChanged(e: Event) {
+  const target = <HTMLInputElement>e.target;
+  switch (props.type) {
+    case "number":
+      emits('update:modelValue', target.valueAsNumber);
+      break;
+    default:
+      emits('update:modelValue', target.value)
+      break;
+  }
+}
 </script>
 
 <template>
-  <input
-    :value="modelValue"
-    class="dark:bg-slate-900"
-    @input="emits('update:modelValue', ($event.target as HTMLInputElement)?.value)"
-  >
+  <input :value="modelValue" :type="type" class="dark:bg-slate-900" @input="valueChanged">
 </template>

web/src/components/MainMenu.vue

@@ -0,0 +1,44 @@
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useRouter } from "vue-router";
+import { useBudgetsStore } from "../stores/budget";
+import { useSessionStore } from "../stores/session";
+import { useSettingsStore } from "../stores/settings";
+
+const router = useRouter();
+
+const CurrentBudgetName = computed(() => useBudgetsStore().CurrentBudgetName);
+const LoggedIn = computed(() => useSessionStore().LoggedIn);
+function logout() {
+  useSessionStore().logout();
+  router.push("/login");
+}
+
+function toggleMenu() {
+  useSettingsStore().toggleMenu();
+}
+function toggleMenuSize() {
+  useSettingsStore().toggleMenuSize();
+}
+
+router.afterEach(function(to, from) {
+  useSettingsStore().Menu.Show = false;
+})
+</script>
+
+<template>
+  <div class="flex bg-gray-400 dark:bg-gray-600 p-4 static top-0 left-0 w-full h-14">
+    <span class="flex-1 font-bold text-5xl -my-3 hidden md:inline" @click="toggleMenuSize">≡</span>
+    <span class="flex-1 font-bold text-5xl -my-3 md:hidden" @click="toggleMenu">≡</span>
+    <span class="flex-1">{{ CurrentBudgetName }}</span>
+    <div class="flex flex-1 flex-row justify-end -mx-4">
+      <router-link v-if="LoggedIn" class="mx-4" to="/dashboard">
+        Dashboard
+      </router-link>
+      <router-link v-if="!LoggedIn" class="mx-4" to="/login">
+        Login
+      </router-link>
+      <a v-if="LoggedIn" class="mx-4" @click="logout">Logout</a>
+    </div>
+  </div>
+</template>

web/src/components/Modal.vue

@@ -48,7 +48,7 @@ function submitDialog() {
     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 w-96 shadow-lg rounded-md bg-white dark:bg-black"
+      class="relative md:top-20 md:mx-auto p-5 md:w-96 shadow-lg md:h-auto h-full rounded-md bg-white dark:bg-black"
     >
       <div class="mt-3 text-center">
         <h3

web/src/components/TransactionEditRow.vue

@@ -8,7 +8,8 @@ import Input from "./Input.vue";
 import Button from "./SimpleButton.vue";
 
 const props = defineProps<{
-    transactionid: string
+  transactionid: string,
+  withAccount: boolean,
 }>()
 
 const emit = defineEmits(["save"]);
@@ -18,67 +19,47 @@ const TX = transactionsStore.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"
+  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();
-    transactionsStore.editTransaction(TX.ID, payload.value);
-    emit('save');
+  e.preventDefault();
+  transactionsStore.editTransaction(TX.ID, payload.value);
+  emit('save');
 }
 </script>
 
 <template>
   <tr>
     <td class="text-sm">
-      <DateInput
-        v-model="TX.Date"
-        class="border-b-2 border-black"
-      />
+      <DateInput v-model="TX.Date" class="border-b-2 border-black" />
+    </td>
+    <td v-if="withAccount">
+      <Autocomplete v-model:text="TX.Account" v-model:id="TX.AccountID" model="accounts" />
     </td>
     <td>
-      <Autocomplete
-        v-model:text="TX.Payee"
-        v-model:id="TX.PayeeID"
-        v-model:type="payeeType"
-        model="payees"
-      />
+      <Autocomplete v-model:text="TX.Payee" v-model:id="TX.PayeeID" v-model:type="payeeType" model="payees" />
     </td>
     <td>
-      <Autocomplete
-        v-model:text="TX.Category"
-        v-model:id="TX.CategoryID"
-        model="categories"
-      />
+      <Autocomplete v-model:text="TX.Category" v-model:id="TX.CategoryID" model="categories" />
     </td>
     <td>
-      <Input
-        v-model="TX.Memo"
-        class="block w-full border-b-2 border-black"
-        type="text"
-      />
+      <Input v-model="TX.Memo" class="block w-full border-b-2 border-black" type="text" />
     </td>
     <td class="text-right">
-      <Input
-        v-model="TX.Amount"
-        class="text-right block w-full border-b-2 border-black"
-        type="currency"
-      />
+      <Input v-model="TX.Amount" class="text-right block w-full border-b-2 border-black" type="currency" />
     </td>
     <td>
-      <Button
-        class="bg-blue-500"
-        @click="saveTransaction"
-      >
+      <Button class="bg-blue-500" @click="saveTransaction">
         Save
       </Button>
     </td>

web/src/components/TransactionInputRow.vue

@@ -24,7 +24,9 @@ const TX = ref<Transaction>({
     ID: "",
     Status: "Uncleared",
     TransferAccount: "",
-    Reconciled: false
+    Reconciled: false,
+    Account: "",
+    AccountID: "",
 });
 
 const payeeType = ref<string|undefined>(undefined);
@@ -63,7 +65,7 @@ defineExpose({Save});
     <td class="text-sm">
       <DateInput
         v-model="TX.Date"
-        class="border-b-2 border-black"
+        class="block w-full border-b-2 border-black"
       />
     </td>
     <label class="md:hidden">Payee</label>
@@ -83,6 +85,7 @@ defineExpose({Save});
         model="categories"
       />
     </td>
+    <label class="md:hidden">Memo</label>
     <td class="col-span-2">
       <Input
         v-model="TX.Memo"

web/src/components/TransactionRow.vue

@@ -6,12 +6,12 @@ import Currency from "./Currency.vue";
 import TransactionEditRow from "./TransactionEditRow.vue";
 import { formatDate } from "../date";
 import { useAccountStore } from "../stores/budget-account";
-import Input from "./Input.vue";
 import Checkbox from "./Checkbox.vue";
 
 const props = defineProps<{
     transactionid: string,
     index: number,
+    withAccount: boolean,
 }>();
 
 const edit = ref(false);
@@ -22,19 +22,6 @@ const Reconciling = computed(() => useTransactionsStore().Reconciling);
 const transactionsStore = useTransactionsStore();
 const TX = transactionsStore.Transactions.get(props.transactionid)!;
 
-function dateChanged() {
-    const currentAccount = useAccountStore().CurrentAccount;
-    if (currentAccount == null)
-        return true;
-    const transactionIndex = currentAccount.Transactions.indexOf(props.transactionid);
-    if(transactionIndex<=0)
-        return true;
-
-    const previousTransactionId = currentAccount.Transactions[transactionIndex-1];
-    const previousTransaction = transactionsStore.Transactions.get(previousTransactionId);
-    return TX.Date.getTime() != previousTransaction?.Date.getTime();
-}
-
 function getStatusSymbol() {
     if(TX.Status == "Reconciled")
         return "✔";
@@ -47,22 +34,17 @@ function getStatusSymbol() {
 </script>
 
 <template>
-  <tr v-if="dateChanged()" class="table-row md:hidden">
-    <td class="py-2" colspan="5">
-      <span class="bg-gray-400 dark:bg-slate-600 rounded-lg p-1 px-2 w-full block">
-        {{ formatDate(TX.Date) }}
-      </span>
-    </td>
-  </tr>
   <tr
     v-if="!edit"
     class="{{new Date(TX.Date) > new Date() ? 'future' : ''}}"
-    :class="[index % 6 < 3 ? 'md:bg-gray-300 dark:md:bg-gray-700' : 'md:bg-gray-100 dark:md:bg-gray-900']"
+    :class="[index % 2 < 1 ? 'md:bg-gray-300 dark:md:bg-gray-700' : 'md:bg-gray-100 dark:md:bg-gray-900']"
   >
-    <!--:class="[index % 6 < 3 ? index % 6 === 1 ? 'bg-gray-400' : 'bg-gray-300' : index % 6 !== 4 ? 'bg-gray-100' : '']">-->
     <td class="hidden md:block">
       {{ formatDate(TX.Date) }}
     </td>
+    <td v-if="withAccount" class="pl-2 md:pl-0">
+      {{ TX.Account }}
+    </td>
     <td class="pl-2 md:pl-0">
       {{ TX.TransferAccount ? "Transfer : " + TX.TransferAccount : TX.Payee }}
     </td>
@@ -93,6 +75,7 @@ function getStatusSymbol() {
   <TransactionEditRow
     v-if="edit"
     :transactionid="TX.ID"
+    :with-account="withAccount"
     @save="edit = false"
   />
 </template>

web/src/date.ts

@@ -6,3 +6,12 @@ export function formatDate(date: Date): string {
         day: "2-digit",
     });
 }
+
+export function groupBy<T, K extends keyof any>(list: T[], getKey: (item: T) => K) {
+  return list.reduce((previous, currentItem) => {
+    const group = getKey(currentItem);
+    if (!previous[group]) previous[group] = [];
+    previous[group].push(currentItem);
+    return previous;
+  }, {} as Record<K, T[]>);
+}

web/src/pages/Account.vue

@@ -10,6 +10,7 @@ import { useTransactionsStore } from "../stores/transactions";
 import Modal from "../components/Modal.vue";
 import Input from "../components/Input.vue";
 import Checkbox from "../components/Checkbox.vue";
+import { formatDate } from "../date";
 
 defineProps<{
     budgetid: string
@@ -116,27 +117,13 @@ function createReconcilationTransaction() {
 
   <table>
     <tr class="font-bold">
-      <td
-        class="hidden md:block"
-        style="width: 90px;"
-      >
-        Date
-      </td>
-      <td style="max-width: 150px;">
-        Payee
-      </td>
-      <td style="max-width: 200px;">
-        Category
-      </td>
+      <td class="hidden md:block" style="width: 90px;">Date</td>
+      <td style="max-width: 150px;">Payee</td>
+      <td style="max-width: 200px;">Category</td>
       <td>Memo</td>
-      <td class="text-right">
-        Amount
-      </td>
+      <td class="text-right">Amount</td>
       <td style="width: 80px;">
-        <Checkbox
-          v-if="transactions.Reconciling"
-          @input="setReconciled"
-        />
+        <Checkbox v-if="transactions.Reconciling" @input="setReconciled" />
       </td>
     </tr>
     <TransactionInputRow
@@ -144,12 +131,22 @@ function createReconcilationTransaction() {
       :budgetid="budgetid"
       :accountid="accountid"
     />
-    <TransactionRow
-      v-for="(transaction, index) in transactions.TransactionsList"
-      :key="transaction.ID"
-      :transactionid="transaction.ID"
-      :index="index"
-    />
+    <template v-for="(dayTransactions, key, index) in transactions.TransactionsByDate" :key="key">
+      <tr class="table-row md:hidden">
+        <td class="py-2" colspan="5">
+          <span class="bg-gray-400 dark:bg-slate-600 rounded-lg p-1 px-2 w-full block">
+            {{ key }}
+          </span>
+        </td>
+      </tr>
+      <TransactionRow
+        v-for="transaction in dayTransactions"
+        :key="transaction.ID"
+        :index="index"
+        :transactionid="transaction.ID"
+        :with-account="false"
+      />
+    </template>
   </table>
   <div class="md:hidden">
     <Modal @submit="submitModal">
@@ -162,7 +159,7 @@ function createReconcilationTransaction() {
       </template>
       <TransactionInputRow
         ref="modalInputRow"
-        class="grid grid-cols-2"
+        class="flex flex-col w-full h-full top-0"
         :budgetid="budgetid"
         :accountid="accountid"
       />

web/src/pages/AllAccounts.vue

@@ -0,0 +1,125 @@
+<script lang="ts" setup>
+import { computed, ref, onMounted, watch } from "vue"
+import Currency from "../components/Currency.vue";
+import TransactionRow from "../components/TransactionRow.vue";
+import TransactionInputRow from "../components/TransactionInputRow.vue";
+import { useAccountStore } from "../stores/budget-account";
+import EditAccount from "../dialogs/EditAccount.vue";
+import Button from "../components/SimpleButton.vue";
+import { useTransactionsStore } from "../stores/transactions";
+import Modal from "../components/Modal.vue";
+import Input from "../components/Input.vue";
+import Checkbox from "../components/Checkbox.vue";
+import { formatDate } from "../date";
+import DateInput from "../components/DateInput.vue";
+import Autocomplete from '../components/Autocomplete.vue'
+
+defineProps<{
+    budgetid: string
+}>()
+
+const modalInputRow = ref<typeof TransactionInputRow | null>(null);
+
+function submitModal() {
+  modalInputRow.value!.Save();
+}
+
+const accounts = useAccountStore();
+const transactions = useTransactionsStore();
+
+onMounted(() => {
+  transactions.GetProblematicTransactions();
+})
+
+const filters = ref({
+  Account: null,
+  AccountID: null,
+  Payee: null,
+  PayeeID: null,
+  Category: null,
+  CategoryID: null,
+  FromDate: new Date(1900, 0, 2),
+  ToDate: new Date(2999,11,32),
+});
+
+watch(() => filters.value.AccountID 
+  + filters.value.PayeeID 
+  + filters.value.CategoryID
+  + filters.value.FromDate?.toISOString()
+  + filters.value.ToDate?.toISOString(), function() {
+  if(!hasFilters.value)
+    return;
+  transactions.GetFilteredTransactions(
+    filters.value.AccountID, 
+    filters.value.CategoryID, 
+    filters.value.PayeeID,
+    filters.value.FromDate?.toISOString(),
+    filters.value.ToDate?.toISOString(),
+    );
+})
+
+const hasFilters = computed(() => 
+  filters.value.AccountID != null 
+  || filters.value.PayeeID != null 
+  || filters.value.CategoryID != null
+  || (filters.value.FromDate != null && filters.value.FromDate.getFullYear() > 1901)
+  || (filters.value.ToDate != null && filters.value.ToDate.getFullYear() < 2998))
+
+const transactionsList = computed(() => {
+  if (hasFilters.value){
+    return transactions.FilteredTransactionsList;
+  }
+  return transactions.ProblematicTransactionsList;
+})
+</script>
+
+<template>
+  <div class="grid grid-cols-[1fr_auto]">
+    <div>
+      <h1 class="inline">
+        {{ hasFilters ? "Filtered" : "Problematic" }} Transactions
+      </h1>
+    </div>
+  </div>
+
+  <div class="grid grid-cols-2 w-96">
+    Account: 
+    <Autocomplete v-model:text="filters.Account" v-model:id="filters.AccountID" model="accounts" class="inline-block" /><br>
+    Payee:
+    <Autocomplete v-model:text="filters.Payee" v-model:id="filters.PayeeID" model="payees" class="inline-block" /><br>
+    Category:
+    <Autocomplete v-model:text="filters.Category" v-model:id="filters.CategoryID" model="categories" class="inline-block" /><br>
+    From Date:
+    <DateInput v-model="filters.FromDate" class="inline-block" /><br>
+    To Date:
+    <DateInput v-model="filters.ToDate" class="inline-block" />
+  </div>
+
+  <table>
+    <tr class="font-bold">
+      <td class="hidden md:block" style="width: 90px;">Date</td>
+      <td style="max-width: 200px;">Account</td>
+      <td style="max-width: 150px;">Payee</td>
+      <td style="max-width: 200px;">Category</td>
+      <td>Memo</td>
+      <td class="text-right">Amount</td>
+    </tr>
+    <TransactionRow
+      v-for="(transaction, index) in transactionsList"
+      :key="transaction.ID"
+      :with-account="true"
+      :transactionid="transaction.ID"
+      :index="index"
+    />
+  </table>
+</template>
+
+<style>
+table {
+    width: 100%;
+    table-layout: fixed;
+}
+.negative {
+    color: red;
+}
+</style>

web/src/pages/BudgetSidebar.vue

@@ -19,68 +19,47 @@ const OnBudgetAccounts = computed(() => accountStore.OnBudgetAccounts);
 const OffBudgetAccounts = computed(() => accountStore.OffBudgetAccounts);
 const OnBudgetAccountsBalance = computed(() => accountStore.OnBudgetAccountsBalance);
 const OffBudgetAccountsBalance = computed(() => accountStore.OffBudgetAccountsBalance);
+
+function toggleMenu() {
+  useSettingsStore().toggleMenu();
+}
 </script>
 
 <template>
-  <div
-    :class="[ExpandMenu ? 'md:w-72' : 'md:w-36', ShowMenu ? '' : 'hidden']"
-    class="md:block flex-shrink-0 w-full bg-gray-500 border-r-4 border-black"
-  >
-    <div class="flex flex-col mt-14 md:mt-0">
-      <span
-        class="m-2 p-1 px-3 h-10 overflow-hidden"
-        :class="[ExpandMenu ? 'text-2xl' : 'text-md']"
-      >
-        <router-link
-          to="/dashboard"
-          style="font-size: 150%"
-        >⌂</router-link>
-        {{ CurrentBudgetName }}
-      </span>
+  <div :class="[ExpandMenu ? 'md:w-72' : 'md:w-36', ShowMenu ? '' : 'hidden']"
+       class="md:block flex-shrink-0 w-full bg-gray-500 border-r-4 border-black">
+    <div class="flex flex-col">
+      <div class="m-2 md:px-3 p-1">
+        <span class="font-bold-my-3 md:hidden font-bold text-5xl pr-3" @click="toggleMenu">≡</span>
+        <span class="h-10 overflow-hidden" :class="[ExpandMenu ? 'text-2xl' : 'text-md']">
+          <router-link to="/dashboard" class="text-5xl">⌂</router-link>
+          {{ CurrentBudgetName }}
+        </span>
+      </div>
       <span class="bg-gray-100 dark:bg-gray-700 p-2 px-3 flex flex-col">
         <router-link :to="'/budget/' + CurrentBudgetID + '/budgeting'">Budget</router-link>
         <br>
         <!--<router-link :to="'/budget/'+CurrentBudgetID+'/reports'">Reports</router-link>-->
-        <!--<router-link :to="'/budget/'+CurrentBudgetID+'/all-accounts'">All Accounts</router-link>-->
+        <router-link :to="'/budget/'+CurrentBudgetID+'/problematic-transactions'">Transactions</router-link>
       </span>
       <li class="bg-slate-200 dark:bg-slate-700 my-2 p-2 px-3">
         <div class="flex flex-row justify-between font-bold">
           <span>On-Budget Accounts</span>
-          <Currency
-            :class="ExpandMenu ? 'md:inline' : 'md:hidden'"
-            :value="OnBudgetAccountsBalance"
-          />
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" class="whitespace-nowrap" :value="OnBudgetAccountsBalance" />
         </div>
-        <div
-          v-for="account in OnBudgetAccounts"
-          :key="account.ID"
-          class="flex flex-row justify-between"
-        >
-          <AccountWithReconciled :account="account" />
-          <Currency
-            :class="ExpandMenu ? 'md:inline' : 'md:hidden'"
-            :value="account.ClearedBalance"
-          />
+        <div v-for="account in OnBudgetAccounts" :key="account.ID" class="flex flex-row justify-between">
+          <AccountWithReconciled class="whitespace-nowrap overflow-hidden mr-4" :account="account" />
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" class="whitespace-nowrap" :value="account.ClearedBalance" />
         </div>
       </li>
       <li class="bg-slate-200 dark:bg-slate-700 my-2 p-2 px-3">
         <div class="flex flex-row justify-between font-bold">
           <span>Off-Budget Accounts</span>
-          <Currency
-            :class="ExpandMenu ? 'md:inline' : 'md:hidden'"
-            :value="OffBudgetAccountsBalance"
-          />
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" class="whitespace-nowrap" :value="OffBudgetAccountsBalance" />
         </div>
-        <div
-          v-for="account in OffBudgetAccounts"
-          :key="account.ID"
-          class="flex flex-row justify-between"
-        >
-          <AccountWithReconciled :account="account" />
-          <Currency
-            :class="ExpandMenu ? 'md:inline' : 'md:hidden'"
-            :value="account.ClearedBalance"
-          />
+        <div v-for="account in OffBudgetAccounts" :key="account.ID" class="flex flex-row justify-between">
+          <AccountWithReconciled class="whitespace-nowrap overflow-hidden mr-4" :account="account" />
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" class="whitespace-nowrap" :value="account.ClearedBalance" />
         </div>
       </li>
       <!--

web/src/pages/Budgeting.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, defineProps, onMounted, ref, watchEffect } from "vue";
+import { computed, onMounted, ref, watchEffect } from "vue";
 import Currency from "../components/Currency.vue";
 import { useBudgetsStore } from "../stores/budget";
 import { Category, useAccountStore } from "../stores/budget-account";
@@ -72,14 +72,60 @@ function assignedChanged(e : Event, category : Category){
     POST("/budget/"+CurrentBudgetID.value+"/category/" + category.ID + "/" + selected.value.Year + "/" + (selected.value.Month+1),
     JSON.stringify({Assigned: category.Assigned}));
 }
+
+const budgeted = computed(() => accountStore.GetBudgeted(selected.value.Year, selected.value.Month))
 </script>
 
 <template>
   <h1>Budget for {{ selected.Month + 1 }}/{{ selected.Year }}</h1>
-  <span>Available balance:
-    <Currency
-      :value="accountStore.GetIncomeAvailable(selected.Year, selected.Month)"
-    /></span>
+  <table class="inline-block">
+    <tr>
+      <td>
+        Available last month:
+      </td>
+      <td class="text-right">
+        <Currency :value="accountStore.Available-accountStore.OverspentLastMonth+budgeted.Assigned+budgeted.Deassigned" />
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Overspent last month:
+      </td>
+      <td class="text-right">
+        <Currency :value="accountStore.OverspentLastMonth" />
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Budgeted this month:
+      </td>
+      <td class="text-right">
+        <Currency :value="budgeted.Assigned+budgeted.Deassigned" />
+      </td>
+      <td class="text-sm pl-2">
+        = <Currency :value="budgeted.Assigned" /> - <Currency :value="-budgeted.Deassigned" />
+      </td>
+    </tr>
+    <tr class="font-bold">
+      <td class="py-2">
+        Available balance:
+      </td>
+      <td class="text-right">
+        <Currency :value="accountStore.Available" />
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Activity:
+      </td>
+      <td class="text-right">
+        <Currency :value="budgeted.Income + budgeted.Spent" />
+      </td>
+      <td class="text-sm pl-2">
+        = <Currency :value="budgeted.Income" /> - <Currency :value="-1 * budgeted.Spent" />
+      </td>
+    </tr>
+  </table>
   <div>
     <router-link
       :to="'/budget/' + CurrentBudgetID + '/budgeting/' + previous.Year + '/' + previous.Month"

web/src/pages/Dashboard.vue

@@ -3,10 +3,6 @@ import NewBudget from '../dialogs/NewBudget.vue';
 import RowCard from '../components/RowCard.vue';
 import { useSessionStore } from '../stores/session';
 
-const props = defineProps<{
-    budgetid: string,
-}>();
-
 const BudgetsList = useSessionStore().BudgetsList;
 </script>
 
@@ -24,7 +20,7 @@ const BudgetsList = useSessionStore().BudgetsList;
         <!--<svg class="w-24"></svg>-->
         <p class="w-24 text-center text-6xl" />
         <span class="text-lg">{{ budget.Name
-        }}{{ budget.ID == budgetid ? " *" : "" }}</span>
+        }}</span>
       </router-link>
     </RowCard>
     <NewBudget />

web/src/pages/Settings.vue

@@ -9,6 +9,8 @@ import Button from "../components/SimpleButton.vue";
 import { saveAs } from 'file-saver';
 import Input from "../components/Input.vue";
 
+const router = useRouter();
+
 const transactionsFile = ref<File | undefined>(undefined);
 const assignmentsFile = ref<File | undefined>(undefined);
 
@@ -39,14 +41,11 @@ function deleteBudget() {
 
     const budgetStore = useSessionStore();
     budgetStore.Budgets.delete(CurrentBudgetID.value);
-    useRouter().push("/")
+    router.push("/dashboard")
 };
 function clearBudget() {
     POST("/budget/" + CurrentBudgetID.value + "/settings/clear", null)
 };
-function cleanNegative() {
-    // <a href="/budget/{{.Budget.ID}}/settings/clean-negative">Fix all historic negative category-balances</a>
-};
 function ynabImport() {
     if (transactionsFile.value == undefined || assignmentsFile.value == undefined)
         return
@@ -109,21 +108,6 @@ function ynabExport() {
           Delete budget
         </Button>
       </RowCard>
-      <RowCard 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 py-2"
-          @click="cleanNegative"
-        >
-          Fix negative
-        </Button>
-      </RowCard>
       <RowCard class="flex-col p-3">
         <h2 class="text-lg font-bold">
           Import YNAB Budget

web/src/router/index.ts

@@ -3,7 +3,8 @@ import {
     createWebHistory,
     RouteLocationNormalized,
 } from "vue-router";
-import Account from "@/pages/Account.vue";
+import Account from "../pages/Account.vue";
+import AllAccounts from "../pages/AllAccounts.vue";
 import Budgeting from "../pages/Budgeting.vue";
 import BudgetSidebar from "../pages/BudgetSidebar.vue";
 import Dashboard from "../pages/Dashboard.vue";
@@ -13,7 +14,12 @@ import Settings from "../pages/Settings.vue";
 import WelcomePage from "../pages/WelcomePage.vue";
 
 const routes = [
-    { path: "/", name: "Index", component: WelcomePage },
+    { 
+        path: "/", 
+        name: "Index", 
+        component: WelcomePage,
+        meta: { hideForAuth: true },
+    },
     {
         path: "/dashboard",
         name: "Dashboard",
@@ -58,6 +64,13 @@ const routes = [
         props: true,
         meta: { requiresAuth: true },
     },
+    {
+        path: "/budget/:budgetid/problematic-transactions",
+        name: "Problematic Transactions",
+        components: { default: AllAccounts, sidebar: BudgetSidebar },
+        props: true,
+        meta: { requiresAuth: true },
+    },
     {
         path: "/budget/:budgetid/account/:accountid",
         name: "Account",

web/src/stores/budget-account.ts

@@ -9,6 +9,8 @@ interface State {
     CurrentAccountID: string | null;
     Categories: Map<string, Category>;
     Months: Map<number, Map<number, Map<string, Category>>>;
+    Available: number,
+    OverspentLastMonth: number,
     Assignments: [];
 }
 
@@ -38,11 +40,20 @@ export interface Category {
     Activity: number;
 }
 
+interface BudgetedAmounts {
+    Assigned: number,
+    Deassigned: number,
+    Spent: number,
+    Income: number,
+}
+
 export const useAccountStore = defineStore("budget/account", {
     state: (): State => ({
         Accounts: new Map<string, Account>(),
         CurrentAccountID: null,
         Months: new Map<number, Map<number, Map<string, Category>>>(),
+        Available: 0,
+        OverspentLastMonth: 0,
         Categories: new Map<string, Category>(),
         Assignments: [],
     }),
@@ -59,7 +70,7 @@ export const useAccountStore = defineStore("budget/account", {
             return (category: Category): number => {
                 return (
                     category.AvailableLastMonth +
-                    Number(category.Assigned) +
+                    category.Assigned +
                     category.Activity
                 );
             };
@@ -68,17 +79,34 @@ export const useAccountStore = defineStore("budget/account", {
             const budget = useBudgetsStore();
             return budget.CurrentBudget?.IncomeCategoryID;
         },
-        GetIncomeAvailable(state) {
-            return (year: number, month: number) => {
+        GetBudgeted(state) {
+            return (year: number, month: number) : BudgetedAmounts => {
                 const IncomeCategoryID = this.GetIncomeCategoryID;
-                if (IncomeCategoryID == null) return 0;
+                if (IncomeCategoryID == null) return {Spent: 0, Income: 0, Assigned: 0, Deassigned: 0};
 
                 const categories = this.AllCategoriesForMonth(year, month);
-                const category = categories.filter(
-                    (x) => x.ID == IncomeCategoryID
-                )[0];
-                if (category == null) return 0;
-                return category.AvailableLastMonth;
+
+                let assigned = 0, deassigned = 0;
+                let spent = 0, income = 0;
+                for (const category of categories) {
+                    if (category.ID == IncomeCategoryID)
+                        continue;
+                    
+                    if(category.Activity > 0)
+                        income += category.Activity;
+                    else
+                        spent += category.Activity;
+                    if(category.Assigned > 0)
+                        assigned += category.Assigned;
+                    else
+                        deassigned += category.Assigned;
+                }
+                return {
+                    Assigned: assigned,
+                    Deassigned: deassigned,
+                    Spent: spent,
+                    Income: income
+                };
             };
         },
         CategoryGroupsForMonth(state) {
@@ -87,7 +115,7 @@ export const useAccountStore = defineStore("budget/account", {
                 const categoryGroups = [];
                 let prev = undefined;
                 for (const category of categories) {
-                    if (category.ID == this.GetIncomeCategoryID) continue;
+                    //if (category.ID == this.GetIncomeCategoryID) continue;
 
                     if (prev == undefined || category.Group != prev.Name) {
                         prev = {
@@ -169,10 +197,9 @@ export const useAccountStore = defineStore("budget/account", {
             );
             const response = await result.json();
             const transactionsStore = useTransactionsStore();
-            const transactions = transactionsStore.AddTransactions(
+            transactionsStore.AddTransactions(
                 response.Transactions
             );
-            account.Transactions = transactions;
         },
         async FetchMonthBudget(budgetid: string, year: number, month: number) {
             const result = await GET(
@@ -184,7 +211,7 @@ export const useAccountStore = defineStore("budget/account", {
                 response.Categories.length <= 0
             )
                 return;
-            this.addCategoriesForMonth(year, month, response.Categories);
+            this.addCategoriesForMonth(year, month, response.Categories, response.AvailableBalance, response.OverspentLastMonth);
         },
         async EditAccount(
             accountid: string,
@@ -210,7 +237,9 @@ export const useAccountStore = defineStore("budget/account", {
         addCategoriesForMonth(
             year: number,
             month: number,
-            categories: Category[]
+            categories: Category[],
+            available: number,
+            overspentLastMonth: number,
         ): void {
             this.$patch((state) => {
                 const yearMap =
@@ -224,6 +253,9 @@ export const useAccountStore = defineStore("budget/account", {
 
                 yearMap.set(month, monthMap);
                 state.Months.set(year, yearMap);
+
+                state.Available = available;
+                state.OverspentLastMonth = overspentLastMonth;
             });
         },
         logout() {

web/src/stores/transactions.ts

@@ -1,10 +1,14 @@
 import { defineStore } from "pinia";
-import { POST } from "../api";
+import { GET, POST } from "../api";
+import { formatDate, groupBy } from "../date";
+import { useBudgetsStore } from "./budget";
 import { useAccountStore } from "./budget-account";
 
 interface State {
     Transactions: Map<string, Transaction>;
     Reconciling: boolean;
+    ProblematicTransactions: Array<string>;
+    FilteredTransactions: Array<string>;
 }
 
 export interface Transaction {
@@ -21,12 +25,16 @@ export interface Transaction {
     PayeeID: string | undefined;
     Amount: number;
     Reconciled: boolean;
+    Account: string;
+    AccountID: string;
 }
 
 export const useTransactionsStore = defineStore("budget/transactions", {
     state: (): State => ({
         Transactions: new Map<string, Transaction>(),
         Reconciling: false,
+        ProblematicTransactions: new Array<string>(),
+        FilteredTransactions: new Array<string>(),
     }),
     getters: {
         ReconcilingBalance(state): number {
@@ -39,24 +47,33 @@ export const useTransactionsStore = defineStore("budget/transactions", {
             }
             return reconciledBalance;
         },
-        TransactionsList(state): Transaction[] {
+        TransactionsByDate(state) : Record<string, Transaction[]> {
             const accountsStore = useAccountStore();
-            return accountsStore.CurrentAccount!.Transactions.map((x) => {
-                return this.Transactions.get(x)!;
-            });
+            const accountID = accountsStore.CurrentAccountID;
+            const allTransactions = [...this.Transactions.values()].filter(x => x.AccountID == accountID);
+            return groupBy(allTransactions, x => formatDate(x.Date));
         },
+        TransactionsList(state) : Transaction[] {
+            const accountsStore = useAccountStore();
+            const accountID = accountsStore.CurrentAccountID;
+            const allTransactions = [...this.Transactions.values()];
+            return allTransactions.filter(x => x.AccountID == accountID);
+        },
+        ProblematicTransactionsList(state) : Transaction[] {
+            return [...state.ProblematicTransactions.map(x => state.Transactions!.get(x)!)];
+        },
+        FilteredTransactionsList(state) : Transaction[] {
+            return [...state.FilteredTransactions.map(x => state.Transactions!.get(x)!)];
+        }
     },
     actions: {
         AddTransactions(transactions: Array<Transaction>) {
-            const transactionIds = [] as Array<string>;
             this.$patch(() => {
                 for (const transaction of transactions) {
                     transaction.Date = new Date(transaction.Date);
                     this.Transactions.set(transaction.ID, transaction);
-                    transactionIds.push(transaction.ID);
                 }
             });
-            return transactionIds;
         },
         SetReconciledForAllTransactions(value: boolean) {
             for (const transaction of this.TransactionsList) {
@@ -65,6 +82,29 @@ export const useTransactionsStore = defineStore("budget/transactions", {
                 transaction.Reconciled = value;
             }
         },
+        async GetProblematicTransactions() {
+            const budgetStore = useBudgetsStore();
+            const result = await GET("/budget/" + budgetStore.CurrentBudgetID + "/problematic-transactions");
+            const response = await result.json();
+            const transactions = response.Transactions ?? [];
+            this.AddTransactions(transactions);
+            this.ProblematicTransactions = [...transactions?.map((x : Transaction) => x.ID)];
+        },
+        async GetFilteredTransactions(accountID : string | null, categoryID : string | null, payeeID : string | null, fromDate : string, toDate : string) {
+            const budgetStore = useBudgetsStore();
+            const payload = JSON.stringify({
+              category_id: categoryID,
+              payee_id: payeeID,
+              account_id: accountID,
+              from_date: fromDate,
+              to_date: toDate,
+            });
+            const result = await POST("/budget/" + budgetStore.CurrentBudgetID + "/filtered-transactions", payload);
+            const response = await result.json();
+            const transactions = response.Transactions ?? [];
+            this.AddTransactions(transactions);
+            this.FilteredTransactions = [...transactions.map((x : Transaction) => x.ID)];
+        },
         async SubmitReconcilation(reconciliationTransactionAmount: number) {
             const accountsStore = useAccountStore();
             const account = accountsStore.CurrentAccount!;

web/vite.config.js

@@ -19,7 +19,7 @@ export default defineConfig({
         host: "0.0.0.0",
         proxy: {
             "/api": {
-                target: "http://10.0.0.162:1323/",
+                target: "http://backend:1323/",
                 changeOrigin: true,
             },
         },