:recycle: redone stable marriage | half working

backend/db/mock.js

@@ -1424,8 +1424,8 @@ module.exports = {
         { 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: 1, profile_id: 4, target_id: 3, is_deleted: false },
+        { match_queue_id: 2, profile_id: 4, target_id: 1, 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 },
@@ -1433,5 +1433,14 @@ module.exports = {
         { 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 },
+        { match_queue_id: 10, profile_id: 3, target_id: 6, is_deleted: false },
+        { match_queue_id: 11, profile_id: 3, target_id: 8, is_deleted: false },
+        { match_queue_id: 12, profile_id: 3, target_id: 4, is_deleted: false },
+        { match_queue_id: 13, profile_id: 6, target_id: 1, is_deleted: false },
+        { match_queue_id: 14, profile_id: 6, target_id: 3, is_deleted: false },
+        { match_queue_id: 15, profile_id: 6, target_id: 2, is_deleted: false },
+        { match_queue_id: 16, profile_id: 8, target_id: 1, is_deleted: false },
+        { match_queue_id: 17, profile_id: 8, target_id: 3, is_deleted: false },
+        { match_queue_id: 18, profile_id: 8, target_id: 2, is_deleted: false },
     ],
 }

backend/lib/routes/profile/match.js

@@ -13,7 +13,7 @@ const pluginConfig = {
 const validators = {}
 
 const responseSchemas = {
-    response: Joi.object(),
+    response: Joi.array().items(Joi.object()),
     error: Joi.object({
         error: Joi.string(),
     }),
@@ -32,7 +32,7 @@ module.exports = {
             const { matchService, matchQueueService } =
                 request.server.services()
             const allQueues = await matchQueueService.getAllQueues()
-            matchService.calcMatches(allQueues)
+            const matched = await matchService.calcMatches(allQueues)
             try {
                 if (!allQueues) {
                     throw new RangeError('Unable to match profiles')
@@ -42,7 +42,7 @@ module.exports = {
                     .response({
                         ok: true,
                         handler: pluginConfig.handlerType,
-                        data: allQueues,
+                        data: matched,
                     })
                     .code(200)
             } catch (err) {

backend/lib/routes/profile/update.js

@@ -50,29 +50,33 @@ module.exports = {
             const { profileService } = request.services()
             const profileId = request.params.profile_id
 
-            const responseId = request.params.response_id ? request.params.response_id : null
-            
             /** Grab payload info */
             const res = request.payload
             try {
-                const updatedResponses = await profileService.updateResponsesInProfile(profileId, res)
-
-                if(!updatedResponses) {
-                    throw new RangeError(
-                        'Response not updated',
+                const updatedResponses =
+                    await profileService.updateResponsesInProfile(
+                        profileId,
+                        res,
                     )
+
+                if (!updatedResponses) {
+                    throw new RangeError('Response not updated')
                 }
-                return h.response({
-                    ok: true,
-                    handler: pluginConfig.handlerType,
-                    data: updatedResponses,
-                }).code(200)
+                return h
+                    .response({
+                        ok: true,
+                        handler: pluginConfig.handlerType,
+                        data: updatedResponses,
+                    })
+                    .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)
             }
         },
 

backend/lib/services/match.js

@@ -1,77 +1,62 @@
 const Schmervice = require('@hapipal/schmervice')
 
-const engageEveryone = allYins => {
+function engageEveryone(guys) {
     let done
     do {
-        console.log('rerunning...')
         done = true
-        allYins.forEach(yin => {
-            // Keep matching if no true pairing is found
-            console.log(yin.realId, yin.otp?.realId)
-            if (!yin.otp) {
+        for (let i = 0; i < guys.length; i++) {
+            const guy = guys[i]
+            if (!guy.fiance) {
                 done = false
-                const yang = yin.getNextCandidate()
-                if (!yang.otp || yang.prefers(yin)) {
-                    yin.engageTo(yang)
+                const gal = guy.nextCandidate()
+                if (!gal.fiance || gal.prefers(guy)) {
+                    guy.engageTo(gal)
                 }
-            } else {
-                console.log(yin.otp.realId)
             }
-        })
+        }
     } while (!done)
 }
-class ProfileFacade {
-    constructor(id, matchQueue) {
-        this.realId = id ? id : undefined
 
-        this.matchCandidateIndex = 0
-        this.otp = null
-        this.matchQueue = matchQueue?.length ? matchQueue : []
-        this.fOrder = []
-    }
-    clearPlaceholderMatches() {
-        this.matchQueue = this.matchQueue.filter(match => match.realId == false)
-        this.fOrder = this.fOrder.filter(
-            potentialFiance => potentialFiance.realId == false,
-        )
-        if (this.otp && this.otp.realId) {
-            this.otp = null
+class Person {
+    constructor(name) {
+        let candidateIndex = 0
+        this.name = name
+        this.fiance = null
+        this.candidates = []
+        this.rank = p => {
+            for (let i = 0; i < this.candidates.length; i++) {
+                if (this.candidates[i] === p) return i
+            }
+            return this.candidates.length + 1
         }
-    }
-    rank(id) {
-        const idQueue = this.matchQueue.map(
-            profileFacade => profileFacade.realId,
-        )
-        return idQueue.includes(id)
-            ? idQueue.indexOf(id)
-            : this.matchQueue.length + 1
-    }
-    prefers(p) {
-        return this.rank(p.realId) < this.rank(this.otp.realId)
-    }
-    getNextCandidate() {
-        if (this.matchCandidateIndex >= this.matchQueue.length) return null
-        this.matchCandidateIndex = this.matchCandidateIndex + 1
-        return this.matchQueue[this.matchCandidateIndex - 1]
-    }
-    engageTo(p) {
-        if (p.otp) {
-            p.otp.otp = null
+        this.prefers = p => {
+            return this.rank(p) < this.rank(this.fiance)
         }
-        if (this.otp) {
-            this.otp.otp = null
+        this.nextCandidate = () => {
+            if (candidateIndex >= this.candidates.length) {
+                return null
+            }
+            return this.candidates[candidateIndex++]
         }
 
-        p.otp = this
-        p.fOrder.unshift(this)
+        this.engageTo = p => {
+            if (p.fiance) {
+                p.fiance.fiance = null
+            }
+            p.fiance = this
+            if (this.fiance) {
+                this.fiance.fiance = null
+            }
+            this.fiance = p
+        }
 
-        this.otp = p
-        this.fOrder.unshift(p)
-        console.log(
-            'partners pref: ',
-            this.otp.matchQueue.map(f => f.realId).indexOf(this.realId) + 1,
-            'choice',
-        )
+        this.swapWith = p => {
+            console.log('%s & %s swap partners', this.name, p.name)
+            const thisFiance = this.fiance
+            const pFiance = p.fiance
+            this.engageTo(pFiance)
+            p.engageTo(thisFiance)
+        }
     }
 }
 
@@ -80,29 +65,61 @@ module.exports = class MatchService extends Schmervice.Service {
         super(...args)
     }
     async calcMatches(allQueuesByType) {
-        const seekerIds = Object.keys(allQueuesByType['seeker']).map(id => ({
+        const seekers = Object.keys(allQueuesByType['seeker']).map(id => ({
             profile_id: parseInt(id),
             queue: allQueuesByType['seeker'][id],
         }))
-        const posterIds = Object.keys(allQueuesByType['poster']).map(id => ({
+        const posters = Object.keys(allQueuesByType['poster']).map(id => ({
             profile_id: parseInt(id),
             queue: allQueuesByType['poster'][id],
         }))
 
-        const diff = Math.abs(posterIds.length - seekerIds.length)
-        const smallerList =
-            posterIds.length < seekerIds.length ? posterIds : seekerIds
+        const diff = Math.abs(posters.length - seekers.length)
+        const smallerList = posters.length < seekers.length ? posters : seekers
         // ADD DUMMY IDS TO THE SMALLER LIST
         for (let d = 0; d < diff; d++) {
-            smallerList.push({ profile_id: 'dummy', queue: [] })
+            smallerList.push({ profile_id: `${d}-dummy`, queue: [] })
         }
-        console.log(seekerIds)
-        console.log(posterIds)
-        // const yins = seekerIds.map(id => allProfileFacadesWithQueue[id])
-        // const yangs = posterIds.map(id => allProfileFacadesWithQueue[id])
-
+        console.log('---')
+        let allPeople = [...seekers, ...posters]
+        const queuesById = allPeople.reduce((queuesById, profile) => {
+            queuesById[profile.profile_id] = profile.queue
+            return queuesById
+        }, {})
+        let allIds = allPeople.map(profile => profile.profile_id)
+        seekers.forEach(profile => {
+            profile.queue.forEach(id => allIds.push(id))
+        })
+        posters.forEach(profile => {
+            profile.queue.forEach(id => allIds.push(id))
+        })
+        allIds = [...new Set(allIds)]
+        const peopleById = allIds.reduce((peopleById, id) => {
+            peopleById[id] = new Person(id)
+            if (queuesById[id]) {
+                peopleById[id].candidates = queuesById[id].map(
+                    queueId => new Person(queueId),
+                )
+            }
+            return peopleById
+        }, {})
+        const seekerPeople = seekers.map(
+            profile => peopleById[profile.profile_id],
+        )
+        const posterPeople = posters.map(
+            profile => peopleById[profile.profile_id],
+        )
         // You only need to engage from one side
-        // engageEveryone(yins)
-        return []
+        engageEveryone(seekerPeople)
+        engageEveryone(posterPeople)
+        Object.values(peopleById).forEach(person => {
+            if (person.fiance) {
+                person.fiance.fiance = null
+            }
+        })
+        return Object.values(peopleById).map(person => ({
+            id: person.name,
+            otp: person?.fiance?.name ?? null,
+        }))
     }
 }