Merge branch 'brian_dev' of fyindr/siimee into dev

merges storing of info from notifications

backend/lib/routes/membership/reveal.js

@@ -50,12 +50,39 @@ module.exports = {
                 const idsInGroup = memberships.map(
                     membership => membership.profile_id,
                 )
+
+                // Grab User Info from Users Table
+                const completeProfile = await profileService.getProfilesFor([profile_id], 'participant')
+
+                // 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(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`,
                         {
-                            name: 'REVEALED INFO',
+                            name: 'REVEALED_INFO',
+                            revealed_info: revealInfo,
+                            grouping_id: grouping_id,
                             tag: tag_id,
+                            description: tag_description,
                             type: 'info',
                         },
                         h,

frontend/src/components/SideBar.vue

@@ -5,7 +5,7 @@ aside.sidebar.w-flex.column.pa8
     nav.temp-control-box
         input(v-model="switchToPID" @keyup.enter="$emit('updatePid', switchToPID)")
         button(@click="$emit('updatePid', switchToPID)") switch profile
-    
+
 </template>
 
 <script>

frontend/src/services/chat.service.js

@@ -116,7 +116,7 @@ class Chatter {
         } catch (error) {
             console.error('[chatter]', error)
         }
-        const channelHistory = pastMessages.channels[channel]
+        const channelHistory = pastMessages && pastMessages.channels ? pastMessages.channels[channel] : null
         console.log('channelHistory :>> ', channelHistory)
         return channelHistory
             ? channelHistory.map(msg => ({

frontend/src/services/notification.service.js

@@ -1,5 +1,5 @@
 import { remote } from '../utils/db.js'
-
+import { currentProfile } from '../services'
 /**
  * Base notifier class
  * @param {number} profileId needed to listen for events for this profile
@@ -29,12 +29,35 @@ class StonkAlert extends Toaster {
         this.stonks = {}
         this.listenFor(`${profileId}.${this.event}`, message => {
             const parsed = JSON.parse(message.data)
+            if (parsed.name === 'REVEALED_INFO') {
+                this._appendTagsToGrouping(parsed)
+            }
             this.stonks[parsed.name] = parsed
             waveCb(this._formatToast(parsed), parsed.type)
         })
     }
     _formatToast(parsed) {
-        return `${parsed.name}: ${parsed.profile_id} ${parsed.order} at ${parsed.price}`
+        if (parsed.revealed_info) {
+            return `${parsed.name}: ${parsed.revealed_info} at ${parsed.type}`
+        } else {
+            return `${parsed.name}: ${parsed.profile_id} ${parsed.order} at ${parsed.price}`
+        }
+    }
+    _appendTagsToGrouping(parsed) {
+        const foundGrouping = currentProfile.groupings.find(grouping =>
+            grouping.grouping_id === parsed.grouping_id
+        )
+        if (foundGrouping) {
+            const tagFromNotification = {
+                is_active: 1,
+                tag_category: "reveal",
+                tag_description: parsed.description,
+                tag_id: parsed.tag
+            }
+            const target_desc = parsed.description
+            tagFromNotification[target_desc] = parsed.revealed_info
+            foundGrouping.profile.tags.push(tagFromNotification)
+        }
     }
 }
 

frontend/src/views/ChatView.vue

@@ -13,10 +13,16 @@ main.view--chat
             .w-flex.row
                 button(@click='reveal(7)') reveal my name
                 button(@click='reveal(8)') reveal my email
-            p you revealed: 
-                span(v-if="grouping.revealed[profile.id]") {{ grouping.revealed }}
+                // TODO: Remove later, only for testing
+                button(@click='checkData()') check data
+            p you revealed:
+                span(v-if="grouping.revealed[profile.id.value]")
+                    ul(v-for="reveal in grouping.revealed[profile.id.value]")
+                        li {{ reveal.description }} : {{ profile._profile[reveal.description] }}
             p they revealed:
-                span(v-if="grouping.revealed[grouping.profile.profile_id]") {{ grouping.revealed[grouping.profile.profile_id] }}
+                span(v-if="grouping.revealed[grouping.profile.profile_id]")
+                    ul(v-for="reveal in grouping.revealed[grouping.profile.profile_id]")
+                        li {{ reveal.description }} : {{ grouping.profile[reveal.description] }}
 
     article
         template(v-if='isLoading')
@@ -83,6 +89,10 @@ export default {
         async reveal(tagId) {
             const grouping = this.getGrouping()
             await grouping.reveal(currentProfile.id.value, tagId)
+         },
+        // TODO: remove, only for testing reveal()
+        async checkData() {
+            console.log(currentProfile)
         },
         /**
          * Pubnub message callback fires when message event