Fixed profile pictures attached only when customData is present.

shrihari-prakash · Jan 3, 2024 · db73108 · db73108
1 parent 2f51ecd
commit db73108
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/service/api/user/follow-requests.get.ts b/src/service/api/user/follow-requests.get.ts
@@ -43,7 +43,7 @@ const GET_FollowRequests = async (req: Request, res: Response) => {
       },
     ]).exec();
     for (let i = 0; i < records.length; i++) {
-      await hydrateUserProfile(records[i].source);
+      await hydrateUserProfile(records[i].source, { customData: false });
     }
     res.status(statusCodes.success).json(new SuccessResponse({ records }));
   } catch (err) {

diff --git a/src/service/api/user/followers.get.ts b/src/service/api/user/followers.get.ts
@@ -39,7 +39,7 @@ const GET_Followers = async (req: Request, res: Response) => {
     }
     const records = await FollowModel.aggregate(query).exec();
     for (let i = 0; i < records.length; i++) {
-      await hydrateUserProfile(records[i].source);
+      await hydrateUserProfile(records[i].source, { customData: false });
     }
     res.status(statusCodes.success).json(new SuccessResponse({ records }));
   } catch (err) {
@@ -49,4 +49,3 @@ const GET_Followers = async (req: Request, res: Response) => {
 };
 
 export default GET_Followers;
-
diff --git a/src/utils/user.ts b/src/utils/user.ts
@@ -106,20 +106,29 @@ export const sanitizeEditableFields = () => {
   }
 };
 
-export const hydrateUserProfile = async (user: UserInterface | UserInterface[]) => {
+export const hydrateUserProfile = async (
+  user: UserInterface | UserInterface[],
+  ctx: { customData: boolean } = { customData: true }
+) => {
   if (Array.isArray(user)) {
     for (let i = 0; i < user.length; i++) {
-      if (user[i].customData) {
-        checkSubscription(user[i]);
-        await attachProfilePicture(user[i]);
+      checkSubscription(user[i]);
+      await attachProfilePicture(user[i]);
+      if (user[i].customData && ctx.customData) {
         user[i].customData = JSON.parse(user[i].customData);
+      } else {
+        // @ts-expect-error
+        user.customData = undefined;
       }
     }
   } else {
-    if (user.customData) {
-      checkSubscription(user);
-      await attachProfilePicture(user);
+    checkSubscription(user);
+    await attachProfilePicture(user);
+    if (user.customData && ctx.customData) {
       user.customData = JSON.parse(user.customData);
+    } else {
+      // @ts-expect-error
+      user.customData = undefined;
     }
   }
 };