:recycle: Major refactor almost complete, lesser bugs to address

backend/lib/routes/membership/active.js

@@ -89,52 +89,54 @@ module.exports = {
                 return ids
             }, [])
             /** Assemble complete profiles to reference and pass */
-            const completedProfiles = await profileService.getProfilesFor(
+            let completedProfiles = await profileService.getProfilesFor(
                 pIds,
                 'participant',
                 false,
             )
-            // NOTE: Doesn't rely on profile reveal field to get reveal tags
-            const getGroupingRevealTags = async () => {
-                const groupingRevealTags = []
-                for (const grouping of groupings) {
+
+            /** Grabs the reveal tags for the target profile */
+            const revealTags = await groupings.reduce(
+                async (revealTags, grouping) => {
                     for (const profile of completedProfiles) {
-                        const revealTags = await profileService.getTagsFor(profile.profile_id, grouping.grouping_id, 'reveal')
-                        if (revealTags.length) {
-                            groupingRevealTags.push(revealTags)
-                        }
+                        revealTags = await profileService.
+                            getTagsFor(
+                                profile.profile_id,
+                                grouping.grouping_id,
+                                'reveal')
+                        if (revealTags.length) return revealTags
                     }
-                }
-                return groupingRevealTags
-            }
+                }, [])
 
-            const revealTags = await getGroupingRevealTags()
-            // TODO: Refactor, triple for of loop...
-            const getRevealInfo = async () => {
-                const profilesWithRevealed = []
-                for (const profile of completedProfiles) {
-                    const userInfo = await userService.findById(profile.user_id)
-                    if (userInfo && revealTags.length) {
-                        for (const tags of revealTags) {
-                            for (const tag of tags) {
-                                if (tag.tag.tag_description) {
-                                    profile[tag.tag.tag_description] = userInfo[tag.tag.tag_description]
-                                }
-                            }
-                        }
-                        profilesWithRevealed.push(profile)
+            /** If the revealTags exist, the completedProfile's hidden info is
+            * removed and replaced with the completedProfile's user information
+            * Otherwise the completedProfiles remain unchanged
+             */
+            completedProfiles = await completedProfiles.reduce(
+                async (profilesWithRevealed, profile) => {
+                    if (!revealTags) return completedProfiles
+                    const user = await userService.findById(profile.user_id)
+                    if (user) {
+                        for (const t of revealTags)
+                            if (t.tag.tag_description)
+                                profile[t.tag.tag_description] = 
+                                    user[t.tag.tag_description]
+                        profilesWithRevealed = profile
+                        return profilesWithRevealed = 
+                            profilesWithRevealed.length ? 
+                                profilesWithRevealed : 
+                                completedProfiles
+                    } else {
+                        // TODO: consider removing, throwIfNotFound used in findById
+                        console.error(
+                            '[User Service Error] no user id found for profile id >> ', 
+                            profile.profile_id)
+                        return completedProfiles
                     }
-                }
-                if (profilesWithRevealed.length)
-                    return profilesWithRevealed
-                else
-                    return completedProfiles
-            }
-
-            const completedProfilesWithRevealedInfo = await getRevealInfo()
+                }, [])
 
             const reformattedGroupings = groupings.map(g => {
-                completedProfilesWithRevealedInfo.forEach(p => {
+                completedProfiles.forEach(p => {
                     g.profile = g.profile == p.profile_id ? p : g.profile
                 })
                 g.is_paired = _activeGroupingIds(memberships).includes(

frontend/src/views/ChatView.vue

@@ -16,15 +16,15 @@ main.view--chat
                 // TODO: Remove later, only for testing
                 button(@click='checkData()') check data
             span(v-if="grouping.revealed[profile.id.value]")
-                p you revealed: 
-                ul(v-for="reveal in grouping.revealed[profile.id.value]")
+                p you revealed:
+                ul(v-for="reveal in [...new Set(grouping.revealed[profile.id.value])]")
                     li {{ reveal.description }}
             span(v-if="grouping.revealed[target.profile_id]")
                 p they revealed:
                 ul(v-for="reveal in grouping.revealed[target.profile_id]")
                     li {{ reveal.description }}: {{ target[reveal.description] }}
-            span(v-else-if="grouping.revealedFromNotification.length")
-                p they revealed:
+            span(v-if="grouping.revealedFromNotification.length")
+                p recently revealed:
                 ul(v-for="revealed in grouping.revealedFromNotification")
                     li(v-if="revealed[revealed.tag_description] !== profile._profile[revealed.tag_description]") {{ revealed.tag_description }}: {{ revealed[revealed.tag_description] }}