家庭组 权益修改

internal/logic/public/subscribe/queryUserSubscribeNodeListLogic.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"time"
 
+	commonLogic "github.com/perfect-panel/server/internal/logic/common"
 	"github.com/perfect-panel/server/internal/model/node"
 	"github.com/perfect-panel/server/internal/model/user"
 	"github.com/perfect-panel/server/internal/svc"
@@ -38,7 +39,12 @@ func (l *QueryUserSubscribeNodeListLogic) QueryUserSubscribeNodeList() (resp *ty
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
 
-	userSubscribes, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, u.Id, 0, 1, 2, 3)
+	entitlement, err := commonLogic.ResolveEntitlementUser(l.ctx, l.svcCtx.DB, u.Id)
+	if err != nil {
+		return nil, err
+	}
+
+	userSubscribes, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, entitlement.EffectiveUserID, 0, 1, 2, 3)
 	if err != nil {
 		logger.Errorw("failed to query user subscribe", logger.Field("error", err.Error()), logger.Field("user_id", u.Id))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "DB_ERROR")
@@ -79,12 +85,22 @@ func (l *QueryUserSubscribeNodeListLogic) QueryUserSubscribeNodeList() (resp *ty
 		if l.svcCtx.Config.Register.EnableTrial && l.svcCtx.Config.Register.TrialSubscribe == userSubscribe.SubscribeId {
 			userSubscribeInfo.IsTryOut = true
 		}
+		fillUserSubscribeInfoEntitlementFields(&userSubscribeInfo, entitlement)
 		resp.List = append(resp.List, userSubscribeInfo)
 	}
 
 	return
 }
 
+func fillUserSubscribeInfoEntitlementFields(sub *types.UserSubscribeInfo, entitlement *commonLogic.EntitlementContext) {
+	if sub == nil || entitlement == nil {
+		return
+	}
+	sub.EntitlementSource = entitlement.Source
+	sub.EntitlementOwnerUserId = entitlement.OwnerUserID
+	sub.ReadOnly = entitlement.ReadOnly
+}
+
 func (l *QueryUserSubscribeNodeListLogic) getServers(userSub *user.Subscribe) (userSubscribeNodes []*types.UserSubscribeNodeInfo, err error) {
 	userSubscribeNodes = make([]*types.UserSubscribeNodeInfo, 0)
 	if l.isSubscriptionExpired(userSub) {

internal/logic/public/subscribe/queryUserSubscribeNodeListLogic_test.go

@@ -0,0 +1,25 @@
+package subscribe
+
+import (
+	"testing"
+
+	commonLogic "github.com/perfect-panel/server/internal/logic/common"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/stretchr/testify/require"
+)
+
+func TestFillUserSubscribeInfoEntitlementFields(t *testing.T) {
+	sub := &types.UserSubscribeInfo{}
+	entitlement := &commonLogic.EntitlementContext{
+		EffectiveUserID: 3001,
+		Source:          commonLogic.EntitlementSourceFamilyOwner,
+		OwnerUserID:     3001,
+		ReadOnly:        true,
+	}
+
+	fillUserSubscribeInfoEntitlementFields(sub, entitlement)
+
+	require.Equal(t, commonLogic.EntitlementSourceFamilyOwner, sub.EntitlementSource)
+	require.Equal(t, int64(3001), sub.EntitlementOwnerUserId)
+	require.True(t, sub.ReadOnly)
+}