:recycle: fix-up all backend tests

backend/lib/routes/membership/join.js

@@ -49,7 +49,6 @@ module.exports = {
          */
         handler: async function (request, h) {
             try {
-                console.log('---')
                 const { membershipService } = request.server.services()
 
                 /** Grab payload info */

backend/lib/services/profile/index.js

@@ -119,12 +119,13 @@ module.exports = class ProfileService extends Schmervice.Service {
         // taking the info from profilesEntries
         // to repack into completeProfiles
         // in same order as profileIdArray
-        return profiler.makeOrderedCompleteProfiles(
+        const ordered = profiler.makeOrderedCompleteProfiles(
             profileIdArray,
             profilesEntries,
             type,
             this.tagLookup,
         )
+        return ordered
     }
 
     /**
@@ -293,7 +294,7 @@ module.exports = class ProfileService extends Schmervice.Service {
     }
 
     async calcProfileDistances(matchPool, distanceUnit, userZip) {
-        await Promise.all(
+        return await Promise.all(
             matchPool.map(async profile => {
                 const targetZip = zipcoder.getZipCodeFromProfile(profile)
                 if (!userZip || !targetZip)

backend/lib/services/profile/profiler.js

@@ -72,7 +72,10 @@ class CompleteProfile {
     }
 }
 const _makeCompleteProfile = (profileEntry, type, tagLookup) => {
-    profileEntry.tags = profileEntry.tags.map(tag => tagLookup[tag.tag_id])
+    // remap tags
+    if (profileEntry && profileEntry.tags.length) {
+        profileEntry.tags = profileEntry?.tags.map(tag => tagLookup[tag.tag_id])
+    }
     const complete = new CompleteProfile(profileEntry, type)
     return complete
 }

backend/tests/matchqueue.spec.js

@@ -60,6 +60,17 @@ test('path /<profile_id>/queue/<target_id> should return ok on PATCH', async t =
      */
     server.registerModel = () => {}
     server.models = () => ({ Aspect, AspectLabel, MatchQueue, Profile })
+
+    /**
+     * Register mock authentication just for testing
+     * -
+     * Profile plugin does not do this
+     */
+    server.auth.scheme('jwt', () => ({
+        authenticate: (req, h) => h.authenticated({ credentials: {} }),
+    }))
+    server.auth.strategy('default_jwt', 'jwt')
+
     /**
      * Register Routes and Services as usual
      */

backend/tests/membership-join.spec.js

@@ -56,7 +56,19 @@ test(`path ${pathToTest.url} should return two memberships`, async t => {
         Grouping,
         Membership,
     })
+
+    /**
+     * Register mock authentication just for testing
+     * -
+     * Profile plugin does not do this
+     */
+    server.auth.scheme('jwt', () => ({
+        authenticate: (req, h) => h.authenticated({ credentials: {} }),
+    }))
+    server.auth.strategy('default_jwt', 'jwt')
+
     await plugin.register(server)
+
     server.services()['profileService'] = new ProfileService(server)
     /**
      * TODO: adjust stubs to mock joinGrouping more closely

backend/tests/membership.spec.js

@@ -3,17 +3,17 @@
 const test = require('ava')
 const { stub } = require('sinon')
 const Hapi = require('@hapi/hapi')
+const Objection = require('objection')
 
 const plugin = require('../lib/plugins/membership')
 
 const ProfileService = require('../lib/services/profile')
-const MembershipService = require('../lib/services/membership')
+const UserService = require('../lib/services/user')
 
 const Profile = require('../lib/models/profile')
 const Grouping = require('../lib/models/grouping')
 const Membership = require('../lib/models/membership')
 const Tag = require('../lib/models/tag')
-const ZipCode = require('../lib/models/zip-code')
 const Aspect = require('../lib/models/aspect')
 const AspectLabel = require('../lib/models/aspect_label')
 
@@ -26,10 +26,10 @@ const params = {
 const mockReturn = {
     profile: {
         profile_id: 99,
-        user_id: 99,
         user: {
-            user_email: '',
-            user_name: 'bob',
+            user_id: 22,
+            user_email: 'jill@mail',
+            user_name: 'jill',
         },
         responses: [],
         tags: [],
@@ -50,7 +50,7 @@ const mockReturn = {
                 { val: 'foo', response_key_id: 11 },
                 { val: 'foo', response_key_id: 12 },
             ],
-            user: { user_name: 'phil' },
+            user: { user_id: 11, user_name: 'phil' },
         },
         {
             profile_id: 2,
@@ -63,7 +63,7 @@ const mockReturn = {
                 { val: 'foo', response_key_id: 11 },
                 { val: 'foo', response_key_id: 12 },
             ],
-            user: { user_name: 'gil' },
+            user: { user_id: 30, user_name: 'gil' },
         },
         {
             profile_id: 99,
@@ -76,7 +76,7 @@ const mockReturn = {
                 { val: 'foo', response_key_id: 11 },
                 { val: 'foo', response_key_id: 12 },
             ],
-            user: { user_name: 'jill' },
+            user: { user_id: 22, user_name: 'jill', user_email: 'jill@mail' },
         },
     ],
     tags: [],
@@ -123,7 +123,18 @@ test('path /<profile_id> should return ok', async t => {
         Tag,
     })
 
-    // server.registerService(ProfileService)
+    /**
+     * Register mock authentication just for testing
+     * -
+     * Profile plugin does not do this
+     */
+    server.auth.scheme('jwt', () => ({
+        authenticate: (req, h) => h.authenticated({ credentials: {} }),
+    }))
+    server.auth.strategy('default_jwt', 'jwt')
+
+    // stub(Objection, 'transaction').returns({})
+
     /**
      * Register Routes and Services as usual
      */
@@ -133,23 +144,26 @@ test('path /<profile_id> should return ok', async t => {
      * !: Janky - might be better to temp knex sqlite instance
      */
     server.services()['profileService'] = new ProfileService(server)
+    server.services()['profileService'].getTagsFor = () => []
+
+    // TODO: delete this and figure out stub for Profile
+    server.services()['profileService'].getProfilesFor = () =>
+        mockReturn.profiles
+
+    server.services()['userService'] = new UserService(server)
+    server.services()['userService'].findById = () => mockReturn.profile.user
+
     stub(server.models()['Tag'], 'query').returns(mockReturn.tags)
     stub(server.models()['AspectLabel'], 'query').returns(mockReturn.labels)
     stub(server.models()['Aspect'], 'query').returns(mockReturn.aspects)
     stub(server.models()['Grouping'], 'query').returns({
         whereIn: () => ({
-            withGraphFetched: () => {
-                return mockReturn.groupings
-            },
+            withGraphFetched: () => mockReturn.groupings,
         }),
     })
     stub(server.models()['Membership'], 'query').returns({
-        where: () => {
-            return mockReturn.memberships
-        },
-        whereIn: () => {
-            return mockReturn.memberships
-        },
+        where: () => mockReturn.memberships,
+        whereIn: () => mockReturn.memberships,
     })
     stub(server.models()['Profile'], 'query').returns({
         // Mocked for getProfile()

backend/tests/profile.spec.js

@@ -1,5 +1,4 @@
 'use strict'
-
 const test = require('ava')
 const { stub } = require('sinon')
 const Hapi = require('@hapi/hapi')
@@ -42,6 +41,7 @@ test('path /<profile_id> should return ok', async t => {
      * Schwifty at runtime.
      */
     const server = Hapi.server()
+
     /**
      * Overload so we don't register any models
      * using the plugin call (see plugins/profile.js)
@@ -49,10 +49,22 @@ test('path /<profile_id> should return ok', async t => {
      */
     server.registerModel = () => {}
     server.models = () => ({ Profile, Tag })
+
+    /**
+     * Register mock authentication just for testing
+     * -
+     * Profile plugin does not do this
+     */
+    server.auth.scheme('jwt', () => ({
+        authenticate: (req, h) => h.authenticated({ credentials: {} }),
+    }))
+    server.auth.strategy('default_jwt', 'jwt')
+
     /**
      * Register Routes and Services as usual
      */
     await plugin.register(server)
+
     /**
      * Replace Objection model methods with our own mock functions
      * !: Janky - might be better to temp knex sqlite instance

backend/tests/respond.spec.js

@@ -52,6 +52,17 @@ test('path /<profile_id>/respond should return ok on POST', async t => {
      */
     server.registerModel = () => {}
     server.models = () => ({ Response, ResponseKey })
+
+    /**
+     * Register mock authentication just for testing
+     * -
+     * Profile plugin does not do this
+     */
+    server.auth.scheme('jwt', () => ({
+        authenticate: (req, h) => h.authenticated({ credentials: {} }),
+    }))
+    server.auth.strategy('default_jwt', 'jwt')
+
     /**
      * Register Routes and Services as usual
      */

backend/tests/score.spec.js

@@ -13,7 +13,7 @@ const Aspect = require('../lib/models/aspect')
 const AspectLabel = require('../lib/models/aspect_label')
 
 // !: Must match the key set in servives/profile.js
-const zipcodeKey = 7
+const zipcodeKey = 10
 
 /**
  * Route parameters
@@ -30,6 +30,13 @@ const mockReturn = {
             responses: [
                 { response_key_id: 1, val: '100' },
                 { response_key_id: 2, val: '200' },
+                { response_key_id: 3, val: '200' },
+                { response_key_id: 4, val: '200' },
+                { response_key_id: 5, val: '200' },
+                { response_key_id: 6, val: '200' },
+                { response_key_id: 7, val: '200' },
+                { response_key_id: 8, val: '200' },
+                { response_key_id: 9, val: '200' },
                 { response_key_id: zipcodeKey, val: '90065' },
             ],
         },
@@ -39,6 +46,13 @@ const mockReturn = {
             responses: [
                 { response_key_id: 1, val: '100' },
                 { response_key_id: 2, val: '200' },
+                { response_key_id: 3, val: '200' },
+                { response_key_id: 4, val: '200' },
+                { response_key_id: 5, val: '200' },
+                { response_key_id: 6, val: '200' },
+                { response_key_id: 7, val: '200' },
+                { response_key_id: 8, val: '200' },
+                { response_key_id: 9, val: '200' },
                 { response_key_id: zipcodeKey, val: '97002' },
             ],
         },
@@ -48,6 +62,13 @@ const mockReturn = {
             responses: [
                 { response_key_id: 1, val: '200' },
                 { response_key_id: 2, val: '200' },
+                { response_key_id: 3, val: '200' },
+                { response_key_id: 4, val: '200' },
+                { response_key_id: 5, val: '200' },
+                { response_key_id: 6, val: '200' },
+                { response_key_id: 7, val: '200' },
+                { response_key_id: 8, val: '200' },
+                { response_key_id: 9, val: '200' },
                 { response_key_id: zipcodeKey, val: '96741' },
             ],
         },
@@ -93,6 +114,17 @@ test(`path ${pathToTest.url} should return ok on GET`, async t => {
         Profile,
         ZipCode,
     })
+
+    /**
+     * Register mock authentication just for testing
+     * -
+     * Profile plugin does not do this
+     */
+    server.auth.scheme('jwt', () => ({
+        authenticate: (req, h) => h.authenticated({ credentials: {} }),
+    }))
+    server.auth.strategy('default_jwt', 'jwt')
+
     /**
      * Register Routes and Services as usual
      */

backend/tests/update.spec.js

@@ -8,6 +8,7 @@ const plugin = require('../lib/plugins/profile')
 
 const Response = require('../lib/models/response')
 const ResponseKey = require('../lib/models/response-key')
+const ProfileService = require('../lib/services/profile')
 /**
  * Route parameters
  */
@@ -66,10 +67,22 @@ test(`path ${pathToTest.url} should return ok on ${pathToTest.method}`, async t
      */
     server.registerModel = () => {}
     server.models = () => ({ Response, ResponseKey })
+
+    /**
+     * Register mock authentication just for testing
+     * -
+     * Profile plugin does not do this
+     */
+    server.auth.scheme('jwt', () => ({
+        authenticate: (req, h) => h.authenticated({ credentials: {} }),
+    }))
+    server.auth.strategy('default_jwt', 'jwt')
+
     /**
      * Register Routes and Services as usual
      */
     await plugin.register(server)
+
     /**
      * Replace Objection model methods with our own mock functions
      * !: Janky - might be better to temp knex sqlite instance