修复(#17): 修复订阅流量限制更新未生效

Closes HIF-17

internal/handler/admin/user/updateUserSubscribeHandler.go

@@ -1,9 +1,6 @@
 package user
 
 import (
-	"encoding/json"
-	"errors"
-
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/admin/user"
 	"github.com/perfect-panel/server/internal/svc"
@@ -15,31 +12,18 @@ import (
 func UpdateUserSubscribeHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
 		var req types.UpdateUserSubscribeRequest
-		_ = c.ShouldBind(&req)
+		if err := c.ShouldBind(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
 		validateErr := svcCtx.Validate(&req)
 		if validateErr != nil {
 			result.ParamErrorResult(c, validateErr)
 			return
 		}
-		if err := validateUpdateUserSubscribeTrafficLimit(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
 
 		l := user.NewUpdateUserSubscribeLogic(c.Request.Context(), svcCtx)
 		err := l.UpdateUserSubscribe(&req)
 		result.HttpResult(c, nil, err)
 	}
 }
-
-func validateUpdateUserSubscribeTrafficLimit(req *types.UpdateUserSubscribeRequest) error {
-	if req.TrafficLimit == nil || *req.TrafficLimit == "" {
-		return nil
-	}
-
-	var rules []types.TrafficLimit
-	if err := json.Unmarshal([]byte(*req.TrafficLimit), &rules); err != nil {
-		return errors.New("traffic_limit must be a valid JSON array")
-	}
-	return nil
-}

internal/handler/admin/user/updateUserSubscribeHandler_test.go

@@ -24,7 +24,7 @@ func TestUpdateUserSubscribeHandlerRejectsInvalidLimits(t *testing.T) {
 			body: `{"user_subscribe_id":1,"subscribe_id":1,"traffic":0,"expired_at":4102444800000,"upload":0,"download":0,"speed_limit":-1}`,
 		},
 		{
-			name: "invalid traffic limit json",
+			name: "invalid traffic limit type",
 			body: `{"user_subscribe_id":1,"subscribe_id":1,"traffic":0,"expired_at":4102444800000,"upload":0,"download":0,"traffic_limit":"not-json"}`,
 		},
 	}

internal/logic/admin/user/updateUserSubscribeLogic.go

@@ -2,6 +2,7 @@ package user
 
 import (
 	"context"
+	"encoding/json"
 	"time"
 
 	"github.com/perfect-panel/server/internal/model/user"
@@ -45,7 +46,11 @@ func (l *UpdateUserSubscribeLogic) UpdateUserSubscribe(req *types.UpdateUserSubs
 	}
 	trafficLimit := userSub.TrafficLimit
 	if req.TrafficLimit != nil {
-		trafficLimit = req.TrafficLimit
+		trafficLimit, err = marshalUserSubscribeTrafficLimit(req.TrafficLimit)
+		if err != nil {
+			l.Errorw("marshal traffic_limit failed:", logger.Field("error", err.Error()))
+			return errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "marshal traffic_limit failed: %v", err.Error())
+		}
 	}
 
 	err = l.svcCtx.UserModel.UpdateSubscribe(l.ctx, &user.Subscribe{
@@ -96,3 +101,12 @@ func (l *UpdateUserSubscribeLogic) UpdateUserSubscribe(req *types.UpdateUserSubs
 
 	return nil
 }
+
+func marshalUserSubscribeTrafficLimit(rules []types.TrafficLimit) (*string, error) {
+	val, err := json.Marshal(rules)
+	if err != nil {
+		return nil, err
+	}
+	trafficLimit := string(val)
+	return &trafficLimit, nil
+}

internal/logic/admin/user/updateUserSubscribeLogic_test.go

@@ -0,0 +1,32 @@
+package user
+
+import (
+	"testing"
+
+	"github.com/perfect-panel/server/internal/types"
+)
+
+func TestMarshalUserSubscribeTrafficLimit(t *testing.T) {
+	rules := []types.TrafficLimit{
+		{
+			StatType:     "hour",
+			StatValue:    1,
+			TrafficUsage: 1,
+			SpeedLimit:   1,
+		},
+	}
+
+	got, err := marshalUserSubscribeTrafficLimit(rules)
+	if err != nil {
+		t.Fatalf("marshalUserSubscribeTrafficLimit() error = %v", err)
+	}
+	if got == nil {
+		t.Fatal("marshalUserSubscribeTrafficLimit() returned nil")
+		return
+	}
+
+	want := `[{"stat_type":"hour","stat_value":1,"traffic_usage":1,"speed_limit":1}]`
+	if *got != want {
+		t.Fatalf("marshalUserSubscribeTrafficLimit() = %q, want %q", *got, want)
+	}
+}

internal/types/types.go

@@ -3546,14 +3546,14 @@ type UpdateUserSubscribeNoteRequest struct {
 }
 
 type UpdateUserSubscribeRequest struct {
-	UserSubscribeId int64   `json:"user_subscribe_id"`
-	SubscribeId     int64   `json:"subscribe_id"`
-	Traffic         int64   `json:"traffic"`
-	ExpiredAt       int64   `json:"expired_at"`
-	Upload          int64   `json:"upload"`
-	Download        int64   `json:"download"`
-	SpeedLimit      *int64  `json:"speed_limit,omitempty" validate:"omitempty,gte=0"`
-	TrafficLimit    *string `json:"traffic_limit,omitempty"`
+	UserSubscribeId int64          `json:"user_subscribe_id"`
+	SubscribeId     int64          `json:"subscribe_id"`
+	Traffic         int64          `json:"traffic"`
+	ExpiredAt       int64          `json:"expired_at"`
+	Upload          int64          `json:"upload"`
+	Download        int64          `json:"download"`
+	SpeedLimit      *int64         `json:"speed_limit,omitempty" validate:"omitempty,gte=0"`
+	TrafficLimit    []TrafficLimit `json:"traffic_limit,omitempty"`
 }
 
 type UpdateUserTicketStatusRequest struct {