feat(friend): friend endpoint now presents basic user info

BeatBuzzer · Dec 4, 2024 · 8e4cff3 · 8e4cff3
1 parent c3498a9
commit 8e4cff3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/DB/friendships.sql b/DB/friendships.sql
@@ -156,37 +156,39 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION get_friends(user_id UUID)
     RETURNS TABLE
             (
-                friendship_id  INT,
-                friend_id      UUID,
-                status         friendship_status,
-                action_user_id UUID,
-                created_at     TIMESTAMP WITH TIME ZONE,
-                updated_at     TIMESTAMP WITH TIME ZONE,
-                request_type   TEXT
+                friendship_id             INT,
+                friend_id                 UUID,
+                friend_username           TEXT,
+                friend_avatar             TEXT,
+                friend_spotify_id         TEXT,
+                friend_spotify_visibility BOOLEAN,
+                status                    friendship_status,
+                action_user_id            UUID,
+                created_at                TIMESTAMP WITH TIME ZONE,
+                updated_at                TIMESTAMP WITH TIME ZONE,
+                request_type              TEXT
             )
 AS
 $$
 BEGIN
     RETURN QUERY
         SELECT f.friendship_id,
-               CASE
-                   WHEN f.user1_id = user_id THEN f.user2_id
-                   ELSE f.user1_id
-                   END AS friend_id,
+               CASE WHEN f.user1_id = user_id THEN f.user2_id ELSE f.user1_id END       AS friend_id,
+               u.username                                                               AS friend_username,
+               u.avatar_url                                                             AS friend_avatar,
+               u.spotify_id                                                             AS friend_spotify_id,
+               u.spotify_visibility                                                     AS friend_spotify_visibility,
                f.status,
                f.action_user_id,
                f.created_at,
                f.updated_at,
-               CASE
-                   WHEN f.action_user_id = user_id THEN 'outgoing'
-                   ELSE 'incoming'
-                   END AS request_type
-        FROM friendships f
+               CASE WHEN f.action_user_id = user_id THEN 'outgoing' ELSE 'incoming' END AS request_type
+        FROM friendships f, users u
         WHERE (f.user1_id = user_id OR f.user2_id = user_id)
-          AND (f.status != 'declined');
+          AND (f.status != 'declined')
+          AND (CASE WHEN f.user1_id = user_id THEN f.user2_id ELSE f.user1_id END = u.id);
 END;
 $$ LANGUAGE plpgsql;
-
 -- examples
 -- SELECT send_friend_request('sender', 'receiver');
 -- SELECT accept_friend_request_by_id(4);

diff --git a/types/api/user.friends.ts b/types/api/user.friends.ts
@@ -1,4 +1,6 @@
 // ----- Internal Types -----
+import type * as url from "node:url";
+
 export interface FriendError {
     message: string
 }
@@ -20,6 +22,10 @@ export interface FriendActionParam {
 export interface GetFriendsResponse {
     friendship_id: number,
     friend_id: string,
+    friend_username: string,
+    friend_avatar: url.URL | null,
+    friend_spotify_id: string,
+    friend_spotify_visibility: boolean,
     created_at: string
     updated_at: string
     status: FriendshipStatus,