go-duck-cli 1.1.43 → 1.1.48

package/generators/multitenancy.js

@@ -405,15 +405,21 @@ func CreateDatabaseAndMigrate(masterDB *gorm.DB) gin.HandlerFunc {
             if req.TenantID != "" {
                 existing.TenantID = req.TenantID
             }
-            masterDB.Save(&existing)
+            if saveErr := masterDB.Save(&existing).Error; saveErr != nil {
+                c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("Failed to update role silo: %v", saveErr)})
+                return
+            }
             tenantID = existing.TenantID
         } else {
-            masterDB.Create(&models.TenantRole{
+            if createErr := masterDB.Create(&models.TenantRole{
                 TenantID:  tenantID,
                 RoleName:  req.RoleName,
                 DBName:    req.DBName,
                 IsPrimary: isPrimary,
-            })
+            }).Error; createErr != nil {
+                c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("Failed to provision role silo: %v", createErr)})
+                return
+            }
         }
 
 		// 4. Migrate
@@ -480,8 +486,8 @@ package models
 type TenantRole struct {
 	ID          uint    \`gorm:"primaryKey" json:"id"\`
 	TenantID    string  \`json:"tenantId" gorm:"unique;not null;index"\`
-	RoleName    string  \`json:"roleName" gorm:"unique;not null"\`
-	DBName      string  \`json:"dbName" gorm:"not null"\`
+	RoleName    string  \`json:"roleName" gorm:"not null;uniqueIndex:idx_role_db"\`
+	DBName      string  \`json:"dbName" gorm:"not null;uniqueIndex:idx_role_db"\`
 	MongoDBName string  \`json:"mongoDbName"\`
     IsPrimary   bool    \`json:"isPrimary" gorm:"default:false"\`
 }

package/generators/outbox.js

@@ -42,8 +42,8 @@ import (
 	"{{app_name}}/models"
 	"{{app_name}}/config"
 	"{{app_name}}/middleware"
-	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
+	"gorm.io/gorm/schema"
 )
 
 type OutboxWorker struct {
@@ -122,11 +122,18 @@ func (w *OutboxWorker) markFailed(db *gorm.DB, item *models.DistributedOutbox, r
 }
 
 func (w *OutboxWorker) relayMutation(targetDB *gorm.DB, item models.DistributedOutbox) error {
+	var rawData map[string]interface{}
 	var data map[string]interface{}
-	if item.Payload != "" && item.MutationType != "DELETE" {
-		if err := json.Unmarshal([]byte(item.Payload), &data); err != nil {
+	ns := schema.NamingStrategy{}
+
+	if item.Payload != "" && item.MutationType != "DELETE" && item.MutationType != "BULK_CREATE" && item.MutationType != "BULK_UPDATE" && item.MutationType != "BULK_PATCH" {
+		if err := json.Unmarshal([]byte(item.Payload), &rawData); err != nil {
 			return fmt.Errorf("payload unmarshal failed: %v", err)
 		}
+		data = make(map[string]interface{})
+		for k, v := range rawData {
+			data[ns.ColumnName("", k)] = v
+		}
 	}
 
 	table := strings.ToLower(item.EntityName)
@@ -139,15 +146,30 @@ func (w *OutboxWorker) relayMutation(targetDB *gorm.DB, item models.DistributedO
 	case "DELETE":
 		return targetDB.Table(table).Where("id = ?", item.EntityID).Delete(nil).Error
 	case "BULK_CREATE":
+		var rawList []map[string]interface{}
+		json.Unmarshal([]byte(item.Payload), &rawList)
 		var list []map[string]interface{}
-		json.Unmarshal([]byte(item.Payload), &list)
+		for _, row := range rawList {
+			mappedRow := make(map[string]interface{})
+			for k, v := range row {
+				mappedRow[ns.ColumnName("", k)] = v
+			}
+			list = append(list, mappedRow)
+		}
 		return targetDB.Table(table).Clauses(clause.OnConflict{DoNothing: true}).Create(list).Error
 	case "BULK_UPDATE", "BULK_PATCH":
+		var rawList []map[string]interface{}
+		json.Unmarshal([]byte(item.Payload), &rawList)
 		var list []map[string]interface{}
-		json.Unmarshal([]byte(item.Payload), &list)
+		for _, row := range rawList {
+			mappedRow := make(map[string]interface{})
+			for k, v := range row {
+				mappedRow[ns.ColumnName("", k)] = v
+			}
+			list = append(list, mappedRow)
+		}
 		err := targetDB.Transaction(func(tx *gorm.DB) error {
 			for _, row := range list {
-				// Identify ID for updates in bulk
 				id := row["id"]
 				if id == nil {
 					id = row["ID"]

package/index.js

@@ -82,7 +82,9 @@ type AuditLog struct {
 package middleware
 
 import (
+	"bytes"
 	"fmt"
+	"io"
 	"net/http"
 	"time"
 
@@ -98,6 +100,12 @@ func AuditMiddleware(db *gorm.DB) gin.HandlerFunc {
 			return
 		}
 
+		var bodyBytes []byte
+		if c.Request.Body != nil {
+			bodyBytes, _ = io.ReadAll(c.Request.Body)
+			c.Request.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
+		}
+
 		// Simplified auditing logic
 		method := c.Request.Method
 		path := c.Request.URL.Path
@@ -125,16 +133,30 @@ func AuditMiddleware(db *gorm.DB) gin.HandlerFunc {
 		c.Next()
 
 		// Logic to capture entity ID and snapshot values would go here...
-		auditEntry := models.AuditLog{
-			EntityName: path,
-			TenantDB:   tenantStr,
-			Action:     action,
-			ModifiedBy: emailStr,
-			KeycloakID: kidStr,
-			ModifiedAt: time.Now(),
-			ClientIP:   clientIP,
-		}
-		db.Create(&auditEntry)
+		entityID := c.Param("id")
+        // If ID not in path param, try query param "id"
+        if entityID == "" {
+            entityID = c.Query("id")
+        }
+        var newValue string
+        newValue = string(bodyBytes)
+        // For CREATE actions, previous value is empty; for UPDATE/DELETE we could fetch old value later (placeholder)
+        if action == "UPDATE" || action == "DELETE" {
+            // Attempt to fetch previous record snapshot (basic placeholder implementation)
+            // This could be improved with model-specific hooks.
+        }
+        auditEntry := models.AuditLog{
+            EntityName:    path,
+            EntityID:      entityID,
+            TenantDB:      tenantStr,
+            Action:        action,
+            ModifiedBy:    emailStr,
+            KeycloakID:    kidStr,
+            ModifiedAt:    time.Now(),
+            ClientIP:      clientIP,
+            NewValue:      newValue,
+        }
+        db.Create(&auditEntry)
 	}
 }
 `;
@@ -287,7 +309,7 @@ Handlebars.registerPartial('renderFields', `
     {{> renderFields fields=children isDocument=../isDocument}}
   } \`json:"{{name}}"{{#if ../isDocument}} bson:"{{name}}"{{/if}}\`
 {{else}}
-  {{capitalize name}} {{toGoType type}} \`{{#if ../isDocument}}bson:"{{#if (eq name "id")}}_id{{else}}{{name}}{{/if}}{{#if (eq name "id")}},omitempty{{/if}}"{{else}}{{#if (eq name "id")}}gorm:"primaryKey"{{else}}{{#if unique}}gorm:"uniqueIndex"{{/if}}{{/if}}{{/if}} {{#if (isJson type)}}gorm:"type:{{toLowerCase type}};serializer:json"{{/if}} json:"{{name}}"{{#if required}} binding:"required"{{/if}}\`
+  {{capitalize name}} {{toGoType type}} \`bson:"{{#if (eq name "id")}}_id{{else}}{{name}}{{/if}}{{#if (eq name "id")}},omitempty{{/if}}" {{#if (eq name "id")}}gorm:"primaryKey;column:id"{{else}}{{#if unique}}gorm:"uniqueIndex"{{/if}}{{/if}} {{#if (isJson type)}}gorm:"type:{{toLowerCase type}};serializer:json"{{/if}} json:"{{name}}"{{#if required}} binding:"required"{{/if}}\`
 {{/if}}
 {{/each}}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.1.43",
+  "version": "1.1.48",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",

package/templates/go/controller.go.hbs

@@ -309,6 +309,17 @@ func (ctrl *{{capitalize name}}Controller) Update(c *gin.Context) {
 	{{/if}}
 
 	cache.ClearPattern("*:{{capitalize name}}:" + id)
+	
+	{{#if isFederated}}
+	rolesInterface, _ := c.Get("tenantRoles")
+	roles := rolesInterface.([]string)
+	firstRole := "tenant"
+	if len(roles) > 0 { firstRole = roles[0] }
+	messaging.PublishEvent(ctrl.Config.GoDuck.Messaging.MQTT.TopicPrefix, firstRole, "UPDATE", "{{capitalize name}}", entity, nil)
+	{{else}}
+	messaging.PublishEvent(ctrl.Config.GoDuck.Messaging.MQTT.TopicPrefix, "tenant", "UPDATE", "{{capitalize name}}", entity, nil)
+	{{/if}}
+
 	c.JSON(http.StatusOK, entity)
 }
 
@@ -327,6 +338,17 @@ func (ctrl *{{capitalize name}}Controller) Delete(c *gin.Context) {
 	{{/if}}
 
 	cache.ClearPattern("*:{{capitalize name}}:" + id)
+
+	{{#if isFederated}}
+	rolesInterface, _ := c.Get("tenantRoles")
+	roles := rolesInterface.([]string)
+	firstRole := "tenant"
+	if len(roles) > 0 { firstRole = roles[0] }
+	messaging.PublishEvent(ctrl.Config.GoDuck.Messaging.MQTT.TopicPrefix, firstRole, "DELETE", "{{capitalize name}}", map[string]string{"id": id}, nil)
+	{{else}}
+	messaging.PublishEvent(ctrl.Config.GoDuck.Messaging.MQTT.TopicPrefix, "tenant", "DELETE", "{{capitalize name}}", map[string]string{"id": id}, nil)
+	{{/if}}
+
 	c.JSON(http.StatusNoContent, nil)
 }
 
@@ -350,6 +372,17 @@ func (ctrl *{{capitalize name}}Controller) Patch(c *gin.Context) {
     {{/if}}
 
     cache.ClearPattern("*:{{capitalize name}}:" + id)
+
+	{{#if isFederated}}
+	rolesInterface, _ := c.Get("tenantRoles")
+	roles := rolesInterface.([]string)
+	firstRole := "tenant"
+	if len(roles) > 0 { firstRole = roles[0] }
+	messaging.PublishEvent(ctrl.Config.GoDuck.Messaging.MQTT.TopicPrefix, firstRole, "PATCH", "{{capitalize name}}", updates, nil)
+	{{else}}
+	messaging.PublishEvent(ctrl.Config.GoDuck.Messaging.MQTT.TopicPrefix, "tenant", "PATCH", "{{capitalize name}}", updates, nil)
+	{{/if}}
+
     c.JSON(http.StatusOK, gin.H{"message": "Patch successful"})
 }
 

package/templates/go/entity.go.hbs

@@ -9,34 +9,30 @@ import (
 
 type {{name}} struct {
 {{#if isDocument}}
-ID string `json:"id" bson:"_id,omitempty"`
+ID string `gorm:"primaryKey;column:id" json:"id" bson:"_id,omitempty"`
 {{else}}
-ID uint `gorm:"primaryKey" json:"id"`
+ID uint `gorm:"primaryKey;column:id" json:"id" bson:"_id,omitempty"`
 {{/if}}
 {{> renderFields fields=fields isDocument=isDocument}}
 {{#if isAudited}}
-CreatedBy string `{{#if isDocument}}bson:"created_by"{{else}}gorm:"column:created_by"{{/if}} json:"createdBy"`
-CreatedDate time.Time `{{#if isDocument}}bson:"created_date"{{else}}gorm:"column:created_date"{{/if}} json:"createdDate"`
-LastModifiedBy string `{{#if isDocument}}bson:"last_modified_by"{{else}}gorm:"column:last_modified_by"{{/if}} json:"lastModifiedBy"`
-LastModifiedDate time.Time `{{#if isDocument}}bson:"last_modified_date"{{else}}gorm:"column:last_modified_date"{{/if}} json:"lastModifiedDate"`
+CreatedBy string `gorm:"column:created_by" bson:"created_by" json:"createdBy"`
+CreatedDate time.Time `gorm:"column:created_date" bson:"created_date" json:"createdDate"`
+LastModifiedBy string `gorm:"column:last_modified_by" bson:"last_modified_by" json:"lastModifiedBy"`
+LastModifiedDate time.Time `gorm:"column:last_modified_date" bson:"last_modified_date" json:"lastModifiedDate"`
 {{else}}
-CreatedAt time.Time `{{#if isDocument}}bson:"created_at"{{else}}gorm:"autoCreateTime"{{/if}} json:"createdAt"`
-UpdatedAt time.Time `{{#if isDocument}}bson:"updated_at"{{else}}gorm:"autoUpdateTime"{{/if}} json:"updatedAt"`
+CreatedAt time.Time `gorm:"autoCreateTime;column:created_at" bson:"created_at" json:"createdAt"`
+UpdatedAt time.Time `gorm:"autoUpdateTime;column:updated_at" bson:"updated_at" json:"updatedAt"`
 {{/if}}
 {{#each relationships}}
 {{#if (eq from.entity ../name)}}
-{{capitalize from.field}} []{{capitalize to.entity}} `{{#unless ../isDocument}}{{#unless toIsDocument}}gorm:"foreignKey:{{capitalize to.field}}ID"{{else}}gorm:"-"{{/unless}}{{/unless}} json:"{{from.field}}" bson:"{{from.field}}"`
+{{capitalize from.field}} []{{capitalize to.entity}} `{{#unless ../isDocument}}{{#unless toIsDocument}}gorm:"foreignKey:{{capitalize to.field}}ID"{{else}}gorm:"-"{{/unless}}{{else}}gorm:"-"{{/unless}} json:"{{from.field}}" bson:"{{from.field}}"`
 {{else}}
-{{capitalize to.field}}ID {{#if ../isDocument}}string{{else}}{{#if fromIsDocument}}string{{else}}*uint{{/if}}{{/if}} `{{#if ../isDocument}}bson:"{{toLowerCase to.field}}_id"{{else}}gorm:"column:{{to.field}}_id;index"{{/if}} json:"{{to.field}}Id"`
-{{#unless ../isDocument}}
-{{capitalize to.field}} *{{capitalize from.entity}} `{{#unless fromIsDocument}}gorm:"foreignKey:{{capitalize to.field}}ID"{{else}}gorm:"-"{{/unless}} json:"{{to.field}},omitempty"`
-{{/unless}}
+{{capitalize to.field}}ID {{#if ../isDocument}}string{{else}}{{#if fromIsDocument}}string{{else}}*uint{{/if}}{{/if}} `gorm:"column:{{toLowerCase to.field}}_id;index" bson:"{{toLowerCase to.field}}_id" json:"{{to.field}}Id"`
+{{capitalize to.field}} *{{capitalize from.entity}} `{{#unless fromIsDocument}}gorm:"foreignKey:{{capitalize to.field}}ID"{{else}}gorm:"-"{{/unless}} json:"{{to.field}},omitempty" bson:"-"`
 {{/if}}
 {{/each}}
 }
 
-{{#unless isDocument}}
 func ({{name}}) TableName() string {
     return "{{toLowerCase name}}"
-}
-{{/unless}}
+}

package/templates/kratos/service.go.hbs

@@ -12,7 +12,9 @@ import (
 	"time"
 	{{/if}}
 	pb "{{projectName}}/api/v1"
+	"{{projectName}}/config"
 	"{{projectName}}/internal/repository"
+	"{{projectName}}/messaging"
 	"{{projectName}}/models"
 	{{#if (hasJson fields)}}
 	"gorm.io/datatypes"
@@ -105,6 +107,12 @@ func (s *{{capitalize name}}Service) Create{{capitalize name}}(ctx context.Conte
 	{{/if}}
 	{{/if}}
 
+	for role, pbEntity := range federatedData {
+		if config.AppConfig != nil {
+			messaging.PublishEvent(config.AppConfig.GoDuck.Messaging.MQTT.TopicPrefix, role, "CREATE", "{{capitalize name}}", pbEntity, nil)
+		}
+	}
+
 	return &pb.{{capitalize name}}Reply{
 		FederatedData: federatedData,
 	}, nil
@@ -213,6 +221,12 @@ func (s *{{capitalize name}}Service) Update{{capitalize name}}(ctx context.Conte
 	{{/if}}
 	{{/if}}
 
+	for role, pbEntity := range federatedData {
+		if config.AppConfig != nil {
+			messaging.PublishEvent(config.AppConfig.GoDuck.Messaging.MQTT.TopicPrefix, role, "UPDATE", "{{capitalize name}}", pbEntity, nil)
+		}
+	}
+
 	return &pb.{{capitalize name}}Reply{
 		FederatedData: federatedData,
 	}, nil
@@ -222,25 +236,37 @@ func (s *{{capitalize name}}Service) Delete{{capitalize name}}(ctx context.Conte
 	{{#if isDocument}}
 	{{#if isFederated}}
 	siloConns, _ := ctx.Value("tenantMongoConnections").(map[string]*mongo.Database)
-	for _, db := range siloConns {
+	for role, db := range siloConns {
 		db.Collection("{{toLowerCase name}}s").DeleteOne(ctx, bson.M{"_id": req.Id})
+		if config.AppConfig != nil {
+			messaging.PublishEvent(config.AppConfig.GoDuck.Messaging.MQTT.TopicPrefix, role, "DELETE", "{{capitalize name}}", map[string]interface{}{"id": req.Id}, nil)
+		}
 	}
 	{{else}}
 	db, ok := ctx.Value("tenantMongoDB").(*mongo.Database)
 	if ok {
 		db.Collection("{{toLowerCase name}}s").DeleteOne(ctx, bson.M{"_id": req.Id})
+		if config.AppConfig != nil {
+			messaging.PublishEvent(config.AppConfig.GoDuck.Messaging.MQTT.TopicPrefix, "tenant", "DELETE", "{{capitalize name}}", map[string]interface{}{"id": req.Id}, nil)
+		}
 	}
 	{{/if}}
 	{{else}}
 	{{#if isFederated}}
 	siloConns, _ := ctx.Value("tenantSiloConns").(map[string]*gorm.DB)
-	for _, db := range siloConns {
+	for role, db := range siloConns {
 		db.WithContext(ctx).Where("id = ?", req.Id).Delete(&models.{{capitalize name}}{})
+		if config.AppConfig != nil {
+			messaging.PublishEvent(config.AppConfig.GoDuck.Messaging.MQTT.TopicPrefix, role, "DELETE", "{{capitalize name}}", map[string]interface{}{"id": req.Id}, nil)
+		}
 	}
 	{{else}}
 	db, ok := ctx.Value("tenantDBConn").(*gorm.DB)
 	if ok {
 		db.WithContext(ctx).Where("id = ?", req.Id).Delete(&models.{{capitalize name}}{})
+		if config.AppConfig != nil {
+			messaging.PublishEvent(config.AppConfig.GoDuck.Messaging.MQTT.TopicPrefix, "tenant", "DELETE", "{{capitalize name}}", map[string]interface{}{"id": req.Id}, nil)
+		}
 	}
 	{{/if}}
 	{{/if}}