:construction: new filter service to preprocess a users match pool before scoring

backend/lib/services/filter.js

@@ -0,0 +1,24 @@
+const zipcoder = require ('./profile/zipcoder')
+
+const byProfileType = (profileList, userProfile) => {
+    const isUserOpposite = userProfile.is_poster == 1 ? 0 : 1
+    return profileList.filter(profile => (profile.user.is_poster == isUserOpposite))
+}
+const byNullZip = (profileList) => {
+    return profileList.filter(profile => {
+        return zipcoder.getZipCodeFromProfile(profile) ? true : false
+    })
+}
+const byMaxDistance = (profileList, max) => {
+    return profileList.filter(profile => {
+        const profileDistance = Math.floor(parseFloat(profile.distance) * 100)
+        const adjustedMaxDistance = Math.floor(parseFloat(max) * 100)
+        return profileDistance <= adjustedMaxDistance
+    })
+}
+
+module.exports = {
+    byProfileType,
+    byNullZip,
+    byMaxDistance,
+}

backend/lib/services/profile/index.js

@@ -4,7 +4,12 @@ const config = require('../../../db/data-generator/config.json')
 const profiler = require('./profiler')
 const scoring = require('./scorer')
 const zipcoder = require('./zipcoder')
+<<<<<<< HEAD
 const { response } = require('@hapi/hapi/lib/validation')
+=======
+const tagger = require('./tagger')
+const filter = require('./filter')
+>>>>>>> 154d171 (:construction: new filter service to preprocess a users match pool before scoring)
 
 module.exports = class ProfileService extends Schmervice.Service {
     constructor(...args) {
@@ -253,30 +258,36 @@ module.exports = class ProfileService extends Schmervice.Service {
             .findOne('profile_id', profileId)
             .withGraphFetched('responses')
             .withGraphFetched('user')
-
-        // Move unneeded responses
+        
         const userZip = zipcoder.getZipCodeFromProfile(userProfile)
 
-        // Find all Profiles that are NOT of our userProfile.type
-        // ie. If userProfile.type == seeker, then find: poster
-        let profileIdsOfOppositeType = await Profile.query()
+        // preprocess potential match pool with filter service methods
+        let matchPool = await Profile.query()
             .withGraphFetched('responses')
             .withGraphFetched('user')
-        // TODO: Let Objection optimize this
-        const isPosterOpposite = userProfile.user.is_poster == 1 ? 0 : 1
-        profileIdsOfOppositeType = profileIdsOfOppositeType
-            .filter(profile => {
-                return profile.user.is_poster == isPosterOpposite
-            })
-            .filter(profile => {
-                // Only include profiles that included zipcode response
-                return zipcoder.getZipCodeFromProfile(profile) ? true : false
-            })
 
-        const profilePlusDistance = await Promise.all(
-            profileIdsOfOppositeType.map(async profile => {
-                const targetZip = zipcoder.getZipCodeFromProfile(profile)
+        matchPool = filter.byProfileType(matchPool, userProfile.user)
+        matchPool = filter.byNullZip(matchPool)
+        // attach distance to pool profiles for max distance filter 
+        matchPool = await this.calcProfileDistances(matchPool, distanceUnit, userZip)
+        // filter with matchPool profiles that have distance
+        matchPool = filter.byMaxDistance(matchPool, maxDistance)
+
+        const scoredProfilesWithDistance = scoring.scoreAll(
+            matchPool,
+            userProfile,
+            this.scoreLookup,
+        )
+        // Order by score
+        return scoredProfilesWithDistance.sort(
+            (a, b) => b.score.total - a.score.total,
+        )
+    }
 
+    async calcProfileDistances(matchPool, distanceUnit, userZip){
+        await Promise.all(
+            matchPool.map(async profile => {
+                const targetZip = zipcoder.getZipCodeFromProfile(profile)
                 if (!userZip || !targetZip)
                     return { ...profile, distance: [9999, distanceUnit] }
 
@@ -289,21 +300,7 @@ module.exports = class ProfileService extends Schmervice.Service {
                     ...profile,
                     distance: [distance.toFixed(2), distanceUnit],
                 }
-            }),
-        )
-
-        const distanceFilteredProfiles = zipcoder.filterByDistance(
-            profilePlusDistance,
-            maxDistance,
-        )
-        const scoredProfilesWithDistance = scoring.scoreAll(
-            distanceFilteredProfiles,
-            userProfile,
-            this.scoreLookup,
-        )
-        // Order by score
-        return scoredProfilesWithDistance.sort(
-            (a, b) => b.score.total - a.score.total,
+            })
         )
     }
 
@@ -351,8 +348,8 @@ module.exports = class ProfileService extends Schmervice.Service {
         await this._setTagLookup()
         let associations = groupingId
             ? await TagAssociation.query()
-                  .where('grouping_id', groupingId)
-                  .andWhere('profile_id', profileId)
+                .where('grouping_id', groupingId)
+                .andWhere('profile_id', profileId)
             : await TagAssociation.query().andWhere('profile_id', profileId)
         return associations
             .map(assoc => ({

backend/lib/services/profile/zipcoder.js

@@ -11,15 +11,6 @@ const getZipCodeFromProfile = profile => {
     return zipRes.val
 }
 
-const filterByDistance = (profileList, max) => {
-    return profileList.filter(profile => {
-        const profileDistance = Math.floor(parseFloat(profile.distance) * 100)
-        const adjustedMaxDistance = Math.floor(parseFloat(max) * 100)
-        return profileDistance <= adjustedMaxDistance
-    })
-}
-
 module.exports = {
     getZipCodeFromProfile,
-    filterByDistance,
 }

frontend/src/views/OnboardingView.vue

@@ -2,7 +2,6 @@
 main.view--onboarding
     article(
         style='display: flex; flex-direction: column; align-items: center'
-<<<<<<< HEAD
         v-if='currentStep !== survey.steps.length'
     )
         .answers(v-for='(value, key) in answered')
@@ -32,33 +31,15 @@ main.view--onboarding
 
     article(v-else)
         SurveyCompleteView(:answers='answered' :surveySteps='survey.steps')
-=======
-        v-if='survey'
-    )
-        .step(v-for='(step, i) in survey.steps')
-            component(
-                :aspect-questions='step.component == "Aspects" ? survey.aspectQuestions : null'
-                :is='step.component'
-                :question='step'
-                @handle-submit='onSubmit'
-                @update-answers='updateAnswers'
-                v-if='step && currentStep == i'
-            )
->>>>>>> b0c2120 (another pre-release (#53))
 </template>
 
 <script>
 import { Authenticator } from '../services/auth.service.js'
 import { surveyFactory } from '@/utils'
-<<<<<<< HEAD
 import stepViews from '@/components/onboarding'
 import SurveyCompleteView from './SurveyCompleteView.vue'
 let hashedAccessToken = null
 let currentProfileId = null
-=======
-import { allSteps } from '@/utils/lang'
-import stepViews from '@/components/onboarding'
->>>>>>> b0c2120 (another pre-release (#53))
 
 // import savesurveybyprfileid - call it on submit
 // paginate to save every steps answers
@@ -66,7 +47,6 @@ export default {
     name: 'OnboardingView',
     components: {
         ...stepViews,
-<<<<<<< HEAD
         SurveyCompleteView,
     },
     data: () => ({
@@ -93,23 +73,10 @@ export default {
             this.goToStep(0)
         }
     },
-=======
-    },
-    data: () => ({
-        answered: {},
-        aspectQuestions: [],
-        currentStep: 0,
-        survey: null,
-    }),
-    async created() {
-        this.survey = await surveyFactory.createSurvey(allSteps['usa'])
-    },
->>>>>>> b0c2120 (another pre-release (#53))
     methods: {
         onSubmit() {
             console.log(JSON.stringify(this.answered))
         },
-<<<<<<< HEAD
         async goToStep(num) {
             this.currentStep = num
         },
@@ -175,21 +142,6 @@ export default {
             } else {
                 this.goToStep(this.currentStep + 1)
             }
-=======
-        goToStep(num) {
-            this.currentStep = num
-        },
-        updateAnswers(payload) {
-            // null payload is passed on splash page
-            if (payload) {
-                const k = payload.question.response_key_prompt
-                this.answered[k] = payload.answer
-                console.log(`${k}:`, this.answered[k])
-                console.log(`Updated answers: ${JSON.stringify(this.answered)}`)
-                if (k === 'aspects') return
-            }
-            this.goToStep(this.currentStep + 1)
->>>>>>> b0c2120 (another pre-release (#53))
         },
     },
 }
@@ -207,12 +159,9 @@ export default {
     article
         height: 100vh
 
-<<<<<<< HEAD
     .answers
         text-align: center
 
-=======
->>>>>>> b0c2120 (another pre-release (#53))
     .w-button
             display: flex
             width: 315px