:recycle: moving match queue routes | renaming match queue classes

backend/db/migrations/20211003195015_create_match_queues_table.js

@@ -0,0 +1,12 @@
+exports.up = function (knex) {
+    return knex.schema.createTable('match_queues', function (table) {
+        table.increments('match_queue_id').primary()
+        table.integer('profile_id').notNullable()
+        table.integer('target_id').notNullable()
+        table.boolean('is_deleted').notNullable()
+    })
+}
+
+exports.down = function (knex) {
+    return knex.schema.dropTable('match_queues')
+}

backend/db/mock.js

@@ -1423,4 +1423,15 @@ module.exports = {
         { message_id: 8, user_id: 1, grouping_id: 5, message: 'hello!' },
         { message_id: 9, user_id: 3, grouping_id: 5, message: 'meow' },
     ],
+    match_queues: [
+        { match_queue_id: 1, profile_id: 4, target_id: 1, is_deleted: false },
+        { match_queue_id: 2, profile_id: 4, target_id: 3, is_deleted: false },
+        { match_queue_id: 3, profile_id: 4, target_id: 2, is_deleted: false },
+        { match_queue_id: 4, profile_id: 1, target_id: 4, is_deleted: false },
+        { match_queue_id: 5, profile_id: 1, target_id: 6, is_deleted: false },
+        { match_queue_id: 6, profile_id: 1, target_id: 8, is_deleted: false },
+        { match_queue_id: 7, profile_id: 2, target_id: 8, is_deleted: false },
+        { match_queue_id: 8, profile_id: 2, target_id: 6, is_deleted: false },
+        { match_queue_id: 9, profile_id: 2, target_id: 4, is_deleted: false },
+    ],
 }

backend/db/seeds/09-match_queues.js

@@ -0,0 +1,11 @@
+const mock = require('../mock')
+
+exports.seed = function (knex) {
+    // Deletes ALL existing entries
+    return knex('match_queues')
+        .truncate()
+        .then(function () {
+            // Inserts seed entries
+            return knex('match_queues').insert(mock.match_queues)
+        })
+}

backend/lib/index.js

@@ -2,6 +2,7 @@ const UserPlugin = require('./plugins/user')
 const MembershipPlugin = require('./plugins/membership')
 const SurveyPlugin = require('./plugins/survey')
 const ProfilePlugin = require('./plugins/profile')
+const MatchQueuePlugin = require('./plugins/matchqueue')
 
 /**
  * A Hapi server instance
@@ -27,6 +28,10 @@ exports.plugin = {
             routes: { prefix: '/user' },
         })
 
+        await server.register(MatchQueuePlugin, {
+            routes: { prefix: '/matchqueue' },
+        })
+
         await server.register(MembershipPlugin, {
             routes: { prefix: '/membership' },
         })

backend/lib/models/matchqueue.js

@@ -1,21 +1,17 @@
 const Schwifty = require('@hapipal/schwifty')
 const Joi = require('joi')
 
-const Profile = require('./profile')
-// const User = require('./user')
-// const Membership = require('./membership')
-
-module.exports = class MatchQue extends Schwifty.Model {
+module.exports = class MatchQueue extends Schwifty.Model {
     static get tableName() {
-        return 'matchque'
+        return 'match_queues'
     }
 
     static get joiSchema() {
         return Joi.object({
-            match_id: Joi.number(),
+            match_queue_id: Joi.number(),
             profile_id: Joi.number().required(),
-            profile_id_2: Joi.number().required(),
-            deleted: Joi.boolean().required(),
+            target_id: Joi.number().required(),
+            is_deleted: Joi.boolean().required(),
         })
     }
 }

backend/lib/plugins/matchqueue.js

@@ -2,11 +2,10 @@ const Objection = require('objection')
 const Schmervice = require('@hapipal/schmervice')
 const Schwifty = require('@hapipal/schwifty')
 
-const MatchQueService = require('../services/matchqueue')
+const MatchQueueService = require('../services/matchqueue')
 
-const MatchQueModel = require('../models/matchqueue')
-const MatchQueRoute = require('../routes/matchqueue/matchqueue')
-const MatchQueChooseRoute = require('../routes/matchqueue/choosematch')
+const MatchQueueModel = require('../models/matchqueue')
+const MatchQueueChooseRoute = require('../routes/matchqueue/choosematch')
 
 module.exports = {
     name: 'matchqueue-plugin',
@@ -14,7 +13,7 @@ module.exports = {
     register: async (server, options) => {
         await server.register(Schwifty)
 
-        await server.registerModel(MatchQueModel)
+        await server.registerModel(MatchQueueModel)
 
         server.bind({
             transaction: fn => Objection.transaction(server.knex(), fn),
@@ -22,9 +21,8 @@ module.exports = {
 
         await server.register(Schmervice)
 
-        server.registerService(MatchQueService)
+        server.registerService(MatchQueueService)
 
-        await server.route(MatchQueRoute)
-        await server.route(MatchQueChooseRoute)
+        await server.route(MatchQueueChooseRoute)
     },
 }

backend/lib/plugins/profile.js

@@ -11,6 +11,7 @@ const ProfileScoreRoute = require('../routes/profile/score')
 const ProfileUpdateRoute = require('../routes/profile/update')
 const ProfileRespondRoute = require('../routes/profile/respond')
 const ProfileMatchRoute = require('../routes/profile/match')
+const ProfileQueueRoute = require('../routes/profile/queue')
 
 module.exports = {
     name: 'profile-plugin',
@@ -33,5 +34,6 @@ module.exports = {
         await server.route(ProfileRespondRoute)
         await server.route(ProfileUpdateRoute)
         await server.route(ProfileMatchRoute)
+        await server.route(ProfileQueueRoute)
     },
 }

backend/lib/routes/matchqueue/matchqueue.js

@@ -1,79 +0,0 @@
-'use strict'
-
-const Joi = require('joi')
-
-const pluginConfig = {
-    handlerType: 'matchque',
-    docs: {
-        description: 'inserts scored matches',
-        notes: 'Waits for Scoring Service, and inserts any that does not exist in MatchQue Table',
-    },
-}
-
-const validators = {
-    //     /** Validate the header (cookie check) */
-    //     // headers: true,
-
-    //     /** Validate the route params (/active/{thing}) */
-    params: Joi.object({ profile_id: Joi.number() }),
-
-    //     /** Validate the route query (/active/{thing}?limit=10&offset=10) */
-    //     // query: true,
-
-    //     /** Validate the incoming payload (POST method) */
-
-    payload: Joi.object({
-        maxDistance: Joi.number().required(),
-        distanceUnit: Joi.string().required(),
-    }),
-}
-
-module.exports = {
-    method: 'POST',
-    path: '/{profile_id}/matches',
-    options: {
-        ...pluginConfig.docs,
-        tags: ['api'],
-        /** Protect this route with authentication? */
-        auth: false,
-        handler: async function (request, h) {
-            const { profile_id } = request.params
-            const { maxDistance, distanceUnit } = request.payload
-            const { matchQueService, profileService } =
-                request.server.services()
-            // get results back from profileServices.scoreProfilesFor(profile_id, maxDistance, distanceUnit)
-            const potentials = await profileService.scoreProfilesFor(
-                profile_id,
-                maxDistance,
-                distanceUnit,
-            )
-            let potentialProfileIds = potentials.map(
-                potential => potential.profile_id,
-            )
-            potentialProfileIds = [...new Set(potentialProfileIds)]
-
-            await matchQueService.insertScoredProfilesIntoMatchQue(
-                profile_id,
-                potentialProfileIds,
-            )
-
-            return matchQueService.getPotentials(profile_id)
-        },
-        /** Validate based on validators object */
-        validate: {
-            ...validators,
-            failAction: 'log',
-        },
-
-        // couldn't get validate server response working...
-
-        /** Validate the server response */
-        // response: {
-        //     schema: Joi.object({
-        //         ok: Joi.bool(),
-        //         handler: Joi.string(),
-        //         data: Joi.object(),
-        //     }),
-        // },
-    },
-}

backend/lib/routes/profile/queue.js

@@ -0,0 +1,48 @@
+'use strict'
+
+const Joi = require('joi')
+
+const pluginConfig = {
+    handlerType: 'profile',
+    docs: {
+        description: 'Returns previously scored profiles',
+        notes: 'returns from the MatchQueue Table',
+    },
+}
+
+const validators = {
+    params: Joi.object({ profile_id: Joi.number() }),
+}
+
+module.exports = {
+    method: 'GET',
+    path: '/{profile_id}/queue',
+    options: {
+        ...pluginConfig.docs,
+        tags: ['api'],
+        /** Protect this route with authentication? */
+        auth: false,
+        handler: async function (request, h) {
+            const { profile_id } = request.params
+            const { matchQueueService } = request.server.services()
+
+            return await matchQueueService.getPotentials(profile_id)
+        },
+        /** Validate based on validators object */
+        validate: {
+            ...validators,
+            failAction: 'log',
+        },
+
+        // couldn't get validate server response working...
+
+        /** Validate the server response */
+        // response: {
+        //     schema: Joi.object({
+        //         ok: Joi.bool(),
+        //         handler: Joi.string(),
+        //         data: Joi.object(),
+        //     }),
+        // },
+    },
+}

backend/lib/routes/profile/score.js

@@ -20,7 +20,7 @@ const validators = {
     }),
 
     /** Validate the route query (/active/{thing}?limit=10&offset=10) */
-    query:Joi.object({
+    query: Joi.object({
         max_distance: Joi.number(),
         unit: Joi.string(),
     }),
@@ -45,27 +45,43 @@ module.exports = {
         auth: false,
 
         handler: async function (request, h) {
-            const { profileService } = request.services()
+            const { profileService, matchQueueService } =
+                request.server.services()
+
             const profileId = request.params.profile_id
             const maxDistanceMiles = request.query.max_distance
-            const distanceUnit = request.query.unit ? request.query.unit : 'mile'
-            const profiles = await profileService.scoreProfilesFor(profileId, maxDistanceMiles, distanceUnit)
+            const distanceUnit = request.query.unit
+                ? request.query.unit
+                : 'mile'
+            const profiles = await profileService.scoreProfilesFor(
+                profileId,
+                maxDistanceMiles,
+                distanceUnit,
+            )
+            await matchQueueService.insertScoredProfilesIntoMatchQueue(
+                profileId,
+                profiles.map(profile => profile.profile_id),
+            )
             try {
-                if(!profiles){
+                if (!profiles) {
                     throw new RangeError('Unable to score profiles')
                 }
-                
-                return h.response({
-                    ok: true,
-                    handler: pluginConfig.handlerType,
-                    data: profiles,
-                }).code(200)
+
+                return h
+                    .response({
+                        ok: true,
+                        handler: pluginConfig.handlerType,
+                        data: profiles,
+                    })
+                    .code(200)
             } catch (err) {
-                return h.response({
-                    ok: false,
-                    handler: pluginConfig.handlerType,
-                    data: { error: `${err}` },
-                }).code(409)
+                return h
+                    .response({
+                        ok: false,
+                        handler: pluginConfig.handlerType,
+                        data: { error: `${err}` },
+                    })
+                    .code(409)
             }
         },
 
@@ -88,7 +104,7 @@ module.exports = {
                     handler: Joi.string(),
                     data: responseSchemas.error,
                 }),
-            }
+            },
         },
     },
 }

backend/lib/services/matchqueue.js

@@ -1,15 +1,15 @@
 const Schmervice = require('@hapipal/schmervice')
 
-module.exports = class MatchQueService extends Schmervice.Service {
+module.exports = class MatchQueueService extends Schmervice.Service {
     constructor(...args) {
         super(...args)
     }
 
     async getPotentials(profileId) {
-        const { MatchQue } = this.server.models()
-        const allPotentials = await MatchQue.query()
+        const { MatchQueue } = this.server.models()
+        const allPotentials = await MatchQueue.query()
             .where('profile_id', profileId)
-            .andWhere('deleted', false)
+            .andWhere('is_deleted', false)
         return allPotentials
     }
     /**
@@ -17,21 +17,21 @@ module.exports = class MatchQueService extends Schmervice.Service {
      * @param {number} profileId
      * @param {array} potentialProfileIds
      */
-    async insertScoredProfilesIntoMatchQue(profileId, potentialProfileIds) {
-        const { MatchQue } = this.server.models()
+    async insertScoredProfilesIntoMatchQueue(profileId, potentialProfileIds) {
+        const { MatchQueue } = this.server.models()
 
         // returns an array of all matches for the profileId where the profile_id_2 already exists in the potentialProfileIds array
-        await MatchQue.query()
+        await MatchQueue.query()
             .patch({
-                deleted: true,
+                is_deleted: true,
             })
             .where('profile_id', profileId)
 
         for (let potentialProfileId of potentialProfileIds) {
-            await MatchQue.query().insert({
+            await MatchQueue.query().insert({
                 profile_id: profileId,
-                profile_id_2: potentialProfileId,
-                deleted: false,
+                target_id: potentialProfileId,
+                is_deleted: false,
             })
         }
 
@@ -40,24 +40,24 @@ module.exports = class MatchQueService extends Schmervice.Service {
     /**
      * Set the rows deleted as true, does NOT DELETE from database
      * @param {number} profileId
-     * @param {number} profileId2
+     * @param {number} targetId
      * @param {boolean} reinsert
      * @returns
      */
-    async markAsDeleted(profileId, profileId2, reinsert) {
-        const { MatchQue } = this.server.models()
-        await MatchQue.query()
+    async markAsDeleted(profileId, targetId, reinsert) {
+        const { MatchQueue } = this.server.models()
+        await MatchQueue.query()
             .patch({
                 deleted: true,
             })
             .where('profile_id', profileId)
-            .andWhere('profile_id_2', profileId2)
+            .andWhere('target_id', targetId)
             .first()
 
         if (reinsert) {
-            await MatchQue.query().insert({
+            await MatchQueue.query().insert({
                 profile_id: profileId,
-                profile_id_2: profileId2,
+                target_id: targetId,
                 deleted: false,
             })
         }

backend/lib/services/profile.js

@@ -3,7 +3,6 @@ const cosineSimilarity = require('compute-cosine-similarity')
 const haversine = require('haversine')
 
 const runMatch = (allYins, allYangs) => {
-    balanceSides(allYins, allYangs)
     console.log(allYins.length, ':', allYangs.length)
     // You only need to engage from one side
     engageEveryone(allYins)
@@ -30,14 +29,6 @@ const engageEveryone = allYins => {
         })
     } while (!done)
 }
-const balanceSides = (yins, yangs) => {
-    let diff = Math.abs(yangs.length - yins.length)
-    let smallerList = yangs.length < yins.length ? yangs : yins
-    const totalProfiles = yangs.length + yins.length + 1
-    for (let i = 0; i < diff; i++) {
-        smallerList.push(new ProfileFacade(totalProfiles + i))
-    }
-}
 class ProfileFacade {
     constructor(id, matchQueue) {
         this.realId = id ? id : undefined
@@ -351,9 +342,20 @@ module.exports = class ProfileService extends Schmervice.Service {
 
         // Grab all profiles with matchQueues
         let allProfiles = await Profile.query().withGraphFetched('user')
-
+        const seekerIds = allProfiles
+            .filter(profile => profile.user.is_poster == 0)
+            .map(profile => profile.profile_id)
+        const posterIds = allProfiles
+            .filter(profile => profile.user.is_poster == 1)
+            .map(profile => profile.profile_id)
+        let diff = Math.abs(posterIds.length - seekerIds.length)
+        let smallerList =
+            posterIds.length < seekerIds.length ? posterIds : seekerIds
+        // ADD DUMMY IDS TO THE SMALLER LIST
+        for (let d = 0; d < diff; d++) {
+            smallerList.push(allProfiles.length + d)
+        }
         // !:FAKE Score everyone
-        // const profileIds = allProfiles.map(profile => profile.profile_id)
         const scoredProfileQueuesById = {}
         for (let profile of allProfiles) {
             const profileQueue = await this.scoreProfilesFor(
@@ -377,14 +379,6 @@ module.exports = class ProfileService extends Schmervice.Service {
             return new ProfileFacade(profile.profile_id, profileFacadeQueue)
         })
         // // ! FAKE -- END
-
-        const seekerIds = allProfiles
-            .filter(profile => profile.user.is_poster == 0)
-            .map(profile => profile.profile_id)
-        const posterIds = allProfiles
-            .filter(profile => profile.user.is_poster == 1)
-            .map(profile => profile.profile_id)
-
         const yins = seekerIds.map(id => allProfileFacadesWithQueue[id])
         const yangs = posterIds.map(id => allProfileFacadesWithQueue[id])