:recycle: Large refactor concentrating survey object in db

backend/db/data-generator/index.js

@@ -115,7 +115,8 @@ const generateResponses = profiles => {
     // Generate responses first, before filling in details
     let responses = generate(
         classes.Response,
-        (config.batchSize + extraProfilesToGenerate) * mock.response_keys.length,
+        (config.batchSize + extraProfilesToGenerate) *
+            mock.response_keys.length,
         { starting: generatedResponseCount + config.batchSize },
     )
     profiles.forEach((profile, i) => {
@@ -125,29 +126,27 @@ const generateResponses = profiles => {
             resToEdit.response_key_id = k + 1
             resToEdit.profile_id = profile.profile_id
 
-            if(resToEdit.response_key_id < config.zipcodeKey) {
+            if (resToEdit.response_key_id < config.zipcodeKey) {
                 resToEdit.val = random.valFrom(Object.values(possibleResponses))
-            }
-            else if(resToEdit.response_key_id == config.zipcodeKey) {
+            } else if (resToEdit.response_key_id == config.zipcodeKey) {
                 resToEdit.val = random.valFrom(config.possibleZipcodes)
-            }
-            else {
+            } else {
                 switch (resToEdit.response_key_id) {
-                case config.mediaKey:
-                    resToEdit.val = random.media()
-                    break
-                case config.langKey:
-                    resToEdit.val = random.language()
-                    break
-                case 10:
-                    resToEdit.val = random.duration()
-                    break
-                case 11:
-                    resToEdit.val = random.location()
-                    break
-                case config.blurbKey:
-                    resToEdit.val = random.blurb()
-                    break
+                    case config.mediaKey:
+                        resToEdit.val = random.media()
+                        break
+                    case config.langKey:
+                        resToEdit.val = random.language()
+                        break
+                    case 10:
+                        resToEdit.val = random.duration()
+                        break
+                    case 11:
+                        resToEdit.val = random.location()
+                        break
+                    case config.blurbKey:
+                        resToEdit.val = random.blurb()
+                        break
                 }
             }
         }
@@ -170,7 +169,7 @@ for (
     let jobPosterIds = users
         .filter(user => user.is_poster > 0)
         .map(user => user.user_id)
-    // Guarentee ONE job poster
+    // Guarantee ONE job poster
     if (!jobPosterIds.length) {
         random.valFrom(users).is_poster = 1
         jobPosterIds = users

backend/db/data-generator/mock.js

@@ -426,106 +426,249 @@ module.exports = {
             is_deleted: false,
         },
     ],
+    // need to add responses? table to join to here... use json capability? OR
+    // use simplified association logic on front end that is already sort of
+    // present
     response_keys: [
         {
             response_key_id: 1,
+            response_key_category: 'splash',
+            response_key_prompt: 'splash page',
+            response_key_description: 'required for splash page rendering',
+            aspect: null,
+            category: 'splash',
+            component: 'Splash',
+            survey_stage: 'splash',
+            placeholder: null,
+            invalidInputPrompt: null,
+        },
+        {
+            response_key_id: 2,
             response_key_category: 'visionary_vs_implementer',
             response_key_prompt: 'Do you prefer to work with those who are driven by their Visionary insights, or those who are driven more by their Implementation?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'visionary_vs_implementer',
+            category: 'aspect',
+            component: 'QuestionResponse',
+            survey_stage: 'aspect-1',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
-            response_key_id: 2,
+            response_key_id: 3,
             response_key_category: 'creative_vs_methodical',
             response_key_prompt: 'Have you found more success working with employees that are more Creative or those that are more Methodical?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'creative_vs_methodical',
+            category: 'aspect',
+            component: 'QuestionResponse',
+            survey_stage: 'aspect-2',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
-            response_key_id: 3,
+            response_key_id: 4,
             response_key_category: 'dynamic_vs_ordered',
             response_key_prompt: 'Which do you find to be the ideal working environment, one that is more Collaborative or one that is more Independent?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'dynamic_vs_ordered',
+            category: 'aspect',
+            component: 'QuestionResponse',
+            survey_stage: 'aspect-3',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
-            response_key_id: 4,
+            response_key_id: 5,
             response_key_category: 'precise_vs_resourceful',
             response_key_prompt: 'Is the success of your team more likely if it includes individuals who are more Innovative, or those that are more Conventional when fulfilling their job duties?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'precise_vs_resourceful',
+            category: 'aspect',
+            component: 'QuestionResponse',
+            survey_stage: 'aspect-4',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
-            response_key_id: 5,
+            response_key_id: 6,
             response_key_category: 'big_Picture_vs_focused',
             response_key_prompt: 'When fulfilling the role of the hiring leader, do you find yourself focusing more on the Big Picture or The Task At Hand?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'big_Picture_vs_focused',
+            category: 'aspect',
+            component: 'QuestionResponse',
+            survey_stage: 'aspect-5',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
-            response_key_id: 6,
+            response_key_id: 7,
             response_key_category: 'guided_vs_self-managed',
             response_key_prompt: 'Do you prefer to Guide your employees towards achieving the team goals, or do you prefer your employees to be Self-Managed?',
             response_key_description: 'first round draft scoring question',
-        },
-        {
-            response_key_id: 7,
-            response_key_category: 'profile',
-            response_key_prompt: 'zipcode',
-            response_key_description: 'required for distance calculations',
+            aspect: 'guided_vs_self-managed',
+            category: 'aspect',
+            component: 'QuestionResponse',
+            survey_stage: 'aspect-6',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
             response_key_id: 8,
             response_key_category: 'profile',
-            response_key_prompt: 'image',
-            response_key_description: 'required for profile pictures',
+            response_key_prompt: 'First things first, could you provide us with your name? [break] I am called [break] when others address me.',
+            response_key_description: 'required for profile creation',
+            aspect: null,
+            category: null,
+            component: 'FormInput',
+            survey_stage: 'name',
+            placeholder: 'Joe Doe',
+            invalidInputPrompt: 'So sorry, but what is your name?',
         },
         {
             response_key_id: 9,
             response_key_category: 'profile',
-            response_key_prompt: 'language',
-            response_key_description:
-                'programming and spoken language preference',
+            response_key_prompt: 'In order for others to reach out to you on Siimee, we will need you to provide your email address.[break]When reaching out to me, [break] is my preferred email.',
+            response_key_description: 'required for profile creation',
+            aspect: null,
+            category: null,
+            component: 'FormInput',
+            survey_stage: 'email',
+            placeholder: 'joe@mailme.com',
+            invalidInputPrompt: 'It looks like that email is not valid, try en email that is formatted like so: joe@joe.com',
         },
         {
             response_key_id: 10,
             response_key_category: 'profile',
-            response_key_prompt: 'duration',
-            response_key_description:
-                'duration preference for hours able to dedicate to work',
+            response_key_prompt: 'So far so good! Next we will need you to establish a super secret password. Your password should be at least 10 characters long and have at least 2 special characters.[break]My [break] is a very secure passcode that only I will have access to!',
+            response_key_description: 'required for profile creation',
+            aspect: null,
+            category: null,
+            component: 'FormInput',
+            survey_stage: 'password',
+            placeholder: 'supersecr3tp@ssword',
+            invalidInputPrompt: 'That password does not fit our requirements, please follow the above instructions to generate a secure password.',
         },
         {
             response_key_id: 11,
             response_key_category: 'profile',
-            response_key_prompt: 'presence',
-            response_key_description:
-                'location preference for where work happens',
+            response_key_prompt: 'Looking good! Doing great. The next piece of info needed is your zip code. That way we can be sure to only show you other people in your area.[break]My zip code, [break] is the general area where I wish to see results in.',
+            response_key_description: 'required for distance calculations',
+            aspect: null,
+            category: null,
+            component: 'FormInput',
+            survey_stage: 'zipcode',
+            placeholder: '90012',
+            invalidInputPrompt: 'Oops! That is not a recognized zipcode, please enter a 5 digit zipcode like: 97869',
         },
         {
             response_key_id: 12,
             response_key_category: 'profile',
-            response_key_prompt: 'blurb',
-            response_key_description: 'required for profile description',
+            response_key_prompt: 'What are you seeking? Are you looking to find a position to be employed in, or are you looking to employ a candidate?[break] I am a [break] seeking an employer/employee.',
+            response_key_description: 'required for profile generation',
+            aspect: null,
+            category: null,
+            component: 'FormDropdown',
+            survey_stage: 'seeking',
+            placeholder: null,
+            invalidInputPrompt: 'In order to provide you with the best results, Siimee will need to know whether you are an employer looking to fill a position, or a candidate looking for an employment. Please take a look at our above options and choose one.',
         },
         {
             response_key_id: 13,
             response_key_category: 'profile',
-            response_key_prompt: 'urgency',
-            response_key_description: 'urgency for when work is required',
+            response_key_prompt: 'Hey, you are almost done! Please provide an image of yourself so others can recognize you if you ever meet up IRL:',
+            response_key_description: 'required for profile pictures',
+            aspect: null,
+            category: null,
+            component: 'FormInput',
+            survey_stage: 'image',
+            placeholder: null,
+            invalidInputPrompt: 'It appears you have yet to upload an image. Please provide Siimee with an image in case you want to show others what you look like.',
         },
         {
             response_key_id: 14,
             response_key_category: 'profile',
-            response_key_prompt: 'role',
-            response_key_description: 'current and desired role',
+            response_key_prompt: 'What language is your native language?[break] I consider [break] language as my native language.',
+            response_key_description: 'programming and spoken language preference',
+            aspect: null,
+            category: null,
+            component: 'FormDropdown',
+            survey_stage: 'language',
+            placeholder: null,
+            invalidInputPrompt: 'We try our best to provide results in the language of your choosing. ¿Prefieres ver resultados en español? Or would you prefer to see results in english?',
         },
         {
             response_key_id: 15,
             response_key_category: 'profile',
-            response_key_prompt: 'pronouns',
-            response_key_description: 'required for profile pronouns',
+            response_key_prompt: 'What kind of duration would you prefer? Are you looking for part-time, full-time, other?[break] Currently, I am looking for a [break] job at this time.',
+            response_key_description: 'duration preference for hours able to dedicate to work',
+            aspect: null,
+            category: null,
+            component: 'FormDropdown',
+            survey_stage: 'duration',
+            placeholder: null,
+            invalidInputPrompt: 'Looks like you have yet to  fill out what kind of work you are most interested in. As in, part-time, full-time. Take a look at our above options and choose whatever feels right for you right now. You can always edit them later!',
         },
         {
             response_key_id: 16,
             response_key_category: 'profile',
-            response_key_prompt: 'distance',
-            response_key_description:
-                'preference for commuting distance cutoff',
+            response_key_prompt: 'Would you prefer remote, hybrid, in-person work?[break] Personally I would prefer a [break] job right now. It is just what works best for me.',
+            response_key_description: 'location preference for where work happens',
+            aspect: null,
+            category: null,
+            component: 'FormDropdown',
+            survey_stage: 'presence',
+            placeholder: null,
+            invalidInputPrompt: 'Hold up! So sorry to put a pause here, but it looks like you have not chosen whether to work remotely or in person. No worries, if you are unsure, just choose the flexible option.',
+        },
+        {
+            response_key_id: 17,
+            response_key_category: 'profile',
+            response_key_prompt: 'Please provide us with a short blurb about yourself. What is your backstory?[break] My origin story starts like this:[break]',
+            response_key_description: 'required for profile description',
+            aspect: null,
+            category: null,
+            component: 'FormInput',
+            survey_stage: 'blurb', 
+            placeholder: 'my backstory starts long long ago...',
+            invalidInputPrompt: 'Whoa! Cool story. Unfortunately your backstory is either too long or too short. Please tell us a bit about yourself between 1 and 100 characters.',
+        },
+        {
+            response_key_id: 18,
+            response_key_category: 'profile',
+            response_key_prompt: 'How soon do you need the position filled or you need to be employed? [break]I am currently [break] when it comes to employment opportunities right now.',
+            response_key_description: 'urgency for when work is required',
+            aspect: null,
+            category: null,
+            component: 'FormDropdown',
+            survey_stage: 'urgency',
+            placeholder: null,
+            invalidInputPrompt: 'Looks like you left this field blank. Take a look at our provided options and tell us when you would like be employed.',
+        },
+        {
+            response_key_id: 19,
+            response_key_category: 'profile',
+            response_key_prompt: 'When others refer to you, what pronouns do you prefer they use?[break]I prefer to be called [break] when others refer to me.',
+            response_key_description: 'required for profile pronouns',
+            aspect: null,
+            category: null,
+            component: 'FormDropdown',
+            survey_stage: 'pronouns',
+            placeholder: null,
+            invalidInputPrompt: 'Ensuring that others on our platform are aware of what your preferred pronouns are is important to us. Please choose from one of the above options.',
+        },
+        {
+            response_key_id: 20,
+            response_key_category: 'profile',
+            response_key_prompt: 'What distance from your home are you looking to work in?[break] Preferably, I would like to work [break] from my place of residence.',
+            response_key_description: 'preference for commuting distance cutoff',
+            aspect: null,
+            category: null,
+            component: 'FormInput',
+            survey_stage: 'distance',
+            placeholder: '5 mi',
+            invalidInputPrompt: 'Whoa! You either left this field blank or tried to input an astronomically large distance you would like to see results from. Please input a distance you would like to see results in.',
         },
     ],
     responses: [],

backend/db/migrations/20210527174416_create_response_keys_table.js

@@ -4,6 +4,12 @@ exports.up = function (knex) {
         table.string('response_key_category').notNullable()
         table.string('response_key_prompt')
         table.string('response_key_description')
+        table.string('aspect')
+        table.string('category')
+        table.string('component')
+        table.string('survey_stage')
+        table.string('placeholder')
+        table.string('invalidInputPrompt')
     })
 }
 

backend/lib/schemas/responses.js

@@ -14,6 +14,13 @@ const singleResponseKey = Joi.object({
     response_key_category: Joi.string().required(),
     response_key_prompt: Joi.string().required(),
     response_key_description: Joi.any(),
+    aspect: Joi.string().allow(null, ''),
+    category: Joi.string().allow(null, ''),
+    component: Joi.string(),
+    survey_stage: Joi.string(),
+    placeholder: Joi.string().allow(null, ''),
+    invalidInputPrompt: Joi.string().allow(null, ''),
+
 }).label('question_single')
 
 module.exports = {

frontend/src/components/onboarding/QuestionResponse.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
 w-card.question
-    p {{ question.survey_stage }}
+    p {{ question.response_key_prompt }}
     section.radio-buttons.w-flex.row.justify-space-between
         p(v-for='label in question.labels') {{ label }}
     w-radios.w-flex.row.justify-space-between(

frontend/src/utils/lang.js

@@ -1,8 +1,4 @@
-const DELIMITER = '_'
-// TO ADD ASPECT, increment aspectsArr here
 const aspectsArr = [1, 2, 3, 4, 5, 6]
-
-// TODO: Combine these two
 const allSteps = {
     usa: {
         splash: 'splash',
@@ -30,26 +26,6 @@ const allSteps = {
     },
 }
 
-const promptToComponent = {
-    splash: 'Splash',
-    aspect: 'QuestionResponse', // Special hacky case
-    name: 'FormInput',
-    email: 'FormInput',
-    password: 'FormInput',
-    zipcode: 'FormInput',
-    seeking: 'FormDropdown',
-    urgency: 'FormDropdown',
-    presence: 'FormDropdown',
-    duration: 'FormDropdown',
-    pronouns: 'FormDropdown',
-    language: 'FormDropdown',
-    image: 'FormInput',
-    distance: 'FormInput',
-    blurb: 'FormInput',
-    // experience: 'FormTags',
-    // role: 'FormDropdown',
-}
-
 const aspectResponses = {
     usa: {
         never: 'never',
@@ -79,104 +55,39 @@ possible.usa = {
     // key 10
     duration: ['full-time', 'part-time', 'contract', 'flexible'],
     // Experience and roles concat, key: 14
-    experience: ['associate', 'junior', 'mid-level', 'senior', 'staff'],
-    roles: {
-        type: [
-            'back-end',
-            'database',
-            'front-end',
-            'full-stack',
-            'qa',
-            'security',
-            'system',
-            'test',
-        ],
-        position: [
-            'administrator',
-            'analyst',
-            'architect',
-            'developer',
-            'engineer',
-            'manager',
-            'technician',
-        ],
-        candidate: ['hiring_manager', 'recruiter'],
-    },
+//     experience: ['associate', 'junior', 'mid-level', 'senior', 'staff'],
+    // roles: {
+        // type: [
+            // 'back-end',
+            // 'database',
+            // 'front-end',
+            // 'full-stack',
+            // 'qa',
+            // 'security',
+            // 'system',
+            // 'test',
+        // ],
+        // position: [
+            // 'administrator',
+            // 'analyst',
+            // 'architect',
+            // 'developer',
+            // 'engineer',
+            // 'manager',
+            // 'technician',
+        // ],
+        // candidate: ['hiring_manager', 'recruiter'],
+    // },
     pronouns: ['she/her', 'she/they', 'he/him', 'he/they', 'they/them'],
+//    role: ['role1', 'role2'],
     image: [],
     zipcode: [],
     blurb: [],
 }
 
-// TODO: set up a separate object of similar prompts based off of
-// employer/employee, right now is generic
-const promptOverrides = {
-    name: 'First things first, could you provide us with your name? [break] I am called [break] when others address me.',
-    email: "In order for others to reach out to you on Siimee, you'll need to provide your email address.[break]When reaching out to me, [break] is my preferred email.",
-    password:
-        "So far so good! Next we'll need you to establish a super secret password. Your password should be at least 10 characters long and have at least 2 special characters.[break]My [break] is a very secure passcode that only I will have access to!",
-    zipcode:
-        "Looking good! You're doing great. The next piece of info we'll need is your zip code. That way we can be sure to only show you other people in your area.[break]My zip code, [break] is the general area where I wish to see results in.",
-    seeking:
-        "Alright, let's continue! What are you seeking? Are you looking to find a position to be employed in, or are you looking to employ a candidate?[break] I am a [break] seeking an employer/employee.",
-    blurb: "Please provide us with a short blurb about yourself. What's your backstory?[break] My origin story starts like this:[break]",
-    image: "Hey, you're almost done! Please provide an image of yourself so others can recognize you if you ever meet up IRL:",
-    pronouns:
-        'When others refer to you, what pronouns do you prefer they use?[break]I prefer to be called [break] when others refer to me.',
-    urgency:
-        'How soon do you need the position filled or you need to be employed? [break]I am currently [break] when it comes to employment opportunities right now.',
-    presence:
-        "Would you prefer remote, hybrid, in-person work?[break] Personally I'd prefer a [break] job right now. It's just what works best for me.",
-    duration:
-        "What kind of duration would you prefer? Are you looking for part-time, full-time, other?[break] Currently, I'm looking for a [break] job at this time.",
-    language:
-        'What language is your native language?[break] I consider [break] language as my native language.',
-    distance:
-        "What distance from your home are you looking to work in?[break] Preferably, I'd like to work [break] from my place of residence.",
-}
-
-const inputPlaceholders = {
-    name: 'Joe Doe',
-    email: 'Joe@mailme.com',
-    zipcode: '90012',
-    password: 'supersecr3tp@ssword',
-    blurb: 'my backstory starts long long ago...',
-    distance: '5 mi',
-}
-
-const invalidInputPrompts = {
-    name: "So sorry, but what's your name?",
-    email: "It looks like that email isn't valid, try en email that is formatted like so: joe@joe.com",
-    password:
-        "That password doesn't fit our requirements, please follow the above instructions to generate a secure password.",
-    zipcode:
-        "Oops! That isn't a recognized zipcode, please enter a 5 digit zipcode like: 97869",
-    blurb: 'Whoa! Cool story. Unfortunately your backstory is either too long or too short. Please tell us a bit about yourself between 1 and 100 characters.',
-    image: "It appears you didn't upload an image. Please provide Siimee with an image in case you want to show others what you look like.",
-    seeking:
-        "In order to provide you with the best results, Siimee will need to know whether you're an employer looking to fill a position, or a candidate looking for an employment. Please take a look at our above options and choose one.",
-    pronouns:
-        'Ensuring that others on our platform are aware of what your preferred pronouns are is important to us. Please choose from one of the above options.',
-    urgency:
-        "Looks like you left this field blank. Take a look at our provided options and tell us when you'd like be employed.",
-    presence:
-        "Hold up! So sorry to put a pause here, but it looks like you haven't chosen whether to work remotely or in person. No worries, if you're unsure, just choose the 'flexible' option.",
-    duration:
-        "Looks like you haven't filled out what kind of work you're most interested in. As in, part-time, full-time. Take a look at our above options and choose whatever feels right for you right now. You can always edit them later!",
-    language:
-        'We try our best to provide results in the language of your choosing. ¿Prefieres ver resultados en español? Or would you prefer to see results in english?',
-    distance:
-        "Whoa! You either left this field blank or tried to input an astronomically large distance you'd like to see results from. Please input a distance you'd like to see results in.",
-}
-
 export {
-    promptOverrides,
-    promptToComponent,
-    inputPlaceholders,
-    invalidInputPrompts,
     allSteps,
     aspectResponses,
     aspectsArr,
     possible,
-    DELIMITER,
 }

frontend/src/utils/survey.js

@@ -1,100 +1,22 @@
 import { Survey } from '../entities/index.js'
 import { fetchQuestions } from '../services/index.js'
-import {
-    allSteps,
-    promptOverrides,
-    promptToComponent,
-    inputPlaceholders,
-    invalidInputPrompts,
-    possible,
-    aspectsArr,
-} from './lang.js'
-
-/**
- * Make a step from match or step information
- * @param {object} match
- * @param {object} step
- * @returns something like a response_key with possible responses
- */
-const formatStep = (match, step) => {
-    const responsesByCategory = possible['usa']
-    const responseKey = {
-        response_key_id: match ? match.response_key_id : null,
-        response_key_category: match ? match.response_key_category : 'profile',
-        response_key_prompt: match ? match.response_key_prompt : step,
-        response_key_description: match ? match.response_key_description : null,
-    }
-    // Embarassing hack
-    const uglyMatch = step.split('-')
-    if (uglyMatch.length > 1 && uglyMatch[0] == 'aspect') {
-        responseKey.aspect = match.response_key_category
-        responseKey.category = 'aspect'
-    }
-    return {
-        ...responseKey,
-        responses: responsesByCategory[step] ? responsesByCategory[step] : [],
-    }
-}
-const associateWithComponent = responseKeyLike => {
-    let component = promptToComponent[responseKeyLike.response_key_prompt]
-    // Embarassing hack
-    if (responseKeyLike.category == 'aspect') {
-        component = promptToComponent[responseKeyLike.category]
-    }
-    return { ...responseKeyLike, component }
-}
-
-const hasMatch = (step, inArray) => {
-    const uglyMatch = step.split('-')
-    // Embarassing hack
-    if (uglyMatch.length > 1 && uglyMatch[0] == 'aspect') {
-        return inArray.find(q => q.response_key_id == uglyMatch[1])
-    } else {
-        return inArray.find(q => q.response_key_prompt == step)
-    }
-}
+import { possible } from './lang.js'
 
 class SurveyFactory {
     constructor() {
         this.questionsFromDb = []
     }
-    _setSteps(langFile) {
-        const stepsToProcess = [...Object.values(langFile)]
-        const seenIds = []
-        const stepsInCommon = stepsToProcess.map(step => {
-            // Match question to step
-            const match = hasMatch(step, this.questionsFromDb)
-            if (match) {
-                seenIds.push(match.response_key_id)
-            }
-            // Reformat something from the db into something the gui likes
-            const responseKeyLike = formatStep(match, step)
-
-            // Lookup a matching component
-            const withComponent = associateWithComponent(responseKeyLike)
-
-            // Mutate the object with extra stuff
-            const langStub = responseKeyLike.response_key_prompt
-            withComponent.survey_stage = langStub
-            if (promptOverrides[responseKeyLike.response_key_prompt]) {
-                withComponent.response_key_prompt = promptOverrides[langStub]
-                withComponent.placeholder = inputPlaceholders[langStub]
-                withComponent.invalidInputPrompt = invalidInputPrompts[langStub]
-            } else {
-                console.warn(
-                    `WARN: ${withComponent.survey_stage} must have promptOverride`,
-                )
-            }
-
-            return withComponent
+    _setSteps() {
+        const responseKeys = this.questionsFromDb
+        const responsesByCategory = possible['usa']
+        Object.keys(responsesByCategory).forEach((k) => {
+            responseKeys.forEach((key) => {
+                if (key.survey_stage === k) {
+                    key.responses = responsesByCategory[k]
+                }
+            })
         })
-        // temporary extra condition in filter
-        let unseen = this.questionsFromDb.filter(
-            q =>
-                !seenIds.includes(q.response_key_id) &&
-                aspectsArr.includes(q.response_key_id),
-        )
-        return [...stepsInCommon, ...unseen]
+        return responseKeys
     }
     async getQuestions() {
         try {
@@ -104,14 +26,14 @@ class SurveyFactory {
             console.error(err)
         }
     }
-    async createSurvey(langFile = allSteps['usa'], roleTree) {
+    async createSurvey(roleTree) {
         if (!this.questionsFromDb.length) {
             const res = await this.getQuestions()
             console.warn(
                 `Attempted to create a survey before getting questions: retrieved ${res.length} questions`,
             )
         }
-        const steps = this._setSteps(langFile)
+        const steps = this._setSteps()
         return new Survey(steps, roleTree)
     }
 }

frontend/src/views/SurveyCompleteView.vue

@@ -18,7 +18,7 @@ main.view--surveycomplete
             p(v-for='(value, key) in answers')
                 p(v-if='response.survey_stage == key') 
                     p Survey Question {{ responseIndex + 1 }}: 
-                    p {{ key }} 
+                    p {{ response.response_key_prompt }}
                     p You Answered: {{ value }}
                     br
         w-button.ma1(@click="changeAnswers") Change Answers