:recycle: fixing up tag schema | fixing up pairing

backend/lib/services/membership.js

@@ -122,7 +122,10 @@ module.exports = class MembershipService extends Schmervice.Service {
         )
         if (matchingGroupingIds.length) {
             /** Grab all memberships associated with groupingIds */
-            let memberships = await findMemberships(matchingGroupingIds)
+            let memberships = await Membership.query().whereIn(
+                'grouping_id',
+                matchingGroupingIds,
+            )
 
             /** Set membership as active only if the user initiates it */
             await this._patchMembership(memberships, profileId, {
@@ -130,7 +133,10 @@ module.exports = class MembershipService extends Schmervice.Service {
             })
 
             /** Make a new query to get updated information */
-            memberships = await findMemberships(matchingGroupingIds)
+            memberships = await Membership.query().whereIn(
+                'grouping_id',
+                matchingGroupingIds,
+            )
             const groupings = await this._getGroupings(matchingGroupingIds, txn)
             return { memberships, groupings }
         } else {

backend/lib/services/profile/index.js

@@ -27,13 +27,11 @@ module.exports = class ProfileService extends Schmervice.Service {
         if (!Object.keys(this.tagLookup).length) {
             const { Tag } = this.server.models()
             const allTagDescriptions = await Tag.query()
-            allTagDescriptions.forEach(
-                desc =>
-                    (this.tagLookup[desc.tag_id] = {
-                        description: desc.tag_description,
-                        category: desc.tag_category,
-                    }),
-            )
+            allTagDescriptions.forEach(desc => {
+                if (desc.is_active) {
+                    this.tagLookup[desc.tag_id] = desc
+                }
+            })
         }
     }
     /**
@@ -66,7 +64,8 @@ module.exports = class ProfileService extends Schmervice.Service {
             .withGraphFetched('user')
 
         tagger.setProfileTags(matchingProfile, matchingProfile, this.tagLookup)
-        return new profiler.CompleteProfile(matchingProfile)
+        const complete = new profiler.CompleteProfile(matchingProfile)
+        return complete
     }
 
     async getCompleteProfilesFor(userId, type) {

backend/tests/membership.spec.js

@@ -21,12 +21,16 @@ const AspectLabel = require('../lib/models/aspect_label')
  * Route parameters
  */
 const params = {
-    profile_id: 1,
+    profile_id: 99,
 }
 const mockReturn = {
     profile: {
         profile_id: 99,
-        user: {},
+        user_id: 99,
+        user: {
+            user_email: '',
+            user_name: 'bob',
+        },
         responses: [],
         tags: [],
     },
@@ -143,6 +147,9 @@ test('path /<profile_id> should return ok', async t => {
         where: () => {
             return mockReturn.memberships
         },
+        whereIn: () => {
+            return mockReturn.memberships
+        },
     })
     stub(server.models()['Profile'], 'query').returns({
         // Mocked for getProfile()

frontend/src/components/ProfileCard.vue

@@ -81,12 +81,11 @@ const onPair = async () => {
     updateQueueByProfileId(currentProfile.id.value, props.card.pid, false)
     currentProfile.getGroupings()
     console.warn('created grouping:', group)
-    console.log('is grouping a match?:', group.membershipMatch.hasMatch)
 
     let goToRoute = { name: 'HomeView' }
-    if (group.membershipMatch.hasMatch) {
-        goToRoute = { name: 'PairsView' }
-    }
+    // if (group.membershipMatch.hasMatch) {
+    //     goToRoute = { name: 'PairsView' }
+    // }
     router.push(goToRoute)
 }
 

frontend/src/services/grouping.service.js

@@ -40,7 +40,6 @@ const postMembershipByProfileId = async ({
         grouping_type: groupingType,
         grouping_name: `${utcDateInSeconds}_${profileId}_${targetId}`,
     }
-    console.log('membership :', membership)
     const membershipMatch = await db.post(
         `/membership/${profileId}/join`,
         membership,