:recycle: moving around some score functions

backend/lib/services/profile.js

@@ -22,6 +22,36 @@ const scoreResponses = (seeker, potentialMatch) => {
         ) * magic,
     )
 }
+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
+    })
+}
+const scoreAll = (profileList, userProfile) => {
+    return profileList.map(profile => {
+        return {
+            // Uncomment to return the whole profile
+            // ...profile,
+            profile_id: profile.profile_id,
+            score: scoreResponses(userProfile, profile),
+            distance: profile.distance
+        }
+    })
+}
+/** 
+     * Grab the zip code string
+    */
+ const getZipCodeFromProfile = (profile) => {
+    // There should only be one zip code entry per profile
+    let zip = profile.responses.filter(response => response.response_key_id == 16)[0]
+    const responseIndexForZip = profile.responses.indexOf(zip)
+    if(responseIndexForZip >= 0) {
+        profile.responses.splice(responseIndexForZip, 1)
+    }
+    return zip.val
+}
 
 /**
  * Class to hold our retrieved profile information
@@ -161,24 +191,13 @@ module.exports = class ProfileService extends Schmervice.Service {
 
         return await Profile.query().delete().where('profile_id', profileId)
     }
-    /** 
-     * Grab the zip code string
-    */
-    _getZipCodeFromProfile(profile) {
-        // There should only be one zip code entry per profile
-        let zip = profile.responses.filter(response => response.response_key_id == 16)[0]
-        const responseIndexForZip = profile.responses.indexOf(zip)
-        if(responseIndexForZip >= 0) {
-            profile.responses.splice(responseIndexForZip, 1)
-        }
-        return zip.val
-    }
+    
     /**
      * Score a profile
      * @param {number} profileId
      * @returns {Array} Ordered and scored Profiles
      */
-    async scoreProfilesFor(profileId, maxDistanceMiles, distanceUnit) {
+    async scoreProfilesFor(profileId, maxDistance, distanceUnit) {
         const { Profile } = this.server.models()
         
         // Our User Profile to score for
@@ -188,7 +207,7 @@ module.exports = class ProfileService extends Schmervice.Service {
         .withGraphFetched('user')
         
         // Move unneeded responses
-        const userZip = this._getZipCodeFromProfile(userProfile)
+        const userZip = getZipCodeFromProfile(userProfile)
 
         // Find all Profiles that are NOT of our userProfile.type
         // ie. If userProfile.type == seeker, then find: poster
@@ -201,7 +220,7 @@ module.exports = class ProfileService extends Schmervice.Service {
         profileIdsOfOppositeType = profileIdsOfOppositeType.filter(profile => profile.user.is_poster == isPosterOpposite)
         
         const profilePlusDistance = await Promise.all(profileIdsOfOppositeType.map(async profile => {
-            const targetZip = this._getZipCodeFromProfile(profile)
+            const targetZip = getZipCodeFromProfile(profile)
             const distance = await this._compareDistance(userZip, targetZip, distanceUnit)
             return {
                 ...profile,
@@ -209,25 +228,12 @@ module.exports = class ProfileService extends Schmervice.Service {
             }
         }))
 
-        // Filter by distance
-        // TODO: probably do this with a query
-        const distanceFiltered = profilePlusDistance.filter(profile => {
-            const profileDistance = Math.floor(parseFloat(profile.distance) * 100)
-            const adjustedMaxDistance = Math.floor(parseFloat(maxDistanceMiles) * 100)
-            return profileDistance <= adjustedMaxDistance
-        })
+        const distanceFilteredProfiles = filterByDistance(profilePlusDistance, maxDistance)
+
+        const scoredProfilesWithDistance = scoreAll(distanceFilteredProfiles, userProfile)
 
-        const scored = distanceFiltered.map(profile => {
-            return {
-                // Uncomment to return the whole profile
-                // ...profile,
-                profile_id: profile.profile_id,
-                score: scoreResponses(userProfile, profile),
-                distance: profile.distance
-            }
-        })
         // Order by score
-        return scored.sort((a, b) => a.score - b.score)
+        return scoredProfilesWithDistance.sort((a, b) => a.score - b.score)
     }
     
     /**