:recycle: Addressing bug - reveal does not cause global reveal

backend/lib/routes/membership/active.js

@@ -102,9 +102,30 @@ module.exports = {
                 g.is_paired = _activeGroupingIds(memberships).includes(
                     g.grouping_id,
                 )
+
+                const defaultValues = {
+                    user_name: g.profile.user_info.user_name,
+                    user_email: g.profile.user_info.user_email
+                }
+
+                // NOTE: better...at least it's not globally shown on the home page...
+                // but we can't rely on reveal for this, it has to be in this grouping in particular
+                if (g.profile.reveal.length) {
+                    console.log('g.profile.reveal :=>', g.profile.reveal)
+                    for (let [attribute, defaultVal] of Object.entries(defaultValues)) {
+                        const typeOfReveal = typeof g.profile.reveal.find(tag =>
+                            tag.tag_description === attribute)
+                        if (typeOfReveal !== 'undefined') {
+                            g.profile[attribute] = defaultVal
+                        }
+                    }
+                }
+
+                // NOTE: delete profile.user_info for privacy
+                delete g.profile.user_info
                 return g
             })
-
+            console.log('reformattedGroupings :=>', reformattedGroupings[0].profile.user_name)
             try {
                 return {
                     ok: true,

backend/lib/schemas/profiles.js

@@ -10,6 +10,7 @@ const singleProfile = Joi.object({
     user_id: Joi.number(),
     user_name: Joi.string(),
     user_email: Joi.string(),
+    user_info: Joi.any(),
     responses: surveyResponseSchema.list,
     reveal: Joi.array().items(),
     tags: tagSchema.list,

backend/lib/services/profile/profiler.js

@@ -9,17 +9,17 @@ class CompleteProfile {
     constructor(profile, includeResponses = false, type) {
         this.user_id = profile.user_id // int user_id
         this.profile_id = profile.profile_id // int profile_id
-        this.user_name = profile.user.user_name // string user_name
-        this.user_email = profile.user.user_email
+        this.user_name = 'hidden_name'// string user_name
+        this.user_email = 'hidden@email.com'
         this.responses = []
         this.user_type = type
         this.tags = profile.tags.filter(t => t.tag_category != 'reveal')
-
         // TODO: generalize this for multiple images, and languages
         this.profile_description = ''
         this.profile_media = []
         this.profile_languages = []
         this.profile_prefs = {}
+        this.user_info = profile.user
 
         // TODO: Use reveal tags to add or remove information from profile!
         // TODO: ---
@@ -27,20 +27,6 @@ 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 = typeof 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

frontend/src/entities/profile/profile.schema.js

@@ -27,6 +27,7 @@ const profileSchema = {
         user_name: Joi.string(),
         user_id: Joi.number(),
         user_email: Joi.string(),
+        user_info: Joi.any(),
         profile_id: Joi.number(),
         profile_description: Joi.string().allow(null, ''),
         profile_media: Joi.array().items(Joi.string()),