[refactor] Remove useless interfaces + tests improvements

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/joho/godotenv v1.5.1
 	github.com/lib/pq v1.10.9
+	github.com/rs/cors v1.11.1
 	github.com/testcontainers/testcontainers-go v0.38.0
 	github.com/testcontainers/testcontainers-go/modules/postgres v0.38.0
 	golang.org/x/crypto v0.40.0
@@ -65,7 +66,6 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/rs/cors v1.11.1 // indirect
 	github.com/shirou/gopsutil/v4 v4.25.5 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/stretchr/testify v1.10.0 // indirect

handler/categories.go

@@ -3,6 +3,7 @@ package handler
 import (
 	"encoding/json"
 	"github.com/oullin/database"
+	"github.com/oullin/database/repository"
 	"github.com/oullin/database/repository/pagination"
 	"github.com/oullin/handler/paginate"
 	"github.com/oullin/handler/payload"
@@ -11,16 +12,14 @@ import (
 	baseHttp "net/http"
 )
 
-type categoriesRepo interface {
-	GetAll(pagination.Paginate) (*pagination.Pagination[database.Category], error)
-}
-
 type CategoriesHandler struct {
-	Categories categoriesRepo
+	Categories *repository.Categories
 }
 
-func MakeCategoriesHandler(categories categoriesRepo) CategoriesHandler {
-	return CategoriesHandler{Categories: categories}
+func MakeCategoriesHandler(categories *repository.Categories) CategoriesHandler {
+	return CategoriesHandler{
+		Categories: categories,
+	}
 }
 
 func (h *CategoriesHandler) Index(w baseHttp.ResponseWriter, r *baseHttp.Request) *http.ApiError {

handler/categories_test.go

@@ -0,0 +1,53 @@
+package handler
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/oullin/database"
+	"github.com/oullin/database/repository"
+	"github.com/oullin/database/repository/pagination"
+	"github.com/oullin/handler/payload"
+	handlertests "github.com/oullin/handler/tests"
+)
+
+func TestCategoriesHandlerIndex_Success(t *testing.T) {
+	conn, author := handlertests.MakeTestDB(t)
+	published := time.Now()
+	post := database.Post{UUID: uuid.NewString(), AuthorID: author.ID, Slug: "hello", Title: "Hello", Excerpt: "Ex", Content: "Body", PublishedAt: &published}
+	if err := conn.Sql().Create(&post).Error; err != nil {
+		t.Fatalf("create post: %v", err)
+	}
+	cat := database.Category{UUID: uuid.NewString(), Name: "Cat", Slug: "cat", Description: "desc"}
+	if err := conn.Sql().Create(&cat).Error; err != nil {
+		t.Fatalf("create category: %v", err)
+	}
+	link := database.PostCategory{PostID: post.ID, CategoryID: cat.ID}
+	if err := conn.Sql().Create(&link).Error; err != nil {
+		t.Fatalf("create link: %v", err)
+	}
+
+	h := MakeCategoriesHandler(&repository.Categories{DB: conn})
+
+	req := httptest.NewRequest("GET", "/categories", nil)
+	rec := httptest.NewRecorder()
+
+	if err := h.Index(rec, req); err != nil {
+		t.Fatalf("index err: %v", err)
+	}
+	if rec.Code != http.StatusOK {
+		t.Fatalf("status %d", rec.Code)
+	}
+
+	var resp pagination.Pagination[payload.CategoryResponse]
+	if err := json.NewDecoder(rec.Body).Decode(&resp); err != nil {
+		t.Fatalf("decode: %v", err)
+	}
+	if len(resp.Data) != 1 || resp.Data[0].Slug != "cat" {
+		t.Fatalf("unexpected data: %+v", resp.Data)
+	}
+}

handler/education_test.go

@@ -0,0 +1,12 @@
+package handler
+
+import "testing"
+
+func TestEducationHandler(t *testing.T) {
+	runFileHandlerTest(t, fileHandlerTestCase{
+		make:     func(f string) fileHandler { return MakeEducationHandler(f) },
+		endpoint: "/education",
+		data:     []map[string]string{{"uuid": "1"}},
+		assert:   assertArrayUUID1,
+	})
+}

handler/experience_test.go

@@ -0,0 +1,12 @@
+package handler
+
+import "testing"
+
+func TestExperienceHandler(t *testing.T) {
+	runFileHandlerTest(t, fileHandlerTestCase{
+		make:     func(f string) fileHandler { return MakeExperienceHandler(f) },
+		endpoint: "/experience",
+		data:     []map[string]string{{"uuid": "1"}},
+		assert:   assertArrayUUID1,
+	})
+}

handler/file_handler_test.go

@@ -0,0 +1,87 @@
+package handler
+
+import (
+	"encoding/json"
+	baseHttp "net/http"
+	"net/http/httptest"
+	"os"
+	"testing"
+
+	handlertests "github.com/oullin/handler/tests"
+	pkgHttp "github.com/oullin/pkg/http"
+)
+
+type fileHandler interface {
+	Handle(baseHttp.ResponseWriter, *baseHttp.Request) *pkgHttp.ApiError
+}
+
+type fileHandlerTestCase struct {
+	make     func(string) fileHandler
+	endpoint string
+	data     interface{}
+	assert   func(*testing.T, any)
+}
+
+func runFileHandlerTest(t *testing.T, tc fileHandlerTestCase) {
+	file := handlertests.WriteJSON(t, handlertests.TestEnvelope{Version: "v1", Data: tc.data})
+	defer os.Remove(file)
+
+	h := tc.make(file)
+	req := httptest.NewRequest("GET", tc.endpoint, nil)
+	rec := httptest.NewRecorder()
+	if err := h.Handle(rec, req); err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if rec.Code != baseHttp.StatusOK {
+		t.Fatalf("status %d", rec.Code)
+	}
+
+	var resp handlertests.TestEnvelope
+	if err := json.NewDecoder(rec.Body).Decode(&resp); err != nil {
+		t.Fatalf("decode: %v", err)
+	}
+	if resp.Version != "v1" {
+		t.Fatalf("version %s", resp.Version)
+	}
+	tc.assert(t, resp.Data)
+
+	req2 := httptest.NewRequest("GET", tc.endpoint, nil)
+	req2.Header.Set("If-None-Match", "\"v1\"")
+	rec2 := httptest.NewRecorder()
+	if err := h.Handle(rec2, req2); err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if rec2.Code != baseHttp.StatusNotModified {
+		t.Fatalf("status %d", rec2.Code)
+	}
+
+	badF, _ := os.CreateTemp("", "bad.json")
+	badF.WriteString("{")
+	badF.Close()
+	defer os.Remove(badF.Name())
+
+	bad := tc.make(badF.Name())
+	rec3 := httptest.NewRecorder()
+	req3 := httptest.NewRequest("GET", tc.endpoint, nil)
+	if bad.Handle(rec3, req3) == nil {
+		t.Fatalf("expected error")
+	}
+}
+
+func assertArrayUUID1(t *testing.T, data any) {
+	arr, ok := data.([]interface{})
+	if !ok || len(arr) != 1 {
+		t.Fatalf("unexpected data: %+v", data)
+	}
+	m, ok := arr[0].(map[string]interface{})
+	if !ok || m["uuid"] != "1" {
+		t.Fatalf("unexpected payload: %+v", data)
+	}
+}
+
+func assertNicknameNick(t *testing.T, data any) {
+	obj, ok := data.(map[string]interface{})
+	if !ok || obj["nickname"] != "nick" {
+		t.Fatalf("unexpected payload: %+v", data)
+	}
+}