From 949cfa113bf4e7b0efb1954acff0084a257beaa9 Mon Sep 17 00:00:00 2001
From: oneao <hi_itao@163.com>
Date: Sun, 8 Feb 2026 22:23:30 +0800
Subject: [PATCH] u

---
 code/allapp/allapp-go/utils/redisx/helper.go | 134 ++++++++++++++-----
 1 file changed, 102 insertions(+), 32 deletions(-)

diff --git a/code/allapp/allapp-go/utils/redisx/helper.go b/code/allapp/allapp-go/utils/redisx/helper.go
index f77dfeb4..c604cfa5 100644
--- a/code/allapp/allapp-go/utils/redisx/helper.go
+++ b/code/allapp/allapp-go/utils/redisx/helper.go
@@ -40,7 +40,14 @@ func Exists(key string) (bool, error) {
 	return cnt > 0, nil
 }
 
-// ================== Space User / Role ==================
+/*
+Key design:
+
+space:user:{spaceId}:{userId} -> role (string/int)
+space:users:{spaceId}         -> Set(userId)
+*/
+
+// ================== Role ==================
 
 const (
 	RoleMember int32 = 1
@@ -50,32 +57,78 @@ const (
 	SpaceUserTTL = 10 * time.Minute
 )
 
-// space:user:{spaceId}:{userId}
-func SpaceUserKey(spaceId int64, userId int64) string {
+// ================== Key helpers ==================
+
+func spaceUserKey(spaceId, userId int64) string {
 	return fmt.Sprintf("space:user:%d:%d", spaceId, userId)
 }
 
-// Set / Create space user role
-func SetSpaceUserRole(spaceId int64, userId int64, role int32) error {
-	key := SpaceUserKey(spaceId, userId)
-	return Set(key, role, SpaceUserTTL)
+func spaceUsersKey(spaceId int64) string {
+	return fmt.Sprintf("space:users:%d", spaceId)
 }
 
-// Update space user role (same as set, semantic clarity)
-func UpdateSpaceUserRole(spaceId int64, userId int64, role int32) error {
-	return SetSpaceUserRole(spaceId, userId, role)
-}
+// ================== Domain APIs ==================
 
-// Get space user role
-// return 0 means not exists
-func GetSpaceUserRole(spaceId int64, userId int64) (int32, error) {
-	key := SpaceUserKey(spaceId, userId)
-	val, err := Get(key)
-	if err != nil {
-		return 0, err
+// JoinSpace
+// - add user to space users set
+// - set user role
+func JoinSpace(spaceId, userId int64, role int32) error {
+	ctx := context.Background()
+
+	// 1. add to space users
+	if err := Client().SAdd(ctx, spaceUsersKey(spaceId), userId).Err(); err != nil {
+		return err
 	}
-	if val == "" {
-		return 0, nil
+
+	// 2. set role
+	if err := Set(spaceUserKey(spaceId, userId), role, SpaceUserTTL); err != nil {
+		// rollback
+		_ = Client().SRem(ctx, spaceUsersKey(spaceId), userId).Err()
+		return err
+	}
+
+	return nil
+}
+
+// LeaveSpace
+// - remove user from space
+// - delete role cache
+func LeaveSpace(spaceId, userId int64) error {
+	ctx := context.Background()
+
+	if err := Client().SRem(ctx, spaceUsersKey(spaceId), userId).Err(); err != nil {
+		return err
+	}
+
+	return Delete(spaceUserKey(spaceId, userId))
+}
+
+// KickSpaceUser = LeaveSpace
+func KickSpaceUser(spaceId, userId int64) error {
+	return LeaveSpace(spaceId, userId)
+}
+
+// ChangeSpaceUserRole
+func ChangeSpaceUserRole(spaceId, userId int64, role int32) error {
+	ok, err := IsUserInSpace(spaceId, userId)
+	if err != nil {
+		return err
+	}
+	if !ok {
+		return fmt.Errorf("user not in space")
+	}
+
+	return Set(spaceUserKey(spaceId, userId), role, SpaceUserTTL)
+}
+
+// ================== Query APIs ==================
+
+// GetSpaceUserRole
+// return 0 means not exists
+func GetSpaceUserRole(spaceId, userId int64) (int32, error) {
+	val, err := Get(spaceUserKey(spaceId, userId))
+	if err != nil || val == "" {
+		return 0, err
 	}
 
 	r, err := strconv.ParseInt(val, 10, 32)
@@ -85,20 +138,37 @@ func GetSpaceUserRole(spaceId int64, userId int64) (int32, error) {
 	return int32(r), nil
 }
 
-// Delete space user (kick / dissolve)
-func DeleteSpaceUser(spaceId int64, userId int64) error {
-	key := SpaceUserKey(spaceId, userId)
-	return Delete(key)
+func IsUserInSpace(spaceId, userId int64) (bool, error) {
+	return Client().
+		SIsMember(context.Background(), spaceUsersKey(spaceId), userId).
+		Result()
 }
 
-// Exists space user
-func ExistsSpaceUser(spaceId int64, userId int64) (bool, error) {
-	key := SpaceUserKey(spaceId, userId)
-	return Exists(key)
+func GetSpaceUsers(spaceId int64) ([]int64, error) {
+	members, err := Client().
+		SMembers(context.Background(), spaceUsersKey(spaceId)).
+		Result()
+	if err != nil {
+		return nil, err
+	}
+
+	users := make([]int64, 0, len(members))
+	for _, m := range members {
+		uid, err := strconv.ParseInt(m, 10, 64)
+		if err == nil {
+			users = append(users, uid)
+		}
+	}
+	return users, nil
 }
 
-// Permission check
-// owner > admin > member
-func HasPermission(userRole int32, needRole int32) bool {
-	return userRole >= needRole
+// CheckRole
+// check whether user's role in space >= needRole
+func CheckRole(spaceId, userId int64, needRole int32) (bool, error) {
+	userRole, err := GetSpaceUserRole(spaceId, userId)
+	if err != nil {
+		return false, err
+	}
+
+	return userRole == needRole, nil
 }