From f81b28417e4b4c614f14f5e838abefd38a46dcc0 Mon Sep 17 00:00:00 2001 From: zardzul Date: Fri, 13 Mar 2026 20:42:50 +0100 Subject: [PATCH] Add initial database setup and user/artist management functionality --- api/.env.example | 5 ++ api/database/database.go | 35 ++++++++++++ api/database/querier.go | 19 ------- api/database/users.sql.go | 35 ------------ api/go.mod | 8 ++- api/go.sum | 13 +++++ api/handlers/artist_handler.go | 25 +++++++++ api/handlers/user_handler.go | 75 +++++++++++++++++++++++++ api/main.go | 27 ++++++++- api/queries/albums.sql | 6 ++ api/queries/artists.sql | 9 +++ api/queries/user_albums.sql | 9 +++ api/queries/users.sql | 7 ++- api/repository/artist_repository.go | 22 ++++++++ api/repository/user_repository.go | 29 ++++++++++ api/routes/router.go | 28 ++++++++++ api/sqlc.json | 4 +- api/sqlc/albums.sql.go | 60 ++++++++++++++++++++ api/sqlc/artists.sql.go | 85 +++++++++++++++++++++++++++++ api/{database => sqlc}/db.go | 2 +- api/{database => sqlc}/models.go | 2 +- api/sqlc/querier.go | 29 ++++++++++ api/sqlc/user_albums.sql.go | 44 +++++++++++++++ api/sqlc/users.sql.go | 58 ++++++++++++++++++++ db/Dockerfile | 2 +- docker-compose.yml | 11 ++++ 26 files changed, 585 insertions(+), 64 deletions(-) create mode 100644 api/.env.example create mode 100644 api/database/database.go delete mode 100644 api/database/querier.go delete mode 100644 api/database/users.sql.go create mode 100644 api/handlers/artist_handler.go create mode 100644 api/handlers/user_handler.go create mode 100644 api/queries/albums.sql create mode 100644 api/queries/artists.sql create mode 100644 api/queries/user_albums.sql create mode 100644 api/repository/artist_repository.go create mode 100644 api/repository/user_repository.go create mode 100644 api/routes/router.go create mode 100644 api/sqlc/albums.sql.go create mode 100644 api/sqlc/artists.sql.go rename api/{database => sqlc}/db.go (97%) rename api/{database => sqlc}/models.go (98%) create mode 100644 api/sqlc/querier.go create mode 100644 api/sqlc/user_albums.sql.go create mode 100644 api/sqlc/users.sql.go create mode 100644 docker-compose.yml diff --git a/api/.env.example b/api/.env.example new file mode 100644 index 0000000..51fd3ed --- /dev/null +++ b/api/.env.example @@ -0,0 +1,5 @@ +# Postgres +POSTGRES_HOST= +POSTGRES_USER= +POSTGRES_PASSWORD= +POSTGRES_DB= \ No newline at end of file diff --git a/api/database/database.go b/api/database/database.go new file mode 100644 index 0000000..82c518d --- /dev/null +++ b/api/database/database.go @@ -0,0 +1,35 @@ +package database + +import ( + "context" + "fmt" + "os" + "time" + + db "zardzul/music-index/sqlc" + + "github.com/jackc/pgx/v5/pgxpool" +) + +func Connect() (*pgxpool.Pool, *db.Queries, error) { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + + databaseURL := os.Getenv("DATABASE_URL") + if databaseURL == "" { + databaseURL = "postgres://postgres:postgres@localhost:5432/postgres?sslmode=disable" + } + + pool, err := pgxpool.New(ctx, databaseURL) + if err != nil { + return nil, nil, fmt.Errorf("create pool: %w", err) + } + + if err := pool.Ping(ctx); err != nil { + pool.Close() + return nil, nil, fmt.Errorf("ping database: %w", err) + } + + queries := db.New(pool) + return pool, queries, nil +} diff --git a/api/database/querier.go b/api/database/querier.go deleted file mode 100644 index 31323dc..0000000 --- a/api/database/querier.go +++ /dev/null @@ -1,19 +0,0 @@ -// Code generated by sqlc. DO NOT EDIT. -// versions: -// sqlc v1.30.0 - -package database - -import ( - "context" - - "github.com/jackc/pgx/v5/pgtype" -) - -type Querier interface { - // users.sql - GetUsernameByID(ctx context.Context, id pgtype.UUID) (string, error) - checkUserExistsByEmail(ctx context.Context, userMail string) (pgtype.UUID, error) -} - -var _ Querier = (*Queries)(nil) diff --git a/api/database/users.sql.go b/api/database/users.sql.go deleted file mode 100644 index 488937d..0000000 --- a/api/database/users.sql.go +++ /dev/null @@ -1,35 +0,0 @@ -// Code generated by sqlc. DO NOT EDIT. -// versions: -// sqlc v1.30.0 -// source: users.sql - -package database - -import ( - "context" - - "github.com/jackc/pgx/v5/pgtype" -) - -const getUsernameByID = `-- name: GetUsernameByID :one -SELECT user_name FROM users WHERE id = $1 -` - -// users.sql -func (q *Queries) GetUsernameByID(ctx context.Context, id pgtype.UUID) (string, error) { - row := q.db.QueryRow(ctx, getUsernameByID, id) - var user_name string - err := row.Scan(&user_name) - return user_name, err -} - -const checkUserExistsByEmail = `-- name: checkUserExistsByEmail :one -SELECT id FROM users WHERE user_mail = $1 -` - -func (q *Queries) checkUserExistsByEmail(ctx context.Context, userMail string) (pgtype.UUID, error) { - row := q.db.QueryRow(ctx, checkUserExistsByEmail, userMail) - var id pgtype.UUID - err := row.Scan(&id) - return id, err -} diff --git a/api/go.mod b/api/go.mod index 15f0ffc..5f499fe 100644 --- a/api/go.mod +++ b/api/go.mod @@ -2,6 +2,12 @@ module zardzul/music-index go 1.25.7 +require ( + github.com/gin-gonic/gin v1.12.0 + github.com/google/uuid v1.6.0 + github.com/jackc/pgx/v5 v5.8.0 +) + require ( github.com/bytedance/gopkg v0.1.3 // indirect github.com/bytedance/sonic v1.15.0 // indirect @@ -9,7 +15,6 @@ require ( github.com/cloudwego/base64x v0.1.6 // indirect github.com/gabriel-vasile/mimetype v1.4.12 // indirect github.com/gin-contrib/sse v1.1.0 // indirect - github.com/gin-gonic/gin v1.12.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.30.1 // indirect @@ -17,7 +22,6 @@ require ( github.com/goccy/go-yaml v1.19.2 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/pgx/v5 v5.8.0 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect diff --git a/api/go.sum b/api/go.sum index dda32e9..f5097d5 100644 --- a/api/go.sum +++ b/api/go.sum @@ -7,6 +7,7 @@ github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCc github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw= github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= @@ -14,6 +15,8 @@ github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8= github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -24,7 +27,11 @@ github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +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/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -48,6 +55,7 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= @@ -63,12 +71,16 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE= go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= golang.org/x/arch v0.22.0 h1:c/Zle32i5ttqRXjdLyyHZESLD/bB90DCU1g9l/0YBDI= golang.org/x/arch v0.22.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= @@ -86,4 +98,5 @@ google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aO google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/api/handlers/artist_handler.go b/api/handlers/artist_handler.go new file mode 100644 index 0000000..a08efb4 --- /dev/null +++ b/api/handlers/artist_handler.go @@ -0,0 +1,25 @@ +package handlers + +import ( + "net/http" + "zardzul/music-index/repository" + + "github.com/gin-gonic/gin" +) + +type ArtistHandler struct { + repo repository.ArtistRepository +} + +func NewArtistHandler(repo repository.ArtistRepository) *ArtistHandler { + return &ArtistHandler{repo: repo} +} + +func (handler *ArtistHandler) GetAll(c *gin.Context) { + artists, err := handler.repo.GetAll(c.Request.Context()) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + } + + c.JSON(http.StatusOK, artists) +} diff --git a/api/handlers/user_handler.go b/api/handlers/user_handler.go new file mode 100644 index 0000000..9d87fbf --- /dev/null +++ b/api/handlers/user_handler.go @@ -0,0 +1,75 @@ +package handlers + +import ( + "net/http" + db "zardzul/music-index/sqlc" + + "zardzul/music-index/repository" + + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "github.com/jackc/pgx/v5/pgtype" +) + +type UserHandler struct { + repo repository.UserRepository +} + +func NewUserHandler(repo repository.UserRepository) *UserHandler { + return &UserHandler{repo: repo} +} + +type createUserRequest struct { + UserName string `json:"user_name" binding:"required"` + UserMail string `json:"user_mail" binding:"required,email"` + Password string `json:"password" binding:"required,min=8"` +} + +func (h *UserHandler) CreateUser(c *gin.Context) { + var req createUserRequest + if err := c.ShouldBindJSON(&req); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + + var pgID pgtype.UUID + if err := pgID.Scan(uuid.New().String()); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to generate user id"}) + return + } + + id, err := h.repo.CreateUser(c.Request.Context(), db.CreateUserParams{ + ID: pgID, + UserName: req.UserName, + UserMail: req.UserMail, + Password: req.Password, // TODO: hash this before storing + }) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + + c.JSON(http.StatusCreated, gin.H{ + "message": "user created", + "id": id.String(), + }) +} + +func (h *UserHandler) GetUsernameByID(c *gin.Context) { + idParam := c.Param("id") + var pgID pgtype.UUID + if err := pgID.Scan(idParam); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "invalid user id"}) + return + } + + username, err := h.repo.GetUsernameByID(c.Request.Context(), pgID) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + + c.JSON(http.StatusOK, gin.H{ + "user_name": username, + }) +} diff --git a/api/main.go b/api/main.go index fe7f767..f434392 100644 --- a/api/main.go +++ b/api/main.go @@ -1,5 +1,30 @@ package main +import ( + "zardzul/music-index/database" + "zardzul/music-index/handlers" + "zardzul/music-index/repository" + "zardzul/music-index/routes" + + "github.com/gin-gonic/gin" +) + func main() { - + pool, queries, databaseError := database.Connect() + if databaseError != nil { + panic(databaseError) + } + defer pool.Close() + + userRepo := repository.NewUserRepository(queries) + userHandler := handlers.NewUserHandler(userRepo) + artistRepo := repository.NewArtistRepository(queries) + artistHandler := handlers.NewArtistHandler(artistRepo) + + router := gin.Default() + routes.Routes(router, userHandler, artistHandler) + + if routerError := router.Run(":8080"); routerError != nil { + panic(routerError) + } } diff --git a/api/queries/albums.sql b/api/queries/albums.sql new file mode 100644 index 0000000..da59b3e --- /dev/null +++ b/api/queries/albums.sql @@ -0,0 +1,6 @@ +-- albums.sql +-- name: GetAlbumByID :one +SELECT * FROM albums WHERE id = $1; + +-- name: GetAllAlbums :many +SELECT * FROM albums; \ No newline at end of file diff --git a/api/queries/artists.sql b/api/queries/artists.sql new file mode 100644 index 0000000..589258d --- /dev/null +++ b/api/queries/artists.sql @@ -0,0 +1,9 @@ +-- artists.sql +-- name: GetArtistByID :one +SELECT * FROM artists WHERE id = $1; + +-- name: GetAllArtists :many +SELECT * FROM artists; + +-- name: CreateArtist :one +INSERT INTO artists (id, name, genre, bio, artist_image_url) VALUES ($1, $2, $3, $4, $5) RETURNING id; diff --git a/api/queries/user_albums.sql b/api/queries/user_albums.sql new file mode 100644 index 0000000..fe6b506 --- /dev/null +++ b/api/queries/user_albums.sql @@ -0,0 +1,9 @@ +-- user_albums.sql +-- name: UpdateUserAlbumStatus :exec +INSERT INTO user_albums (user_id, album_id, album_owned, album_want, +is_vinyl, is_cd) VALUES ($1, $2, $3, $4, $5, $6) +ON CONFLICT (user_id, album_id) DO UPDATE SET +album_owned = EXCLUDED.album_owned, +album_want = EXCLUDED.album_want, +is_vinyl = EXCLUDED.is_vinyl, +is_cd = EXCLUDED.is_cd; \ No newline at end of file diff --git a/api/queries/users.sql b/api/queries/users.sql index 19d88e4..74776b4 100644 --- a/api/queries/users.sql +++ b/api/queries/users.sql @@ -2,5 +2,8 @@ -- name: GetUsernameByID :one SELECT user_name FROM users WHERE id = $1; --- name: checkUserExistsByEmail :one -SELECT id FROM users WHERE user_mail = $1; \ No newline at end of file +-- name: CheckUserExistsByEmail :one +SELECT id FROM users WHERE user_mail = $1; + +-- name: CreateUser :one +INSERT INTO users (id, user_name, user_mail, password) VALUES ($1, $2, $3, $4) RETURNING id; diff --git a/api/repository/artist_repository.go b/api/repository/artist_repository.go new file mode 100644 index 0000000..f1d77b6 --- /dev/null +++ b/api/repository/artist_repository.go @@ -0,0 +1,22 @@ +package repository + +import ( + "context" + db "zardzul/music-index/sqlc" +) + +type ArtistRepository interface { + GetAll(ctx context.Context) ([]db.Artist, error) +} + +type SQLCArtistRepository struct { + q *db.Queries +} + +func NewArtistRepository(queries *db.Queries) *SQLCArtistRepository { + return &SQLCArtistRepository{q: queries} +} + +func (r *SQLCArtistRepository) GetAll(ctx context.Context) ([]db.Artist, error) { + return r.q.GetAllArtists(ctx) +} diff --git a/api/repository/user_repository.go b/api/repository/user_repository.go new file mode 100644 index 0000000..55007d2 --- /dev/null +++ b/api/repository/user_repository.go @@ -0,0 +1,29 @@ +package repository + +import ( + "context" + db "zardzul/music-index/sqlc" + + "github.com/jackc/pgx/v5/pgtype" +) + +type UserRepository interface { + CreateUser(ctx context.Context, arg db.CreateUserParams) (pgtype.UUID, error) + GetUsernameByID(ctx context.Context, id pgtype.UUID) (string, error) +} + +type SQLCUserRepository struct { + q *db.Queries +} + +func NewUserRepository(q *db.Queries) *SQLCUserRepository { + return &SQLCUserRepository{q: q} +} + +func (r *SQLCUserRepository) CreateUser(ctx context.Context, arg db.CreateUserParams) (pgtype.UUID, error) { + return r.q.CreateUser(ctx, arg) +} + +func (r *SQLCUserRepository) GetUsernameByID(ctx context.Context, id pgtype.UUID) (string, error) { + return r.q.GetUsernameByID(ctx, id) +} diff --git a/api/routes/router.go b/api/routes/router.go new file mode 100644 index 0000000..de2413a --- /dev/null +++ b/api/routes/router.go @@ -0,0 +1,28 @@ +package routes + +import ( + "net/http" + "zardzul/music-index/handlers" + + "github.com/gin-gonic/gin" +) + +func Routes(router *gin.Engine, userHandler *handlers.UserHandler, artistHandler *handlers.ArtistHandler) { + root := router.Group("/") + { + root.GET("/ping", func(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{"message": "pong"}) + }) + } + + user := root.Group("/user") + { + user.POST("/create", userHandler.CreateUser) + user.GET("/getUserNameByID/:id", userHandler.GetUsernameByID) + } + + artist := root.Group("/artist") + { + artist.GET("/getAll", artistHandler.GetAll) + } +} diff --git a/api/sqlc.json b/api/sqlc.json index 7accc00..a428de3 100644 --- a/api/sqlc.json +++ b/api/sqlc.json @@ -7,8 +7,8 @@ "queries": "./queries/", "gen": { "go": { - "package": "database", - "out": "./database", + "package": "sqlc", + "out": "./sqlc", "sql_package": "pgx/v5", "emit_interface": true, "emit_json_tags": true diff --git a/api/sqlc/albums.sql.go b/api/sqlc/albums.sql.go new file mode 100644 index 0000000..1fa72e8 --- /dev/null +++ b/api/sqlc/albums.sql.go @@ -0,0 +1,60 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: albums.sql + +package sqlc + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +const getAlbumByID = `-- name: GetAlbumByID :one +SELECT id, name, artist, release_date, album_art_url FROM albums WHERE id = $1 +` + +// albums.sql +func (q *Queries) GetAlbumByID(ctx context.Context, id pgtype.UUID) (Album, error) { + row := q.db.QueryRow(ctx, getAlbumByID, id) + var i Album + err := row.Scan( + &i.ID, + &i.Name, + &i.Artist, + &i.ReleaseDate, + &i.AlbumArtUrl, + ) + return i, err +} + +const getAllAlbums = `-- name: GetAllAlbums :many +SELECT id, name, artist, release_date, album_art_url FROM albums +` + +func (q *Queries) GetAllAlbums(ctx context.Context) ([]Album, error) { + rows, err := q.db.Query(ctx, getAllAlbums) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Album + for rows.Next() { + var i Album + if err := rows.Scan( + &i.ID, + &i.Name, + &i.Artist, + &i.ReleaseDate, + &i.AlbumArtUrl, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/api/sqlc/artists.sql.go b/api/sqlc/artists.sql.go new file mode 100644 index 0000000..437df60 --- /dev/null +++ b/api/sqlc/artists.sql.go @@ -0,0 +1,85 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: artists.sql + +package sqlc + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +const createArtist = `-- name: CreateArtist :one +INSERT INTO artists (id, name, genre, bio, artist_image_url) VALUES ($1, $2, $3, $4, $5) RETURNING id +` + +type CreateArtistParams struct { + ID pgtype.UUID `json:"id"` + Name string `json:"name"` + Genre pgtype.Text `json:"genre"` + Bio pgtype.Text `json:"bio"` + ArtistImageUrl pgtype.Text `json:"artist_image_url"` +} + +func (q *Queries) CreateArtist(ctx context.Context, arg CreateArtistParams) (pgtype.UUID, error) { + row := q.db.QueryRow(ctx, createArtist, + arg.ID, + arg.Name, + arg.Genre, + arg.Bio, + arg.ArtistImageUrl, + ) + var id pgtype.UUID + err := row.Scan(&id) + return id, err +} + +const getAllArtists = `-- name: GetAllArtists :many +SELECT id, name, genre, bio, artist_image_url FROM artists +` + +func (q *Queries) GetAllArtists(ctx context.Context) ([]Artist, error) { + rows, err := q.db.Query(ctx, getAllArtists) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Artist + for rows.Next() { + var i Artist + if err := rows.Scan( + &i.ID, + &i.Name, + &i.Genre, + &i.Bio, + &i.ArtistImageUrl, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const getArtistByID = `-- name: GetArtistByID :one +SELECT id, name, genre, bio, artist_image_url FROM artists WHERE id = $1 +` + +// artists.sql +func (q *Queries) GetArtistByID(ctx context.Context, id pgtype.UUID) (Artist, error) { + row := q.db.QueryRow(ctx, getArtistByID, id) + var i Artist + err := row.Scan( + &i.ID, + &i.Name, + &i.Genre, + &i.Bio, + &i.ArtistImageUrl, + ) + return i, err +} diff --git a/api/database/db.go b/api/sqlc/db.go similarity index 97% rename from api/database/db.go rename to api/sqlc/db.go index bdf4241..7a56507 100644 --- a/api/database/db.go +++ b/api/sqlc/db.go @@ -2,7 +2,7 @@ // versions: // sqlc v1.30.0 -package database +package sqlc import ( "context" diff --git a/api/database/models.go b/api/sqlc/models.go similarity index 98% rename from api/database/models.go rename to api/sqlc/models.go index 11b1926..714779a 100644 --- a/api/database/models.go +++ b/api/sqlc/models.go @@ -2,7 +2,7 @@ // versions: // sqlc v1.30.0 -package database +package sqlc import ( "github.com/jackc/pgx/v5/pgtype" diff --git a/api/sqlc/querier.go b/api/sqlc/querier.go new file mode 100644 index 0000000..a2b238c --- /dev/null +++ b/api/sqlc/querier.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package sqlc + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +type Querier interface { + CheckUserExistsByEmail(ctx context.Context, userMail string) (pgtype.UUID, error) + CreateArtist(ctx context.Context, arg CreateArtistParams) (pgtype.UUID, error) + CreateUser(ctx context.Context, arg CreateUserParams) (pgtype.UUID, error) + // albums.sql + GetAlbumByID(ctx context.Context, id pgtype.UUID) (Album, error) + GetAllAlbums(ctx context.Context) ([]Album, error) + GetAllArtists(ctx context.Context) ([]Artist, error) + // artists.sql + GetArtistByID(ctx context.Context, id pgtype.UUID) (Artist, error) + // users.sql + GetUsernameByID(ctx context.Context, id pgtype.UUID) (string, error) + // user_albums.sql + UpdateUserAlbumStatus(ctx context.Context, arg UpdateUserAlbumStatusParams) error +} + +var _ Querier = (*Queries)(nil) diff --git a/api/sqlc/user_albums.sql.go b/api/sqlc/user_albums.sql.go new file mode 100644 index 0000000..eb0be1c --- /dev/null +++ b/api/sqlc/user_albums.sql.go @@ -0,0 +1,44 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: user_albums.sql + +package sqlc + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +const updateUserAlbumStatus = `-- name: UpdateUserAlbumStatus :exec +INSERT INTO user_albums (user_id, album_id, album_owned, album_want, +is_vinyl, is_cd) VALUES ($1, $2, $3, $4, $5, $6) +ON CONFLICT (user_id, album_id) DO UPDATE SET +album_owned = EXCLUDED.album_owned, +album_want = EXCLUDED.album_want, +is_vinyl = EXCLUDED.is_vinyl, +is_cd = EXCLUDED.is_cd +` + +type UpdateUserAlbumStatusParams struct { + UserID pgtype.UUID `json:"user_id"` + AlbumID pgtype.UUID `json:"album_id"` + AlbumOwned bool `json:"album_owned"` + AlbumWant bool `json:"album_want"` + IsVinyl bool `json:"is_vinyl"` + IsCd bool `json:"is_cd"` +} + +// user_albums.sql +func (q *Queries) UpdateUserAlbumStatus(ctx context.Context, arg UpdateUserAlbumStatusParams) error { + _, err := q.db.Exec(ctx, updateUserAlbumStatus, + arg.UserID, + arg.AlbumID, + arg.AlbumOwned, + arg.AlbumWant, + arg.IsVinyl, + arg.IsCd, + ) + return err +} diff --git a/api/sqlc/users.sql.go b/api/sqlc/users.sql.go new file mode 100644 index 0000000..dc6f531 --- /dev/null +++ b/api/sqlc/users.sql.go @@ -0,0 +1,58 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: users.sql + +package sqlc + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +const checkUserExistsByEmail = `-- name: CheckUserExistsByEmail :one +SELECT id FROM users WHERE user_mail = $1 +` + +func (q *Queries) CheckUserExistsByEmail(ctx context.Context, userMail string) (pgtype.UUID, error) { + row := q.db.QueryRow(ctx, checkUserExistsByEmail, userMail) + var id pgtype.UUID + err := row.Scan(&id) + return id, err +} + +const createUser = `-- name: CreateUser :one +INSERT INTO users (id, user_name, user_mail, password) VALUES ($1, $2, $3, $4) RETURNING id +` + +type CreateUserParams struct { + ID pgtype.UUID `json:"id"` + UserName string `json:"user_name"` + UserMail string `json:"user_mail"` + Password string `json:"password"` +} + +func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (pgtype.UUID, error) { + row := q.db.QueryRow(ctx, createUser, + arg.ID, + arg.UserName, + arg.UserMail, + arg.Password, + ) + var id pgtype.UUID + err := row.Scan(&id) + return id, err +} + +const getUsernameByID = `-- name: GetUsernameByID :one +SELECT user_name FROM users WHERE id = $1 +` + +// users.sql +func (q *Queries) GetUsernameByID(ctx context.Context, id pgtype.UUID) (string, error) { + row := q.db.QueryRow(ctx, getUsernameByID, id) + var user_name string + err := row.Scan(&user_name) + return user_name, err +} diff --git a/db/Dockerfile b/db/Dockerfile index 32e177b..273b919 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -5,5 +5,5 @@ ENV POSTGRES_USER=${POSTGRES_USER} ENV POSTGRES_PASSWORD=${POSTGRES_PASSWORD} ENV POSTGRES_DB=${POSTGRES_DB} -# Copy the database setup script +# Copy the sqlc setup script COPY db.sql /docker-entrypoint-initdb.d/01_init.sql \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..79b9884 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +services: + db: + build: + context: db + dockerfile: Dockerfile + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=postgres + ports: + - "5432:5432"