UPDATE: Auth module, User module

db/query/roles.sql

@@ -11,11 +11,14 @@ WHERE name = $1 AND is_deleted = false;
 SELECT id, name, is_deleted, created_at, updated_at  FROM roles
 WHERE id = $1 AND is_deleted = false;
 
+-- name: GetRolesByIDs :many
+SELECT id, name, is_deleted, created_at, updated_at
+FROM roles
+WHERE id = ANY($1::uuid[]) AND is_deleted = false;
+
 -- name: AddUserRole :exec
 INSERT INTO user_roles (user_id, role_id)
-SELECT $1, r.id
-FROM roles r
-WHERE r.name = $2
+SELECT $1, unnest($2::uuid[])
 ON CONFLICT DO NOTHING;
 
 -- name: RemoveUserRole :exec

db/query/users.sql

@@ -3,17 +3,14 @@ INSERT INTO users (
     email,
     password_hash,
     google_id,
-    auth_provider,
-    is_verified
+    auth_provider
 ) VALUES (
-    $1, $2, $3, $4, $5
+    $1, $2, $3, $4
 )
 ON CONFLICT (email) 
 DO UPDATE SET
     google_id = EXCLUDED.google_id,
-    auth_provider = EXCLUDED.auth_provider,
-    is_verified = users.is_verified OR EXCLUDED.is_verified,
-    updated_at = now()
+    auth_provider = EXCLUDED.auth_provider
 RETURNING *;
 
 -- name: CreateUserProfile :one
@@ -55,12 +52,6 @@ SET
 WHERE id = $1
   AND is_deleted = false;
 
--- name: VerifyUser :exec
-UPDATE users
-SET
-    is_verified = true
-WHERE id = $1
-  AND is_deleted = false;
 
 -- name: DeleteUser :exec
 UPDATE users
@@ -79,7 +70,6 @@ SELECT
     u.id,
     u.email,
     u.password_hash,
-    u.is_verified,
     u.token_version,
     u.refresh_token,
     u.is_deleted,
@@ -116,6 +106,47 @@ SELECT
 FROM users u
 WHERE u.id = $1 AND u.is_deleted = false;
 
+-- name: GetUserByIDWithoutDeleted :one
+SELECT
+    u.id,
+    u.email,
+    u.password_hash,
+    u.token_version,
+    u.refresh_token,
+    u.is_deleted,
+    u.created_at,
+    u.updated_at,
+
+    -- profile JSON
+    (
+        SELECT json_build_object(
+            'display_name', p.display_name,
+            'full_name', p.full_name,
+            'avatar_url', p.avatar_url,
+            'bio', p.bio,
+            'location', p.location,
+            'website', p.website,
+            'country_code', p.country_code,
+            'phone', p.phone
+        )
+        FROM user_profiles p
+        WHERE p.user_id = u.id
+    ) AS profile,
+
+    -- roles JSON
+    (
+        SELECT COALESCE(
+            json_agg(json_build_object('id', r.id, 'name', r.name)),
+            '[]'
+        )::json
+        FROM user_roles ur
+        JOIN roles r ON ur.role_id = r.id
+        WHERE ur.user_id = u.id
+    ) AS roles
+
+FROM users u
+WHERE u.id = $1;
+
 -- name: GetTokenVersion :one
 SELECT token_version
 FROM users
@@ -131,7 +162,6 @@ SELECT
     u.id,
     u.email,
     u.password_hash,
-    u.is_verified,
     u.token_version,
     u.is_deleted,
     u.created_at,
@@ -170,7 +200,59 @@ SELECT
     u.id,
     u.email,
     u.password_hash,
-    u.is_verified,
+    u.token_version,
+    u.refresh_token,
+    u.is_deleted,
+    u.created_at,
+    u.updated_at,
+
+    -- profile JSON
+    (
+        SELECT json_build_object(
+            'display_name', p.display_name,
+            'full_name', p.full_name,
+            'avatar_url', p.avatar_url,
+            'bio', p.bio,
+            'location', p.location,
+            'website', p.website,
+            'country_code', p.country_code,
+            'phone', p.phone
+        )
+        FROM user_profiles p
+        WHERE p.user_id = u.id
+    ) AS profile,
+
+    -- roles JSON
+    (
+        SELECT COALESCE(
+            json_agg(json_build_object('id', r.id, 'name', r.name)),
+            '[]'
+        )::json
+        FROM user_roles ur
+        JOIN roles r ON ur.role_id = r.id
+        WHERE ur.user_id = u.id
+    ) AS roles
+
+FROM users u
+WHERE 
+    (sqlc.narg('cursor')::uuid IS NULL OR u.id > sqlc.narg('cursor')::uuid)
+    AND (sqlc.narg('is_deleted')::boolean IS NULL OR u.is_deleted = sqlc.narg('is_deleted')::boolean)
+    AND (
+        sqlc.narg('role_ids')::uuid[] IS NULL OR 
+        EXISTS (
+            SELECT 1 FROM user_roles ur2 
+            WHERE ur2.user_id = u.id AND ur2.role_id = ANY(sqlc.narg('role_ids')::uuid[])
+        )
+    )
+ORDER BY u.id ASC
+LIMIT sqlc.arg('limit');
+
+
+-- name: SearchUsers :many
+SELECT
+    u.id,
+    u.email,
+    u.password_hash,
     u.token_version,
     u.refresh_token,
     u.is_deleted,
@@ -203,4 +285,26 @@ SELECT
     ) AS roles
 
 FROM users u
-WHERE u.is_deleted = false;
+WHERE 
+    (sqlc.narg('cursor')::uuid IS NULL OR u.id > sqlc.narg('cursor')::uuid)
+    
+    AND (sqlc.narg('is_deleted')::boolean IS NULL OR u.is_deleted = sqlc.narg('is_deleted')::boolean)
+    AND (
+        sqlc.narg('role_ids')::uuid[] IS NULL OR 
+        EXISTS (
+            SELECT 1 FROM user_roles ur2 
+            WHERE ur2.user_id = u.id AND ur2.role_id = ANY(sqlc.narg('role_ids')::uuid[])
+        )
+    )
+    
+    AND (sqlc.narg('search_id')::uuid IS NULL OR u.id = sqlc.narg('search_id')::uuid)
+    AND (
+        sqlc.narg('search_text')::text IS NULL OR 
+        u.email ILIKE '%' || sqlc.narg('search_text')::text || '%' OR
+        EXISTS (
+            SELECT 1 FROM user_profiles p 
+            WHERE p.user_id = u.id AND p.display_name ILIKE '%' || sqlc.narg('search_text')::text || '%'
+        )
+    )
+ORDER BY u.id ASC
+LIMIT sqlc.arg('limit');