Merge branch 'develop' into iss2223-tests

Author: RahulGoyal-tech

controllers/users.js

@@ -678,8 +678,14 @@ const getUserImageForVerification = async (req, res) => {
 const updateUser = async (req, res) => {
   try {
     const { id: profileDiffId, message } = req.body;
-
-    const profileDiffData = await profileDiffsQuery.fetchProfileDiffUnobfuscated(profileDiffId);
+    const devFeatureFlag = req.query.dev;
+    let profileDiffData;
+    if (devFeatureFlag === "true") {
+      profileDiffData = await profileDiffsQuery.fetchProfileDiffUnobfuscated(profileDiffId);
+    } else {
+      profileDiffData = await profileDiffsQuery.fetchProfileDiff(profileDiffId);
+    }
+    Object.freeze(profileDiffData);
     if (!profileDiffData) return res.boom.notFound("Profile Diff doesn't exist");
 
     const { approval, timestamp, userId, ...profileDiff } = profileDiffData;

models/profileDiffs.js

@@ -152,7 +152,7 @@ const fetchProfileDiffUnobfuscated = async (profileDiffId) => {
       ...profileDiffData,
     };
   } catch (err) {
-    logger.error("Error retrieving profile Diff", err);
+    logger.error("Error retrieving Unobfuscated profile Diff", err);
     throw err;
   }
 };

models/users.js

@@ -93,10 +93,6 @@ const addOrUpdate = async (userData, userId = null) => {
       // 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;
         }