Added seperate function for unobfuscated contact details and filtered id in update data step.

Author: RahulGoyal-tech

controllers/users.js

@@ -654,7 +654,7 @@ const updateUser = async (req, res) => {
   try {
     const { id: profileDiffId, message } = req.body;
 
-    const profileDiffData = await profileDiffsQuery.fetchProfileDiff(profileDiffId);
+    const profileDiffData = await profileDiffsQuery.fetchProfileDiffUnobfuscated(profileDiffId);
     if (!profileDiffData) return res.boom.notFound("Profile Diff doesn't exist");
 
     const { approval, timestamp, userId, ...profileDiff } = profileDiffData;

models/profileDiffs.js

@@ -133,6 +133,30 @@ const fetchProfileDiff = async (profileDiffId) => {
   }
 };
 
+/**
+ * Fetches the unobfuscated profileDiff data of the provided profileDiff Id
+ * @param profileDiffId profileDiffId of the diffs need to be fetched
+ * @returns unobfuscated profileDiff Data
+ */
+const fetchProfileDiffUnobfuscated = async (profileDiffId) => {
+  try {
+    const profileDiff = await profileDiffsModel.doc(profileDiffId).get();
+
+    if (!profileDiff.exists) {
+      return { profileDiffExists: false };
+    }
+    const profileDiffData = profileDiff.data();
+    return {
+      id: profileDiff.id,
+      profileDiffExists: true,
+      ...profileDiffData,
+    };
+  } catch (err) {
+    logger.error("Error retrieving profile Diff", err);
+    throw err;
+  }
+};
+
 /** Add profileDiff
  *
  * @param profileDiffData { Object }: Data to be added
@@ -181,4 +205,5 @@ module.exports = {
   add,
   updateProfileDiff,
   fetchProfileDiffsWithPagination,
+  fetchProfileDiffUnobfuscated,
 };

models/users.js

@@ -44,9 +44,17 @@ const addOrUpdate = async (userData, userId = null) => {
       const isNewUser = !user.data();
       // user exists update user
       if (user.data()) {
+        // remove id field if exist in fetched data or profileDiff
+        const currentData = user.data();
+        if ("id" in currentData) {
+          delete currentData.id;
+        }
+        if ("id" in userData) {
+          delete userData.id;
+        }
         await userModel.doc(userId).set(
           {
-            ...user.data(),
+            ...currentData,
             ...userData,
             updated_at: Date.now(),
           },