aykhans/slash-e
1
0
Fork 0
mirror of https://github.com/aykhans/slash-e.git synced 2025-12-13 20:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: refactor code structure

Browse Source
This commit is contained in:
Steven
2023-02-23 08:22:06 +08:00
parent f77a84a649
commit 0fbbcae872
36 changed files with 768 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
store/workspace_user.go
View File

@@ -15,8 +15,6 @@ type workspaceUserRaw struct {
WorkspaceID int
UserID int
Role api.Role
CreatedTs int64
UpdatedTs int64
}
func (raw *workspaceUserRaw) toWorkspaceUser() *api.WorkspaceUser {
@@ -24,8 +22,6 @@ func (raw *workspaceUserRaw) toWorkspaceUser() *api.WorkspaceUser {
WorkspaceID: raw.WorkspaceID,
UserID: raw.UserID,
Role: raw.Role,
CreatedTs: raw.CreatedTs,
UpdatedTs: raw.UpdatedTs,
}
}
@@ -38,7 +34,7 @@ func (s *Store) ComposeWorkspaceUser(ctx context.Context, workspaceUser *api.Wor
}
workspaceUser.Email = user.Email
workspaceUser.Name = user.Name
workspaceUser.DisplayName = user.DisplayName
return nil
}
@@ -159,17 +155,14 @@ func upsertWorkspaceUser(ctx context.Context, tx *sql.Tx, upsert *api.WorkspaceU
VALUES (` + strings.Join(placeholder, ",") + `)
ON CONFLICT(workspace_id, user_id) DO UPDATE
SET
role = EXCLUDED.role,
updated_ts = EXCLUDED.updated_ts
RETURNING workspace_id, user_id, role, created_ts, updated_ts
role = EXCLUDED.role
RETURNING workspace_id, user_id, role
`
var workspaceUserRaw workspaceUserRaw
if err := tx.QueryRowContext(ctx, query, args...).Scan(
&workspaceUserRaw.WorkspaceID,
&workspaceUserRaw.UserID,
&workspaceUserRaw.Role,
&workspaceUserRaw.CreatedTs,
&workspaceUserRaw.UpdatedTs,
); err != nil {
return nil, FormatError(err)
}
@@ -191,13 +184,9 @@ func findWorkspaceUserList(ctx context.Context, tx *sql.Tx, find *api.WorkspaceU
SELECT
workspace_id,
user_id,
role,
created_ts,
updated_ts
role
FROM workspace_user
WHERE ` + strings.Join(where, " AND ") + `
ORDER BY updated_ts DESC, created_ts DESC
`
WHERE ` + strings.Join(where, " AND ")
rows, err := tx.QueryContext(ctx, query, args...)
if err != nil {
return nil, FormatError(err)
@@ -211,8 +200,6 @@ func findWorkspaceUserList(ctx context.Context, tx *sql.Tx, find *api.WorkspaceU
&workspaceUserRaw.WorkspaceID,
&workspaceUserRaw.UserID,
&workspaceUserRaw.Role,
&workspaceUserRaw.CreatedTs,
&workspaceUserRaw.UpdatedTs,
); err != nil {
return nil, FormatError(err)
}