Reorganize OpenAPI spec into separate admin.yaml file

Author: sunfmin

api/gen/admin/gen.go

@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/ogen-go/ogen/cmd/ogen@latest --target . --clean ../../openapi.yaml
+//go:generate go run github.com/ogen-go/ogen/cmd/ogen@latest --target . --clean ../../openapi/admin.yaml

api/openapi.yaml api/openapi/admin.yamlapi/openapi.yaml renamed to api/openapi/admin.yaml

@@ -34,13 +34,28 @@ func main() {
 		handlers.SetHideErrorDetails(true)
 	}
 
-	// Create service (implements ogen Handler interface)
-	service := services.NewAdminService(db).Build()
+	// Create individual domain services
+	authService := services.NewAuthService(db).Build()
+	userService := services.NewUserService(db).Build()
+	taskService := services.NewTaskService(db).Build()
+	appService := services.NewAppService(db).Build()
+	chatService := services.NewChatService(db).Build()
+	dashboardService := services.NewDashboardService().Build()
 
-	// Create server via handlers package (includes ErrorHandler)
-	server, err := handlers.NewServer(service)
+	// Create OgenHandler with all services
+	handler := services.NewOgenHandler().
+		WithAuthService(authService).
+		WithUserService(userService).
+		WithTaskService(taskService).
+		WithAppService(appService).
+		WithChatService(chatService).
+		WithDashboardService(dashboardService).
+		Build()
+
+	// Create router with ogen server
+	router, err := handlers.NewRouter(handler).Build()
 	if err != nil {
-		log.Fatalf("Failed to create server: %v", err)
+		log.Fatalf("Failed to create router: %v", err)
 	}
 
 	// Get port from environment
@@ -50,7 +65,7 @@ func main() {
 	}
 
 	log.Printf("Starting server on :%s", port)
-	if err := http.ListenAndServe(":"+port, server); err != nil {
+	if err := http.ListenAndServe(":"+port, router); err != nil {
 		log.Fatalf("Failed to start server: %v", err)
 	}
 }

cmd/api/main.go

@@ -1,6 +1,8 @@
 package handlers
 
 import (
+	"net/http"
+
 	api "github.com/sunfmin/shadcn-admin-go/api/gen/admin"
 )
 
@@ -12,3 +14,40 @@ func NewServer(h api.Handler) (*api.Server, error) {
 		api.WithErrorHandler(OgenErrorHandler),
 	)
 }
+
+// RouterBuilder builds an HTTP router with the ogen server and optional middleware
+type RouterBuilder struct {
+	handler     api.Handler
+	middlewares []func(http.Handler) http.Handler
+}
+
+// NewRouter creates a new RouterBuilder
+func NewRouter(handler api.Handler) *RouterBuilder {
+	return &RouterBuilder{
+		handler:     handler,
+		middlewares: make([]func(http.Handler) http.Handler, 0),
+	}
+}
+
+// WithMiddleware adds a middleware to the router
+func (b *RouterBuilder) WithMiddleware(mw func(http.Handler) http.Handler) *RouterBuilder {
+	b.middlewares = append(b.middlewares, mw)
+	return b
+}
+
+// Build creates the HTTP handler with all configured middleware
+func (b *RouterBuilder) Build() (http.Handler, error) {
+	server, err := NewServer(b.handler)
+	if err != nil {
+		return nil, err
+	}
+
+	var handler http.Handler = server
+
+	// Apply middlewares in reverse order so they execute in the order they were added
+	for i := len(b.middlewares) - 1; i >= 0; i-- {
+		handler = b.middlewares[i](handler)
+	}
+
+	return handler, nil
+}

handlers/server.go

@@ -53,7 +53,7 @@ func generateTaskID(num int) string {
 func padNumber(num, width int) string {
 	s := ""
 	for i := 0; i < width; i++ {
-		s = string('0'+num%10) + s
+		s = string(rune('0'+num%10)) + s
 		num /= 10
 	}
 	return s

internal/models/models.go

@@ -4,15 +4,41 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strings"
 
 	api "github.com/sunfmin/shadcn-admin-go/api/gen/admin"
 	"github.com/sunfmin/shadcn-admin-go/internal/models"
 	"gorm.io/gorm"
 )
 
-// ListApps implements api.Handler.
-func (s *AdminService) ListApps(ctx context.Context, params api.ListAppsParams) (*api.AppListResponse, error) {
+// AppService interface for app operations
+type AppService interface {
+	List(ctx context.Context, params api.ListAppsParams) (*api.AppListResponse, error)
+	Connect(ctx context.Context, params api.ConnectAppParams) (*api.App, error)
+	Disconnect(ctx context.Context, params api.DisconnectAppParams) (*api.App, error)
+}
+
+// appServiceImpl implements AppService
+type appServiceImpl struct {
+	db *gorm.DB
+}
+
+// appServiceBuilder is the builder for AppService
+type appServiceBuilder struct {
+	db *gorm.DB
+}
+
+// NewAppService creates a new AppService builder
+func NewAppService(db *gorm.DB) *appServiceBuilder {
+	return &appServiceBuilder{db: db}
+}
+
+// Build creates the AppService
+func (b *appServiceBuilder) Build() AppService {
+	return &appServiceImpl{db: b.db}
+}
+
+// List implements AppService
+func (s *appServiceImpl) List(ctx context.Context, params api.ListAppsParams) (*api.AppListResponse, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -62,8 +88,8 @@ func (s *AdminService) ListApps(ctx context.Context, params api.ListAppsParams)
 	}, nil
 }
 
-// ConnectApp implements api.Handler.
-func (s *AdminService) ConnectApp(ctx context.Context, params api.ConnectAppParams) (*api.App, error) {
+// Connect implements AppService
+func (s *appServiceImpl) Connect(ctx context.Context, params api.ConnectAppParams) (*api.App, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -87,8 +113,8 @@ func (s *AdminService) ConnectApp(ctx context.Context, params api.ConnectAppPara
 	return &result, nil
 }
 
-// DisconnectApp implements api.Handler.
-func (s *AdminService) DisconnectApp(ctx context.Context, params api.DisconnectAppParams) (*api.App, error) {
+// Disconnect implements AppService
+func (s *appServiceImpl) Disconnect(ctx context.Context, params api.DisconnectAppParams) (*api.App, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -127,8 +153,3 @@ func appToAPI(a models.App) api.App {
 
 	return result
 }
-
-// generateAppID generates a unique app ID
-func generateAppID(name string) string {
-	return strings.ToLower(strings.ReplaceAll(name, " ", "-"))
-}

services/admin_service.go

@@ -12,8 +12,35 @@ import (
 	"gorm.io/gorm"
 )
 
-// Login implements api.Handler.
-func (s *AdminService) Login(ctx context.Context, req *api.LoginRequest) (api.LoginRes, error) {
+// AuthService interface for authentication operations
+type AuthService interface {
+	Login(ctx context.Context, req *api.LoginRequest) (api.LoginRes, error)
+	Logout(ctx context.Context) error
+	GetCurrentUser(ctx context.Context) (api.GetCurrentUserRes, error)
+}
+
+// authServiceImpl implements AuthService
+type authServiceImpl struct {
+	db *gorm.DB
+}
+
+// authServiceBuilder is the builder for AuthService
+type authServiceBuilder struct {
+	db *gorm.DB
+}
+
+// NewAuthService creates a new AuthService builder
+func NewAuthService(db *gorm.DB) *authServiceBuilder {
+	return &authServiceBuilder{db: db}
+}
+
+// Build creates the AuthService
+func (b *authServiceBuilder) Build() AuthService {
+	return &authServiceImpl{db: b.db}
+}
+
+// Login implements AuthService
+func (s *authServiceImpl) Login(ctx context.Context, req *api.LoginRequest) (api.LoginRes, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -46,13 +73,13 @@ func (s *AdminService) Login(ctx context.Context, req *api.LoginRequest) (api.Lo
 	}, nil
 }
 
-// Logout implements api.Handler.
-func (s *AdminService) Logout(ctx context.Context) error {
+// Logout implements AuthService
+func (s *authServiceImpl) Logout(ctx context.Context) error {
 	return nil
 }
 
-// GetCurrentUser implements api.Handler.
-func (s *AdminService) GetCurrentUser(ctx context.Context) (api.GetCurrentUserRes, error) {
+// GetCurrentUser implements AuthService
+func (s *authServiceImpl) GetCurrentUser(ctx context.Context) (api.GetCurrentUserRes, error) {
 	return &api.GetCurrentUserUnauthorized{}, nil
 }
 

services/app_methods.go services/app_service.goservices/app_methods.go renamed to services/app_service.go

@@ -11,8 +11,35 @@ import (
 	"gorm.io/gorm"
 )
 
-// ListChats implements api.Handler.
-func (s *AdminService) ListChats(ctx context.Context, params api.ListChatsParams) (*api.ChatListResponse, error) {
+// ChatService interface for chat operations
+type ChatService interface {
+	List(ctx context.Context, params api.ListChatsParams) (*api.ChatListResponse, error)
+	Get(ctx context.Context, params api.GetChatParams) (api.GetChatRes, error)
+	SendMessage(ctx context.Context, req *api.SendMessageRequest, params api.SendMessageParams) (*api.ChatMessage, error)
+}
+
+// chatServiceImpl implements ChatService
+type chatServiceImpl struct {
+	db *gorm.DB
+}
+
+// chatServiceBuilder is the builder for ChatService
+type chatServiceBuilder struct {
+	db *gorm.DB
+}
+
+// NewChatService creates a new ChatService builder
+func NewChatService(db *gorm.DB) *chatServiceBuilder {
+	return &chatServiceBuilder{db: db}
+}
+
+// Build creates the ChatService
+func (b *chatServiceBuilder) Build() ChatService {
+	return &chatServiceImpl{db: b.db}
+}
+
+// List implements ChatService
+func (s *chatServiceImpl) List(ctx context.Context, params api.ListChatsParams) (*api.ChatListResponse, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -41,8 +68,8 @@ func (s *AdminService) ListChats(ctx context.Context, params api.ListChatsParams
 	}, nil
 }
 
-// GetChat implements api.Handler.
-func (s *AdminService) GetChat(ctx context.Context, params api.GetChatParams) (api.GetChatRes, error) {
+// Get implements ChatService
+func (s *chatServiceImpl) Get(ctx context.Context, params api.GetChatParams) (api.GetChatRes, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -61,8 +88,8 @@ func (s *AdminService) GetChat(ctx context.Context, params api.GetChatParams) (a
 	return &result, nil
 }
 
-// SendMessage implements api.Handler.
-func (s *AdminService) SendMessage(ctx context.Context, req *api.SendMessageRequest, params api.SendMessageParams) (*api.ChatMessage, error) {
+// SendMessage implements ChatService
+func (s *chatServiceImpl) SendMessage(ctx context.Context, req *api.SendMessageRequest, params api.SendMessageParams) (*api.ChatMessage, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()

services/auth_methods.go services/auth_service.goservices/auth_methods.go renamed to services/auth_service.go

@@ -6,8 +6,31 @@ import (
 	api "github.com/sunfmin/shadcn-admin-go/api/gen/admin"
 )
 
-// GetDashboardStats implements api.Handler.
-func (s *AdminService) GetDashboardStats(ctx context.Context) (*api.DashboardStats, error) {
+// DashboardService interface for dashboard operations
+type DashboardService interface {
+	GetStats(ctx context.Context) (*api.DashboardStats, error)
+	GetOverview(ctx context.Context) (*api.DashboardOverview, error)
+	GetRecentSales(ctx context.Context) (*api.RecentSalesResponse, error)
+}
+
+// dashboardServiceImpl implements DashboardService
+type dashboardServiceImpl struct{}
+
+// dashboardServiceBuilder is the builder for DashboardService
+type dashboardServiceBuilder struct{}
+
+// NewDashboardService creates a new DashboardService builder
+func NewDashboardService() *dashboardServiceBuilder {
+	return &dashboardServiceBuilder{}
+}
+
+// Build creates the DashboardService
+func (b *dashboardServiceBuilder) Build() DashboardService {
+	return &dashboardServiceImpl{}
+}
+
+// GetStats implements DashboardService
+func (s *dashboardServiceImpl) GetStats(ctx context.Context) (*api.DashboardStats, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -35,8 +58,8 @@ func (s *AdminService) GetDashboardStats(ctx context.Context) (*api.DashboardSta
 	}, nil
 }
 
-// GetDashboardOverview implements api.Handler.
-func (s *AdminService) GetDashboardOverview(ctx context.Context) (*api.DashboardOverview, error) {
+// GetOverview implements DashboardService
+func (s *dashboardServiceImpl) GetOverview(ctx context.Context) (*api.DashboardOverview, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -64,8 +87,8 @@ func (s *AdminService) GetDashboardOverview(ctx context.Context) (*api.Dashboard
 	}, nil
 }
 
-// GetRecentSales implements api.Handler.
-func (s *AdminService) GetRecentSales(ctx context.Context) (*api.RecentSalesResponse, error) {
+// GetRecentSales implements DashboardService
+func (s *dashboardServiceImpl) GetRecentSales(ctx context.Context) (*api.RecentSalesResponse, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()