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

Closes HIF-17
This commit is contained in:
2026-06-09 22:56:40 -07:00
committed by GitHub
parent e74958e17f
commit 9b5ff89ee8
6 changed files with 61 additions and 31 deletions
@@ -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
}
@@ -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)
}
}