Module project, commit, submission

db/query/project.sql

@@ -13,16 +13,18 @@ RETURNING
         'full_name', up.full_name,
         'avatar_url', up.avatar_url
     )::json AS user,
-    '{}'::uuid[] AS commit_ids,
-    '{}'::uuid[] AS submission_ids;
+    '[]'::json AS commits,
+    '{}'::uuid[] AS submission_ids,
+    '[]'::json AS members;
 
 -- name: GetProjectById :one
 SELECT 
     p.*,
     COALESCE(
-        (SELECT array_agg(id) FROM revisions WHERE project_id = p.id), 
-        '{}'
-    )::uuid[] AS commit_ids,
+        (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC) 
+         FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false), 
+        '[]'
+    )::json AS commits,
     COALESCE(
         (SELECT array_agg(id) FROM submissions WHERE project_id = p.id), 
         '{}'
@@ -33,7 +35,18 @@ SELECT
         'display_name', up.display_name,
         'full_name', up.full_name,
         'avatar_url', up.avatar_url
-    )::json AS user
+    )::json AS user,
+    COALESCE(
+        (SELECT json_agg(json_build_object(
+            'user_id', pm.user_id, 'role', pm.role,
+            'display_name', mup.display_name, 'avatar_url', mup.avatar_url
+         ) ORDER BY pm.role ASC, pm.created_at ASC)
+         FROM project_members pm
+         JOIN users mu ON pm.user_id = mu.id
+         LEFT JOIN user_profiles mup ON mu.id = mup.user_id
+         WHERE pm.project_id = p.id),
+        '[]'
+    )::json AS members
 FROM projects p
 JOIN users u ON p.user_id = u.id
 LEFT JOIN user_profiles up ON u.id = up.user_id
@@ -44,8 +57,7 @@ UPDATE projects
 SET 
     title = COALESCE(sqlc.narg('title'), title),
     description = COALESCE(sqlc.narg('description'), description),
-    latest_revision_id = COALESCE(sqlc.narg('latest_revision_id'), latest_revision_id),
-    version_count = COALESCE(sqlc.narg('version_count'), version_count),
+    latest_commit_id = COALESCE(sqlc.narg('latest_commit_id'), latest_commit_id),
     project_status = COALESCE(sqlc.narg('status'), status),
     locked_by = COALESCE(sqlc.narg('locked_by'), locked_by),
     updated_at = NOW()
@@ -62,8 +74,23 @@ RETURNING
         'full_name', up.full_name,
         'avatar_url', up.avatar_url
     )::json AS user,
-    COALESCE((SELECT array_agg(id) FROM revisions WHERE project_id = projects.id), '{}')::uuid[] AS commit_ids,
-    COALESCE((SELECT array_agg(id) FROM submissions WHERE project_id = projects.id), '{}')::uuid[] AS submission_ids;
+    COALESCE(
+        (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC)
+         FROM commits c WHERE c.project_id = projects.id AND c.is_deleted = false),
+        '[]'
+    )::json AS commits,
+    COALESCE((SELECT array_agg(id) FROM submissions WHERE project_id = projects.id), '{}')::uuid[] AS submission_ids,
+    COALESCE(
+        (SELECT json_agg(json_build_object(
+            'user_id', pm.user_id, 'role', pm.role,
+            'display_name', mup.display_name, 'avatar_url', mup.avatar_url
+         ) ORDER BY pm.role ASC, pm.created_at ASC)
+         FROM project_members pm
+         JOIN users mu ON pm.user_id = mu.id
+         LEFT JOIN user_profiles mup ON mu.id = mup.user_id
+         WHERE pm.project_id = projects.id),
+        '[]'
+    )::json AS members;
 
 -- name: DeleteProject :exec
 UPDATE projects
@@ -75,9 +102,10 @@ WHERE id = $1;
 SELECT 
     p.*,
     COALESCE(
-        (SELECT array_agg(id) FROM revisions WHERE project_id = p.id), 
-        '{}'
-    )::uuid[] AS commit_ids,
+        (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC)
+         FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false),
+        '[]'
+    )::json AS commits,
     COALESCE(
         (SELECT array_agg(id) FROM submissions WHERE project_id = p.id), 
         '{}'
@@ -88,14 +116,25 @@ SELECT
         'display_name', up.display_name,
         'full_name', up.full_name,
         'avatar_url', up.avatar_url
-    )::json AS user
+    )::json AS user,
+    COALESCE(
+        (SELECT json_agg(json_build_object(
+            'user_id', pm.user_id, 'role', pm.role,
+            'display_name', mup.display_name, 'avatar_url', mup.avatar_url
+         ) ORDER BY pm.role ASC, pm.created_at ASC)
+         FROM project_members pm
+         JOIN users mu ON pm.user_id = mu.id
+         LEFT JOIN user_profiles mup ON mu.id = mup.user_id
+         WHERE pm.project_id = p.id),
+        '[]'
+    )::json AS members
 FROM projects p
 JOIN users u ON p.user_id = u.id
 LEFT JOIN user_profiles up ON u.id = up.user_id
 WHERE p.is_deleted = false
   AND (
-      sqlc.narg('statuses')::text[] IS NULL 
-      OR p.project_status = ANY(sqlc.narg('statuses')::text[])
+      sqlc.narg('statuses')::smallint[] IS NULL 
+      OR p.project_status = ANY(sqlc.narg('statuses')::smallint[])
   )
   AND (sqlc.narg('user_ids')::uuid[] IS NULL OR p.user_id = ANY(sqlc.narg('user_ids')::uuid[]))
   AND (
@@ -121,8 +160,8 @@ SELECT count(*)
 FROM projects p
 WHERE p.is_deleted = false
   AND (
-      sqlc.narg('statuses')::text[] IS NULL 
-      OR p.project_status = ANY(sqlc.narg('statuses')::text[])
+      sqlc.narg('statuses')::smallint[] IS NULL 
+      OR p.project_status = ANY(sqlc.narg('statuses')::smallint[])
   )
   AND (sqlc.narg('user_ids')::uuid[] IS NULL OR p.user_id = ANY(sqlc.narg('user_ids')::uuid[]))
   AND (
@@ -137,9 +176,10 @@ WHERE p.is_deleted = false
 SELECT 
     p.*,
     COALESCE(
-        (SELECT array_agg(id) FROM revisions WHERE project_id = p.id), 
-        '{}'
-    )::uuid[] AS commit_ids,
+        (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC)
+         FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false),
+        '[]'
+    )::json AS commits,
     COALESCE(
         (SELECT array_agg(id) FROM submissions WHERE project_id = p.id), 
         '{}'
@@ -150,21 +190,35 @@ SELECT
         'display_name', up.display_name,
         'full_name', up.full_name,
         'avatar_url', up.avatar_url
-    )::json AS user
+    )::json AS user,
+    COALESCE(
+        (SELECT json_agg(json_build_object(
+            'user_id', pm.user_id, 'role', pm.role,
+            'display_name', mup.display_name, 'avatar_url', mup.avatar_url
+         ) ORDER BY pm.role ASC, pm.created_at ASC)
+         FROM project_members pm
+         JOIN users mu ON pm.user_id = mu.id
+         LEFT JOIN user_profiles mup ON mu.id = mup.user_id
+         WHERE pm.project_id = p.id),
+        '[]'
+    )::json AS members
 FROM projects p
 JOIN users u ON p.user_id = u.id
 LEFT JOIN user_profiles up ON u.id = up.user_id
-WHERE p.user_id = $1 
+WHERE (p.user_id = $1 OR EXISTS (SELECT 1 FROM project_members pm2 WHERE pm2.project_id = p.id AND pm2.user_id = $1))
   AND p.is_deleted = false 
   AND (sqlc.narg('cursor_id')::uuid IS NULL OR p.id < sqlc.narg('cursor_id')::uuid)
 ORDER BY p.updated_at DESC
 LIMIT sqlc.arg('limit');
 
-
 -- name: GetProjectsByIDs :many
 SELECT 
     p.*,
-    COALESCE((SELECT array_agg(id) FROM revisions WHERE project_id = p.id), '{}')::uuid[] AS commit_ids,
+    COALESCE(
+        (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC)
+         FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false),
+        '[]'
+    )::json AS commits,
     COALESCE((SELECT array_agg(id) FROM submissions WHERE project_id = p.id), '{}')::uuid[] AS submission_ids,
     json_build_object(
         'id', u.id,
@@ -172,8 +226,51 @@ SELECT
         'display_name', up.display_name,
         'full_name', up.full_name,
         'avatar_url', up.avatar_url
-    )::json AS user
+    )::json AS user,
+    COALESCE(
+        (SELECT json_agg(json_build_object(
+            'user_id', pm.user_id, 'role', pm.role,
+            'display_name', mup.display_name, 'avatar_url', mup.avatar_url
+         ) ORDER BY pm.role ASC, pm.created_at ASC)
+         FROM project_members pm
+         JOIN users mu ON pm.user_id = mu.id
+         LEFT JOIN user_profiles mup ON mu.id = mup.user_id
+         WHERE pm.project_id = p.id),
+        '[]'
+    )::json AS members
 FROM projects p
 JOIN users u ON p.user_id = u.id
 LEFT JOIN user_profiles up ON u.id = up.user_id
 WHERE p.id = ANY($1::uuid[]) AND p.is_deleted = false;
+
+-- name: AddProjectMember :one
+INSERT INTO project_members (
+    project_id, user_id, role, invited_by
+) VALUES (
+    $1, $2, $3, $4
+)
+RETURNING *;
+
+-- name: UpdateProjectMemberRole :one
+UPDATE project_members
+SET role = $3
+WHERE project_id = $1 AND user_id = $2
+RETURNING *;
+
+-- name: RemoveProjectMember :exec
+DELETE FROM project_members
+WHERE project_id = $1 AND user_id = $2;
+
+-- name: CheckProjectPermission :one
+SELECT role FROM project_members
+WHERE project_id = $1 AND user_id = $2;
+
+-- name: ChangeProjectOwner :exec
+UPDATE projects
+SET user_id = $2, updated_at = NOW()
+WHERE id = $1 AND is_deleted = false;
+
+-- name: UpdateLatestCommit :exec
+UPDATE projects
+SET latest_commit_id = $2, updated_at = NOW()
+WHERE id = $1 AND is_deleted = false;