Re-migrate code

controllers/serials_controller.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 
@@ -57,8 +58,20 @@ func (c *SerialsController) Generate(ctx *gin.Context) {
 		return
 	}
 
-	SuccessResponse(ctx, "成功生成 "+strconv.Itoa(len(serials))+" 个序列号", gin.H{
-		"serials": serials,
+	items := make([]gin.H, 0, len(serials))
+	for _, serial := range serials {
+		items = append(items, gin.H{
+			"serialNumber": serial.SerialNumber,
+			"companyName":  serial.CompanyName,
+			"validUntil":   serial.ValidUntil,
+			"isActive":     serial.IsActive,
+			"createdAt":    serial.CreatedAt,
+			"createdBy":    userModel.Name,
+		})
+	}
+
+	SuccessResponse(ctx, "成功生成"+strconv.Itoa(len(serials))+"个序列号", gin.H{
+		"serials": items,
 	})
 }
 
@@ -98,8 +111,20 @@ func (c *SerialsController) GenerateWithPrefix(ctx *gin.Context) {
 		return
 	}
 
-	SuccessResponse(ctx, "成功生成 "+strconv.Itoa(len(serials))+" 个序列号", gin.H{
-		"serials": serials,
+	items := make([]gin.H, 0, len(serials))
+	for _, serial := range serials {
+		items = append(items, gin.H{
+			"serialNumber": serial.SerialNumber,
+			"companyName":  serial.CompanyName,
+			"validUntil":   serial.ValidUntil,
+			"isActive":     serial.IsActive,
+			"createdAt":    serial.CreatedAt,
+			"createdBy":    userModel.Name,
+		})
+	}
+
+	SuccessResponse(ctx, "成功生成"+strconv.Itoa(len(serials))+"个序列号", gin.H{
+		"serials": items,
 	})
 }
 
@@ -168,8 +193,26 @@ func (c *SerialsController) Query(ctx *gin.Context) {
 		return
 	}
 
+	createdBy := ""
+	if serial.User != nil {
+		createdBy = serial.User.Name
+	}
+
+	status := "active"
+	if !serial.IsActive {
+		status = "disabled"
+	}
+
 	SuccessResponse(ctx, "查询成功", gin.H{
-		"serial": serial,
+		"serial": gin.H{
+			"serialNumber": serial.SerialNumber,
+			"companyName":  serial.CompanyName,
+			"validUntil":   serial.ValidUntil,
+			"status":       status,
+			"isActive":     serial.IsActive,
+			"createdAt":    serial.CreatedAt,
+			"createdBy":    createdBy,
+		},
 	})
 }
 
@@ -197,8 +240,25 @@ func (c *SerialsController) FindAll(ctx *gin.Context) {
 		return
 	}
 
+	items := make([]gin.H, 0, len(serials))
+	for _, serial := range serials {
+		createdBy := ""
+		if serial.User != nil {
+			createdBy = serial.User.Name
+		}
+
+		items = append(items, gin.H{
+			"serialNumber": serial.SerialNumber,
+			"companyName":  serial.CompanyName,
+			"validUntil":   serial.ValidUntil,
+			"isActive":     serial.IsActive,
+			"createdAt":    serial.CreatedAt,
+			"createdBy":    createdBy,
+		})
+	}
+
 	SuccessResponse(ctx, "获取序列号列表成功", gin.H{
-		"data": serials,
+		"data": items,
 		"pagination": gin.H{
 			"page":       page,
 			"limit":      limit,
@@ -237,8 +297,21 @@ func (c *SerialsController) Update(ctx *gin.Context) {
 		return
 	}
 
-	SuccessResponse(ctx, "序列号信息更新成功", gin.H{
-		"serial": serial,
+	createdBy := ""
+	if serial.User != nil {
+		createdBy = serial.User.Name
+	}
+
+	SuccessResponse(ctx, "序列号更新成功", gin.H{
+		"serial": gin.H{
+			"serialNumber": serial.SerialNumber,
+			"companyName":  serial.CompanyName,
+			"validUntil":   serial.ValidUntil,
+			"isActive":     serial.IsActive,
+			"createdAt":    serial.CreatedAt,
+			"updatedAt":    serial.UpdatedAt,
+			"createdBy":    createdBy,
+		},
 	})
 }
 
@@ -264,5 +337,9 @@ func (c *SerialsController) Revoke(ctx *gin.Context) {
 		return
 	}
 
-	SuccessResponse(ctx, "序列号吊销成功")
+	SuccessResponse(ctx, "序列号已吊销", gin.H{
+		"data": gin.H{
+			"serialNumber": strings.ToUpper(serialNumber),
+		},
+	})
 }