go-duck-cli 1.2.1 → 1.2.3

package/templates/go/controller.go.hbs

@@ -3,6 +3,7 @@ package controllers
 import (
 	"net/http"
 	"strconv"
+	"strings"
 	{{#if isSearchable}}
 	"context"
 	{{/if}}
@@ -22,6 +23,8 @@ import (
 	"{{app_name}}/internal/search"
 	{{/if}}
 	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/gin-gonic/gin/render"
 	{{#if isDocument}}
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -44,9 +47,16 @@ type {{capitalize name}}Controller struct {
 func (ctrl *{{capitalize name}}Controller) Create(c *gin.Context) {
 	ctx := c.Request.Context()
 	var entity models.{{capitalize name}}
-	if err := c.ShouldBindJSON(&entity); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-		return
+	if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+		if err := c.ShouldBindWith(&entity, binding.MsgPack); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+	} else {
+		if err := c.ShouldBindJSON(&entity); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
 	}
 
 	{{#if isDocument}}
@@ -138,7 +148,11 @@ func (ctrl *{{capitalize name}}Controller) Create(c *gin.Context) {
 	}
 	{{/if}}
 
-	c.JSON(http.StatusCreated, entity)
+	if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+		c.Render(http.StatusCreated, render.MsgPack{Data: entity})
+	} else {
+		c.JSON(http.StatusCreated, entity)
+	}
 }
 
 // GetAll handles parallel read aggregation for both SQL and Mongo
@@ -146,6 +160,7 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 	ctx := c.Request.Context()
 	page, _ := strconv.Atoi(c.DefaultQuery("page", "0"))
 	size, _ := strconv.Atoi(c.DefaultQuery("size", "20"))
+	sortParam := c.DefaultQuery("sort", "")
 	
 	offset := 0
 	if page > 0 {
@@ -169,6 +184,15 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 				defer wg.Done()
 				var entities []models.{{capitalize name}}
 				opts := options.Find().SetSkip(int64(offset)).SetLimit(int64(size))
+				if sortParam != "" {
+					parts := strings.Split(sortParam, ",")
+					field := parts[0]
+					order := 1
+					if len(parts) > 1 && strings.ToLower(parts[1]) == "desc" {
+						order = -1
+					}
+					opts.SetSort(bson.D{bson.E{Key: field, Value: order}})
+				}
 				cursor, err := db.Collection("{{toLowerCase name}}s").Find(ctx, bson.M{}, opts)
 				if err == nil {
 					cursor.All(ctx, &entities)
@@ -179,7 +203,11 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 			}(role, siloDB)
 		}
 		wg.Wait()
-		c.JSON(http.StatusOK, federatedData)
+		if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+			c.Render(http.StatusOK, render.MsgPack{Data: federatedData})
+		} else {
+			c.JSON(http.StatusOK, federatedData)
+		}
 		return
 	}
 	{{/if}}
@@ -200,13 +228,26 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 
 	var entities []models.{{capitalize name}}
 	opts := options.Find().SetSkip(int64(offset)).SetLimit(int64(size))
+	if sortParam != "" {
+		parts := strings.Split(sortParam, ",")
+		field := parts[0]
+		order := 1
+		if len(parts) > 1 && strings.ToLower(parts[1]) == "desc" {
+			order = -1
+		}
+		opts.SetSort(bson.D{bson.E{Key: field, Value: order}})
+	}
 	cursor, err := tenantDB.Collection("{{toLowerCase name}}s").Find(ctx, filter, opts)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 	cursor.All(ctx, &entities)
-	c.JSON(http.StatusOK, entities)
+	if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+		c.Render(http.StatusOK, render.MsgPack{Data: entities})
+	} else {
+		c.JSON(http.StatusOK, entities)
+	}
 
 	{{else}}
 	// 🦆 GORM Path
@@ -227,7 +268,11 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 			go func(r string, db *gorm.DB) {
 				defer wg.Done()
 				var entities []models.{{capitalize name}}
-				if err := db.WithContext(ctx).Offset(offset).Limit(size).Find(&entities).Error; err == nil {
+				query := db.WithContext(ctx)
+				if sortParam != "" {
+					query = query.Order(strings.ReplaceAll(sortParam, ",", " "))
+				}
+				if err := query.Offset(offset).Limit(size).Find(&entities).Error; err == nil {
 					mu.Lock()
 					federatedData[r] = entities
 					mu.Unlock()
@@ -235,7 +280,11 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 			}(role, siloDB)
 		}
 		wg.Wait()
-		c.JSON(http.StatusOK, federatedData)
+		if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+			c.Render(http.StatusOK, render.MsgPack{Data: federatedData})
+		} else {
+			c.JSON(http.StatusOK, federatedData)
+		}
 		return
 	}
 	{{/if}}
@@ -248,11 +297,19 @@ func (ctrl *{{capitalize name}}Controller) GetAll(c *gin.Context) {
 	c.Header("X-Total-Count", strconv.FormatInt(totalCount, 10))
 
 	var entities []models.{{capitalize name}}
-	if err := tenantDB.WithContext(ctx).Offset(offset).Limit(size).Find(&entities).Error; err != nil {
+	query := tenantDB.WithContext(ctx)
+	if sortParam != "" {
+		query = query.Order(strings.ReplaceAll(sortParam, ",", " "))
+	}
+	if err := query.Offset(offset).Limit(size).Find(&entities).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
-	c.JSON(http.StatusOK, entities)
+	if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+		c.Render(http.StatusOK, render.MsgPack{Data: entities})
+	} else {
+		c.JSON(http.StatusOK, entities)
+	}
 	{{/if}}
 }
 
@@ -269,7 +326,11 @@ func (ctrl *{{capitalize name}}Controller) GetByID(c *gin.Context) {
 		c.JSON(http.StatusNotFound, gin.H{"error": "Not found"})
 		return
 	}
-	c.JSON(http.StatusOK, entity)
+	if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+		c.Render(http.StatusOK, render.MsgPack{Data: entity})
+	} else {
+		c.JSON(http.StatusOK, entity)
+	}
 	{{else}}
 	db, _ := c.Get("tenantDBConn")
 	tenantDB := db.(*gorm.DB)
@@ -278,7 +339,11 @@ func (ctrl *{{capitalize name}}Controller) GetByID(c *gin.Context) {
 		c.JSON(http.StatusNotFound, gin.H{"error": "Not found"})
 		return
 	}
-	c.JSON(http.StatusOK, entity)
+	if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+		c.Render(http.StatusOK, render.MsgPack{Data: entity})
+	} else {
+		c.JSON(http.StatusOK, entity)
+	}
 	{{/if}}
 }
 
@@ -286,9 +351,16 @@ func (ctrl *{{capitalize name}}Controller) Update(c *gin.Context) {
 	ctx := c.Request.Context()
 	id := c.Param("id")
 	var entity models.{{capitalize name}}
-	if err := c.ShouldBindJSON(&entity); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-		return
+	if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+		if err := c.ShouldBindWith(&entity, binding.MsgPack); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+	} else {
+		if err := c.ShouldBindJSON(&entity); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
 	}
 
 	{{#if isDocument}}
@@ -320,7 +392,11 @@ func (ctrl *{{capitalize name}}Controller) Update(c *gin.Context) {
 	messaging.PublishEvent(ctrl.Config.GoDuck.Messaging.MQTT.TopicPrefix, "tenant", "UPDATE", "{{capitalize name}}", entity, nil)
 	{{/if}}
 
-	c.JSON(http.StatusOK, entity)
+	if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+		c.Render(http.StatusOK, render.MsgPack{Data: entity})
+	} else {
+		c.JSON(http.StatusOK, entity)
+	}
 }
 
 func (ctrl *{{capitalize name}}Controller) Delete(c *gin.Context) {
@@ -356,9 +432,16 @@ func (ctrl *{{capitalize name}}Controller) Patch(c *gin.Context) {
 	ctx := c.Request.Context()
     id := c.Param("id")
     var updates map[string]interface{}
-    if err := c.ShouldBindJSON(&updates); err != nil {
-        c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-        return
+    if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+        if err := c.ShouldBindWith(&updates, binding.MsgPack); err != nil {
+            c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+            return
+        }
+    } else {
+        if err := c.ShouldBindJSON(&updates); err != nil {
+            c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+            return
+        }
     }
 
     {{#if isDocument}}
@@ -383,7 +466,11 @@ func (ctrl *{{capitalize name}}Controller) Patch(c *gin.Context) {
 	messaging.PublishEvent(ctrl.Config.GoDuck.Messaging.MQTT.TopicPrefix, "tenant", "PATCH", "{{capitalize name}}", updates, nil)
 	{{/if}}
 
-    c.JSON(http.StatusOK, gin.H{"message": "Patch successful"})
+    if ctrl.Config.GoDuck.Server.REST.Protocol == "messagepack" {
+        c.Render(http.StatusOK, render.MsgPack{Data: gin.H{"message": "Patch successful"}})
+    } else {
+        c.JSON(http.StatusOK, gin.H{"message": "Patch successful"})
+    }
 }
 
 func (ctrl *{{capitalize name}}Controller) BulkCreate(c *gin.Context) { c.JSON(http.StatusNotImplemented, gin.H{"error": "Bulk operations use primary silo isolation by default."}) }

package/templates/go/main.go.hbs

@@ -14,6 +14,8 @@ import (
     "{{app_name}}/integrations/wso2"
     "gorm.io/driver/postgres"
     "gorm.io/gorm"
+    "net/http"
+    "github.com/improbable-eng/grpc-web/go/grpcweb"
 )
 
 func main() {
@@ -40,6 +42,18 @@ func main() {
         go func() {
             grpcSrv := server.NewGRPCServer(appConfig, repo)
             logger.Info("Starting Kratos gRPC server on %s", appConfig.GoDuck.Server.GRPC.Addr)
+            
+            if appConfig.GoDuck.Server.GRPC.WebEnabled {
+                wrappedGrpc := grpcweb.WrapServer(grpcSrv.Server)
+                go func() {
+                    webPort := fmt.Sprintf(":%d", appConfig.GoDuck.Server.GRPC.WebPort)
+                    logger.Info("Starting gRPC-Web Proxy on %s", webPort)
+                    if err := http.ListenAndServe(webPort, wrappedGrpc); err != nil {
+                        logger.Error("Failed to start gRPC-Web Proxy: %v", err)
+                    }
+                }()
+            }
+            
             if err := grpcSrv.Start(context.Background()); err != nil {
                 logger.Error("Failed to start Kratos gRPC server: %v", err)
             }
@@ -56,7 +70,7 @@ func main() {
 	}
 
 	// 6. Start HTTP Server
-	port := fmt.Sprintf(":%d", appConfig.GoDuck.Server.Port)
-	logger.Info("Starting HTTP server on %s", port)
+	port := fmt.Sprintf(":%d", appConfig.GoDuck.Server.REST.Port)
+	logger.Info("Starting HTTP REST server on %s", port)
 	r.Run(port)
 }

package/templates/kratos/service.go.hbs

@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"strings"
 	{{#if needFmt}}
 	"fmt"
 	{{/if}}
@@ -283,6 +284,15 @@ func (s *{{capitalize name}}Service) List{{capitalize name}}(ctx context.Context
 	for role, db := range siloConns {
 		var results []models.{{capitalize name}}
 		opts := options.Find().SetSkip(int64((req.Page - 1) * req.PageSize)).SetLimit(int64(req.PageSize))
+		if req.Sort != "" {
+			parts := strings.Split(req.Sort, ",")
+			field := parts[0]
+			order := 1
+			if len(parts) > 1 && strings.ToLower(parts[1]) == "desc" {
+				order = -1
+			}
+			opts.SetSort(bson.D{bson.E{Key: field, Value: order}})
+		}
 		cursor, err := db.Collection("{{toLowerCase name}}s").Find(ctx, bson.M{}, opts)
 		if err == nil {
 			cursor.All(ctx, &results)
@@ -300,6 +310,15 @@ func (s *{{capitalize name}}Service) List{{capitalize name}}(ctx context.Context
 	if ok {
 		var results []models.{{capitalize name}}
 		opts := options.Find().SetSkip(int64((req.Page - 1) * req.PageSize)).SetLimit(int64(req.PageSize))
+		if req.Sort != "" {
+			parts := strings.Split(req.Sort, ",")
+			field := parts[0]
+			order := 1
+			if len(parts) > 1 && strings.ToLower(parts[1]) == "desc" {
+				order = -1
+			}
+			opts.SetSort(bson.D{bson.E{Key: field, Value: order}})
+		}
 		cursor, err := db.Collection("{{toLowerCase name}}s").Find(ctx, bson.M{}, opts)
 		if err == nil {
 			cursor.All(ctx, &results)
@@ -319,7 +338,9 @@ func (s *{{capitalize name}}Service) List{{capitalize name}}(ctx context.Context
 	for role, db := range siloConns {
 		var results []models.{{capitalize name}}
 		query := db.WithContext(ctx).Model(&models.{{capitalize name}}{})
-		
+		if req.Sort != "" {
+			query = query.Order(strings.ReplaceAll(req.Sort, ",", " "))
+		}
 		var count int64
 		query.Count(&count)
 		total += count
@@ -338,7 +359,9 @@ func (s *{{capitalize name}}Service) List{{capitalize name}}(ctx context.Context
 	if ok {
 		var results []models.{{capitalize name}}
 		query := db.WithContext(ctx).Model(&models.{{capitalize name}}{})
-		
+		if req.Sort != "" {
+			query = query.Order(strings.ReplaceAll(req.Sort, ",", " "))
+		}
 		var count int64
 		query.Count(&count)
 		total = count

package/templates/proto/entity.proto.hbs

@@ -83,6 +83,7 @@ message List{{capitalize name}}Request {
   int32 page = 1;
   int32 page_size = 2;
   string query = 3;
+  string sort = 4;
 }
 
 message List{{capitalize name}}Reply {