:recycle: mapping input to score array | saving email | tweaking guard to use survey

backend/db/data-generator/mock.js

@@ -95,98 +95,98 @@ module.exports = {
             response_key_id: 1,
             response_key_category: 'grit',
             response_key_prompt: 'can you power through adversity',
-            response_key_description: null,
+            response_key_description: 'first round draft scoring question',
         },
         {
             response_key_id: 2,
             response_key_category: 'openness',
             response_key_prompt: 'are you open with your emotions with everyone',
-            response_key_description: null,
+            response_key_description: 'first round draft scoring question',
         },
         {
             response_key_id: 3,
             response_key_category: 'bravery',
             response_key_prompt: 'do you speak-up when you feel something is wrong',
-            response_key_description: null,
+            response_key_description: 'first round draft scoring question',
         },
         {
             response_key_id: 4,
             response_key_category: 'empathy',
             response_key_prompt:
                 'do you stop to help others when they are struggling',
-            response_key_description: null,
+            response_key_description: 'first round draft scoring question',
         },
         {
             response_key_id: 5,
             response_key_category: 'honesty',
             response_key_prompt: 'when telling a story do you exaggerate for dramatic effect',
-            response_key_description: null,
+            response_key_description: 'first round draft scoring question',
         },
         {
             response_key_id: 6,
             response_key_category: 'respect',
             response_key_prompt: 'do you treat difficult people as well as you treat your close friends',
-            response_key_description: null,
+            response_key_description: 'first round draft scoring question',
         },
         {
             response_key_id: 7,
             response_key_category: 'profile',
             response_key_prompt: 'zipcode',
-            response_key_description: null,
+            response_key_description: 'required for distance calculations',
         },
         {
             response_key_id: 8,
             response_key_category: 'profile',
             response_key_prompt: 'image',
-            response_key_description: null,
+            response_key_description: 'required for profile pictures',
         },
         {
             response_key_id: 9,
             response_key_category: 'profile',
             response_key_prompt: 'language',
-            response_key_description: null,
+            response_key_description: 'programming and spoken language preference',
         },
         {
             response_key_id: 10,
             response_key_category: 'profile',
             response_key_prompt: 'duration',
-            response_key_description: null,
+            response_key_description: 'duration preference for hours able to dedicate to work',
         },
         {
             response_key_id: 11,
             response_key_category: 'profile',
             response_key_prompt: 'presence',
-            response_key_description: null,
+            response_key_description: 'location preference for where work happens',
         },
         {
             response_key_id: 12,
             response_key_category: 'profile',
             response_key_prompt: 'blurb',
-            response_key_description: null,
+            response_key_description: 'required for profile description',
         },
         {
             response_key_id: 13,
             response_key_category: 'profile',
             response_key_prompt: 'urgency',
-            response_key_description: null,
+            response_key_description: 'urgency for when work is required',
         },
         {
             response_key_id: 14,
             response_key_category: 'profile',
             response_key_prompt: 'role',
-            response_key_description: null,
+            response_key_description: 'current and desired role',
         },
         {
             response_key_id: 15,
             response_key_category: 'profile',
             response_key_prompt: 'pronouns',
-            response_key_description: null,
+            response_key_description: 'required for profile pronouns',
         },
         {
             response_key_id: 16,
             response_key_category: 'profile',
             response_key_prompt: 'distance',
-            response_key_description: null,
+            response_key_description: 'preference for commuting distance cutoff',
         },
     ],
     responses: [],

backend/lib/services/profile.js

@@ -1,8 +1,9 @@
 const Schmervice = require('@hapipal/schmervice')
 const haversine = require('haversine')
+const config = require('../../db/data-generator/config.json')
 
 // Keys that are profile data responses
-const _TEMP_RES_KEYS = [8, 9, 10, 11, 12]
+const _TEMP_RES_KEYS = [1, 2, 3, 4, 5, 6]
 const _ZIPCODEKEY = 7
 const scoreResponses = (seeker, potentialMatch, prescoreLookup) => {
     if (seeker.responses.length != potentialMatch.responses.length)
@@ -11,10 +12,10 @@ const scoreResponses = (seeker, potentialMatch, prescoreLookup) => {
         }
 
     const aRes = seeker.responses.filter(
-        res => !_TEMP_RES_KEYS.includes(res.response_key_id),
+        res => _TEMP_RES_KEYS.includes(res.response_key_id)
     )
     const bRes = potentialMatch.responses.filter(
-        res => !_TEMP_RES_KEYS.includes(res.response_key_id),
+        res => _TEMP_RES_KEYS.includes(res.response_key_id)
     )
 
     const composite = []
@@ -129,7 +130,6 @@ module.exports = class ProfileService extends Schmervice.Service {
         super(...args)
         this.scoreLookup = {}
         this.tagLookup = {}
-
         // this.responseKeyLookup = ResponseKey.query()
     }
     async _setScoreLookup() {
@@ -309,16 +309,16 @@ module.exports = class ProfileService extends Schmervice.Service {
         let allResponses = await Response.query().where({
             profile_id: profileId,
         })
+
+        // Delete matches
+        // ?:Maybe bad idea
         const matchingResponses = allResponses.filter(
             response =>
                 response.response_key_id == responseToSave.response_key_id,
         )
-
-        // Delete matches
-        // ?:Maybe bad idea
         if (matchingResponses.length > 0) {
             const alreadyAnswered = matchingResponses.map(
-                matchingRes => matchingRes.response_key_id,
+                matchingRes => matchingRes.response_key_id
             )
             await Response.query()
                 .where({ profile_id: profileId })
@@ -326,7 +326,20 @@ module.exports = class ProfileService extends Schmervice.Service {
                 .whereIn('response_key_id', alreadyAnswered)
         }
 
-        await Response.query().insert(responseToSave)
+        /**
+         * Convert indexes to actual score values
+         * Using using the input and converting to index
+         * of the generated possible prescore array in config
+         */ 
+        let convertedResponse = responseToSave
+        if(_TEMP_RES_KEYS.includes(responseToSave.response_key_id)) {
+            // Convert -3 to 0, 0 to 3, 3 to 6
+            const offset = (config.scoreVals.length - 1) / 2
+            const indexFromInput = parseInt(responseToSave.val) + offset
+            convertedResponse.val = config.scoreVals[indexFromInput]
+        }
+
+        await Response.query().insert(convertedResponse)
         return allResponses
     }
 

frontend/src/components/ProfileCardList.vue

@@ -9,7 +9,7 @@ section.profile_card_list.w-full
             v-for="(profile, i) in loadedProfiles"
             :style="{ 'z-index': 1000-i }"
         )
-            .card.b-solid.rounded.p-0.bg-cover.randomize(
+            .card.b-solid.rounded.bg-cover.randomize(
                 :style="{ 'background-image': `url(${profile.avatar})`, 'top': `${randomize(10)}px`, 'right': `${randomize(20)}px`, 'transform': `rotate(${randomize(7)}deg)` }"
             )
                 .card__content
@@ -27,7 +27,7 @@ section.profile_card_list.w-full
             :key="profile.pid"
             v-for="(profile, i) in loadedProfiles"
         )
-                .card.b-solid.rounded.p-0.bg-cover(
+                .card.b-solid.rounded.bg-cover(
                     :style="{ 'background-image': `url(${profile.avatar})` }"
                 )
                 .card__content

frontend/src/router/guards.js

@@ -6,11 +6,12 @@ const checkLoginStatus = (destination, nextCb) => {
     console.warn('currentProfile completed:', currentProfile.isComplete())
     if (
         destination.meta.requiresCompleteProfile &&
-        currentProfile.isLoggedIn() &&
+        !currentProfile.isLoggedIn() &&
         !currentProfile.isComplete() 
     ) {
         nextCb('survey')
     } else if(
+        destination.meta.requiresCompleteProfile &&
         destination.meta.requiresAuth &&
         !currentProfile.isLoggedIn()
     ) {

frontend/src/services/login.service.js

@@ -24,7 +24,7 @@ class Login {
         return this.id.value != null
     }
     isComplete() {
-        return this.responses.length == surveyFactory.questions.length
+        return this.responses.length == surveyFactory.questionsFromDb.length && surveyFactory.questionsFromDb.length > 0
     }
     hasResponses() {
         return this.responses.length && this.responses.length > 0

frontend/src/utils/lang.js

@@ -1,6 +1,7 @@
 const DELIMITER = '_'
 
 const stepToComponentMap = {
+    email: 'InputString',
     name: 'InputString',
     seeking: 'ButtonChoice',
     urgency: 'ButtonChoice',
@@ -18,6 +19,7 @@ const stepToComponentMap = {
 // TODO: Combine these two
 const allSteps = {
     usa: {
+        email: 'email',
         name: 'name',
         pronouns: 'pronouns',
         seeking: 'seeking',
@@ -50,6 +52,7 @@ const allResponses = {
 
 const possible = {}
 possible.usa = {
+    email: [],
     name: [],
     seeking: ['position', 'candidate'],
     language: [

frontend/src/utils/survey.js

@@ -25,14 +25,18 @@ class SurveyFactory {
         return [...stepsInCommon, ...unseen]
     }
     async getQuestions() {
-        this.questionsFromDb = await fetchQuestions()
+        try {
+            this.questionsFromDb = await fetchQuestions()
+            return this.questionsFromDb
+        } catch(err) {
+            console.error(err)
+        }
     }
     async createSurvey(langFile, roleTree) {
         if(!this.questionsFromDb.length) {
-            console.error('Attempted to create a survey before getting questions')
-            await this.getQuestions()
+            const res = await this.getQuestions()
+            console.warn(`Attempted to create a survey before getting questions: retrieved ${res.length} questions`)
         }
-
         const steps = this._setSteps(langFile)
         return new Survey(steps, roleTree)
     }

frontend/src/views/SurveyView.vue

@@ -74,6 +74,7 @@ export default {
             slideDuration: 1200,
             step: 0,
             profile: {
+                email: '',
                 name: '',
                 seeking: '',
                 urgency: '',
@@ -110,7 +111,7 @@ export default {
     },
     async created() {
         /**
-         * Before this ever gets called, surveyFactory.questions
+         * Before this ever gets called, surveyFactory.questionsFromDb
          * must be set by App.created()
          */
         this.validSurvey = await surveyFactory.createSurvey(