refactor: Refactor to pkg and iternal structure

cmd/convert.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"path"
 
-	"github.com/glass-cms/glasscms/item"
-	"github.com/glass-cms/glasscms/parser"
-	"github.com/glass-cms/glasscms/sourcer"
+	"github.com/glass-cms/glasscms/internal/item"
+	"github.com/glass-cms/glasscms/internal/parser"
+	"github.com/glass-cms/glasscms/internal/sourcer"
 	"github.com/lmittmann/tint"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/migrate.go

@@ -4,7 +4,7 @@ import (
 	"log/slog"
 	"os"
 
-	"github.com/glass-cms/glasscms/database"
+	"github.com/glass-cms/glasscms/internal/database"
 	"github.com/lmittmann/tint"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/server/server.go

@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/glass-cms/glasscms/database"
+	"github.com/glass-cms/glasscms/internal/database"
 	"github.com/spf13/cobra"
 )
 

cmd/server/start.go

@@ -6,12 +6,10 @@ import (
 	"os"
 	"os/user"
 
-	"github.com/glass-cms/glasscms/database"
-	"github.com/glass-cms/glasscms/item"
-	ctx "github.com/glass-cms/glasscms/lib/context"
-	"github.com/glass-cms/glasscms/server"
-	"github.com/glass-cms/glasscms/server/handler"
-	v1 "github.com/glass-cms/glasscms/server/handler/v1"
+	"github.com/glass-cms/glasscms/internal/database"
+	"github.com/glass-cms/glasscms/internal/item"
+	"github.com/glass-cms/glasscms/internal/server"
+	ctx "github.com/glass-cms/glasscms/pkg/context"
 	"github.com/lmittmann/tint"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -95,9 +93,8 @@ func (c *StartCommand) Execute(cmd *cobra.Command, _ []string) error {
 
 	repo := item.NewRepository(db, errHandler)
 	service := item.NewService(repo)
-	v1Handler := v1.NewAPIHandler(c.logger, service)
 
-	server, err := server.New(c.logger, []handler.VersionedHandler{v1Handler})
+	server, err := server.New(c.logger, service)
 	if err != nil {
 		return err
 	}

generate.go

@@ -1,3 +1,3 @@
 package main
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=openapi/codegen.cfg.v1.yaml openapi/openapi.v1.yaml
+//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=oapi-codegen-config.yaml openapi.yaml

database/error_test.go → internal/database/error_test.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/glass-cms/glasscms/database"
+	"github.com/glass-cms/glasscms/internal/database"
 	"github.com/mattn/go-sqlite3"
 	"github.com/stretchr/testify/assert"
 )

lib/test/database.go → internal/database/test.go

@@ -1,27 +1,26 @@
-package test
+package database
 
 import (
 	"database/sql"
 	"fmt"
 
-	"github.com/glass-cms/glasscms/database"
 	"github.com/google/uuid"
 )
 
 // NewDB creates a new in-memory SQLite database with the necessary schema
 // for testing purposes.
-func NewDB() (*sql.DB, error) {
-	config := database.Config{
-		Driver: database.DriverName[int32(database.DriverSqlite)],
+func NewTestDB() (*sql.DB, error) {
+	config := Config{
+		Driver: DriverName[int32(DriverSqlite)],
 		DSN:    fmt.Sprintf("file:%s?mode=memory&cache=shared", uuid.New().String()),
 	}
 
-	db, err := database.NewConnection(config)
+	db, err := NewConnection(config)
 	if err != nil {
 		return nil, err
 	}
 
-	if err = database.MigrateDatabase(db, config); err != nil {
+	if err = MigrateDatabase(db, config); err != nil {
 		return nil, err
 	}
 

item/repository.go → internal/item/repository.go

@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/glass-cms/glasscms/database"
+	"github.com/glass-cms/glasscms/internal/database"
 )
 
 type Repository interface {

item/repository_test.go → internal/item/repository_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/glass-cms/glasscms/database"
-	"github.com/glass-cms/glasscms/item"
+	"github.com/glass-cms/glasscms/internal/database"
+	"github.com/glass-cms/glasscms/internal/item"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

item/service.go → internal/item/service.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	"github.com/glass-cms/glasscms/database"
-	"github.com/glass-cms/glasscms/lib/resource"
+	"github.com/glass-cms/glasscms/internal/database"
+	"github.com/glass-cms/glasscms/pkg/resource"
 )
 
 // Service is a service for managing items.

parser/parser.go → internal/parser/parser.go

@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/glass-cms/glasscms/item"
-	"github.com/glass-cms/glasscms/sourcer"
+	"github.com/glass-cms/glasscms/internal/item"
+	"github.com/glass-cms/glasscms/internal/sourcer"
 	"github.com/mozillazg/go-slugify"
 	"gopkg.in/yaml.v3"
 )

parser/parser_test.go → internal/parser/parser_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/glass-cms/glasscms/parser"
+	"github.com/glass-cms/glasscms/internal/parser"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

server/handler/v1/error_handler.go → internal/server/error_handler.go

@@ -1,15 +1,14 @@
-package v1
+package server
 
 import (
 	"net/http"
 	"reflect"
 
-	v1 "github.com/glass-cms/glasscms/api/v1"
-	"github.com/glass-cms/glasscms/server/handler"
+	"github.com/glass-cms/glasscms/pkg/api"
 )
 
 // ErrorMapper is a function that maps an error to an API error response.
-type ErrorMapper func(error) *v1.Error
+type ErrorMapper func(error) *api.Error
 
 type ErrorHandler struct {
 	Mappers map[reflect.Type]ErrorMapper
@@ -37,20 +36,20 @@ func (h *ErrorHandler) HandleError(w http.ResponseWriter, r *http.Request, err e
 	if mapper, exists := h.Mappers[errType]; exists {
 		errResp := mapper(err)
 
-		statusCode, ok := v1.ErrorCodeMapping[errResp.Code]
+		statusCode, ok := ErrorCodeMapping[errResp.Code]
 		if !ok {
 			statusCode = http.StatusInternalServerError
 		}
 
-		handler.SerializeResponse(w, r, statusCode, errResp)
+		SerializeResponse(w, r, statusCode, errResp)
 		return
 	}
 
 	// Fallback on generic error response if we don't have a specific error mapper.
-	errResp := &v1.Error{
-		Code:    v1.ProcessingError,
+	errResp := &api.Error{
+		Code:    api.ProcessingError,
 		Message: "An error occurred while processing the request.",
-		Type:    v1.ApiError,
+		Type:    api.ApiError,
 	}
-	handler.SerializeResponse(w, r, http.StatusInternalServerError, errResp)
+	SerializeResponse(w, r, http.StatusInternalServerError, errResp)
 }