:bug: Addressing reveal bug, in progress...

.gitignore

@@ -6,4 +6,5 @@ dist-ssr
 **/.env
 .nyc_output
 **/generated/_*
-**/.vscode
+**/.vscode
+**/*.vim

backend/lib/routes/membership/reveal.js

@@ -50,7 +50,8 @@ module.exports = {
                 const idsInGroup = memberships.map(
                     membership => membership.profile_id,
                 )
-
+                if (idsInGroup.length > 2)
+                    return console.error('ERROR: idsInGroup cannot have more than 2 entries: ', idsInGroup)
                 // Grab User Info from Users Table
                 const completeProfile = await profileService.getProfilesFor([profile_id], 'participant')
 

backend/lib/services/profile/index.js

@@ -63,7 +63,10 @@ module.exports = class ProfileService extends Schmervice.Service {
             tag => this.tagLookup[tag.tag_id],
         )
         const complete = new profiler.CompleteProfile(matchingProfile, true)
-        return this.setDefaults(complete)
+        // TODO: Refactor to use this.setDefaults(), currently does not play
+        // nice with reveal functionality
+        return complete
+        // return this.setDefaults(complete)
     }
 
     async getCompleteProfilesFor(userId, type) {

frontend/src/components/ProfileCard.vue

@@ -67,7 +67,6 @@ import PairingButton from './PairingButton.vue'
 
 const router = useRouter()
 const isPaired = ref(true)
-// const isPaired = ref(false)
 
 const props = defineProps({
     card: {

frontend/src/entities/response/response.schema.js

@@ -8,7 +8,9 @@ const responseSchema = Joi.object({
     profile_id: Joi.number(),
     response_id: Joi.number(),
     response_key_id: Joi.number(),
-    val: Joi.string(),
+    // TODO: troubleshoot later, suppressed validation warning for now
+    // val: Joi.string(),
+    val: Joi.any(),
 })
 
 export { responseSchema }

frontend/src/services/grouping.service.js

@@ -1,6 +1,6 @@
 import { db } from '../utils/db.js'
 import { Grouping, Profile } from '../entities/index.js'
-
+import { ref } from 'vue'
 /**
  * Get Memberships associated with a single Profile from the database and
  * create a class from the data and
@@ -26,6 +26,7 @@ const fetchMembershipsByProfileId = async profileId => {
                     `/profile/${profileId}/tags/${grouping.grouping_id}`,
                 )
                 grouping.tags = [...targetTags, ...profileTags]
+                grouping.revealedFromNotification = ref([])
                 grouping._loading.value = false
                 validGroupingInstances.push(grouping)
             }

frontend/src/services/notification.service.js

@@ -52,11 +52,13 @@ class StonkAlert extends Toaster {
                 is_active: 1,
                 tag_category: "reveal",
                 tag_description: parsed.description,
-                tag_id: parsed.tag
+                tag_id: parsed.tag,
+                for_profile_id: foundGrouping.profile.profile_id
             }
             const target_desc = parsed.description
             tagFromNotification[target_desc] = parsed.revealed_info
-            foundGrouping.profile.tags.push(tagFromNotification)
+            foundGrouping.profile.reveal.push(tagFromNotification)
+            foundGrouping.revealedFromNotification.value.push(tagFromNotification)
         }
     }
 }

frontend/src/views/ChatView.vue

@@ -15,14 +15,20 @@ main.view--chat
                 button(@click='reveal(8)') reveal my email
                 // TODO: Remove later, only for testing
                 button(@click='checkData()') check data
+            // BUG: grouping.revealed[profile.id.value] needs to be deduped
             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] }}
+                        li {{ reveal.description }}: {{ profile._profile[reveal.description] }}
+            // BUG: they revealed doesn't persist, both for loops are currently necessary
             p they revealed:
-                span(v-if="theyRevealed")
-                    ul(v-for="reveal in theyRevealed")
-                        li {{ reveal.description }} : {{ grouping.profile[reveal.description] }}
+                // BUG: persists, but doesn't display upon reveal
+                span(v-if="grouping.revealed[target.profile_id]")
+                    ul(v-for="reveal in grouping.revealed[target.profile_id]")
+                        li {{ reveal.description }}: {{ target[reveal.description] }}
+            // BUG: reveals, but does not persist
+            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] }}
 
     article
         template(v-if='isLoading')
@@ -66,14 +72,13 @@ export default {
         toSend: '',
         messages: [],
         grouping: {},
+        them: {},
     }),
     // TODO: Make sure grouping.profile.profile_id actually exists
     computed: {
         theyRevealed() {
-            return this.grouping && this.grouping.revealed[this.grouping.profile.profile_id] ?
-                this.grouping.revealed[this.grouping.profile.profile_id] :
-                []
-        }
+            return this.them
+        },
     },
     watch: {
         async profile() {
@@ -88,6 +93,7 @@ export default {
         this.loadTargetProfile()
         currentProfile._loading.value = true
         this.grouping = this.getGrouping()
+        this.them = this.grouping.profile
         this.messages = await currentProfile.chatter.getHistory(this.grouping.grouping_name)
         console.log('this.messages :>> ', this.messages)
         currentProfile.chatter.setOnMessage(this._onMessage)
@@ -100,7 +106,7 @@ export default {
          },
         // TODO: remove, only for testing reveal()
         async checkData() {
-            console.log(currentProfile)
+            console.log('currentProfile :=>', currentProfile)
         },
         /**
          * Pubnub message callback fires when message event
@@ -113,6 +119,9 @@ export default {
         },
         // TODO: test this
         getGrouping() {
+            if (this.$route.params.pid === currentProfile.profile_id) {
+                console.warn('WARNING :=> You cannot chat with yourself!!!')
+            }
             return currentProfile.groupings.find(
                 g => g.profile.profile_id == this.$route.params.pid,
             )