:bug: fixing transposed pubnub group names by returning grouping from backend

backend/lib/routes/membership/join.js

@@ -27,6 +27,7 @@ const responseSchemas = {
     response: Joi.object({
         memberships: Joi.array().items(),
         hasMatch: Joi.boolean(),
+        groupings: Joi.array().items(),
     }).label('grouping_membership_list'),
     error: errorSchema.single,
 }
@@ -68,12 +69,13 @@ module.exports = {
                 // !: You should only be associated with a single company too
 
                 /** User membership service method to create membership */
-                const memberships = await membershipService.joinGrouping(
-                    profileId,
-                    res.target_id,
-                    groupingToWrite,
-                    role,
-                )
+                const { memberships, groupings } =
+                    await membershipService.joinGrouping(
+                        profileId,
+                        res.target_id,
+                        groupingToWrite,
+                        role,
+                    )
                 const hasMatch = memberships.every(
                     membership => membership && membership.is_active == true,
                 )
@@ -103,6 +105,7 @@ module.exports = {
                         data: {
                             memberships,
                             hasMatch,
+                            groupings,
                         },
                     })
                     .code(200)

backend/lib/services/membership.js

@@ -25,7 +25,10 @@ module.exports = class MembershipService extends Schmervice.Service {
         /** Uncomment to dedupe the list just in case */
         return [...new Set(groupingIdsToGrab)]
     }
-
+    async _getGroupings(groupingIds, txn) {
+        const { Grouping } = this.server.models()
+        return await Grouping.query(txn).whereIn('grouping_id', groupingIds)
+    }
     /**
      * Internal method to create a new grouping
      * @param {object} groupingToTry from payload data
@@ -116,7 +119,7 @@ module.exports = class MembershipService extends Schmervice.Service {
 
         if (matchingGroupingIds.length) {
             /** Grab all memberships associated with groupingIds */
-            const memberships = await Membership.query().whereIn(
+            let memberships = await Membership.query().whereIn(
                 'grouping_id',
                 matchingGroupingIds,
             )
@@ -127,10 +130,12 @@ module.exports = class MembershipService extends Schmervice.Service {
             })
 
             /** Make a new query to get updated information */
-            return await Membership.query().whereIn(
+            memberships = await Membership.query().whereIn(
                 'grouping_id',
                 matchingGroupingIds,
             )
+            const groupings = await this._getGroupings(matchingGroupingIds, txn)
+            return { memberships, groupings }
         } else {
             /**
              * If both have NO grouping in common, create a membership
@@ -160,7 +165,10 @@ module.exports = class MembershipService extends Schmervice.Service {
                 is_active: false,
             })
 
-            return [userMembership, targetMembership]
+            return {
+                memberships: [userMembership, targetMembership],
+                groupings: [],
+            }
         }
     }
 

frontend/src/components/ProfileCardList.vue

@@ -98,10 +98,16 @@ const accept = async targetId => {
         profileId,
         targetId,
     })
+
+    // Reuse old grouping name if theres a match
+    let channel = groupingName
     console.log('membershipMatch :>> ', membershipMatch)
     if (membershipMatch?.hasMatch) {
-        await subscribeToChat(groupingName)
+        const [time, intiator, target] = groupingName.split('_')
+        channel = membershipMatch.groupings[0].grouping_name
+        console.log('channel :>> ', channel)
     }
+    await subscribeToChannel(channel)
     emit('reload')
 }
 
@@ -109,7 +115,7 @@ const view = pid => {
     router.push({ path: `/matches/${pid}` })
 }
 
-const subscribeToChat = async groupingName => {
+const subscribeToChannel = async channelName => {
     // create a chatter reference from the current profile
     const chatter = currentProfile.chatter
     // console.log('mock sender:', pid)
@@ -117,11 +123,11 @@ const subscribeToChat = async groupingName => {
     /**
      * publish a new message to the chatter with the channel and the message & title is optional
      */
-    // You MUST send chatter channels as an array
-    chatter.subscribe([groupingName])
-    const res = await chatter.publish(groupingName, {
+    // You MUST send chatter channels as an array in an object
+    chatter.subscribe({ channels: [channelName] })
+    const res = await chatter.publish(channelName, {
         title: 'New Message',
-        description: `This is the checking to see if we are subscribed to the ${groupingName} channel!`,
+        description: `This is the checking to see if we are subscribed to the ${channelName} channel!`,
     })
     // PubNub response will be a timecode of when the message was published
     console.log('res:', res)

frontend/src/services/chat.service.js

@@ -103,7 +103,7 @@ class Chatter {
         // ? .await for the groupings to be fetched before subscribing to channels
         await this._setupAllChannels(this.uuid)
         this._listenFor({ listeners: this.listeners })
-        this.subscribe(this.subscriptions)
+        this.subscribe({ channels: this.subscriptions })
     }
     /**
      * Send a message to a channel
@@ -122,7 +122,7 @@ class Chatter {
      * Facade so we can hide provider specific methods
      * @param {array} channels
      */
-    subscribe(channels) {
+    subscribe({ channels }) {
         providerMethods.subscribe({ channels })
     }
     /**