:recycle: Refactored notification to grab reveal description accurately

backend/lib/routes/membership/reveal.js

@@ -51,19 +51,29 @@ module.exports = {
                     membership => membership.profile_id,
                 )
 
-                // Grab User Info from Users Table and prepare revealed info for
-                // notification based off of tag_id
+                // Grab User Info from Users Table
                 const completeProfile = await profileService.getProfilesFor([profile_id], 'participant')
-                let revealInfo
-                let tag_description
-                if (tag_id == 7) {
-                    revealInfo = completeProfile[0].user_name
-                    tag_description = 'name'
-                } else if (tag_id == 8) {
-                    revealInfo = completeProfile[0].user_email
-                    tag_description = 'email'
+
+                // Grab the TagAssociation that matches the revealed profile
+                // TODO: Check if there are multiple matching tags(?)(there shouldn't be)
+                const returnedTag = () => {
+                    let matchingTag
+                    tags.forEach(async (tagAssoc) => {
+                        if (tagAssoc.grouping_id === grouping_id &&
+                            tagAssoc.profile_id === profile_id &&
+                            tagAssoc.tag_id === tag_id) {
+                            matchingTag = tagAssoc
+                        }
+                    })
+                    if (matchingTag)
+                        return matchingTag
+                    return console.error('ERROR: No matching tagAssociation')
                 }
 
+                const tag_description = returnedTag().tag.tag_description
+                // TODO: Refactor completeProfile[0]... code smell
+                const revealInfo = completeProfile[0][tag_description]
+
                 idsInGroup.forEach(profile_id => {
                     request.server.methods.notify(
                         `${profile_id}.stonk`,

frontend/src/services/notification.service.js

@@ -49,19 +49,13 @@ class StonkAlert extends Toaster {
         )
         if (foundGrouping) {
             const tagFromNotification = {
-                grouping_id: parsed.grouping_id,
-                is_deleted: 0,
-                profile_id: currentProfile._profile.profile_id,
-                target_id: foundGrouping.profile.profile_id,
-                tag: {
-                    is_active: 1,
-                    tag_category: "reveal",
-                    tag_description: parsed.description,
-                    tag_id: parsed.tag
-                }
+                is_active: 1,
+                tag_category: "reveal",
+                tag_description: parsed.description,
+                tag_id: parsed.tag
             }
-            const target_desc = `target_${parsed.description}`
-            tagFromNotification.tag[target_desc] = parsed.revealed_info
+            const target_desc = parsed.description
+            tagFromNotification[target_desc] = parsed.revealed_info
             foundGrouping.profile.tags.push(tagFromNotification)
         }
     }