go-duck-cli 1.4.17 → 1.4.19

package/generators/swagger.js

@@ -121,11 +121,25 @@ export const generateSwaggerDocs = async (config, entities, outputDir, openEntit
 
             regPath(`${basePath}/${name}s`, 'get', {
                 summary: `Get all ${capitalized}s`,
+                description: `Retrieves a paginated list of ${capitalized}s. Supports JPA-style dynamic scalar filtering and relationship eager-loading.`,
                 parameters: [
                     ...commonHeaders,
                     { name: 'page', in: 'query', schema: { type: 'integer' }, description: 'Zero-based page index' },
                     { name: 'size', in: 'query', schema: { type: 'integer' }, description: 'Records per page' },
-                    { name: 'eager', in: 'query', schema: { type: 'boolean' }, description: 'If true, performs SQL Join to fetch relations' }
+                    { name: 'sort', in: 'query', schema: { type: 'string' }, description: 'Sort criteria (e.g., name,desc)' },
+                    { name: 'eager', in: 'query', schema: { type: 'boolean' }, description: 'If true, performs SQL Join to fetch relations' },
+                    ...entity.fields.map(f => ({
+                        name: f.name,
+                        in: 'query',
+                        schema: getSwaggerFieldSchema(f.type),
+                        description: `Filter exactly by ${f.name}`
+                    })),
+                    ...entity.relationships.filter(r => r.to.entity === capitalized).map(r => ({
+                        name: r.to.field + 'Id',
+                        in: 'query',
+                        schema: { type: 'integer' },
+                        description: `Filter by foreign key ${r.to.field}Id`
+                    }))
                 ],
                 responses: { 200: { description: 'OK', content: { 'application/json': { schema: { type: 'array', items: { $ref: `#/components/schemas/${capitalized}` } } } } } }
             }, 'read');
@@ -143,12 +157,20 @@ export const generateSwaggerDocs = async (config, entities, outputDir, openEntit
             regPath(`${basePath}/${name}s/{id}`, 'put', {
                 summary: `Update ${capitalized}`,
                 parameters: [...commonHeaders, { name: 'id', in: 'path', required: true, schema: { type: 'integer' } }],
+                requestBody: {
+                    required: true,
+                    content: { 'application/json': { schema: { $ref: `#/components/schemas/${capitalized}` } } }
+                },
                 responses: { 200: { description: 'Updated', content: { 'application/json': { schema: { $ref: `#/components/schemas/${capitalized}` } } } } }
             }, 'update');
 
             regPath(`${basePath}/${name}s/{id}`, 'patch', {
                 summary: `Patch ${capitalized}`,
                 parameters: [...commonHeaders, { name: 'id', in: 'path', required: true, schema: { type: 'integer' } }],
+                requestBody: {
+                    required: true,
+                    content: { 'application/json': { schema: { $ref: `#/components/schemas/${capitalized}` } } }
+                },
                 responses: { 200: { description: 'Patched' } }
             }, 'update');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.4.17",
+  "version": "1.4.19",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",
@@ -34,7 +34,6 @@
     "generator",
     "go-duck"
   ],
-  
   "repository": {
     "type": "git",
     "url": "git+https://github.com/heavenscode/go-duck.git"

package/templates/go/controller.go.hbs

@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"strconv"
 	"strings"
+	"regexp"
 	{{#if isSearchable}}
 	"context"
 	{{/if}}
@@ -215,10 +216,10 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 	db, _ := c.Get("tenantMongoDB")
 	tenantDB := db.(*mongo.Database)
 	
-	// PostgREST-lite Filter Translation (Simple eq check for now)
+	// PostgREST-lite Filter Translation
 	filter := bson.M{}
 	for k, v := range c.Request.URL.Query() {
-		if k != "page" && k != "size" && k != "federated" {
+		if k != "page" && k != "size" && k != "federated" && k != "sort" && k != "eager" {
 			filter[k] = v[0]
 		}
 	}
@@ -298,6 +299,30 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 
 	var entities []models.{{capitalize name}}
 	query := tenantDB.WithContext(ctx)
+
+	// Dynamic Eager Loading
+	if c.DefaultQuery("eager", "false") == "true" {
+		{{#each relationships}}
+		{{#if (eq from.entity ../name)}}
+		query = query.Preload("{{capitalize to.entity}}")
+		{{else}}
+		query = query.Preload("{{capitalize from.entity}}")
+		{{/if}}
+		{{/each}}
+	}
+
+	// Dynamic Filtering (JPA-style)
+	for k, v := range c.Request.URL.Query() {
+		if k != "page" && k != "size" && k != "federated" && k != "sort" && k != "eager" {
+			// Convert camelCase to snake_case for PostgreSQL
+			var matchFirstCap = regexp.MustCompile("(.)([A-Z][a-z]+)")
+			var matchAllCap   = regexp.MustCompile("([a-z0-9])([A-Z])")
+			snake := matchFirstCap.ReplaceAllString(k, "${1}_${2}")
+			snake = matchAllCap.ReplaceAllString(snake, "${1}_${2}")
+			query = query.Where(strings.ToLower(snake)+" = ?", v[0])
+		}
+	}
+
 	if sortParam != "" {
 		query = query.Order(strings.ReplaceAll(sortParam, ",", " "))
 	}