:recycle: Continuing with reveal refactor

backend/lib/routes/membership/active.js

@@ -62,7 +62,7 @@ module.exports = {
         auth: false,
         cors: true,
         handler: async function (request, h) {
-            const { membershipService, profileService } =
+            const { membershipService, profileService, userService } =
                 request.server.services()
             const membershipType = request.query.type
 
@@ -95,6 +95,34 @@ module.exports = {
                 'participant',
                 false,
             )
+
+            const revealTags = []
+            completedProfiles.forEach(p => {
+                p.tags.forEach(t => {
+                    if (t.tag_category === 'reveal') {
+                        if (t.tag_description === 'user_email' || t.tag_description === 'user_name') {
+                            revealTags.push(t)
+                        }
+                    }
+                })
+            })
+
+            const getRevealInfo = async () => {
+                const profilesWithRevealed = []
+                for (const profile of completedProfiles) {
+                    const userInfo = await userService.findById(profile.user_id)
+                    for (const tag of revealTags) {
+                        profile[tag.tag_description] = userInfo[tag.tag_description]
+                    }
+                    profilesWithRevealed.push(profile)
+                }
+                return profilesWithRevealed
+            }
+
+            const revealedInfo = await getRevealInfo()
+            console.log('revealedInfo :=>', revealedInfo)
+            // if revealTags.length, return revealInfo, otherwise return completeProfiles...
+
             const reformattedGroupings = groupings.map(g => {
                 completedProfiles.forEach(p => {
                     g.profile = g.profile == p.profile_id ? p : g.profile
@@ -102,30 +130,9 @@ 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,7 +10,6 @@ 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

@@ -13,13 +13,13 @@ class CompleteProfile {
         this.user_email = 'hidden@email.com'
         this.responses = []
         this.user_type = type
-        this.tags = profile.tags.filter(t => t.tag_category != 'reveal')
+        // NOTE: just have all the tags in one place
+        this.tags = profile.tags
         // 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: ---

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

@@ -27,7 +27,6 @@ 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()),