.drone.yml

@@ -4,29 +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:
-    - task ci
-  when:
-    event:
-    - pull_request
-
 - name: Taskfile.dev
   image: hub.javil.eu/budgeteer:dev
-  pull: always
+  pull: true
   commands:
-    - task ci
+    - task
-  when:
-    branch:
-    - master
-    event:
-    - push
 
 - name: docker  
   image: plugins/docker
@@ -38,38 +20,14 @@ steps:
       from_secret: docker_password
     repo: hub.javil.eu/budgeteer
     context: build
-    dockerfile: docker/Dockerfile
+    dockerfile: build/Dockerfile
     tags: 
       - latest
   when:
-    branch:
-    - master
     event:
-    - push
+      exclude:
+      - pull_request
 
-- name: docker tag
-  image: plugins/docker
-  settings:
-    registry: hub.javil.eu
-    username: 
-      from_secret: docker_user
-    password:
-      from_secret: docker_password
-    repo: hub.javil.eu/budgeteer
-    context: build
-    dockerfile: docker/Dockerfile
-    auto_tag: true
-  when:
-    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 

.earthignore

@@ -0,0 +1,10 @@
+build/
+.git/
+docker-compose.yml
+README.md
+Earthfile
+config.example.json
+.gitignore
+.vscode/
+budgeteer
+budgeteer.exe

.gitmodules

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

.golangci.yml

@@ -1,43 +0,0 @@
-linters:
-  enable-all: true
-  disable:
-    - golint
-    - scopelint
-    - maligned
-    - interfacer
-    - wsl
-    - forbidigo
-    - nlreturn
-    - testpackage
-    - ifshort
-    - exhaustivestruct
-    - gci # not working, shows errors on freshly formatted file
-    - varnamelen
-    - lll
-
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - io/ioutil.ReadFile
-      - io.Copy(*bytes.Buffer)
-      - (*github.com/gin-gonic/gin.Context).AbortWithError
-      - (*github.com/gin-gonic/gin.Context).AbortWithError
-      - io.Copy(os.Stdout)
-  varnamelen:
-    ignore-decls:
-      - c *gin.Context
-  wrapcheck:
-    ignoreSigs:
-      - .JSON(
-      - .Redirect(
-      - .String(
-      - .Errorf(
-      - errors.New(
-      - errors.Unwrap(
-      - .Wrap(
-      - .Wrapf(
-      - .WithMessage(
-      - .WithMessagef(
-      - .WithStack(
-    ignorePackageGlobs:
-      - git.javil.eu/jacob1123/budgeteer/postgres

.vscode/settings.json

@@ -1,15 +1,6 @@
 {
         "files.exclude": {
                 "**/node_modules": true,
-                "**/vendor": true,
+                "**/vendor": true
-                "**/*.sql.go": true,
+        }
-                ".task/": true,
-                "build/": true,
-                "web/dist/": true
-        },
-        "gopls": {
-                "formatting.gofumpt": true,
-        },
-        "editor.detectIndentation": false,
-        "editor.tabSize": 2
 }

.woodpecker.yml

@@ -0,0 +1,23 @@
+pipeline:
+  build:
+    name: Taskfile.dev
+    image: hub.javil.eu/budgeteer:dev
+    pull: true
+    commands:
+      - task
+
+  docker:
+    image: plugins/docker
+    secrets: [ docker_username, docker_password ]
+    settings:
+      registry: hub.javil.eu
+      repo: hub.javil.eu/budgeteer
+      context: build
+      dockerfile: build/Dockerfile
+      tags: 
+        - latest
+    when:
+      event: [push, tag, deployment]
+
+image_pull_secrets:
+- hub.javil.eu 

Earthfile

@@ -0,0 +1,21 @@
+FROM golang:1.17
+WORKDIR /src
+
+build:
+	COPY go.mod go.sum .
+	RUN go mod download
+	COPY . .
+	RUN --mount=type=cache,target=/root/.cache/go-build go build -o build/budgeteer ./cmd/budgeteer
+	SAVE ARTIFACT build/budgeteer /budgeteer AS LOCAL build/budgeteer
+
+docker:
+	WORKDIR /app
+	COPY +build/budgeteer .
+	ENTRYPOINT ["/app/budgeteer"]
+	SAVE IMAGE hub.javil.eu/budgeteer:latest
+
+run:
+	LOCALLY
+	WITH DOCKER --load=+docker
+		RUN docker-compose up -d
+	END

README.md

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

Taskfile.yml

@@ -5,58 +5,10 @@ vars:
 
 tasks:
   default:
-    desc: Build budgeteer in production mode
-    deps: [frontend, go-mod, go-sqlc]
     cmds:
-      - task: backend
+      - task: build-prod
 
-  run:
+  sqlc:
-    desc: Start budgeteer
-    deps: [backend, go-mod, go-sqlc]
-    cmds:
-      - ./build/budgeteer{{exeExt}}
-
-  dev:
-    desc: Build budgeteer in dev mode (without frontend)
-    deps: [go-mod, go-sqlc]
-    cmds:
-      - task: backend
-
-  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
-      - ./go.sum
-      - ./**/*.go
-      - ./web/dist/**/*
-      - ./postgres/schema/*
-    generates:
-      - build/budgeteer{{exeExt}}
-    env:
-      CGO_ENABLED: '0'
-    cmds:
-      - go build -o ./build/budgeteer{{exeExt}} ./cmd/budgeteer
-
-  go-vet:
-    cmds:
-      - go vet
-
-  go-fmt:
-    cmds:
-      - go fmt
-
-  go-lint:
-    cmds:
-      - golangci-lint run
-
-  go-sqlc:
     desc: sqlc code generation
     sources:
       - ./sqlc.yaml
@@ -67,7 +19,7 @@ tasks:
     cmds:
       - sqlc generate
 
-  go-mod:
+  gomod:
     desc: Go modules
     sources:
       - ./go.mod
@@ -76,67 +28,75 @@ tasks:
     cmds:
       - go mod download
 
-  cover:
+  build:
-    desc: Run test and analyze coverage
+    desc: Build budgeteer
+    sources:
+      - ./go.mod
+      - ./go.sum
+      - ./cmd/budgeteer/*.go
+      - ./*.go
+      - ./config/*.go
+      - ./http/*.go
+      - ./jwt/*.go
+      - ./postgres/*.go
+      - ./web/dist/**/*
+      - ./postgres/schema/*
+    generates:
+      - build/budgeteer{{exeExt}}
+    env:
+      CGO_ENABLED: '0'
     cmds:
-      - go test ./... -coverprofile=coverage.out -covermode=atomic
+      - go build -o ./build/budgeteer{{exeExt}} ./cmd/budgeteer
-      - go tool cover -html=coverage.out -o=coverage.html 
+
+  build-dev:
+    desc: Build budgeteer in dev mode
+    deps: [gomod, sqlc]
+    cmds:
+      - task: build
+
+  build-prod:
+    desc: Build budgeteer in prod mode
+    deps: [gomod, sqlc, frontend]
+    cmds:
+      - task: build
 
   frontend:
     desc: Build vue frontend
-    deps: [js-build]
+    dir: web
     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
 
-  js-tsc:
+  docker:
-    dir: web
+    desc: Build budgeeter:latest
-    deps: [js-mod]
+    deps: [build-prod]
+    sources:
+      - ./build/budgeteer{{exeExt}}
+      - ./build/Dockerfile
     cmds:
-      - yarn run vue-tsc --noEmit
+      - docker build -t {{.IMAGE_NAME}}:latest ./build
-
+      - docker push {{.IMAGE_NAME}}:latest
-  js-lint:
-    dir: web
-    deps: [js-mod]
-    cmds:
-      - yarn run eslint "./src/**"
 
   dev-docker:
     desc: Build budgeeter:dev
     sources:
-      - ./docker/Dockerfile.dev
+      - ./docker/Dockerfile
-      - ./web/package.json
-      - ./web/yarn.lock
     cmds:
-    - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile.dev
+      - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile
-    - docker push {{.IMAGE_NAME}}:dev
+      - docker push {{.IMAGE_NAME}}:dev
 
-  run-dev:
+  run:
-    desc: Run dev environment in docker
+    desc: Start budgeteer
-    deps: [dev-docker]
+    deps: [build-dev]
     cmds:
-      - docker-compose -f docker/docker-compose.dev.yml -p budgeteer up -d
+      - ./build/budgeteer{{exeExt}}
+
+  rundocker:
+    desc: Start docker-compose
+    deps: [docker]
+    cmds:
+      - docker-compose up -d

bass.build

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

bcrypt/verifier.go

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

build/Dockerfile

@@ -0,0 +1,3 @@
+FROM scratch
+COPY ./budgeteer /app/budgeteer
+ENTRYPOINT ["/app/budgeteer"]

cmd/budgeteer/main.go

@@ -1,46 +1,31 @@
 package main
 
 import (
-	"fmt"
-	"io/fs"
 	"log"
-	"net/http"
 
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/config"
+	"git.javil.eu/jacob1123/budgeteer/http"
 	"git.javil.eu/jacob1123/budgeteer/jwt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"git.javil.eu/jacob1123/budgeteer/server"
-	"git.javil.eu/jacob1123/budgeteer/web"
 )
 
 func main() {
 	cfg, err := config.LoadConfig()
 	if err != nil {
-		log.Fatalf("load config: %v", err)
+		log.Fatalf("Could not load config: %v", err)
 	}
 
-	queries, err := postgres.Connect("pgx", cfg.DatabaseConnection)
+	q, err := postgres.Connect("pgx", cfg.DatabaseConnection)
 	if err != nil {
-		log.Fatalf("connect to database: %v", err)
+		log.Fatalf("Failed connecting to DB: %v", err)
 	}
 
-	static, err := fs.Sub(web.Static, "dist")
+	h := &http.Handler{
-	if err != nil {
+		Service:             q,
-		panic("open static files")
+		TokenVerifier:       &jwt.TokenVerifier{},
-	}
-
-	tokenVerifier, err := jwt.NewTokenVerifier(cfg.SessionSecret)
-	if err != nil {
-		panic(fmt.Errorf("create token verifier: %w", err))
-	}
-
-	handler := &server.Handler{
-		Service:             queries,
-		TokenVerifier:       tokenVerifier,
 		CredentialsVerifier: &bcrypt.Verifier{},
-		StaticFS:            http.FS(static),
 	}
 
-	handler.Serve()
+	h.Serve()
 }

config.example.json

@@ -0,0 +1,6 @@
+{
+	"DatabaseHost": "localhost", 
+	"DatabaseUser": "user", 
+	"DatabasePassword": "thisismypassword", 
+	"DatabaseName": "budgeteer"
+}

config/config.go

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

docker-compose.dev.yml

@@ -1,31 +1,25 @@
 version: '3.7'
 
 services:
-        backend:
+        app:
                 image: hub.javil.eu/budgeteer:dev
-                command: task -w run
+                container_name: budgeteer
+                stdin_open: true # docker run -i
+                tty: true        # docker run -t
                 ports:
                         - 1323:1323
+                        - 3000:3000
+                user: '1000' 
                 volumes:
                         - ~/budgeteer:/src
-                        - go-cache:/go
+                        - ~/.gitconfig:/.gitconfig
-                        - yarn-cache:/.cache
+                        - ~/.go:/go
+                        - ~/.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:
@@ -46,5 +40,3 @@ services:
                 
 volumes:
         db:
-        go-cache:
-        yarn-cache:

docker/Dockerfile

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

docker/Dockerfile.dev

@@ -1,15 +0,0 @@
-FROM alpine as godeps
-RUN apk --no-cache add go
-RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
-RUN go install github.com/go-task/task/v3/cmd/task@latest
-RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-
-FROM alpine
-RUN apk --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/
-WORKDIR /src
-VOLUME /go
-VOLUME /.cache
-COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/

go.mod

@@ -4,28 +4,21 @@ go 1.17
 
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/gin-gonic/gin v1.7.4
 	github.com/google/uuid v1.3.0
 	github.com/jackc/pgx/v4 v4.13.0
 	github.com/pressly/goose/v3 v3.3.1
 	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
 )
 
-require (
+require github.com/DATA-DOG/go-txdb v0.1.5 // indirect
-	github.com/DATA-DOG/go-txdb v0.1.5
-	github.com/labstack/echo/v4 v4.8.0
-)
-
-require (
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mattn/go-colorable v0.1.11 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
-	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
-)
 
 require (
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.13.0 // indirect
+	github.com/go-playground/universal-translator v0.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.4.1 // indirect
+	github.com/golang/protobuf v1.5.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.10.0 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
@@ -33,9 +26,16 @@ require (
 	github.com/jackc/pgproto3/v2 v2.1.1 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
 	github.com/jackc/pgtype v1.8.1 // direct
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/json-iterator/go v1.1.9 // indirect
+	github.com/leodido/go-urn v1.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
+	github.com/ugorji/go/codec v1.1.7 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
 )

go.sum

@@ -56,13 +56,24 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM=
+github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
+github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -71,14 +82,13 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -86,6 +96,7 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -93,7 +104,9 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
@@ -154,6 +167,8 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -162,14 +177,14 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/labstack/echo/v4 v4.8.0 h1:wdc6yKVaHxkNOEdz4cRZs1pQkwSXPiRjq69yWP4QQS8=
+github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
-github.com/labstack/echo/v4 v4.8.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o=
-github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -182,13 +197,10 @@ github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
 github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
@@ -198,6 +210,10 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -266,11 +282,11 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -305,7 +321,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -327,7 +342,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -361,23 +375,17 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b h1:1VkfZQv42XQlA/jchYumAnv1UPo6RgF9rJFkTgZIxO4=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -397,6 +405,7 @@ golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -409,9 +418,11 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
@@ -419,10 +430,11 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

http/account.go

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

http/account_test.go

@@ -0,0 +1,79 @@
+package http
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"git.javil.eu/jacob1123/budgeteer/bcrypt"
+	"git.javil.eu/jacob1123/budgeteer/jwt"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/gin-gonic/gin"
+
+	txdb "github.com/DATA-DOG/go-txdb"
+)
+
+func init() {
+	txdb.Register("pgtx", "pgx", "postgres://budgeteer_test:budgeteer_test@localhost:5432/budgeteer_test")
+}
+
+func TestListTimezonesHandler(t *testing.T) {
+	db, err := postgres.Connect("pgtx", "example")
+	if err != nil {
+		t.Errorf("could not connect to db: %s", err)
+		return
+	}
+
+	h := Handler{
+		Service:             db,
+		TokenVerifier:       &jwt.TokenVerifier{},
+		CredentialsVerifier: &bcrypt.Verifier{},
+	}
+
+	rr := httptest.NewRecorder()
+	c, engine := gin.CreateTestContext(rr)
+	h.LoadRoutes(engine)
+
+	t.Run("RegisterUser", func(t *testing.T) {
+		c.Request, err = http.NewRequest(http.MethodPost, "/api/v1/user/register", strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
+		if err != nil {
+			t.Errorf("error creating request: %s", err)
+			return
+		}
+
+		h.registerPost(c)
+
+		if rr.Code != http.StatusOK {
+			t.Errorf("handler returned wrong status code: got %v want %v", rr.Code, http.StatusOK)
+		}
+
+		var response LoginResponse
+		err = json.NewDecoder(rr.Body).Decode(&response)
+		if err != nil {
+			t.Error(err.Error())
+			t.Error("Error registering")
+		}
+		if len(response.Token) == 0 {
+			t.Error("Did not get a token")
+		}
+	})
+
+	t.Run("GetTransactions", func(t *testing.T) {
+		c.Request, err = http.NewRequest(http.MethodGet, "/account/accountid/transactions", nil)
+		if rr.Code != http.StatusOK {
+			t.Errorf("handler returned wrong status code: got %v want %v", rr.Code, http.StatusOK)
+		}
+
+		var response TransactionsResponse
+		err = json.NewDecoder(rr.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.")
+		}
+	})
+}

http/admin.go

@@ -0,0 +1,112 @@
+package http
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+	"github.com/pressly/goose/v3"
+)
+
+func (h *Handler) clearDatabase(c *gin.Context) {
+	if err := goose.Reset(h.Service.DB, "schema"); err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+	}
+
+	if err := goose.Up(h.Service.DB, "schema"); err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+	}
+}
+
+func (h *Handler) deleteBudget(c *gin.Context) {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+
+	h.clearBudgetData(c, budgetUUID)
+
+	err = h.Service.DeleteBudget(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+}
+
+func (h *Handler) clearBudgetData(c *gin.Context, budgetUUID uuid.UUID) {
+	rows, err := h.Service.DeleteAllAssignments(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	fmt.Printf("Deleted %d assignments\n", rows)
+
+	rows, err = h.Service.DeleteAllTransactions(c.Request.Context(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	fmt.Printf("Deleted %d transactions\n", rows)
+}
+
+func (h *Handler) clearBudget(c *gin.Context) {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+
+	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
+		}
+	}*/
+}

http/autocomplete.go

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

http/budget.go

@@ -0,0 +1,36 @@
+package http
+
+import (
+	"fmt"
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer"
+	"github.com/gin-gonic/gin"
+)
+
+type newBudgetInformation struct {
+	Name string `json:"name"`
+}
+
+func (h *Handler) newBudget(c *gin.Context) {
+	var newBudget newBudgetInformation
+	err := c.BindJSON(&newBudget)
+	if err != nil {
+		c.AbortWithError(http.StatusNotAcceptable, err)
+		return
+	}
+
+	if newBudget.Name == "" {
+		c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("Budget name is needed"))
+		return
+	}
+
+	userID := c.MustGet("token").(budgeteer.Token).GetID()
+	budget, err := h.Service.NewBudget(c.Request.Context(), newBudget.Name, userID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, budget)
+}

http/budgeting.go

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

http/dashboard.go

@@ -0,0 +1,26 @@
+package http
+
+import (
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/gin-gonic/gin"
+)
+
+func (h *Handler) dashboard(c *gin.Context) {
+	userID := c.MustGet("token").(budgeteer.Token).GetID()
+	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
+}

http/http.go

@@ -0,0 +1,120 @@
+package http
+
+import (
+	"errors"
+	"io"
+	"io/fs"
+	"net/http"
+	"path"
+	"strings"
+
+	"git.javil.eu/jacob1123/budgeteer"
+	"git.javil.eu/jacob1123/budgeteer/bcrypt"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/web"
+
+	"github.com/gin-gonic/gin"
+)
+
+// Handler handles incoming requests
+type Handler struct {
+	Service             *postgres.Database
+	TokenVerifier       budgeteer.TokenVerifier
+	CredentialsVerifier *bcrypt.Verifier
+	StaticFS            http.FileSystem
+}
+
+const (
+	expiration = 72
+)
+
+// Serve starts the http server
+func (h *Handler) Serve() {
+	router := gin.Default()
+	h.LoadRoutes(router)
+	router.Run(":1323")
+}
+
+// LoadRoutes initializes all the routes
+func (h *Handler) LoadRoutes(router *gin.Engine) {
+	static, err := fs.Sub(web.Static, "dist")
+	if err != nil {
+		panic("couldn't open static files")
+	}
+	h.StaticFS = http.FS(static)
+
+	router.Use(enableCachingForStaticFiles())
+	router.NoRoute(h.ServeStatic)
+
+	withLogin := router.Group("")
+	withLogin.Use(h.verifyLoginWithRedirect)
+
+	withBudget := router.Group("")
+	withBudget.Use(h.verifyLoginWithForbidden)
+	withBudget.GET("/budget/:budgetid/:year/:month", h.budgeting)
+	withBudget.GET("/budget/:budgetid/settings/clean-negative", h.cleanNegativeBudget)
+
+	api := router.Group("/api/v1")
+
+	unauthenticated := api.Group("/user")
+	unauthenticated.GET("/login", func(c *gin.Context) { c.Redirect(http.StatusPermanentRedirect, "/login") })
+	unauthenticated.POST("/login", h.loginPost)
+	unauthenticated.POST("/register", h.registerPost)
+
+	authenticated := api.Group("")
+	authenticated.Use(h.verifyLoginWithForbidden)
+	authenticated.GET("/dashboard", h.dashboard)
+	authenticated.GET("/account/:accountid/transactions", h.transactionsForAccount)
+	authenticated.GET("/admin/clear-database", h.clearDatabase)
+	authenticated.GET("/budget/:budgetid", h.budgeting)
+	authenticated.GET("/budget/:budgetid/:year/:month", h.budgetingForMonth)
+	authenticated.GET("/budget/:budgetid/autocomplete/payees", h.autocompletePayee)
+	authenticated.GET("/budget/:budgetid/autocomplete/categories", h.autocompleteCategories)
+	authenticated.DELETE("/budget/:budgetid", h.deleteBudget)
+	authenticated.POST("/budget/:budgetid/import/ynab", h.importYNAB)
+	authenticated.POST("/budget/:budgetid/settings/clear", h.clearBudget)
+
+	budget := authenticated.Group("/budget")
+	budget.POST("/new", h.newBudget)
+
+	transaction := authenticated.Group("/transaction")
+	transaction.POST("/new", h.newTransaction)
+	transaction.POST("/:transactionid", h.newTransaction)
+}
+func (h *Handler) ServeStatic(c *gin.Context) {
+	h.ServeStaticFile(c, c.Request.URL.Path)
+}
+
+func (h *Handler) ServeStaticFile(c *gin.Context, fullPath string) {
+	file, err := h.StaticFS.Open(fullPath)
+	if errors.Is(err, fs.ErrNotExist) {
+		h.ServeStaticFile(c, path.Join("/", "/index.html"))
+		return
+	}
+
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	stat, err := file.Stat()
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	if stat.IsDir() {
+		h.ServeStaticFile(c, path.Join(fullPath, "index.html"))
+		return
+	}
+
+	http.ServeContent(c.Writer, c.Request, stat.Name(), stat.ModTime(), file.(io.ReadSeeker))
+}
+
+func enableCachingForStaticFiles() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if strings.HasPrefix(c.Request.RequestURI, "/static/") {
+			c.Header("Cache-Control", "max-age=86400")
+		}
+	}
+}

http/json-date.go

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

http/session.go

@@ -0,0 +1,146 @@
+package http
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/gin-gonic/gin"
+)
+
+func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, error) {
+	tokenString := c.GetHeader("Authorization")
+	if len(tokenString) < 8 {
+		return nil, fmt.Errorf("no authorization header supplied")
+	}
+
+	tokenString = tokenString[7:]
+	token, err := h.TokenVerifier.VerifyToken(tokenString)
+	if err != nil {
+		return nil, fmt.Errorf("verify token '%s': %w", tokenString, err)
+	}
+
+	return token, nil
+}
+
+func (h *Handler) verifyLoginWithForbidden(c *gin.Context) {
+	token, err := h.verifyLogin(c)
+	if err != nil {
+		//c.Header("WWW-Authenticate", "Bearer")
+		c.AbortWithError(http.StatusForbidden, err)
+		return
+	}
+
+	c.Set("token", token)
+	c.Next()
+}
+
+func (h *Handler) verifyLoginWithRedirect(c *gin.Context) {
+	token, err := h.verifyLogin(c)
+	if err != nil {
+		c.Redirect(http.StatusTemporaryRedirect, "/login")
+		c.Abort()
+		return
+	}
+
+	c.Set("token", token)
+	c.Next()
+}
+
+type loginInformation struct {
+	Password string `json:"password"`
+	User     string `json:"user"`
+}
+
+func (h *Handler) loginPost(c *gin.Context) {
+	var login loginInformation
+	err := c.BindJSON(&login)
+	if err != nil {
+		return
+	}
+
+	user, err := h.Service.GetUserByUsername(c.Request.Context(), login.User)
+	if err != nil {
+		c.AbortWithError(http.StatusUnauthorized, err)
+		return
+	}
+
+	if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil {
+		c.AbortWithError(http.StatusUnauthorized, err)
+		return
+	}
+
+	t, err := h.TokenVerifier.CreateToken(&user)
+	if err != nil {
+		c.AbortWithError(http.StatusUnauthorized, err)
+	}
+
+	go h.Service.UpdateLastLogin(context.Background(), user.ID)
+
+	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
+	if err != nil {
+		return
+	}
+
+	c.JSON(http.StatusOK, LoginResponse{t, user, budgets})
+}
+
+type LoginResponse struct {
+	Token   string
+	User    postgres.User
+	Budgets []postgres.Budget
+}
+
+type registerInformation struct {
+	Password string `json:"password"`
+	Email    string `json:"email"`
+	Name     string `json:"name"`
+}
+
+func (h *Handler) registerPost(c *gin.Context) {
+	var register registerInformation
+	c.BindJSON(&register)
+
+	if register.Email == "" || register.Password == "" || register.Name == "" {
+		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("e-mail, password and name are required"))
+		return
+	}
+
+	_, err := h.Service.GetUserByUsername(c.Request.Context(), register.Email)
+	if err == nil {
+		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("email is already taken"))
+		return
+	}
+
+	hash, err := h.CredentialsVerifier.Hash(register.Password)
+	if err != nil {
+		c.AbortWithError(http.StatusBadRequest, err)
+		return
+	}
+
+	createUser := postgres.CreateUserParams{
+		Name:     register.Name,
+		Password: hash,
+		Email:    register.Email,
+	}
+	user, err := h.Service.CreateUser(c.Request.Context(), createUser)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+	}
+
+	t, err := h.TokenVerifier.CreateToken(&user)
+	if err != nil {
+		c.AbortWithError(http.StatusUnauthorized, err)
+	}
+
+	go h.Service.UpdateLastLogin(context.Background(), user.ID)
+
+	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
+	if err != nil {
+		return
+	}
+
+	c.JSON(http.StatusOK, LoginResponse{t, user, budgets})
+}

http/transaction.go

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

http/util.go

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

http/ynab-import.go

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

jwt/login.go

@@ -0,0 +1,105 @@
+package jwt
+
+import (
+	"fmt"
+	"time"
+
+	"git.javil.eu/jacob1123/budgeteer"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/dgrijalva/jwt-go"
+	"github.com/google/uuid"
+)
+
+// TokenVerifier verifies Tokens
+type TokenVerifier struct {
+}
+
+// Token contains everything to authenticate a user
+type Token struct {
+	username string
+	name     string
+	expiry   float64
+	id       uuid.UUID
+}
+
+const (
+	expiration = 72
+	secret     = "uditapbzuditagscwxuqdflgzpbu´ßiaefnlmzeßtrubiadern"
+)
+
+// CreateToken creates a new token from username and name
+func (tv *TokenVerifier) CreateToken(user *postgres.User) (string, error) {
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+		"usr":  user.Email,
+		"name": user.Name,
+		"exp":  time.Now().Add(time.Hour * expiration).Unix(),
+		"id":   user.ID,
+	})
+
+	// Generate encoded token and send it as response.
+	t, err := token.SignedString([]byte(secret))
+	if err != nil {
+		return "", err
+	}
+
+	return t, nil
+}
+
+// VerifyToken verifys a given string-token
+func (tv *TokenVerifier) VerifyToken(tokenString string) (budgeteer.Token, error) {
+	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
+		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
+			return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
+		}
+		return []byte(secret), nil
+	})
+	if err != nil {
+		return nil, fmt.Errorf("parse jwt: %w", err)
+	}
+
+	claims, err := verifyToken(token)
+	if err != nil {
+		return nil, fmt.Errorf("verify jwt: %w", err)
+	}
+
+	tkn := &Token{
+		username: claims["usr"].(string),
+		name:     claims["name"].(string),
+		expiry:   claims["exp"].(float64),
+		id:       uuid.MustParse(claims["id"].(string)),
+	}
+	return tkn, nil
+}
+
+func verifyToken(token *jwt.Token) (jwt.MapClaims, error) {
+	if !token.Valid {
+		return nil, fmt.Errorf("Token is not valid")
+	}
+
+	claims, ok := token.Claims.(jwt.MapClaims)
+	if !ok {
+		return nil, fmt.Errorf("Claims are not of Type MapClaims")
+	}
+
+	if !claims.VerifyExpiresAt(time.Now().Unix(), true) {
+		return nil, fmt.Errorf("Claims have expired")
+	}
+
+	return claims, nil
+}
+
+func (t *Token) GetName() string {
+	return t.name
+}
+
+func (t *Token) GetUsername() string {
+	return t.username
+}
+
+func (t *Token) GetExpiry() float64 {
+	return t.expiry
+}
+
+func (t *Token) GetID() uuid.UUID {
+	return t.id
+}

jwt/token-verifier.go

@@ -1,89 +0,0 @@
-package jwt
-
-import (
-	"fmt"
-	"time"
-
-	"git.javil.eu/jacob1123/budgeteer"
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/dgrijalva/jwt-go"
-	"github.com/google/uuid"
-)
-
-// TokenVerifier verifies Tokens.
-type TokenVerifier struct {
-	Expiration time.Duration
-	secret     string
-}
-
-const DefaultExpiration = time.Hour * time.Duration(72)
-
-func NewTokenVerifier(secret string) (*TokenVerifier, error) {
-	if secret == "" {
-		return nil, ErrEmptySecret
-	}
-
-	return &TokenVerifier{
-		Expiration: DefaultExpiration,
-		secret:     secret,
-	}, nil
-}
-
-var (
-	ErrUnexpectedSigningMethod = fmt.Errorf("unexpected signing method")
-	ErrInvalidToken            = fmt.Errorf("token is invalid")
-	ErrTokenExpired            = fmt.Errorf("token has expired")
-	ErrEmptySecret             = fmt.Errorf("secret is required")
-)
-
-// CreateToken creates a new token from username and name.
-func (tv *TokenVerifier) CreateToken(user *postgres.User) (string, error) {
-	if tv.secret == "" {
-		return "", ErrEmptySecret
-	}
-
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
-		"usr":  user.Email,
-		"name": user.Name,
-		"exp":  time.Now().Add(tv.Expiration).Unix(),
-		"id":   user.ID,
-	})
-
-	// Generate encoded token and send it as response.
-	t, err := token.SignedString([]byte(tv.secret))
-	if err != nil {
-		return "", fmt.Errorf("create token: %w", err)
-	}
-
-	return t, nil
-}
-
-// VerifyToken verifies a given string-token.
-func (tv *TokenVerifier) VerifyToken(tokenString string) (budgeteer.Token, error) { //nolint:ireturn
-	if tv.secret == "" {
-		return nil, ErrEmptySecret
-	}
-
-	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
-		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("method '%v': %w", token.Header["alg"], ErrUnexpectedSigningMethod)
-		}
-		return []byte(tv.secret), nil
-	})
-	if err != nil {
-		return nil, fmt.Errorf("parse jwt: %w", err)
-	}
-
-	claims, err := verifyToken(token)
-	if err != nil {
-		return nil, fmt.Errorf("verify jwt: %w", err)
-	}
-
-	tkn := &Token{ //nolint:forcetypeassert
-		username: claims["usr"].(string),
-		name:     claims["name"].(string),
-		expiry:   claims["exp"].(float64),
-		id:       uuid.MustParse(claims["id"].(string)),
-	}
-	return tkn, nil
-}

jwt/token.go

@@ -1,49 +0,0 @@
-package jwt
-
-import (
-	"time"
-
-	"github.com/dgrijalva/jwt-go"
-	"github.com/google/uuid"
-)
-
-// Token contains everything to authenticate a user.
-type Token struct {
-	username string
-	name     string
-	expiry   float64
-	id       uuid.UUID
-}
-
-func verifyToken(token *jwt.Token) (jwt.MapClaims, error) {
-	if !token.Valid {
-		return nil, ErrInvalidToken
-	}
-
-	claims, ok := token.Claims.(jwt.MapClaims)
-	if !ok {
-		return nil, ErrInvalidToken
-	}
-
-	if !claims.VerifyExpiresAt(time.Now().Unix(), true) {
-		return nil, ErrTokenExpired
-	}
-
-	return claims, nil
-}
-
-func (t *Token) GetName() string {
-	return t.name
-}
-
-func (t *Token) GetUsername() string {
-	return t.username
-}
-
-func (t *Token) GetExpiry() float64 {
-	return t.expiry
-}
-
-func (t *Token) GetID() uuid.UUID {
-	return t.id
-}

postgres/accounts.sql.go

@@ -1,15 +1,11 @@
 // Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.13.0
 // source: accounts.sql
 
 package postgres
 
 import (
 	"context"
-	"database/sql"
 
-	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
@@ -17,7 +13,7 @@ const createAccount = `-- name: CreateAccount :one
 INSERT INTO accounts
 (name, budget_id)
 VALUES ($1, $2)
-RETURNING id, budget_id, name, on_budget, is_open, last_reconciled
+RETURNING id, budget_id, name, on_budget
 `
 
 type CreateAccountParams struct {
@@ -33,14 +29,12 @@ func (q *Queries) CreateAccount(ctx context.Context, arg CreateAccountParams) (A
 		&i.BudgetID,
 		&i.Name,
 		&i.OnBudget,
-		&i.IsOpen,
-		&i.LastReconciled,
 	)
 	return i, err
 }
 
 const getAccount = `-- name: GetAccount :one
-SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled FROM accounts
+SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget FROM accounts
 WHERE accounts.id = $1
 `
 
@@ -52,16 +46,13 @@ func (q *Queries) GetAccount(ctx context.Context, id uuid.UUID) (Account, error)
 		&i.BudgetID,
 		&i.Name,
 		&i.OnBudget,
-		&i.IsOpen,
-		&i.LastReconciled,
 	)
 	return i, err
 }
 
 const getAccounts = `-- name: GetAccounts :many
-SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled FROM accounts
+SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget FROM accounts
 WHERE accounts.budget_id = $1
-AND accounts.is_open = TRUE
 ORDER BY accounts.name
 `
 
@@ -79,8 +70,6 @@ func (q *Queries) GetAccounts(ctx context.Context, budgetID uuid.UUID) ([]Accoun
 			&i.BudgetID,
 			&i.Name,
 			&i.OnBudget,
-			&i.IsOpen,
-			&i.LastReconciled,
 		); err != nil {
 			return nil, err
 		}
@@ -96,25 +85,19 @@ func (q *Queries) GetAccounts(ctx context.Context, budgetID uuid.UUID) ([]Accoun
 }
 
 const getAccountsWithBalance = `-- name: GetAccountsWithBalance :many
-SELECT accounts.id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled,
+SELECT accounts.id, accounts.name, accounts.on_budget, SUM(transactions.amount)::decimal(12,2) as balance
-        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW())::decimal(12,2) as working_balance,
-        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status IN ('Cleared', 'Reconciled'))::decimal(12,2) as cleared_balance,
-        (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status = 'Reconciled')::decimal(12,2) as reconciled_balance
 FROM accounts
+LEFT JOIN transactions ON transactions.account_id = accounts.id AND transactions.date < NOW()
 WHERE accounts.budget_id = $1
-AND accounts.is_open = TRUE
+GROUP BY accounts.id, accounts.name
 ORDER BY accounts.name
 `
 
 type GetAccountsWithBalanceRow struct {
-	ID                uuid.UUID
+	ID       uuid.UUID
-	Name              string
+	Name     string
-	OnBudget          bool
+	OnBudget bool
-	IsOpen            bool
+	Balance  Numeric
-	LastReconciled    sql.NullTime
-	WorkingBalance    numeric.Numeric
-	ClearedBalance    numeric.Numeric
-	ReconciledBalance numeric.Numeric
 }
 
 func (q *Queries) GetAccountsWithBalance(ctx context.Context, budgetID uuid.UUID) ([]GetAccountsWithBalanceRow, error) {
@@ -130,11 +113,7 @@ func (q *Queries) GetAccountsWithBalance(ctx context.Context, budgetID uuid.UUID
 			&i.ID,
 			&i.Name,
 			&i.OnBudget,
-			&i.IsOpen,
+			&i.Balance,
-			&i.LastReconciled,
-			&i.WorkingBalance,
-			&i.ClearedBalance,
-			&i.ReconciledBalance,
 		); err != nil {
 			return nil, err
 		}
@@ -148,97 +127,3 @@ func (q *Queries) GetAccountsWithBalance(ctx context.Context, budgetID uuid.UUID
 	}
 	return items, nil
 }
-
-const searchAccounts = `-- name: SearchAccounts :many
-SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts
-WHERE accounts.budget_id = $1
-AND accounts.is_open = TRUE
-AND accounts.name ILIKE $2
-ORDER BY accounts.name
-`
-
-type SearchAccountsParams struct {
-	BudgetID uuid.UUID
-	Search   string
-}
-
-type SearchAccountsRow struct {
-	ID       uuid.UUID
-	BudgetID uuid.UUID
-	Name     string
-	Type     interface{}
-}
-
-func (q *Queries) SearchAccounts(ctx context.Context, arg SearchAccountsParams) ([]SearchAccountsRow, error) {
-	rows, err := q.db.QueryContext(ctx, searchAccounts, arg.BudgetID, arg.Search)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []SearchAccountsRow
-	for rows.Next() {
-		var i SearchAccountsRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.BudgetID,
-			&i.Name,
-			&i.Type,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const setLastReconciled = `-- name: SetLastReconciled :exec
-UPDATE accounts
-SET last_reconciled = NOW()
-WHERE accounts.id = $1
-`
-
-func (q *Queries) SetLastReconciled(ctx context.Context, id uuid.UUID) error {
-	_, err := q.db.ExecContext(ctx, setLastReconciled, id)
-	return err
-}
-
-const updateAccount = `-- name: UpdateAccount :one
-UPDATE accounts
-SET name = $1,
-    on_budget = $2,
-    is_open = $3
-WHERE accounts.id = $4
-RETURNING id, budget_id, name, on_budget, is_open, last_reconciled
-`
-
-type UpdateAccountParams struct {
-	Name     string
-	OnBudget bool
-	IsOpen   bool
-	ID       uuid.UUID
-}
-
-func (q *Queries) UpdateAccount(ctx context.Context, arg UpdateAccountParams) (Account, error) {
-	row := q.db.QueryRowContext(ctx, updateAccount,
-		arg.Name,
-		arg.OnBudget,
-		arg.IsOpen,
-		arg.ID,
-	)
-	var i Account
-	err := row.Scan(
-		&i.ID,
-		&i.BudgetID,
-		&i.Name,
-		&i.OnBudget,
-		&i.IsOpen,
-		&i.LastReconciled,
-	)
-	return i, err
-}

postgres/assignments.sql.go

@@ -1,6 +1,4 @@
 // Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.13.0
 // source: assignments.sql
 
 package postgres
@@ -9,7 +7,6 @@ import (
 	"context"
 	"time"
 
-	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
@@ -19,12 +16,12 @@ INSERT INTO assignments (
 ) VALUES (
         $1, $2, $3
 )
-RETURNING category_id, date, memo, amount
+RETURNING id, category_id, date, memo, amount
 `
 
 type CreateAssignmentParams struct {
 	Date       time.Time
-	Amount     numeric.Numeric
+	Amount     Numeric
 	CategoryID uuid.UUID
 }
 
@@ -32,6 +29,7 @@ func (q *Queries) CreateAssignment(ctx context.Context, arg CreateAssignmentPara
 	row := q.db.QueryRowContext(ctx, createAssignment, arg.Date, arg.Amount, arg.CategoryID)
 	var i Assignment
 	err := row.Scan(
+		&i.ID,
 		&i.CategoryID,
 		&i.Date,
 		&i.Memo,
@@ -55,49 +53,6 @@ func (q *Queries) DeleteAllAssignments(ctx context.Context, budgetID uuid.UUID)
 	return result.RowsAffected()
 }
 
-const getAllAssignments = `-- name: GetAllAssignments :many
-SELECT assignments.date, categories.name as category, category_groups.name as group, assignments.amount
-FROM assignments
-INNER JOIN categories ON categories.id = assignments.category_id
-INNER JOIN category_groups ON categories.category_group_id = category_groups.id
-WHERE category_groups.budget_id = $1
-`
-
-type GetAllAssignmentsRow struct {
-	Date     time.Time
-	Category string
-	Group    string
-	Amount   numeric.Numeric
-}
-
-func (q *Queries) GetAllAssignments(ctx context.Context, budgetID uuid.UUID) ([]GetAllAssignmentsRow, error) {
-	rows, err := q.db.QueryContext(ctx, getAllAssignments, budgetID)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []GetAllAssignmentsRow
-	for rows.Next() {
-		var i GetAllAssignmentsRow
-		if err := rows.Scan(
-			&i.Date,
-			&i.Category,
-			&i.Group,
-			&i.Amount,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getAssignmentsByMonthAndCategory = `-- name: GetAssignmentsByMonthAndCategory :many
 SELECT date, category_id, budget_id, amount
 FROM assignments_by_month
@@ -131,41 +86,3 @@ func (q *Queries) GetAssignmentsByMonthAndCategory(ctx context.Context, budgetID
 	}
 	return items, nil
 }
-
-const updateAssignment = `-- name: UpdateAssignment :exec
-INSERT INTO assignments (category_id, date, amount)
-VALUES($1, $2, $3) 
-ON CONFLICT (category_id, date) 
-DO 
-   UPDATE SET amount = $3
-`
-
-type UpdateAssignmentParams struct {
-	CategoryID uuid.UUID
-	Date       time.Time
-	Amount     numeric.Numeric
-}
-
-func (q *Queries) UpdateAssignment(ctx context.Context, arg UpdateAssignmentParams) error {
-	_, err := q.db.ExecContext(ctx, updateAssignment, arg.CategoryID, arg.Date, arg.Amount)
-	return err
-}
-
-const updateAssignmentWithDifference = `-- name: UpdateAssignmentWithDifference :exec
-INSERT INTO assignments (category_id, date, amount)
-VALUES($1, $2, $3) 
-ON CONFLICT (category_id, date) 
-DO 
-   UPDATE SET amount = assignments.amount + $3
-`
-
-type UpdateAssignmentWithDifferenceParams struct {
-	CategoryID uuid.UUID
-	Date       time.Time
-	Amount     numeric.Numeric
-}
-
-func (q *Queries) UpdateAssignmentWithDifference(ctx context.Context, arg UpdateAssignmentWithDifferenceParams) error {
-	_, err := q.db.ExecContext(ctx, updateAssignmentWithDifference, arg.CategoryID, arg.Date, arg.Amount)
-	return err
-}

postgres/budgets.sql.go

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

postgres/budgetservice.go

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

postgres/categories.sql.go

@@ -1,6 +1,4 @@
 // Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.13.0
 // source: categories.sql
 
 package postgres
@@ -120,12 +118,10 @@ func (q *Queries) GetCategoryGroups(ctx context.Context, budgetID uuid.UUID) ([]
 }
 
 const searchCategories = `-- name: SearchCategories :many
-SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id, 'category' as type
+SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id FROM categories
-FROM categories
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id
 WHERE category_groups.budget_id = $1
-AND categories.name ILIKE $2
+AND categories.name LIKE $2
-AND category_groups.name != 'Hidden Categories'
 ORDER BY category_groups.name, categories.name
 `
 
@@ -137,7 +133,6 @@ type SearchCategoriesParams struct {
 type SearchCategoriesRow struct {
 	Name interface{}
 	ID   uuid.UUID
-	Type interface{}
 }
 
 func (q *Queries) SearchCategories(ctx context.Context, arg SearchCategoriesParams) ([]SearchCategoriesRow, error) {
@@ -149,7 +144,7 @@ func (q *Queries) SearchCategories(ctx context.Context, arg SearchCategoriesPara
 	var items []SearchCategoriesRow
 	for rows.Next() {
 		var i SearchCategoriesRow
-		if err := rows.Scan(&i.Name, &i.ID, &i.Type); err != nil {
+		if err := rows.Scan(&i.Name, &i.ID); err != nil {
 			return nil, err
 		}
 		items = append(items, i)

postgres/conn.go

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

postgres/cumultative-balances.sql.go

@@ -1,6 +1,4 @@
 // Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.13.0
 // source: cumultative-balances.sql
 
 package postgres
@@ -9,25 +7,26 @@ import (
 	"context"
 	"time"
 
-	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
 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,
+       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
+       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
 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 COALESCE(ass.budget_id, tra.budget_id) = $1
+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.amount, tra.amount)
+ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id)
 `
 
 type GetCumultativeBalancesRow struct {
-	Date         time.Time
+	Date            time.Time
-	CategoryID   uuid.UUID
+	CategoryID      uuid.UUID
-	Assignments  numeric.Numeric
+	Assignments     Numeric
-	Transactions numeric.Numeric
+	AssignmentsCum  Numeric
+	Transactions    Numeric
+	TransactionsCum Numeric
 }
 
 func (q *Queries) GetCumultativeBalances(ctx context.Context, budgetID uuid.UUID) ([]GetCumultativeBalancesRow, error) {
@@ -43,7 +42,9 @@ 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,6 +1,4 @@
 // Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.13.0
 
 package postgres
 

postgres/models.go

@@ -1,6 +1,4 @@
 // Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.13.0
 
 package postgres
 
@@ -9,7 +7,6 @@ import (
 	"fmt"
 	"time"
 
-	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
 )
 
@@ -34,19 +31,18 @@ func (e *TransactionStatus) Scan(src interface{}) error {
 }
 
 type Account struct {
-	ID             uuid.UUID
+	ID       uuid.UUID
-	BudgetID       uuid.UUID
+	BudgetID uuid.UUID
-	Name           string
+	Name     string
-	OnBudget       bool
+	OnBudget bool
-	IsOpen         bool
-	LastReconciled sql.NullTime
 }
 
 type Assignment struct {
+	ID         uuid.UUID
 	CategoryID uuid.UUID
 	Date       time.Time
 	Memo       sql.NullString
-	Amount     numeric.Numeric
+	Amount     Numeric
 }
 
 type AssignmentsByMonth struct {
@@ -75,24 +71,6 @@ type CategoryGroup struct {
 	Name     string
 }
 
-type DisplayTransaction struct {
-	ID              uuid.UUID
-	Date            time.Time
-	Memo            string
-	Amount          numeric.Numeric
-	GroupID         uuid.NullUUID
-	Status          TransactionStatus
-	Account         string
-	PayeeID         uuid.NullUUID
-	CategoryID      uuid.NullUUID
-	Payee           string
-	CategoryGroup   string
-	Category        string
-	TransferAccount string
-	BudgetID        uuid.UUID
-	AccountID       uuid.UUID
-}
-
 type Payee struct {
 	ID       uuid.UUID
 	BudgetID uuid.UUID
@@ -103,7 +81,7 @@ type Transaction struct {
 	ID         uuid.UUID
 	Date       time.Time
 	Memo       string
-	Amount     numeric.Numeric
+	Amount     Numeric
 	AccountID  uuid.UUID
 	CategoryID uuid.NullUUID
 	PayeeID    uuid.NullUUID

postgres/numeric.go

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

postgres/numeric/numeric.go

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

postgres/numeric/numeric_test.go

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

postgres/payees.sql.go

@@ -1,6 +1,4 @@
 // Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.13.0
 // source: payees.sql
 
 package postgres
@@ -60,9 +58,9 @@ func (q *Queries) GetPayees(ctx context.Context, budgetID uuid.UUID) ([]Payee, e
 }
 
 const searchPayees = `-- name: SearchPayees :many
-SELECT payees.id, payees.budget_id, payees.name, 'payee' as type FROM payees 
+SELECT payees.id, payees.budget_id, payees.name FROM payees 
 WHERE payees.budget_id = $1
-AND payees.name ILIKE $2
+AND payees.name LIKE $2
 ORDER BY payees.name
 `
 
@@ -71,28 +69,16 @@ type SearchPayeesParams struct {
 	Search   string
 }
 
-type SearchPayeesRow struct {
+func (q *Queries) SearchPayees(ctx context.Context, arg SearchPayeesParams) ([]Payee, error) {
-	ID       uuid.UUID
-	BudgetID uuid.UUID
-	Name     string
-	Type     interface{}
-}
-
-func (q *Queries) SearchPayees(ctx context.Context, arg SearchPayeesParams) ([]SearchPayeesRow, error) {
 	rows, err := q.db.QueryContext(ctx, searchPayees, arg.BudgetID, arg.Search)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []SearchPayeesRow
+	var items []Payee
 	for rows.Next() {
-		var i SearchPayeesRow
+		var i Payee
-		if err := rows.Scan(
+		if err := rows.Scan(&i.ID, &i.BudgetID, &i.Name); err != nil {
-			&i.ID,
-			&i.BudgetID,
-			&i.Name,
-			&i.Type,
-		); err != nil {
 			return nil, err
 		}
 		items = append(items, i)

postgres/queries/accounts.sql

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

postgres/queries/assignments.sql

@@ -16,24 +16,3 @@ WHERE categories.id = assignments.category_id AND category_groups.budget_id = @b
 SELECT *
 FROM assignments_by_month
 WHERE assignments_by_month.budget_id = @budget_id;
-
--- name: GetAllAssignments :many
-SELECT assignments.date, categories.name as category, category_groups.name as group, assignments.amount
-FROM assignments
-INNER JOIN categories ON categories.id = assignments.category_id
-INNER JOIN category_groups ON categories.category_group_id = category_groups.id
-WHERE category_groups.budget_id = @budget_id;
-
--- name: UpdateAssignment :exec
-INSERT INTO assignments (category_id, date, amount)
-VALUES($1, $2, $3) 
-ON CONFLICT (category_id, date) 
-DO 
-   UPDATE SET amount = $3;
-
--- name: UpdateAssignmentWithDifference :exec
-INSERT INTO assignments (category_id, date, amount)
-VALUES($1, $2, $3) 
-ON CONFLICT (category_id, date) 
-DO 
-   UPDATE SET amount = assignments.amount + $3;

postgres/queries/categories.sql

@@ -21,11 +21,9 @@ WHERE category_groups.budget_id = $1
 ORDER BY category_groups.name, categories.name;
 
 -- name: SearchCategories :many
-SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id, 'category' as type
+SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id FROM categories
-FROM categories
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id
 WHERE category_groups.budget_id = @budget_id
-AND categories.name ILIKE @search
+AND categories.name LIKE @search
-AND category_groups.name != 'Hidden Categories'
 ORDER BY category_groups.name, categories.name;
 --ORDER BY levenshtein(payees.name, $2);

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,
+       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
+       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
 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 COALESCE(ass.budget_id, tra.budget_id) = @budget_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.amount, tra.amount);
+ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id);

postgres/queries/payees.sql

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

postgres/queries/transactions.sql

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

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

postgres/schema/0016_closed-accounts.sql

@@ -1,5 +0,0 @@
--- +goose Up
-ALTER TABLE accounts ADD COLUMN is_open BOOLEAN NOT NULL DEFAULT TRUE;
-
--- +goose Down
-ALTER TABLE accounts DROP COLUMN is_open;

postgres/schema/0017_natural-key-assignments.sql

@@ -1,6 +0,0 @@
--- +goose Up
-ALTER TABLE assignments DROP id;
-ALTER TABLE assignments ADD PRIMARY KEY (category_id, date);
-
--- +goose Down
-ALTER TABLE assignments ADD COLUMN id uuid DEFAULT uuid_generate_v4() PRIMARY KEY;

postgres/schema/0018_reconciled-on.sql

@@ -1,12 +0,0 @@
--- +goose Up
-ALTER TABLE accounts ADD COLUMN last_reconciled date NULL;
-UPDATE accounts
-SET last_reconciled = (
-    SELECT MAX(transactions.date)
-    FROM transactions
-    WHERE transactions.account_id = accounts.id
-    AND transactions.status = 'Reconciled'
-);
-
--- +goose Down
-ALTER TABLE accounts DROP COLUMN last_reconciled;

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

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

postgres/user_budgets.sql.go

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

postgres/users.sql.go

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

postgres/ynab-export.go

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

postgres/ynab-import.go

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

server/account.go

@@ -1,135 +0,0 @@
-package server
-
-import (
-	"net/http"
-	"time"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v4"
-)
-
-type FilterTransactionsRequest struct {
-	CategoryID string    `json:"categoryId"`
-	PayeeID    string    `json:"payeeId"`
-	AccountID  string    `json:"accountId"`
-	FromDate   time.Time `json:"fromDate"`
-	ToDate     time.Time `json:"toDate"`
-}
-
-func (h *Handler) filteredTransactions(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	var request FilterTransactionsRequest
-	err = c.Bind(&request)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	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 {
-		return echo.NewHTTPError(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{UUID: val, Valid: true}, true
-}
-
-func (h *Handler) problematicTransactions(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	transactions, err := h.Service.GetProblematicTransactions(c.Request().Context(), budgetUUID)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
-}
-
-func (h *Handler) transactionsForAccount(c echo.Context) error {
-	accountID := c.Param("accountid")
-	accountUUID, err := uuid.Parse(accountID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	account, err := h.Service.GetAccount(c.Request().Context(), accountUUID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusNotFound, err)
-	}
-
-	transactions, err := h.Service.GetTransactionsForAccount(c.Request().Context(), accountUUID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusNotFound, err)
-	}
-
-	return c.JSON(http.StatusOK, TransactionsResponse{&account, transactions})
-}
-
-type TransactionsResponse struct {
-	Account      *postgres.Account
-	Transactions []postgres.DisplayTransaction
-}
-
-type EditAccountRequest struct {
-	Name     string `json:"name"`
-	OnBudget bool   `json:"onBudget"`
-	IsOpen   bool   `json:"isOpen"`
-}
-
-func (h *Handler) editAccount(c echo.Context) error {
-	accountID := c.Param("accountid")
-	accountUUID, err := uuid.Parse(accountID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	var request EditAccountRequest
-	err = c.Bind(&request)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	updateParams := postgres.UpdateAccountParams{
-		Name:     request.Name,
-		OnBudget: request.OnBudget,
-		IsOpen:   request.IsOpen,
-		ID:       accountUUID,
-	}
-	account, err := h.Service.UpdateAccount(c.Request().Context(), updateParams)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusNotFound, err)
-	}
-
-	return h.getBudget(c, account.BudgetID)
-}

server/account_test.go

@@ -1,71 +0,0 @@
-package server
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"git.javil.eu/jacob1123/budgeteer/bcrypt"
-	"git.javil.eu/jacob1123/budgeteer/jwt"
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-
-	"github.com/labstack/echo/v4"
-)
-
-func TestRegisterUser(t *testing.T) {
-	t.Parallel()
-	database, err := postgres.Connect("pgtx", cfg.DatabaseConnection)
-	if err != nil {
-		t.Errorf("connect to DB: %v", err)
-		return
-	}
-
-	tokenVerifier, _ := jwt.NewTokenVerifier(cfg.SessionSecret)
-	h := Handler{
-		Service:             database,
-		TokenVerifier:       tokenVerifier,
-		CredentialsVerifier: &bcrypt.Verifier{},
-	}
-
-	recorder := httptest.NewRecorder()
-	engine := echo.New()
-	h.LoadRoutes(engine)
-
-	t.Run("RegisterUser", func(t *testing.T) {
-		t.Parallel()
-		request, err := http.NewRequestWithContext(context.Background(),
-			http.MethodPost,
-			"/api/v1/user/register",
-			strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
-		request.Header.Set("Content-Type", "application/json")
-		context := engine.NewContext(request, recorder)
-		if err != nil {
-			t.Errorf("error creating request: %s", err)
-			return
-		}
-
-		err = h.registerPost(context)
-		if err != nil {
-			t.Error(err.Error())
-			t.Error("Error registering")
-			return
-		}
-
-		if recorder.Code != http.StatusOK {
-			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
-		}
-
-		var response LoginResponse
-		err = json.NewDecoder(recorder.Body).Decode(&response)
-		if err != nil {
-			t.Error(err.Error())
-			t.Error("Error registering")
-		}
-		if len(response.Token) == 0 {
-			t.Error("Did not get a token")
-		}
-	})
-}

server/admin.go

@@ -1,69 +0,0 @@
-package server
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v4"
-	"github.com/pressly/goose/v3"
-)
-
-func (h *Handler) clearDatabase(c echo.Context) error {
-	if err := goose.Reset(h.Service.DB, "schema"); err != nil {
-		return echo.NewHTTPError(http.StatusInternalServerError, err)
-	}
-
-	if err := goose.Up(h.Service.DB, "schema"); err != nil {
-		return echo.NewHTTPError(http.StatusInternalServerError, err)
-	}
-
-	return nil
-}
-
-func (h *Handler) deleteBudget(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	err = h.clearBudgetData(c, budgetUUID)
-	if err != nil {
-		return err
-	}
-
-	err = h.Service.DeleteBudget(c.Request().Context(), budgetUUID)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *Handler) clearBudgetData(c echo.Context, budgetUUID uuid.UUID) error {
-	rows, err := h.Service.DeleteAllAssignments(c.Request().Context(), budgetUUID)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Deleted %d assignments\n", rows)
-
-	rows, err = h.Service.DeleteAllTransactions(c.Request().Context(), budgetUUID)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Deleted %d transactions\n", rows)
-	return nil
-}
-
-func (h *Handler) clearBudget(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	return h.clearBudgetData(c, budgetUUID)
-}

server/autocomplete.go

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

server/budget.go

@@ -1,30 +0,0 @@
-package server
-
-import (
-	"net/http"
-
-	"github.com/labstack/echo/v4"
-)
-
-type newBudgetInformation struct {
-	Name string `json:"name"`
-}
-
-func (h *Handler) newBudget(c echo.Context) error {
-	var newBudget newBudgetInformation
-	if err := c.Bind(&newBudget); err != nil {
-		return echo.NewHTTPError(http.StatusNotAcceptable, err)
-	}
-
-	if newBudget.Name == "" {
-		return echo.NewHTTPError(http.StatusBadRequest, "budget name is required")
-	}
-
-	userID := MustGetToken(c).GetID()
-	budget, err := h.Service.NewBudget(c.Request().Context(), newBudget.Name, userID)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(http.StatusOK, budget)
-}

server/budgeting.go

@@ -1,182 +0,0 @@
-package server
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v4"
-)
-
-type CategoryWithBalance struct {
-	*postgres.GetCategoriesRow
-	AvailableLastMonth numeric.Numeric
-	Activity           numeric.Numeric
-	Assigned           numeric.Numeric
-}
-
-func NewCategoryWithBalance(category *postgres.GetCategoriesRow) CategoryWithBalance {
-	return CategoryWithBalance{
-		GetCategoriesRow:   category,
-		AvailableLastMonth: numeric.Zero(),
-		Activity:           numeric.Zero(),
-		Assigned:           numeric.Zero(),
-	}
-}
-
-func (h *Handler) budgetingForMonth(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
-	}
-
-	budget, err := h.Service.GetBudget(c.Request().Context(), budgetUUID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	month, err := getDate(c)
-	if err != nil {
-		return c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String())
-	}
-
-	data, err := h.getBudgetingViewForMonth(c.Request().Context(), budget, month)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(http.StatusOK, data)
-}
-
-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,
-) numeric.Numeric {
-	availableBalance := moneyUsed
-
-	for _, bal := range cumultativeBalances {
-		if bal.CategoryID != budget.IncomeCategoryID {
-			continue
-		}
-
-		if month.InFuture(bal.Date) {
-			continue
-		}
-
-		availableBalance.AddI(bal.Transactions)
-		availableBalance.AddI(bal.Assignments) // should be zero, but who knows
-	}
-
-	return availableBalance
-}
-
-type BudgetingResponse struct {
-	Accounts []postgres.GetAccountsWithBalanceRow
-	Budget   postgres.Budget
-}
-
-func (h *Handler) budget(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
-	}
-
-	return h.getBudget(c, budgetUUID)
-}
-
-func (h *Handler) getBudget(c echo.Context, budgetUUID uuid.UUID) error {
-	budget, err := h.Service.GetBudget(c.Request().Context(), budgetUUID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusNotFound, err)
-	}
-
-	accounts, err := h.Service.GetAccountsWithBalance(c.Request().Context(), budgetUUID)
-	if err != nil {
-		return err
-	}
-
-	data := BudgetingResponse{accounts, budget}
-
-	return c.JSON(http.StatusOK, data)
-}
-
-func (h *Handler) calculateBalances(budget postgres.Budget, month Month,
-	categories []postgres.GetCategoriesRow, cumultativeBalances []postgres.GetCumultativeBalancesRow,
-) ([]CategoryWithBalance, numeric.Numeric, numeric.Numeric) {
-	categoriesWithBalance := []CategoryWithBalance{}
-
-	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]
-		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, overspentLastMonth
-}

server/category.go

@@ -1,52 +0,0 @@
-package server
-
-import (
-	"fmt"
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v4"
-)
-
-type SetCategoryAssignmentRequest struct {
-	Assigned float64
-}
-
-func (h *Handler) setCategoryAssignment(c echo.Context) error {
-	categoryID := c.Param("categoryid")
-	categoryUUID, err := uuid.Parse(categoryID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, "categoryid missing from URL")
-	}
-
-	var request SetCategoryAssignmentRequest
-	err = c.Bind(&request)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("invalid payload: %w", err))
-	}
-
-	date, err := getDate(c)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("date invalid: %w", err))
-	}
-
-	var amount numeric.Numeric
-	err = amount.Set(request.Assigned)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("parse amount: %w", err))
-	}
-
-	updateArgs := postgres.UpdateAssignmentParams{
-		CategoryID: categoryUUID,
-		Date:       date.FirstOfMonth(),
-		Amount:     amount,
-	}
-	err = h.Service.UpdateAssignment(c.Request().Context(), updateArgs)
-	if err != nil {
-		return fmt.Errorf("update assignment: %w", err)
-	}
-
-	return nil
-}

server/http.go

@@ -1,128 +0,0 @@
-package server
-
-import (
-	"errors"
-	"io"
-	"io/fs"
-	"net/http"
-	"path"
-	"strings"
-
-	"git.javil.eu/jacob1123/budgeteer"
-	"git.javil.eu/jacob1123/budgeteer/bcrypt"
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-
-	"github.com/labstack/echo/v4"
-	"github.com/labstack/echo/v4/middleware"
-)
-
-// Handler handles incoming requests.
-type Handler struct {
-	Service             *postgres.Database
-	TokenVerifier       budgeteer.TokenVerifier
-	CredentialsVerifier *bcrypt.Verifier
-	StaticFS            http.FileSystem
-}
-
-// Serve starts the http server.
-func (h *Handler) Serve() {
-	router := echo.New()
-	h.LoadRoutes(router)
-
-	if err := router.Start(":1323"); err != nil {
-		panic(err)
-	}
-}
-
-// LoadRoutes initializes all the routes.
-func (h *Handler) LoadRoutes(router *echo.Echo) {
-	router.Use(enableCachingForStaticFiles())
-	router.Use(middleware.StaticWithConfig(middleware.StaticConfig{
-		Filesystem: h.StaticFS,
-		HTML5:      true,
-	}))
-
-	api := router.Group("/api/v1")
-
-	anonymous := api.Group("/user")
-	anonymous.POST("/login", h.loginPost)
-	anonymous.POST("/register", h.registerPost)
-
-	authenticated := api.Group("")
-	{
-		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.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.updateTransaction)
-	}
-}
-
-func (h *Handler) ServeStatic(next echo.HandlerFunc) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		h.ServeStaticFile(c, c.Path())
-		return nil
-	}
-}
-
-func (h *Handler) ServeStaticFile(c echo.Context, fullPath string) {
-	file, err := h.StaticFS.Open(fullPath)
-	if errors.Is(err, fs.ErrNotExist) {
-		h.ServeStaticFile(c, path.Join("/", "/index.html"))
-		return
-	}
-
-	if err != nil {
-		c.Error(err)
-		return
-	}
-
-	stat, err := file.Stat()
-	if err != nil {
-		c.Error(err)
-		return
-	}
-
-	if stat.IsDir() {
-		h.ServeStaticFile(c, path.Join(fullPath, "index.html"))
-		return
-	}
-
-	if file, ok := file.(io.ReadSeeker); ok {
-		http.ServeContent(c.Response().Writer, c.Request(), stat.Name(), stat.ModTime(), file)
-	} else {
-		panic("File does not implement ReadSeeker")
-	}
-}
-
-func enableCachingForStaticFiles() echo.MiddlewareFunc {
-	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		return func(c echo.Context) error {
-			if strings.HasPrefix(c.Path(), "/static/") {
-				c.Response().Header().Set("Cache-Control", "max-age=86400")
-			}
-
-			return next(c)
-		}
-	}
-}

server/main_test.go

@@ -1,305 +0,0 @@
-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

@@ -1,71 +0,0 @@
-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

@@ -1,46 +0,0 @@
-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/reconcile.go

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

server/session.go

@@ -1,156 +0,0 @@
-package server
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer"
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v4"
-)
-
-const (
-	HeaderName = "Authorization"
-	Bearer     = "Bearer "
-	ParamName  = "token"
-)
-
-func MustGetToken(c echo.Context) budgeteer.Token { //nolint:ireturn
-	token := c.Get(ParamName)
-	if token, ok := token.(budgeteer.Token); ok {
-		return token
-	}
-
-	panic("Token is not a valid Token")
-}
-
-func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, error) { //nolint:ireturn
-	tokenString := c.Request().Header.Get(HeaderName)
-	if len(tokenString) <= len(Bearer) {
-		return nil, echo.NewHTTPError(http.StatusUnauthorized, "no authorization header supplied")
-	}
-
-	tokenString = tokenString[7:]
-	token, err := h.TokenVerifier.VerifyToken(tokenString)
-	if err != nil {
-		return nil, fmt.Errorf("verify token '%s': %w", tokenString, err)
-	}
-
-	return token, nil
-}
-
-func (h *Handler) verifyLoginWithForbidden(next echo.HandlerFunc) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		token, err := h.verifyLogin(c)
-		if err != nil {
-			// c.Header("WWW-Authenticate", "Bearer")
-			return echo.NewHTTPError(http.StatusForbidden, err)
-		}
-
-		c.Set(ParamName, token)
-		return next(c)
-	}
-}
-
-type loginInformation struct {
-	Password string `json:"password"`
-	User     string `json:"user"`
-}
-
-func (h *Handler) loginPost(c echo.Context) error {
-	var login loginInformation
-	err := c.Bind(&login)
-	if err != nil {
-		return fmt.Errorf("parse payload: %w", err)
-	}
-
-	user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User)
-	if err != nil {
-		return err
-	}
-
-	if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil {
-		return fmt.Errorf("verify password: %w", err)
-	}
-
-	token, err := h.TokenVerifier.CreateToken(&user)
-	if err != nil {
-		return fmt.Errorf("create token: %w", err)
-	}
-
-	go h.UpdateLastLogin(user.ID)
-
-	budgets, err := h.Service.GetBudgetsForUser(c.Request().Context(), user.ID)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
-}
-
-type LoginResponse struct {
-	Token   string
-	User    postgres.User
-	Budgets []postgres.Budget
-}
-
-type registerInformation struct {
-	Password string `json:"password"`
-	Email    string `json:"email"`
-	Name     string `json:"name"`
-}
-
-func (h *Handler) registerPost(c echo.Context) error {
-	var register registerInformation
-	err := c.Bind(&register)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, "error parsing body")
-	}
-
-	if register.Email == "" || register.Password == "" || register.Name == "" {
-		return echo.NewHTTPError(http.StatusBadRequest, "e-mail, password and name are required")
-	}
-
-	_, err = h.Service.GetUserByUsername(c.Request().Context(), register.Email)
-	if err == nil {
-		return echo.NewHTTPError(http.StatusBadRequest, "email is already taken")
-	}
-
-	hash, err := h.CredentialsVerifier.Hash(register.Password)
-	if err != nil {
-		return fmt.Errorf("hash password: %w", err)
-	}
-
-	createUser := postgres.CreateUserParams{
-		Name:     register.Name,
-		Password: hash,
-		Email:    register.Email,
-	}
-	user, err := h.Service.CreateUser(c.Request().Context(), createUser)
-	if err != nil {
-		return err
-	}
-
-	token, err := h.TokenVerifier.CreateToken(&user)
-	if err != nil {
-		return fmt.Errorf("create token: %w", err)
-	}
-
-	go h.UpdateLastLogin(user.ID)
-
-	budgets, err := h.Service.GetBudgetsForUser(c.Request().Context(), user.ID)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
-}
-
-func (h *Handler) UpdateLastLogin(userID uuid.UUID) {
-	_, err := h.Service.UpdateLastLogin(context.Background(), userID)
-	if err != nil {
-		fmt.Printf("Error updating last login: %s", err)
-	}
-}

server/transaction.go

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

server/util.go

@@ -1,37 +0,0 @@
-package server
-
-import (
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/labstack/echo/v4"
-)
-
-func getDate(c echo.Context) (Month, error) {
-	var year, month int
-	yearString := c.Param("year")
-	monthString := c.Param("month")
-	if yearString == "" && monthString == "" {
-		return getFirstOfMonthTime(time.Now()), nil
-	}
-
-	year, err := strconv.Atoi(yearString)
-	if err != nil {
-		return Month{}, fmt.Errorf("parse year: %w", err)
-	}
-
-	month, err = strconv.Atoi(monthString)
-	if err != nil {
-		return Month{}, fmt.Errorf("parse month: %w", err)
-	}
-
-	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}
-}

server/ynab-import.go

@@ -1,107 +0,0 @@
-package server
-
-import (
-	"fmt"
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v4"
-)
-
-func (h *Handler) importYNAB(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	if budgetID == "" {
-		return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified")
-	}
-
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	ynab, err := postgres.NewYNABImport(c.Request().Context(), h.Service.Queries, budgetUUID)
-	if err != nil {
-		return err
-	}
-
-	transactionsFile, err := c.FormFile("transactions")
-	if err != nil {
-		return fmt.Errorf("get transactions: %w", err)
-	}
-
-	transactions, err := transactionsFile.Open()
-	if err != nil {
-		return fmt.Errorf("open transactions: %w", err)
-	}
-
-	err = ynab.ImportTransactions(c.Request().Context(), transactions)
-	if err != nil {
-		return err
-	}
-
-	assignmentsFile, err := c.FormFile("assignments")
-	if err != nil {
-		return fmt.Errorf("get assignments: %w", err)
-	}
-
-	assignments, err := assignmentsFile.Open()
-	if err != nil {
-		return fmt.Errorf("open assignments: %w", err)
-	}
-
-	err = ynab.ImportAssignments(c.Request().Context(), assignments)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *Handler) exportYNABTransactions(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	if budgetID == "" {
-		return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified")
-	}
-
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	ynab, err := postgres.NewYNABExport(c.Request().Context(), h.Service.Queries, budgetUUID)
-	if err != nil {
-		return err
-	}
-
-	err = ynab.ExportTransactions(c.Request().Context(), c.Response().Writer)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *Handler) exportYNABAssignments(c echo.Context) error {
-	budgetID := c.Param("budgetid")
-	if budgetID == "" {
-		return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified")
-	}
-
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err)
-	}
-
-	ynab, err := postgres.NewYNABExport(c.Request().Context(), h.Service.Queries, budgetUUID)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusInternalServerError, err)
-	}
-
-	err = ynab.ExportAssignments(c.Request().Context(), c.Response().Writer)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusInternalServerError, err)
-	}
-
-	return nil
-}

sqlc.yaml

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

testdata

@@ -1 +0,0 @@
-Subproject commit 8de369b17a81f2e6ed079374ab35f868f259f9c1

token.go

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

web/.eslintrc.js

@@ -1,21 +0,0 @@
-module.exports = {
-    extends: [
-        // add more generic rulesets here, such as:
-        // 'eslint:recommended',
-        "plugin:vue/vue3-recommended",
-        // 'plugin:vue/recommended' // Use this if you are using Vue.js 2.x.
-    ],
-    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",
-    parserOptions: {
-        parser: "@typescript-eslint/parser",
-        sourceType: "module",
-    },
-};

web/index.html

@@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
+  <head>
-        <meta charset="UTF-8" />
+    <meta charset="UTF-8" />
-        <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" href="/favicon.ico" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Vite App</title>
+    <title>Vite App</title>
-    </head>
+  </head>
-    <body
+  <body>
-        class="bg-slate-200 text-slate-800 dark:bg-slate-800 dark:text-slate-200 box-border w-full">
+    <div id="app"></div>
-        <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
-        <script type="module" src="/src/main.ts"></script>
+  </body>
-    </body>
 </html>

web/package.json

@@ -1,41 +1,30 @@
 {
-    "name": "web",
+  "name": "web",
-    "version": "0.0.0",
+  "version": "0.0.0",
-    "scripts": {
+  "scripts": {
-        "serve": "vite preview",
+    "serve": "vite preview",
-        "build": "vite build",
+    "build": "vite build",
-        "dev": "vite",
+    "dev": "vite",
-        "preview": "vite preview"
+    "preview": "vite preview"
-    },
+  },
-    "dependencies": {
+  "dependencies": {
-        "@mdi/font": "5.9.55",
+    "@mdi/font": "5.9.55",
-        "@vueuse/core": "^7.6.1",
+    "@vueuse/core": "^7.6.1",
-        "autoprefixer": "^10.4.2",
+    "autoprefixer": "^10.4.2",
-        "file-saver": "^2.0.5",
+    "pinia": "^2.0.11",
-        "pinia": "^2.0.11",
+    "postcss": "^8.4.6",
-        "postcss": "^8.4.6",
+    "tailwindcss": "^3.0.18",
-        "tailwindcss": "^3.0.18",
+    "vue": "^3.2.25",
-        "vue": "^3.2.25",
+    "vue-router": "^4.0.12"
-        "vue-router": "^4.0.12"
+  },
-    },
+  "devDependencies": {
-    "devDependencies": {
+    "@vitejs/plugin-vue": "^2.0.0",
-        "@types/file-saver": "^2.0.5",
+    "@vue/cli-plugin-babel": "5.0.0-beta.7",
-        "@typescript-eslint/parser": "^5.13.0",
+    "@vue/cli-plugin-typescript": "~4.5.0",
-        "@vitejs/plugin-vue": "^2.0.0",
+    "@vue/cli-service": "5.0.0-beta.7",
-        "eslint": "^8.10.0",
+    "sass": "^1.38.0",
-        "eslint-plugin-vue": "^8.5.0",
+    "sass-loader": "^10.0.0",
-        "prettier": "2.5.1",
+    "vite": "^2.7.2",
-        "sass": "^1.38.0",
+    "vue-cli-plugin-vuetify": "~2.4.5"
-        "sass-loader": "^10.0.0",
+  }
-        "typescript": "^4.5.5",
-        "vite": "^2.7.2",
-        "vue-tsc": "^0.32.0"
-    },
-    "prettier": {
-        "bracketSameLine": true,
-        "embeddedLanguageFormatting": "off",
-        "tabWidth": 4,
-        "useTabs": false
-    },
-    "eslintIgnore": ["index.css"]
 }

web/postcss.config.js

@@ -1,6 +1,6 @@
 module.exports = {
-    plugins: {
+  plugins: {
-        tailwindcss: {},
+    tailwindcss: {},
-        autoprefixer: {},
+    autoprefixer: {},
-    },
+  },
-};
+}

web/src/@types/shims-vue.d.ts

@@ -1,5 +1,5 @@
 declare module "*.vue" {
-    import { defineComponent } from "vue";
+  import { defineComponent } from "vue";
-    const component: ReturnType<typeof defineComponent>;
+  const component: ReturnType<typeof defineComponent>;
-    export default component;
+  export default component;
 }

web/src/App.vue

@@ -1,17 +1,65 @@
-<script lang="ts" setup>
+<script lang="ts">
-import MainMenu from "./components/MainMenu.vue";
+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(useSettingsStore, ["Menu"]),
+        ...mapState(useSessionStore, ["LoggedIn"]),
+    },
+    methods: {
+        logout() {
+            useSessionStore().logout();
+            this.$router.push("/login");
+        },
+        toggleMenu() {
+            useSettingsStore().toggleMenu();
+        },
+        toggleMenuSize() {
+            useSettingsStore().toggleMenuSize();
+        }
+    },
+})
 </script>
 
 <template>
-  <div class="flex flex-col md:flex-row flex-1 h-screen">
+    <div class="box-border w-full">
-    <router-view name="sidebar" />
+        <div class="flex bg-gray-400 p-4 m-2 rounded-lg">
+            <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>
 
-    <div class="flex-1 overflow-auto">
+            <span class="flex-1">{{ CurrentBudgetName }}</span>
-      <MainMenu />
 
-      <div class="p-3 pl-6">
+            <div class="flex flex-1 flex-row justify-end -mx-4">
-        <router-view />
+                <router-link class="mx-4" v-if="LoggedIn" to="/dashboard">Dashboard</router-link>
-      </div>
+                <router-link class="mx-4" v-if="!LoggedIn" to="/login">Login</router-link>
+                <a class="mx-4" v-if="LoggedIn" @click="logout">Logout</a>
+            </div>
+        </div>
+
+        <div class="flex flex-col md:flex-row flex-1">
+            <div
+                :class="[Menu.Expand ? 'md:w-72' : 'md:w-36', Menu.Show ? '' : 'hidden']"
+                class="md:block flex-shrink-0 w-full"
+            >
+                <router-view name="sidebar"></router-view>
+            </div>
+
+            <div class="flex-1 p-6">
+                <router-view></router-view>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
+
+<style>
+#app {
+    font-family: Avenir, Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+</style>

web/src/api.ts

@@ -1,29 +1,26 @@
 import { useSessionStore } from "./stores/session";
 
-export const BASE_URL = "/api/v1";
+export const BASE_URL = "/api/v1"
 
 export function GET(path: string) {
     const sessionStore = useSessionStore();
     return fetch(BASE_URL + path, {
         headers: sessionStore.AuthHeaders,
-    });
+    })
-}
+};
 
 export function POST(path: string, body: FormData | string | null) {
     const sessionStore = useSessionStore();
     return fetch(BASE_URL + path, {
         method: "POST",
-        headers: {
+        headers: sessionStore.AuthHeaders,
-          ...sessionStore.AuthHeaders,
-          "Content-Type": "application/json"
-        },
         body: body,
-    });
+    })
 }
 export function DELETE(path: string) {
     const sessionStore = useSessionStore();
     return fetch(BASE_URL + path, {
         method: "DELETE",
         headers: sessionStore.AuthHeaders,
-    });
+    })
 }

web/src/components/AccountWithReconciled.vue

@@ -1,35 +0,0 @@
-<script lang="ts" setup>
-import { computed } from 'vue';
-import { useBudgetsStore } from '../stores/budget';
-import { Account } from '../stores/budget-account';
-
-const props = defineProps<{
-  account: Account
-}>();
-
-const budgetStore = useBudgetsStore();
-const CurrentBudgetID = computed(() => budgetStore.CurrentBudgetID);
-
-const days = 24 * 60 * 60 * 1000;
-function daysSinceLastReconciled() {
-  const now = new Date().getTime();
-  const diff = new Date(now).getTime() - props.account.LastReconciled.Time.getTime();
-  return Math.floor(diff / days);
-}
-</script>
-
-<template>
-  <span>
-    <router-link
-      :to="'/budget/' + CurrentBudgetID + '/account/' + account.ID"
-    >
-      {{ account.Name }}
-    </router-link>
-    <span
-      v-if="props.account.LastReconciled.Valid && daysSinceLastReconciled() > 7"
-      class="font-bold bg-gray-500 rounded-md text-sm px-2 mx-2 py-1 no-underline"
-    >
-      {{ daysSinceLastReconciled() }}
-    </span>
-  </span>
-</template>

web/src/components/Autocomplete.vue

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

web/src/components/Card.vue

@@ -0,0 +1,13 @@
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+
+})
+</script>
+
+<template>
+    <div class="flex flex-row items-center bg-gray-300 h-32 rounded-lg">
+        <slot></slot>
+    </div>
+</template>

web/src/components/Checkbox.vue

@@ -1,15 +0,0 @@
-<script lang="ts" setup>
-const props = defineProps<{modelValue?: boolean}>();
-const emits = defineEmits<{
-  (e: "update:modelValue", value: boolean): void
-}>();
-</script>
-
-<template>
-  <input
-    type="checkbox"
-    :checked="modelValue"
-    class="dark:bg-slate-900"
-    @change="emits('update:modelValue', ($event.target as HTMLInputElement)?.checked)"
-  >
-</template>

web/src/components/Currency.vue

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

web/src/components/DateInput.vue

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