This commit is contained in:
2025-03-11 10:53:45 +02:00
parent f23f3fbf53
commit 9bbda8d021
14 changed files with 231 additions and 3 deletions

5
go.mod
View File

@@ -1,3 +1,8 @@
module github.com/rdarius/boot-dev-blog-aggregator
go 1.23.6
require (
github.com/google/uuid v1.6.0 // indirect
github.com/lib/pq v1.10.9 // indirect
)

4
go.sum Normal file
View File

@@ -0,0 +1,4 @@
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=

View File

@@ -1,5 +1,8 @@
package config
import "github.com/rdarius/boot-dev-blog-aggregator/internal/database"
type State struct {
DB *database.Queries
Config *Config
}

31
internal/database/db.go Normal file
View File

@@ -0,0 +1,31 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.28.0
package database
import (
"context"
"database/sql"
)
type DBTX interface {
ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
PrepareContext(context.Context, string) (*sql.Stmt, error)
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
}
func New(db DBTX) *Queries {
return &Queries{db: db}
}
type Queries struct {
db DBTX
}
func (q *Queries) WithTx(tx *sql.Tx) *Queries {
return &Queries{
db: tx,
}
}

View File

@@ -0,0 +1,26 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.28.0
// source: getUser.sql
package database
import (
"context"
)
const getUser = `-- name: GetUser :one
SELECT id, created_at, updated_at, name FROM users WHERE name = $1
`
func (q *Queries) GetUser(ctx context.Context, name string) (User, error) {
row := q.db.QueryRowContext(ctx, getUser, name)
var i User
err := row.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Name,
)
return i, err
}

View File

@@ -0,0 +1,18 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.28.0
package database
import (
"time"
"github.com/google/uuid"
)
type User struct {
ID uuid.UUID
CreatedAt time.Time
UpdatedAt time.Time
Name string
}

View File

@@ -0,0 +1,48 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.28.0
// source: users.sql
package database
import (
"context"
"time"
"github.com/google/uuid"
)
const createUser = `-- name: CreateUser :one
INSERT INTO users (id, created_at, updated_at, name)
VALUES (
$1,
$2,
$3,
$4
)
RETURNING id, created_at, updated_at, name
`
type CreateUserParams struct {
ID uuid.UUID
CreatedAt time.Time
UpdatedAt time.Time
Name string
}
func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (User, error) {
row := q.db.QueryRowContext(ctx, createUser,
arg.ID,
arg.CreatedAt,
arg.UpdatedAt,
arg.Name,
)
var i User
err := row.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Name,
)
return i, err
}

View File

@@ -1,17 +1,27 @@
package handlers
import (
"context"
"errors"
"fmt"
"github.com/rdarius/boot-dev-blog-aggregator/internal/config"
"os"
)
func HandlerLogin(s *config.State, cmd config.Command) error {
func LoginHandler(s *config.State, cmd config.Command) error {
if len(cmd.Args) < 1 {
return errors.New("missing required argument USERNAME")
}
err := s.Config.SetUser(cmd.Args[0])
ctx := context.Background()
u, err := s.DB.GetUser(ctx, cmd.Args[0])
if err != nil {
fmt.Println("User does not exist")
os.Exit(1)
}
err = s.Config.SetUser(u.Name)
if err != nil {
return fmt.Errorf("failed to set current user: %w", err)
}

View File

@@ -0,0 +1,46 @@
package handlers
import (
"context"
"errors"
"fmt"
"github.com/google/uuid"
"github.com/rdarius/boot-dev-blog-aggregator/internal/config"
"github.com/rdarius/boot-dev-blog-aggregator/internal/database"
"os"
"time"
)
func RegisterHandler(s *config.State, cmd config.Command) error {
if len(cmd.Args) < 1 {
return errors.New("missing required argument USERNAME")
}
ctx := context.Background()
_, err := s.DB.GetUser(ctx, cmd.Args[0])
if err == nil {
fmt.Println("User already exists")
os.Exit(1)
}
u, err := s.DB.CreateUser(ctx, database.CreateUserParams{
ID: uuid.New(),
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
Name: cmd.Args[0],
})
if err != nil {
fmt.Printf("Failed to create user %v\n", err)
os.Exit(1)
}
err = s.Config.SetUser(u.Name)
if err != nil {
return fmt.Errorf("failed to set current user: %w", err)
}
fmt.Printf("User Created %v\n", u)
return nil
}

10
main.go
View File

@@ -1,7 +1,10 @@
package main
import (
"database/sql"
_ "github.com/lib/pq"
"github.com/rdarius/boot-dev-blog-aggregator/internal/config"
"github.com/rdarius/boot-dev-blog-aggregator/internal/database"
"github.com/rdarius/boot-dev-blog-aggregator/internal/handlers"
"log"
"os"
@@ -16,7 +19,11 @@ func main() {
log.Fatal(err)
}
db, err := sql.Open("postgres", cfg.DbUrl)
dbQueries := database.New(db)
state := config.State{
DB: dbQueries,
Config: &cfg,
}
@@ -24,7 +31,8 @@ func main() {
Commands: map[string]func(*config.State, config.Command) error{},
}
commands.Register("login", handlers.HandlerLogin)
commands.Register("login", handlers.LoginHandler)
commands.Register("register", handlers.RegisterHandler)
if len(os.Args) < 2 {
log.Fatal("usage: boot-dev-blog-aggregator <command> [args...]")

2
sql/queries/getUser.sql Normal file
View File

@@ -0,0 +1,2 @@
-- name: GetUser :one
SELECT * FROM users WHERE name = $1;

9
sql/queries/users.sql Normal file
View File

@@ -0,0 +1,9 @@
-- name: CreateUser :one
INSERT INTO users (id, created_at, updated_at, name)
VALUES (
$1,
$2,
$3,
$4
)
RETURNING *;

10
sql/schema/0001_users.sql Normal file
View File

@@ -0,0 +1,10 @@
-- +goose Up
CREATE TABLE users(
id UUID PRIMARY KEY,
created_at TIMESTAMP not null DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP not null,
name VARCHAR(64) not null UNIQUE
);
-- +goose Down
DROP TABLE users;

8
sqlc.yaml Normal file
View File

@@ -0,0 +1,8 @@
version: "2"
sql:
- schema: "sql/schema"
queries: "sql/queries"
engine: "postgresql"
gen:
go:
out: "internal/database"