u

code/allapp/allapp-go/db/queries/space.sql

@@ -39,7 +39,7 @@ FROM space s
     GROUP BY space_id
 ) mc
                    ON s.id = mc.space_id
-WHERE sm.user_id = $1
+WHERE sm.user_id = $1 AND s.status != 2 AND sm.status != 2
 ORDER BY sm.is_default DESC, sm.sort_number ASC;
 
 -- name: GetSpaceByUserIdAndSpaceId :one
@@ -51,7 +51,8 @@ SELECT
     COALESCE(mc.member_count, 0) AS member_count,
     sm.is_default,
     sm.member_name,
-    sm.sort_number
+    sm.sort_number,
+    s.invite_code
 FROM space s
          JOIN space_member sm
               ON s.id = sm.space_id
@@ -61,7 +62,7 @@ FROM space s
     GROUP BY space_id
 ) mc
                    ON s.id = mc.space_id
-WHERE sm.user_id = $1 AND s.id = $2
+WHERE sm.user_id = $1 AND s.id = $2 AND s.status != 2 AND sm.status != 2
 ORDER BY sm.is_default DESC, sm.sort_number ASC;
 
 -- name: UpdateSpaceName :exec

code/allapp/allapp-go/db/queries/space_member.sql

@@ -38,4 +38,11 @@ WHERE user_id = $2
 UPDATE space_member
 SET sort_number = $1
 WHERE user_id = $2
-  AND space_id = $3;
+  AND space_id = $3;
+
+-- 退出空间
+-- name: UpdateSpaceMemberExit :exec
+UPDATE space_member
+SET status = 2 AND exit_time = NOW()
+WHERE space_id = $1
+  AND user_id = $2;

code/allapp/allapp-go/db/repo/space.sql.go

@@ -75,7 +75,8 @@ SELECT
     COALESCE(mc.member_count, 0) AS member_count,
     sm.is_default,
     sm.member_name,
-    sm.sort_number
+    sm.sort_number,
+    s.invite_code
 FROM space s
          JOIN space_member sm
               ON s.id = sm.space_id
@@ -85,7 +86,7 @@ FROM space s
     GROUP BY space_id
 ) mc
                    ON s.id = mc.space_id
-WHERE sm.user_id = $1 AND s.id = $2
+WHERE sm.user_id = $1 AND s.id = $2 AND s.status != 2 AND sm.status != 2
 ORDER BY sm.is_default DESC, sm.sort_number ASC
 `
 
@@ -103,6 +104,7 @@ type GetSpaceByUserIdAndSpaceIdRow struct {
 	IsDefault   int16
 	MemberName  string
 	SortNumber  int32
+	InviteCode  string
 }
 
 func (q *Queries) GetSpaceByUserIdAndSpaceId(ctx context.Context, arg GetSpaceByUserIdAndSpaceIdParams) (GetSpaceByUserIdAndSpaceIdRow, error) {
@@ -117,6 +119,7 @@ func (q *Queries) GetSpaceByUserIdAndSpaceId(ctx context.Context, arg GetSpaceBy
 		&i.IsDefault,
 		&i.MemberName,
 		&i.SortNumber,
+		&i.InviteCode,
 	)
 	return i, err
 }
@@ -164,7 +167,7 @@ FROM space s
     GROUP BY space_id
 ) mc
                    ON s.id = mc.space_id
-WHERE sm.user_id = $1
+WHERE sm.user_id = $1 AND s.status != 2 AND sm.status != 2
 ORDER BY sm.is_default DESC, sm.sort_number ASC
 `
 

code/allapp/allapp-go/db/repo/space_member.sql.go

@@ -108,6 +108,24 @@ func (q *Queries) UpdateSpaceIsDefault(ctx context.Context, arg UpdateSpaceIsDef
 	return err
 }
 
+const updateSpaceMemberExit = `-- name: UpdateSpaceMemberExit :exec
+UPDATE space_member
+SET status = 2 AND exit_time = NOW()
+WHERE space_id = $1
+  AND user_id = $2
+`
+
+type UpdateSpaceMemberExitParams struct {
+	SpaceID int64
+	UserID  int64
+}
+
+// 退出空间
+func (q *Queries) UpdateSpaceMemberExit(ctx context.Context, arg UpdateSpaceMemberExitParams) error {
+	_, err := q.db.Exec(ctx, updateSpaceMemberExit, arg.SpaceID, arg.UserID)
+	return err
+}
+
 const updateSpaceMemberName = `-- name: UpdateSpaceMemberName :exec
 UPDATE space_member SET member_name = $1
 WHERE space_id = $2 AND user_id = $3