@nakedev/go-scaffold 0.4.0 → 0.4.3

package/templates/generate/module/minimal/service.go.hbs

@@ -1,5 +1,30 @@
 package {{pkg}}
 
+{{#if cqrs}}
+// repository is the complete data dependency retained for the compatibility
+// facade below. CQRS handlers consume the narrower command/query ports.
+type repository interface {
+	commandRepository
+	queryRepository
+	// go-scaffold:repository-interface
+}
+
+// Service is a compatibility facade. New code should depend on
+// commandService or queryService directly.
+type Service struct {
+	commands commandService
+	queries  queryService
+}
+
+func NewService(repo repository) *Service {
+	return &Service{
+		commands: NewCommandHandler(repo),
+		queries:  NewQueryHandler(repo),
+	}
+}
+
+// go-scaffold:service-methods
+{{else}}
 import (
 	"context"
 	"errors"
@@ -39,7 +64,8 @@ func wrapFindErr(err error) error {
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return errNotFound()
 	}
-	return apperror.NewInternal()
+	return apperror.NewInternal(err)
 }
 
 // go-scaffold:service-methods
+{{/if}}

package/templates/generate/module/queries.go.hbs

@@ -0,0 +1,62 @@
+package {{pkg}}
+
+import (
+	"context"
+	"errors"
+
+	"{{goModule}}/internal/app/{{modulePath}}/model"
+	"{{goModule}}/internal/shared/apperror"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+// queryRepository is the outbound port for read-only use cases. A separate
+// port makes it possible to replace this with a projection/read model later
+// without changing command handlers.
+type queryRepository interface {
+	FindAll(ctx context.Context, limit, offset int) ([]model.{{pascalName}}, error)
+	FindByID(ctx context.Context, id uuid.UUID) (*model.{{pascalName}}, error)
+	// go-scaffold:query-repository-interface
+}
+
+// queryService is the inbound application port consumed by read endpoints.
+type queryService interface {
+	List(context.Context, int, int) ([]model.{{pascalName}}, error)
+	Get(context.Context, uuid.UUID) (*model.{{pascalName}}, error)
+	// go-scaffold:query-interface
+}
+
+// QueryHandler owns read-only use cases for {{pkg}}.
+type QueryHandler struct {
+	repo queryRepository
+}
+
+func NewQueryHandler(repo queryRepository) *QueryHandler {
+	return &QueryHandler{repo: repo}
+}
+
+func (h *QueryHandler) List(ctx context.Context, limit, offset int) ([]model.{{pascalName}}, error) {
+	items, err := h.repo.FindAll(ctx, limit, offset)
+	if err != nil {
+		return nil, apperror.NewInternal(err)
+	}
+	return items, nil
+}
+
+func (h *QueryHandler) Get(ctx context.Context, id uuid.UUID) (*model.{{pascalName}}, error) {
+	m, err := h.repo.FindByID(ctx, id)
+	if err != nil {
+		return nil, wrapFindErr(err)
+	}
+	return m, nil
+}
+
+func wrapFindErr(err error) error {
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return errNotFound()
+	}
+	return apperror.NewInternal(err)
+}
+
+// go-scaffold:query-methods

package/templates/generate/module/service.go.hbs

@@ -1,5 +1,60 @@
 package {{pkg}}
 
+{{#if cqrs}}
+import (
+	"context"
+
+	"{{goModule}}/internal/app/{{modulePath}}/model"
+
+	"github.com/google/uuid"
+)
+
+// repository is the complete data dependency retained for the compatibility
+// facade below. The actual CQRS handlers consume the narrower
+// commandRepository/queryRepository ports declared in commands.go/queries.go.
+type repository interface {
+	commandRepository
+	queryRepository
+	// go-scaffold:repository-interface
+}
+
+// Service is a compatibility facade for callers that still want one feature
+// service. New code should depend on commandService or queryService instead,
+// so the read and write paths remain independently replaceable.
+type Service struct {
+	commands commandService
+	queries  queryService
+}
+
+func NewService(repo repository) *Service {
+	return &Service{
+		commands: NewCommandHandler(repo),
+		queries:  NewQueryHandler(repo),
+	}
+}
+
+func (s *Service) Create(ctx context.Context, in createInput) (*model.{{pascalName}}, error) {
+	return s.commands.Create(ctx, in)
+}
+
+func (s *Service) List(ctx context.Context, limit, offset int) ([]model.{{pascalName}}, error) {
+	return s.queries.List(ctx, limit, offset)
+}
+
+func (s *Service) Get(ctx context.Context, id uuid.UUID) (*model.{{pascalName}}, error) {
+	return s.queries.Get(ctx, id)
+}
+
+func (s *Service) Update(ctx context.Context, id uuid.UUID, in updateInput) (*model.{{pascalName}}, error) {
+	return s.commands.Update(ctx, id, in)
+}
+
+func (s *Service) Delete(ctx context.Context, id uuid.UUID) error {
+	return s.commands.Delete(ctx, id)
+}
+
+// go-scaffold:service-methods
+{{else}}
 import (
 	"context"
 	"errors"
@@ -41,7 +96,7 @@ func (s *Service) Create(ctx context.Context, in createInput) (*model.{{pascalNa
 		if dberr.IsDuplicate(err) {
 			return nil, errConflict()
 		}
-		return nil, apperror.NewInternal()
+		return nil, apperror.NewInternal(err)
 	}
 	return m, nil
 }
@@ -49,7 +104,7 @@ func (s *Service) Create(ctx context.Context, in createInput) (*model.{{pascalNa
 func (s *Service) List(ctx context.Context, limit, offset int) ([]model.{{pascalName}}, error) {
 	items, err := s.repo.FindAll(ctx, limit, offset)
 	if err != nil {
-		return nil, apperror.NewInternal()
+		return nil, apperror.NewInternal(err)
 	}
 	return items, nil
 }
@@ -79,7 +134,7 @@ func (s *Service) Update(ctx context.Context, id uuid.UUID, in updateInput) (*mo
 		if dberr.IsDuplicate(err) {
 			return nil, errConflict()
 		}
-		return nil, apperror.NewInternal()
+		return nil, apperror.NewInternal(err)
 	}
 	return m, nil
 }
@@ -93,7 +148,7 @@ func (s *Service) Delete(ctx context.Context, id uuid.UUID) error {
 		if dberr.IsForeignKey(err) {
 			return errHasReferences()
 		}
-		return apperror.NewInternal()
+		return apperror.NewInternal(err)
 	}
 	return nil
 }
@@ -102,7 +157,8 @@ func wrapFindErr(err error) error {
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return errNotFound()
 	}
-	return apperror.NewInternal()
+	return apperror.NewInternal(err)
 }
 
 // go-scaffold:service-methods
+{{/if}}

package/templates/add/auth/docs/google-callback.yaml.hbs

@@ -1,22 +0,0 @@
-get:
-  summary: Google OAuth callback
-  description: Redirect target Google sends the browser back to after consent — not called directly by API clients.
-  operationId: googleCallback
-  tags: [auth]
-  security: []
-  parameters:
-    - name: code
-      in: query
-      required: true
-      schema: { type: string }
-    - name: state
-      in: query
-      required: true
-      schema: { type: string }
-  responses:
-    "200":
-      description: ok, refresh_token set as an httpOnly cookie
-      content:
-        application/json:
-          schema: { $ref: './schemas.yaml#/AuthResponse' }
-    "401": { $ref: '../common/responses.yaml#/UnauthorizedError' }

package/templates/add/auth/docs/google-login.yaml.hbs

@@ -1,7 +0,0 @@
-get:
-  summary: Start the Google OAuth login flow
-  operationId: googleLogin
-  tags: [auth]
-  security: []
-  responses:
-    "302": { description: redirect to Google's consent screen }