:bug: Moved hide logic into CompleteProfile constructor

backend/lib/services/profile/index.js

@@ -63,10 +63,7 @@ module.exports = class ProfileService extends Schmervice.Service {
             tag => this.tagLookup[tag.tag_id],
         )
         const complete = new profiler.CompleteProfile(matchingProfile, true)
-        // TODO: Refactor to use this.setDefaults(), currently does not play
-        // nice with reveal functionality
         return complete
-        // return this.setDefaults(complete)
     }
 
     async getCompleteProfilesFor(userId, type) {
@@ -228,40 +225,6 @@ module.exports = class ProfileService extends Schmervice.Service {
         return allResponses
     }
 
-    /**
-     * Sets default profile attributes
-     * @param {object} complete
-     * @returns {object} updated profile
-     */
-    setDefaults(complete) {
-        let defaultValues = {
-            user_email: 'hidden@email.com',
-            user_name: 'Hidden Name',
-        }
-
-        let defaultProfile = {
-            ...complete,
-            user_email: defaultValues.user_email,
-            user_name: defaultValues.user_name,
-        }
-        console.log('---')
-        console.log('defaultProfile: ', defaultProfile.user_email)
-        if (!complete.reveal.length) return defaultProfile // nothing to reveal
-
-        // swap out values of keys that are not found as complete.reveal.tag.tag_description values
-        for (let [attribute, defaultVal] of Object.entries(defaultValues)) {
-            if (
-                typeof complete.reveal.find(
-                    tag => tag.tag_description == attribute,
-                ) == 'undefined'
-            )
-                complete[attribute] = defaultVal
-        }
-        console.log('complete: ', complete.user_email)
-
-        return complete
-    }
-
     /**
      * Delete a profile
      * @param {number} userId

backend/lib/services/profile/profiler.js

@@ -27,6 +27,20 @@ class CompleteProfile {
         // TODO: and include for certain profiles
 
         this.reveal = profile.tags.filter(t => t.tag_category == 'reveal')
+        // Hides values until revealed
+        const defaultValues = {
+            user_name: 'hidden_name',
+            user_email: 'hidden@email.com',
+        }
+        // BUG: If user reveals EITHER name or email, BOTH get revealed together...
+        if (!this.reveal.length) {
+            for (let [attribute, defaultVal] of Object.entries(defaultValues)) {
+                const typeOfReveal = this.reveal.find(tag => tag.tag_description === attribute)
+                if (typeOfReveal === undefined) {
+                    this[attribute] = defaultVal
+                }
+            }
+        }
         // TODO: filter these correctly
         if (profile?.responses?.length && includeResponses) {
             // [] of all "profile" responses