:recycle: Refactored flow of how aspects are created, removed tests

backend/db/data-generator/mock.js

@@ -463,85 +463,70 @@ module.exports = {
             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',
         },
-        // TO ADD ASPECT: when creating new survey aspect step, add here, re-order response_key_id and run npm run reseed
         {
             response_key_id: 7,
-            response_key_category: 'love_vs_hate',
-            response_key_prompt: 'Do you prefer to be loved our hated?',
-            response_key_description: 'total test question, to be deleted',
-        },
-        {
-            response_key_id: 8,
             response_key_category: 'profile',
             response_key_prompt: 'zipcode',
             response_key_description: 'required for distance calculations',
         },
         {
-            response_key_id: 9,
+            response_key_id: 8,
             response_key_category: 'profile',
             response_key_prompt: 'image',
             response_key_description: 'required for profile pictures',
         },
         {
-            response_key_id: 10,
+            response_key_id: 9,
             response_key_category: 'profile',
             response_key_prompt: 'language',
             response_key_description:
                 'programming and spoken language preference',
         },
         {
-            response_key_id: 11,
+            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_id: 12,
+            response_key_id: 11,
             response_key_category: 'profile',
             response_key_prompt: 'presence',
             response_key_description:
                 'location preference for where work happens',
         },
         {
-            response_key_id: 13,
+            response_key_id: 12,
             response_key_category: 'profile',
             response_key_prompt: 'blurb',
             response_key_description: 'required for profile description',
         },
         {
-            response_key_id: 14,
+            response_key_id: 13,
             response_key_category: 'profile',
             response_key_prompt: 'urgency',
             response_key_description: 'urgency for when work is required',
         },
         {
-            response_key_id: 15,
+            response_key_id: 14,
             response_key_category: 'profile',
             response_key_prompt: 'role',
             response_key_description: 'current and desired role',
         },
         {
-            response_key_id: 16,
+            response_key_id: 15,
             response_key_category: 'profile',
             response_key_prompt: 'pronouns',
             response_key_description: 'required for profile pronouns',
         },
         {
-            response_key_id: 17,
+            response_key_id: 16,
             response_key_category: 'profile',
             response_key_prompt: 'distance',
             response_key_description:
                 'preference for commuting distance cutoff',
         },
-        // TO ADD: when creating new survey step, add here and run npm run reseed
-        {
-            response_key_id: 18,
-            response_key_category: 'profile',
-            response_key_prompt: 'test',
-            response_key_description:
-                'this is just for testing stuff...',
-        },
     ],
     responses: [],
     memberships: [

frontend/src/components/onboarding/Aspects.vue

@@ -12,8 +12,7 @@ p(v-for='question in aspectQuestions')
 
 <script>
 import QuestionResponse from './QuestionResponse.vue'
-// TO ADD ASPECT: when creating new survey aspect step, increment additional null slots here
-const answered = [null, null, null, null, null, null, null]
+import { aspectsArr } from '../../utils/lang.js'
 
 export default {
     name: 'Aspects',
@@ -27,24 +26,30 @@ export default {
         },
     },
     emits: ['handle-submit', 'update-answers'],
+    data: () => ({
+        answered: [],
+    }),
     async created() {
         this.aspectQuestions.forEach((q, i) => {
             console.log(`Aspect #${i}: ${JSON.stringify(q)}`)
             q.isBeingAnswered = i === 0 ? true : false
         })
+        aspectsArr.forEach(() => {
+            this.answered.push(null)
+        })
     },
     methods: {
         updateAll() {
             this.$emit('handle-submit')
         },
         updateRadio(onRadioSelect) {
-            answered[onRadioSelect.id - 1] = onRadioSelect.answer
+            this.answered[onRadioSelect.id - 1] = onRadioSelect.answer
             this.$emit('update-answers', {
                 key: 'Aspects',
                 question: {
                     survey_stage: 'aspects',
                 },
-                input: answered,
+                input: this.answered,
             })
         },
         updateIsAnswered(id) {

frontend/src/components/onboarding/QuestionResponse.vue

@@ -4,13 +4,14 @@ w-card.question
     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(@update:model-value="onUpdate" :items="radioItems" color="red")
-    // TO ADD ASPECT: when creating new survey aspect step, increment increment !== statement here
-    w-button.ma1.grow(v-if='question.id !== 7' @click="updateAnswers") NEXT
+    w-button.ma1.grow(v-if='question.id !== aspectsCount' @click="updateAnswers") NEXT
     w-button.ma1.grow(v-else @click="updateAll") SUBMIT ANSWERS
     p(v-if='noChoiceMade') Tough choices, we know! Just answer to the best of your ability. The team over at Siimee values the answers you provide us so that we can show you results catered to your specific needs.
 </template>
 
 <script>
+import { aspectsArr } from '../../utils/lang.js'
+
 export default {
     props: {
         question: {
@@ -29,6 +30,7 @@ export default {
         ],
         isAnswered: false,
         noChoiceMade: null,
+        aspectsCount: aspectsArr.length
     }),
     methods: {
         onUpdate(e) {

frontend/src/entities/card/card.js

@@ -1,4 +1,5 @@
 /** @module card/card */
+import { aspectsArr } from "../../utils/lang.js"
 
 const DEFAULT_ABOUT =
     'Hello! My name is L.L. and I am a nurse from New York. I have been in the healthcare industry for over 6 years.'
@@ -139,8 +140,7 @@ const makeCardFromProfile = profile => {
     c.locale = `${profile.city}, ${profile.state}`
     c.email = profile.user_email
 
-    // TO ADD ASPECT: when creating new survey aspect step, increment array.indexOf here
-    let aspectResponses = profile?.responses.filter(r => [1,2,3,4,5,6,7].indexOf(r.response_key_id) !== -1)
+    let aspectResponses = profile?.responses.filter(r => aspectsArr.indexOf(r.response_key_id) !== -1)
     if(aspectResponses.length){ // if user has responses for aspects we overwrite default percentages
         c.aspects.map(a => {
             a.percentage = Number(aspectResponses.find(r => responseKeyIdToAspectName[r.response_key_id] == a.name).val )

frontend/src/entities/survey/survey.js

@@ -2,9 +2,9 @@
 import { _baseRecord } from '../index.js'
 import { surveySchema } from './survey.schema.js'
 import { answersSchema } from './survey.answer.schema.js'
+import { aspectsArr } from '../../utils/lang.js'
 
-// TO ADD ASPECT: when creating new survey aspect step, add additional number here
-const SCORED = [1, 2, 3, 4, 5, 6, 7]
+const SCORED = aspectsArr
 const _isScored = id => SCORED.includes(id)
 const _makeCategoryFriendly = responseCategory => {
     const labels = responseCategory.split('_vs_')

frontend/src/utils/lang.js

@@ -1,4 +1,6 @@
 const DELIMITER = '_'
+// TO ADD ASPECT, increment aspectsArr here
+const aspectsArr = [1, 2, 3, 4, 5, 6]
 
 // TODO: Combine these two
 const allSteps = {
@@ -17,10 +19,6 @@ const allSteps = {
         image: 'image',
         distance: 'distance',
         blurb: 'blurb',
-        // TO ADD: when creating a new step, place before aspects
-        test: 'test',
-        // TO ADD DROP DOWN: when creating a new step, place before aspects
-        testOptions: 'testOptions',
         aspects: 'aspects',
         // experience: 'experience',
         // roles: 'role',
@@ -55,9 +53,6 @@ possible.usa = {
     presence: ['remote', 'in_person', 'hybrid', 'flexible'],
     // key 10
     duration: ['full-time', 'part-time', 'contract', 'flexible'],
-    // TO ADD DROP DOWN: When adding new survey Form Drop Down step, add all
-    // options in array
-    testOptions: ['test-option-1', 'test-option-2', 'test-option-3'],
     // Experience and roles concat, key: 14
     experience: ['associate', 'junior', 'mid-level', 'senior', 'staff'],
     roles: {
@@ -83,7 +78,6 @@ possible.usa = {
     image: [],
     zipcode: [],
     blurb: [],
-    test: []
 }
 
 // TODO: set up a separate object of similar prompts based off of
@@ -103,10 +97,6 @@ const promptOverrides = {
     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.",
-    // TO ADD: add new prompt for new survey steps here
-    test: 'this[break]is just[break] a test.',
-    // TO ADD DROP DOWN: add new prompt for new survey steps here
-    testOptions: 'this[break]is another[break] test with options.'
 }
 
 const inputPlaceholders = {
@@ -116,10 +106,6 @@ const inputPlaceholders = {
     password: 'supersecr3tp@ssword',
     blurb: 'my backstory starts long long ago...',
     distance: '5 mi',
-    // TO ADD: add new input place holder here
-    test: 'test',
-    // TO ADD DROP DOWN: add new input place holder here
-    testOptions: 'testOptions'
 }
 
 const invalidInputPrompts = {
@@ -136,10 +122,6 @@ const invalidInputPrompts = {
     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.",
-    // TO ADD: add new input invalid message here
-    test: 'oh goodness, why test this!',
-    // TO ADD DROP DOWN: add new input invalid message here
-    testOptions: 'oh goodness, why test this with Options!'
 }
 
 export {
@@ -148,6 +130,7 @@ export {
     invalidInputPrompts,
     allSteps,
     aspectResponses,
+    aspectsArr,
     possible,
     DELIMITER,
 }

frontend/src/utils/survey.js

@@ -1,6 +1,6 @@
 import { Survey } from '../entities/index.js'
 import { fetchQuestions } from '../services/index.js'
-import { promptOverrides, inputPlaceholders, invalidInputPrompts ,possible } from './lang.js'
+import { promptOverrides, inputPlaceholders, invalidInputPrompts ,possible, aspectsArr } from './lang.js'
 
 const promptToComponent = {
     splash: 'Splash',
@@ -56,6 +56,8 @@ const hasMatch = (step, inArray) => {
 class SurveyFactory {
     constructor() {
         this.questionsFromDb = []
+        // consider moving this into something like lang.js to be imported
+        // wherever aspects needs to be incremented, ie TO ADD ASPECTS
     }
     _setSteps(langFile) {
         const stepsToProcess = [...Object.values(langFile)]
@@ -84,8 +86,7 @@ class SurveyFactory {
         let unseen = this.questionsFromDb.filter(
             q =>
                 !seenIds.includes(q.response_key_id) &&
-                // TO ADD ASPECTS: increment array here
-                [1, 2, 3, 4, 5, 6, 7].includes(q.response_key_id),
+                aspectsArr.includes(q.response_key_id)
         )
         return [...stepsInCommon, ...unseen]
     }