u

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

@@ -1,8 +1,8 @@
 -- 新增分享空间
 -- name: InsertSpace :exec
 INSERT INTO space (
-    id,invite_code,create_time,update_time
-) VALUES ($1,$2,NOW(),NOW());
+    id,name,invite_code,create_time,update_time
+) VALUES ($1,$2,$3,NOW(),NOW());
 
 -- 删除分享空间
 -- name: DeleteSpace :exec
@@ -14,7 +14,7 @@ SELECT * FROM space WHERE id = $1;
 
 -- 查询用户所在的空间信息
 -- name: GetSpaceByUserId :one
-SELECT s.*
+SELECT s.*, m.role
 FROM space s
          JOIN space_user m
               ON s.id = m.space_id

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

@@ -1,51 +1,44 @@
--- name: ListUserSpaces :many
-SELECT s.id, s.name, s.invite_code, su.role
-FROM space s
-         JOIN space_user su ON s.id = su.space_id
-WHERE su.user_id = $1;
+-- 插入空间用户
+-- name: InsertSpaceUser :exec
+INSERT INTO space_user(id,space_id,user_id,role,join_time)
+VALUES ($1,$2,$3,$4,NOW());
 
 -- name: ListSpaceUsers :many
 SELECT
     u.id         AS user_id,
     u.username       AS user_name,
     u.avatar     AS user_avatar,
+    u.last_login_time AS last_login_time,
     su.role
 FROM space_user su
          INNER JOIN "user" u ON su.user_id = u.id
 WHERE su.space_id = $1
 ORDER BY su.role DESC, u.username ASC;
 
--- name: HasUserInSpace :one
-SELECT EXISTS (
-    SELECT 1
-    FROM space_user
-    WHERE user_id = $1 AND space_id = $2
-);
-
 -- 获取空间用户
 -- name: GetSpaceUser :one
 SELECT *
 FROM space_user
-WHERE  user_id = $1 AND space_id = $2;
+WHERE user_id = $1;
 
--- 插入空间用户
--- name: InsertSpaceUser :exec
-INSERT INTO space_user(id,space_id,user_id,role,join_time)
-VALUES ($1,$2,$3,$4,NOW());
-
--- 修改空间用户
--- name: DeleteSpaceUser :exec
+-- 删除某个用户在所有空间的关系
+-- name: DeleteSpaceUserByUserID :exec
 DELETE FROM space_user
-WHERE user_id = $1 AND space_id = $2;
+WHERE user_id = $1;
+
+-- 删除某个用户在指定空间中的关系
+-- name: DeleteSpaceUserBySpaceIDAndUserID :exec
+DELETE FROM space_user
+WHERE space_id = $1
+  AND user_id = $2;
+
+-- 删除某个空间下的所有用户
+-- name: DeleteSpaceUsersBySpaceID :exec
+DELETE FROM space_user
+WHERE space_id = $1;
 
 -- 修改角色
 -- name: UpdateSpaceUserRole :exec
 UPDATE space_user
 SET role = $1
-WHERE user_id = $2 AND space_id = $3;
-
--- 获取空间下的人数
--- name: CountUsersInSpace :one
-SELECT COUNT(id)
-FROM space_user
-WHERE space_id = $1;
+WHERE user_id = $2;