u
This commit is contained in:
oneao committed
1 parent
6a8c31e20c
commit
572011017a
25 files changed
+599
-563
No files matched your search
@@ -3,7 +3,7 @@ SELECT
|
||||
mr.*,
|
||||
u.username AS username
|
||||
FROM money_record mr
|
||||
LEFT JOIN space_user su
|
||||
LEFT JOIN space_member su
|
||||
ON su.user_id = mr.user_id
|
||||
LEFT JOIN "user" u
|
||||
ON u.id = mr.user_id
|
||||
@@ -68,7 +68,7 @@ FROM
|
||||
LEFT JOIN
|
||||
money_user_category muc ON mr.category_id = muc.id -- 连接 money_user_category 获取 type
|
||||
LEFT JOIN
|
||||
space_user su ON su.user_id = $2 -- 连接 space_user 表，查找该用户在空间中的信息
|
||||
space_member su ON su.user_id = $2 -- 连接 space_member 表，查找该用户在空间中的信息
|
||||
LEFT JOIN
|
||||
space s ON s.id = su.space_id -- 连接 space 表，获取空间信息
|
||||
WHERE
|
||||
@@ -94,7 +94,7 @@ FROM
|
||||
LEFT JOIN
|
||||
money_user_category muc ON mr.category_id = muc.id
|
||||
LEFT JOIN
|
||||
space_user su ON su.user_id = $1 -- 连接 space_user 表，查找该用户在空间中的信息
|
||||
space_member su ON su.user_id = $1 -- 连接 space_member 表，查找该用户在空间中的信息
|
||||
LEFT JOIN
|
||||
space s ON s.id = su.space_id -- 连接 space 表，获取空间信息
|
||||
WHERE
|
||||
|
||||
@@ -12,11 +12,12 @@ DELETE FROM space WHERE id = $1;
|
||||
-- name: GetSpaceById :one
|
||||
SELECT * FROM space WHERE id = $1;
|
||||
|
||||
|
||||
-- 查询用户所在的空间信息
|
||||
-- name: GetSpaceByUserId :one
|
||||
SELECT s.*, m.role
|
||||
FROM space s
|
||||
JOIN space_user m
|
||||
JOIN space_member m
|
||||
ON s.id = m.space_id
|
||||
WHERE m.user_id = $1;
|
||||
|
||||
|
||||
+14
-14
@@ -1,44 +1,44 @@
|
||||
-- 插入空间用户
|
||||
-- name: InsertSpaceUser :exec
|
||||
INSERT INTO space_user(id,space_id,user_id,role,join_time)
|
||||
-- name: InsertSpaceMember :exec
|
||||
INSERT INTO space_member(id,space_id,user_id,role,join_time)
|
||||
VALUES ($1,$2,$3,$4,NOW());
|
||||
|
||||
-- name: ListSpaceUsers :many
|
||||
-- name: ListSpaceMembers :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
|
||||
FROM space_member 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: GetSpaceUser :one
|
||||
-- name: GetSpaceMember :one
|
||||
SELECT *
|
||||
FROM space_user
|
||||
FROM space_member
|
||||
WHERE user_id = $1;
|
||||
|
||||
-- 删除某个用户在所有空间的关系
|
||||
-- name: DeleteSpaceUserByUserID :exec
|
||||
DELETE FROM space_user
|
||||
-- name: DeleteSpaceMemberByUserID :exec
|
||||
DELETE FROM space_member
|
||||
WHERE user_id = $1;
|
||||
|
||||
-- 删除某个用户在指定空间中的关系
|
||||
-- name: DeleteSpaceUserBySpaceIDAndUserID :exec
|
||||
DELETE FROM space_user
|
||||
-- name: DeleteSpaceMemberBySpaceIDAndUserID :exec
|
||||
DELETE FROM space_member
|
||||
WHERE space_id = $1
|
||||
AND user_id = $2;
|
||||
|
||||
-- 删除某个空间下的所有用户
|
||||
-- name: DeleteSpaceUsersBySpaceID :exec
|
||||
DELETE FROM space_user
|
||||
-- name: DeleteSpaceMembersBySpaceID :exec
|
||||
DELETE FROM space_member
|
||||
WHERE space_id = $1;
|
||||
|
||||
-- 修改角色
|
||||
-- name: UpdateSpaceUserRole :exec
|
||||
UPDATE space_user
|
||||
-- name: UpdateSpaceMemberRole :exec
|
||||
UPDATE space_member
|
||||
SET role = $1
|
||||
WHERE user_id = $2 AND space_id = $3;
|
||||
@@ -46,7 +46,7 @@ type Space struct {
|
||||
UpdateTime pgtype.Timestamp
|
||||
}
|
||||
|
||||
type SpaceUser struct {
|
||||
type SpaceMember struct {
|
||||
ID int64
|
||||
SpaceID int64
|
||||
UserID int64
|
||||
|
||||
@@ -95,7 +95,7 @@ SELECT
|
||||
mr.id, mr.category_id, mr.user_id, mr.amount, mr.remark, mr.record_time, mr.create_time, mr.update_time,
|
||||
u.username AS username
|
||||
FROM money_record mr
|
||||
LEFT JOIN space_user su
|
||||
LEFT JOIN space_member su
|
||||
ON su.user_id = mr.user_id
|
||||
LEFT JOIN "user" u
|
||||
ON u.id = mr.user_id
|
||||
@@ -173,7 +173,7 @@ FROM
|
||||
LEFT JOIN
|
||||
money_user_category muc ON mr.category_id = muc.id -- 连接 money_user_category 获取 type
|
||||
LEFT JOIN
|
||||
space_user su ON su.user_id = $2 -- 连接 space_user 表，查找该用户在空间中的信息
|
||||
space_member su ON su.user_id = $2 -- 连接 space_member 表，查找该用户在空间中的信息
|
||||
LEFT JOIN
|
||||
space s ON s.id = su.space_id -- 连接 space 表，获取空间信息
|
||||
WHERE
|
||||
@@ -238,7 +238,7 @@ FROM
|
||||
LEFT JOIN
|
||||
money_user_category muc ON mr.category_id = muc.id
|
||||
LEFT JOIN
|
||||
space_user su ON su.user_id = $1 -- 连接 space_user 表，查找该用户在空间中的信息
|
||||
space_member su ON su.user_id = $1 -- 连接 space_member 表，查找该用户在空间中的信息
|
||||
LEFT JOIN
|
||||
space s ON s.id = su.space_id -- 连接 space 表，获取空间信息
|
||||
WHERE
|
||||
|
||||
@@ -60,7 +60,7 @@ func (q *Queries) GetSpaceById(ctx context.Context, id int64) (Space, error) {
|
||||
const getSpaceByUserId = `-- name: GetSpaceByUserId :one
|
||||
SELECT s.id, s.name, s.invite_code, s.create_time, s.update_time, m.role
|
||||
FROM space s
|
||||
JOIN space_user m
|
||||
JOIN space_member m
|
||||
ON s.id = m.space_id
|
||||
WHERE m.user_id = $1
|
||||
`
|
||||
|
||||
@@ -0,0 +1,159 @@
|
||||
// Code generated by sqlc. DO NOT EDIT.
|
||||
// versions:
|
||||
// sqlc v1.30.0
|
||||
// source: space_member.sql
|
||||
|
||||
package repo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgtype"
|
||||
)
|
||||
|
||||
const deleteSpaceMemberBySpaceIDAndUserID = `-- name: DeleteSpaceMemberBySpaceIDAndUserID :exec
|
||||
DELETE FROM space_member
|
||||
WHERE space_id = $1
|
||||
AND user_id = $2
|
||||
`
|
||||
|
||||
type DeleteSpaceMemberBySpaceIDAndUserIDParams struct {
|
||||
SpaceID int64
|
||||
UserID int64
|
||||
}
|
||||
|
||||
// 删除某个用户在指定空间中的关系
|
||||
func (q *Queries) DeleteSpaceMemberBySpaceIDAndUserID(ctx context.Context, arg DeleteSpaceMemberBySpaceIDAndUserIDParams) error {
|
||||
_, err := q.db.Exec(ctx, deleteSpaceMemberBySpaceIDAndUserID, arg.SpaceID, arg.UserID)
|
||||
return err
|
||||
}
|
||||
|
||||
const deleteSpaceMemberByUserID = `-- name: DeleteSpaceMemberByUserID :exec
|
||||
DELETE FROM space_member
|
||||
WHERE user_id = $1
|
||||
`
|
||||
|
||||
// 删除某个用户在所有空间的关系
|
||||
func (q *Queries) DeleteSpaceMemberByUserID(ctx context.Context, userID int64) error {
|
||||
_, err := q.db.Exec(ctx, deleteSpaceMemberByUserID, userID)
|
||||
return err
|
||||
}
|
||||
|
||||
const deleteSpaceMembersBySpaceID = `-- name: DeleteSpaceMembersBySpaceID :exec
|
||||
DELETE FROM space_member
|
||||
WHERE space_id = $1
|
||||
`
|
||||
|
||||
// 删除某个空间下的所有用户
|
||||
func (q *Queries) DeleteSpaceMembersBySpaceID(ctx context.Context, spaceID int64) error {
|
||||
_, err := q.db.Exec(ctx, deleteSpaceMembersBySpaceID, spaceID)
|
||||
return err
|
||||
}
|
||||
|
||||
const getSpaceMember = `-- name: GetSpaceMember :one
|
||||
SELECT id, space_id, user_id, role, join_time
|
||||
FROM space_member
|
||||
WHERE user_id = $1
|
||||
`
|
||||
|
||||
// 获取空间用户
|
||||
func (q *Queries) GetSpaceMember(ctx context.Context, userID int64) (SpaceMember, error) {
|
||||
row := q.db.QueryRow(ctx, getSpaceMember, userID)
|
||||
var i SpaceMember
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.SpaceID,
|
||||
&i.UserID,
|
||||
&i.Role,
|
||||
&i.JoinTime,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const insertSpaceMember = `-- name: InsertSpaceMember :exec
|
||||
INSERT INTO space_member(id,space_id,user_id,role,join_time)
|
||||
VALUES ($1,$2,$3,$4,NOW())
|
||||
`
|
||||
|
||||
type InsertSpaceMemberParams struct {
|
||||
ID int64
|
||||
SpaceID int64
|
||||
UserID int64
|
||||
Role int32
|
||||
}
|
||||
|
||||
// 插入空间用户
|
||||
func (q *Queries) InsertSpaceMember(ctx context.Context, arg InsertSpaceMemberParams) error {
|
||||
_, err := q.db.Exec(ctx, insertSpaceMember,
|
||||
arg.ID,
|
||||
arg.SpaceID,
|
||||
arg.UserID,
|
||||
arg.Role,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
const listSpaceMembers = `-- name: ListSpaceMembers :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_member su
|
||||
INNER JOIN "user" u ON su.user_id = u.id
|
||||
WHERE su.space_id = $1
|
||||
ORDER BY su.role DESC, u.username ASC
|
||||
`
|
||||
|
||||
type ListSpaceMembersRow struct {
|
||||
UserID int64
|
||||
UserName string
|
||||
UserAvatar string
|
||||
LastLoginTime pgtype.Timestamptz
|
||||
Role int32
|
||||
}
|
||||
|
||||
func (q *Queries) ListSpaceMembers(ctx context.Context, spaceID int64) ([]ListSpaceMembersRow, error) {
|
||||
rows, err := q.db.Query(ctx, listSpaceMembers, spaceID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var items []ListSpaceMembersRow
|
||||
for rows.Next() {
|
||||
var i ListSpaceMembersRow
|
||||
if err := rows.Scan(
|
||||
&i.UserID,
|
||||
&i.UserName,
|
||||
&i.UserAvatar,
|
||||
&i.LastLoginTime,
|
||||
&i.Role,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, i)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const updateSpaceMemberRole = `-- name: UpdateSpaceMemberRole :exec
|
||||
UPDATE space_member
|
||||
SET role = $1
|
||||
WHERE user_id = $2 AND space_id = $3
|
||||
`
|
||||
|
||||
type UpdateSpaceMemberRoleParams struct {
|
||||
Role int32
|
||||
UserID int64
|
||||
SpaceID int64
|
||||
}
|
||||
|
||||
// 修改角色
|
||||
func (q *Queries) UpdateSpaceMemberRole(ctx context.Context, arg UpdateSpaceMemberRoleParams) error {
|
||||
_, err := q.db.Exec(ctx, updateSpaceMemberRole, arg.Role, arg.UserID, arg.SpaceID)
|
||||
return err
|
||||
}
|
||||
@@ -1,159 +0,0 @@
|
||||
// Code generated by sqlc. DO NOT EDIT.
|
||||
// versions:
|
||||
// sqlc v1.30.0
|
||||
// source: space_user.sql
|
||||
|
||||
package repo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgtype"
|
||||
)
|
||||
|
||||
const deleteSpaceUserBySpaceIDAndUserID = `-- name: DeleteSpaceUserBySpaceIDAndUserID :exec
|
||||
DELETE FROM space_user
|
||||
WHERE space_id = $1
|
||||
AND user_id = $2
|
||||
`
|
||||
|
||||
type DeleteSpaceUserBySpaceIDAndUserIDParams struct {
|
||||
SpaceID int64
|
||||
UserID int64
|
||||
}
|
||||
|
||||
// 删除某个用户在指定空间中的关系
|
||||
func (q *Queries) DeleteSpaceUserBySpaceIDAndUserID(ctx context.Context, arg DeleteSpaceUserBySpaceIDAndUserIDParams) error {
|
||||
_, err := q.db.Exec(ctx, deleteSpaceUserBySpaceIDAndUserID, arg.SpaceID, arg.UserID)
|
||||
return err
|
||||
}
|
||||
|
||||
const deleteSpaceUserByUserID = `-- name: DeleteSpaceUserByUserID :exec
|
||||
DELETE FROM space_user
|
||||
WHERE user_id = $1
|
||||
`
|
||||
|
||||
// 删除某个用户在所有空间的关系
|
||||
func (q *Queries) DeleteSpaceUserByUserID(ctx context.Context, userID int64) error {
|
||||
_, err := q.db.Exec(ctx, deleteSpaceUserByUserID, userID)
|
||||
return err
|
||||
}
|
||||
|
||||
const deleteSpaceUsersBySpaceID = `-- name: DeleteSpaceUsersBySpaceID :exec
|
||||
DELETE FROM space_user
|
||||
WHERE space_id = $1
|
||||
`
|
||||
|
||||
// 删除某个空间下的所有用户
|
||||
func (q *Queries) DeleteSpaceUsersBySpaceID(ctx context.Context, spaceID int64) error {
|
||||
_, err := q.db.Exec(ctx, deleteSpaceUsersBySpaceID, spaceID)
|
||||
return err
|
||||
}
|
||||
|
||||
const getSpaceUser = `-- name: GetSpaceUser :one
|
||||
SELECT id, space_id, user_id, role, join_time
|
||||
FROM space_user
|
||||
WHERE user_id = $1
|
||||
`
|
||||
|
||||
// 获取空间用户
|
||||
func (q *Queries) GetSpaceUser(ctx context.Context, userID int64) (SpaceUser, error) {
|
||||
row := q.db.QueryRow(ctx, getSpaceUser, userID)
|
||||
var i SpaceUser
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.SpaceID,
|
||||
&i.UserID,
|
||||
&i.Role,
|
||||
&i.JoinTime,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const insertSpaceUser = `-- name: InsertSpaceUser :exec
|
||||
INSERT INTO space_user(id,space_id,user_id,role,join_time)
|
||||
VALUES ($1,$2,$3,$4,NOW())
|
||||
`
|
||||
|
||||
type InsertSpaceUserParams struct {
|
||||
ID int64
|
||||
SpaceID int64
|
||||
UserID int64
|
||||
Role int32
|
||||
}
|
||||
|
||||
// 插入空间用户
|
||||
func (q *Queries) InsertSpaceUser(ctx context.Context, arg InsertSpaceUserParams) error {
|
||||
_, err := q.db.Exec(ctx, insertSpaceUser,
|
||||
arg.ID,
|
||||
arg.SpaceID,
|
||||
arg.UserID,
|
||||
arg.Role,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
const listSpaceUsers = `-- 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
|
||||
`
|
||||
|
||||
type ListSpaceUsersRow struct {
|
||||
UserID int64
|
||||
UserName string
|
||||
UserAvatar string
|
||||
LastLoginTime pgtype.Timestamptz
|
||||
Role int32
|
||||
}
|
||||
|
||||
func (q *Queries) ListSpaceUsers(ctx context.Context, spaceID int64) ([]ListSpaceUsersRow, error) {
|
||||
rows, err := q.db.Query(ctx, listSpaceUsers, spaceID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var items []ListSpaceUsersRow
|
||||
for rows.Next() {
|
||||
var i ListSpaceUsersRow
|
||||
if err := rows.Scan(
|
||||
&i.UserID,
|
||||
&i.UserName,
|
||||
&i.UserAvatar,
|
||||
&i.LastLoginTime,
|
||||
&i.Role,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, i)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const updateSpaceUserRole = `-- name: UpdateSpaceUserRole :exec
|
||||
UPDATE space_user
|
||||
SET role = $1
|
||||
WHERE user_id = $2 AND space_id = $3
|
||||
`
|
||||
|
||||
type UpdateSpaceUserRoleParams struct {
|
||||
Role int32
|
||||
UserID int64
|
||||
SpaceID int64
|
||||
}
|
||||
|
||||
// 修改角色
|
||||
func (q *Queries) UpdateSpaceUserRole(ctx context.Context, arg UpdateSpaceUserRoleParams) error {
|
||||
_, err := q.db.Exec(ctx, updateSpaceUserRole, arg.Role, arg.UserID, arg.SpaceID)
|
||||
return err
|
||||
}
|
||||
@@ -74,7 +74,7 @@ ALTER TABLE space
|
||||
ADD CONSTRAINT space_invite_code_key UNIQUE (invite_code);
|
||||
|
||||
-- 空间成员表（每个用户只能加入一个空间）
|
||||
CREATE TABLE space_user (
|
||||
CREATE TABLE space_member (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
space_id BIGINT NOT NULL,
|
||||
user_id BIGINT NOT NULL,
|
||||
|
||||
Reference in new issue
Block a user