Added /v1/user POST endpoint

kelbwah · Aug 22, 2024 · 9ef58b4 · 9ef58b4
1 parent 4367cb7
commit 9ef58b4
Showing 14 changed files with 296 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,3 +1,10 @@
+# --- Loading .env vars ---
+ifneq (,$(wildcard ./.env))
+    include .env
+    export
+endif
+
+# --- Make targets ---
 run:
 	@./bin/gogreggator
 
@@ -6,3 +13,10 @@ build:
 
 test:
 	@go test -v ./...
+
+db-up:
+	@cd internal/sql/schema && goose postgres $(DATABASE_URL) up
+
+db-down:
+	@cd internal/sql/schema && goose postgres $(DATABASE_URL) down
+
diff --git a/cmd/app/main.go b/cmd/app/main.go
@@ -1,29 +1,65 @@
 package main
 
 import (
+	"database/sql"
+	"errors"
 	"log"
 	"net/http"
 	"os"
 
 	"github.com/joho/godotenv"
+	"github.com/kelbwah/gogreggator/internal/database"
 	"github.com/kelbwah/gogreggator/internal/handlers"
+	"github.com/kelbwah/gogreggator/internal/types"
+	_ "github.com/lib/pq"
 )
 
 func main() {
-	if err := godotenv.Load(".env"); err != nil {
-		log.Fatalf("Error loading .env vars: %v", err)
+	godotenv.Load(".env")
+	env, err := initVars()
+	if err != nil {
+		log.Fatalf("Error loading var(s): %s\n", err.Error())
 	}
-	port := os.Getenv("PORT")
+
+	db, err := sql.Open("postgres", env["dbUrl"])
+	if err != nil {
+		log.Fatalf("Database Error: %s\n", err.Error())
+	}
+
+	dbQueries := database.New(db)
+	apiCfg := &types.APIConfig{
+		DB: dbQueries,
+	}
+
 	mux := http.NewServeMux()
-	handlers.HandlersInit(mux)
+	handlers.HandlersInit(mux, apiCfg)
 
 	server := &http.Server{
-		Addr:    ":" + port,
+		Addr:    ":" + env["port"],
 		Handler: mux,
 	}
 
-	log.Printf("Listening on port ':%s'\n", port)
+	log.Printf("Listening on port ':%s'\n", env["port"])
 	if err := server.ListenAndServe(); err != nil {
 		log.Fatalf("Server failed to start: %v\n", err)
 	}
 }
+
+func initVars() (map[string]string, error) {
+	varMap := make(map[string]string)
+
+	port := os.Getenv("PORT")
+	if port == "" {
+		return nil, errors.New("PORT environment variable is not set")
+	}
+
+	dbUrl := os.Getenv("DATABASE_URL")
+	if dbUrl == "" {
+		return nil, errors.New("DATABASE_URL environment variable is not set")
+	}
+
+	varMap["port"] = port
+	varMap["dbUrl"] = dbUrl
+
+	return varMap, nil
+}
diff --git a/cmd/app/main_test.go b/cmd/app/main_test.go
@@ -0,0 +1,63 @@
+package main
+
+import (
+	"os"
+	"reflect"
+	"testing"
+)
+
+func setEnvs(envs map[string]string) (closer func()) {
+	originalEnvs := map[string]string{}
+
+	for name, value := range envs {
+		if originalValue, ok := os.LookupEnv(name); ok {
+			originalEnvs[name] = originalValue
+		}
+		_ = os.Setenv(name, value)
+	}
+
+	return func() {
+		for name := range envs {
+			_ = os.Unsetenv(name)
+		}
+	}
+}
+
+func TestInitVars(t *testing.T) {
+	t.Run("All env vars set correctly", func(t *testing.T) {
+		curEnvs := setEnvs(map[string]string{
+			"PORT":         "6969",
+			"DATABASE_URL": "testing url",
+		})
+		defer curEnvs()
+
+		expected := map[string]string{
+			"port":  "6969",
+			"dbUrl": "testing url",
+		}
+
+		result, _ := initVars()
+		if reflect.DeepEqual(result, expected) == false {
+			t.Fatalf("Expected %v, got %v\n", expected, result)
+		}
+	})
+
+	t.Run("One env vars set correctly", func(t *testing.T) {
+		curEnvs := setEnvs(map[string]string{
+			"PORT": "6969",
+		})
+		defer curEnvs()
+
+		result, _ := initVars()
+		if result != nil {
+			t.Fatalf("Expected %v, got %v\n", nil, result)
+		}
+	})
+
+	t.Run("No env vars set correctly", func(t *testing.T) {
+		result, _ := initVars()
+		if result != nil {
+			t.Fatalf("Expected %v, got %v\n", nil, result)
+		}
+	})
+}
diff --git a/go.mod b/go.mod
@@ -2,4 +2,8 @@ module github.com/kelbwah/gogreggator
 
 go 1.22.1
 
-require github.com/joho/godotenv v1.5.1 // indirect
+require (
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/lib/pq v1.10.9 // indirect
+)
diff --git a/go.sum b/go.sum
@@ -1,2 +1,6 @@
+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/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
diff --git a/internal/database/db.go b/internal/database/db.go
diff --git a/internal/database/models.go b/internal/database/models.go
diff --git a/internal/database/users.sql.go b/internal/database/users.sql.go
diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
@@ -1,8 +1,16 @@
 package handlers
 
-import "net/http"
+import (
+	"net/http"
 
-func HandlersInit(mux *http.ServeMux) {
+	"github.com/kelbwah/gogreggator/internal/types"
+)
+
+func HandlersInit(mux *http.ServeMux, apiCfg *types.APIConfig) {
+	/* -- GET ENDPOINTS -- */
 	mux.HandleFunc("GET /v1/healthz", readinessHandler)
 	mux.HandleFunc("GET /v1/err", errorHandler)
+
+	/* -- POST ENDPOINTS -- */
+	mux.HandleFunc("POST /v1/users", apiCfg.HandleUsersCreate)
 }
diff --git a/internal/sql/queries/users.sql b/internal/sql/queries/users.sql
@@ -0,0 +1,4 @@
+-- name: CreateUser :one
+INSERT INTO users (id, created_at, updated_at, name)
+VALUES ($1, $2, $3, $4)
+RETURNING *;
diff --git a/internal/sql/schema/001_users.sql b/internal/sql/schema/001_users.sql
@@ -0,0 +1,10 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS users (
+    id UUID PRIMARY KEY,
+    created_at TIMESTAMP NOT NULL,
+    updated_at TIMESTAMP NOT NULL,
+    name TEXT NOT NULL
+);
+
+-- +goose Down
+DROP TABLE users;
diff --git a/internal/types/api.go b/internal/types/api.go
@@ -0,0 +1,44 @@
+package types
+
+import (
+	"encoding/json"
+	"net/http"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/kelbwah/gogreggator/internal/database"
+	"github.com/kelbwah/gogreggator/utils"
+)
+
+type APIConfig struct {
+	DB *database.Queries
+}
+
+func (cfg *APIConfig) HandleUsersCreate(w http.ResponseWriter, r *http.Request) {
+	type parameters struct {
+		Name string `json:"name"`
+	}
+
+	params := parameters{}
+	decoder := json.NewDecoder(r.Body)
+	err := decoder.Decode(&params)
+	if err != nil {
+		utils.RespondWithError(w, http.StatusInternalServerError, "Couldn't decode parameters")
+		return
+	}
+
+	userParams := database.CreateUserParams{
+		ID:        uuid.New(),
+		CreatedAt: time.Now().UTC(),
+		UpdatedAt: time.Now().UTC(),
+		Name:      params.Name,
+	}
+
+	createdUser, err := cfg.DB.CreateUser(r.Context(), userParams)
+	if err != nil {
+		utils.RespondWithError(w, http.StatusInternalServerError, err.Error())
+		return
+	}
+
+	utils.RespondWithJSON(w, http.StatusCreated, createdUser)
+}
diff --git a/sqlc.yaml b/sqlc.yaml
@@ -0,0 +1,8 @@
+version: "2"
+sql:
+  - schema: "internal/sql/schema"
+    queries: "internal/sql/queries"
+    engine: "postgresql"
+    gen:
+      go:
+        out: "internal/database"
diff --git a/utils/utils.go → utils/json.go b/utils/utils.go → utils/json.go