feat: build entire backend into single executable (including migrations etc)

This commit is contained in:
Sam 2023-03-15 10:04:48 +01:00
parent f94bc67f3d
commit ded9d06e4a
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
12 changed files with 137 additions and 32 deletions

View file

@ -1,22 +1,28 @@
package main
package cleandb
import (
"context"
"fmt"
"os"
"time"
dbpkg "codeberg.org/u1f320/pronouns.cc/backend/db"
"github.com/georgysavva/scany/pgxscan"
"github.com/joho/godotenv"
"github.com/rs/xid"
"github.com/urfave/cli/v2"
)
func main() {
var Command = &cli.Command{
Name: "clean",
Usage: "Clean deleted tokens + users daily",
Action: run,
}
func run(c *cli.Context) error {
err := godotenv.Load()
if err != nil {
fmt.Println("error loading .env file:", err)
os.Exit(1)
return err
}
ctx := context.Background()
@ -24,7 +30,7 @@ func main() {
db, err := dbpkg.New()
if err != nil {
fmt.Println("error opening database:", err)
os.Exit(1)
return err
}
defer db.Close()
@ -35,7 +41,7 @@ func main() {
ct, err := db.Exec(ctx, "DELETE FROM tokens WHERE invalidated = true OR expires < $1", time.Now())
if err != nil {
fmt.Println("executing query:", err)
os.Exit(1)
return err
}
fmt.Printf("deleted %v invalidated or expired tokens\n", ct.RowsAffected())
@ -48,12 +54,12 @@ func main() {
ORDER BY id`, time.Now().Add(-dbpkg.SelfDeleteAfter), time.Now().Add(-dbpkg.ModDeleteAfter))
if err != nil {
fmt.Println("error getting to-be-deleted users:", err)
os.Exit(1)
return err
}
if len(users) == 0 {
fmt.Println("there are no users pending deletion")
os.Exit(0)
return nil
}
for _, u := range users {
@ -102,8 +108,9 @@ func main() {
ct, err = db.Exec(ctx, "DELETE FROM users WHERE id = ANY($1)", ids)
if err != nil {
fmt.Printf("error deleting users: %v\n", err)
os.Exit(1)
return err
}
fmt.Printf("deleted %v users!\n", ct.RowsAffected())
return nil
}

View file

@ -0,0 +1,10 @@
-- +migrate Up
-- 2023-03-15: Add data export
create table data_exports (
id serial primary key,
user_id text not null references users (id) on delete cascade,
hash text not null,
created_at timestamptz not null default now()
);

View file

@ -1,5 +1,5 @@
// migrate runs (forward) migrations
package main
package migrate
import (
"database/sql"
@ -9,6 +9,7 @@ import (
"github.com/joho/godotenv"
migrate "github.com/rubenv/sql-migrate"
"github.com/urfave/cli/v2"
// SQL driver
_ "github.com/jackc/pgx/v4/stdlib"
@ -17,7 +18,13 @@ import (
//go:embed *.sql
var migrations embed.FS
func main() {
var Command = &cli.Command{
Name: "migrate",
Usage: "Migrate the database",
Action: run,
}
func run(c *cli.Context) error {
err := godotenv.Load()
if err != nil {
fmt.Println("error loading .env file:", err)
@ -42,7 +49,7 @@ func main() {
if err := db.Ping(); err != nil {
fmt.Println("error pinging database:", err)
return
return nil
}
src := &migrate.EmbedFileSystemMigrationSource{
@ -54,7 +61,7 @@ func main() {
n, err := migrate.Exec(db, "postgres", src, migrate.Up)
if err != nil {
fmt.Println("error executing migrations:", err)
return
return nil
}
if n == 0 {
@ -62,4 +69,5 @@ func main() {
} else {
fmt.Printf("executed %v migrations!\n", n)
}
return nil
}

View file

@ -1,28 +1,34 @@
package main
package seeddb
import (
"context"
"fmt"
"os"
"codeberg.org/u1f320/pronouns.cc/backend/db"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/joho/godotenv"
"github.com/urfave/cli/v2"
)
func main() {
var Command = &cli.Command{
Name: "seed",
Usage: "Seed the database with test data",
Action: run,
}
func run(c *cli.Context) error {
err := godotenv.Load()
if err != nil {
fmt.Println("error loading .env file:", err)
os.Exit(1)
return err
}
ctx := context.Background()
ctx := c.Context
pool, err := pgxpool.Connect(ctx, os.Getenv("DATABASE_URL"))
if err != nil {
fmt.Println("error opening database:", err)
os.Exit(1)
return err
}
defer pool.Close()
@ -33,19 +39,19 @@ func main() {
tx, err := pg.Begin(ctx)
if err != nil {
fmt.Println("error beginning transaction:", err)
os.Exit(1)
return err
}
u, err := pg.CreateUser(ctx, tx, "test")
if err != nil {
fmt.Println("error creating user:", err)
os.Exit(1)
return err
}
_, err = pg.UpdateUser(ctx, tx, u.ID, ptr("testing"), ptr("This is a bio!"), &[]string{"https://pronouns.cc"}, nil)
if err != nil {
fmt.Println("error setting user info:", err)
os.Exit(1)
return err
}
err = pg.SetUserNamesPronouns(ctx, tx, u.ID, []db.FieldEntry{
@ -57,7 +63,7 @@ func main() {
})
if err != nil {
fmt.Println("error setting pronouns:", err)
os.Exit(1)
return err
}
err = pg.SetUserFields(ctx, tx, u.ID, []db.Field{
@ -114,16 +120,17 @@ func main() {
})
if err != nil {
fmt.Println("error setting fields:", err)
os.Exit(1)
return err
}
err = tx.Commit(ctx)
if err != nil {
fmt.Println("error committing transaction:", err)
os.Exit(1)
return err
}
fmt.Println("Created testing user with ID", u.ID, "and name", u.Username)
return nil
}
func ptr[T any](v T) *T {