:twisted_rightwards_arrows: Merged survey_complete into incorp_login

backend/db/data-generator/mock.js

@@ -425,6 +425,17 @@ module.exports = {
             tag_id: 7,
             is_deleted: false,
         },
+        // NOTE: profile_id 147 is chosen based off of GENERATED data,
+        // after running 'npm run generate', replace 147 in mock to next profile_id to be genearted
+        // i.e. last profile_id number + 1
+        // TODO: remove from mock data once bare bones matching logic can show poorly matched matches...
+        {
+            tag_association_id: 50,
+            profile_id: 136,
+            grouping_id: 2,
+            tag_id: 7,
+            is_deleted: false,
+        },
     ],
     response_keys: [
         {
@@ -671,6 +682,26 @@ module.exports = {
             can_edit: false,
             is_active: true,
         },
+        // NOTE: profile_id 147 is chosen based off of GENERATED data,
+        // after running 'npm run generate', replace 147 in mock to next profile_id to be genearted
+        // i.e. last profile_id number + 1
+        // TODO: remove from mock data once bare bones matching logic can show poorly matched matches...
+        {
+            membership_id: 3,
+            profile_id: 147,
+            grouping_id: 2,
+            membership_type: 'participant',
+            can_edit: false,
+            is_active: true,
+        },
+        {
+            membership_id: 4,
+            profile_id: 46,
+            grouping_id: 2,
+            membership_type: 'participant',
+            can_edit: false,
+            is_active: true,
+        },
     ],
     groupings: [
         {
@@ -678,6 +709,11 @@ module.exports = {
             grouping_name: '1663285820.067_41_46',
             grouping_type: 'match',
         },
+        {
+            grouping_id: 2,
+            grouping_name: '1663285820.067_147_46',
+            grouping_type: 'match',
+        },
     ],
     messages: [],
     match_queues: [
@@ -732,43 +768,43 @@ module.exports = {
             target_id: 46,
             is_deleted: false,
         },
-        // NOTE: profile_id 139 is chosen based off of GENERATED data,
-        // after running 'npm run generate', replace 139 in mock to next profile_id to be genearted
+        // NOTE: profile_id 147 is chosen based off of GENERATED data,
+        // after running 'npm run generate', replace 147 in mock to next profile_id to be generated
         // i.e. last profile_id number + 1
         // TODO: remove from mock data once bare bones matching logic can show poorly matched matches...
         {
             match_queue_id: 17,
-            profile_id: 139,
+            profile_id: 147,
             target_id: 46,
             is_deleted: false,
         },
         {
             match_queue_id: 18,
-            profile_id: 139,
+            profile_id: 147,
             target_id: 46,
             is_deleted: false,
         },
         {
             match_queue_id: 19,
-            profile_id: 139,
+            profile_id: 147,
             target_id: 44,
             is_deleted: false,
         },
         {
             match_queue_id: 20,
-            profile_id: 139,
+            profile_id: 147,
             target_id: 43,
             is_deleted: false,
         },
         {
             match_queue_id: 21,
-            profile_id: 139,
+            profile_id: 147,
             target_id: 42,
             is_deleted: false,
         },
         {
             match_queue_id: 22,
-            profile_id: 139,
+            profile_id: 147,
             target_id: 41,
             is_deleted: false,
         },

frontend/src/router/guards.js

@@ -47,8 +47,7 @@ const loginIfToken = async () => {
     ) {
         await currentProfile.login(
             sessionData.profileId,
-            // NOTE: probably not correct...
-            WaveUI.notify,
+            WaveUI.instance.notify,
             sessionData.accessToken,
         )
     }

frontend/src/views/OnboardingView.vue

@@ -62,16 +62,18 @@ export default {
         hashedAccessToken = this.grabStoredCookie('siimee_access')
         try {
             const sessionData = await this.verifySession(hashedAccessToken)
-            await currentProfile.login(
-                sessionData.profileId,
-                this.$waveui.notify,
-                sessionData.accessToken,
-            )
-            this.responses = this.formatResponses(
-                currentProfile._profile.responses,
-            )
-            this.currentStep = this.responses.length + 3
-            this.goToStep(this.currentStep)
+            if (sessionData) {
+                await currentProfile.login(
+                    sessionData.profileId,
+                    this.$waveui.notify,
+                    sessionData.accessToken,
+                )
+                this.responses = this.formatResponses(
+                    currentProfile._profile.responses,
+                )
+                this.currentStep = this.responses.length + 3
+                this.goToStep(this.currentStep)
+            }
         } catch (err) {
             console.error('ERROR :=>', err)
             this.goToStep(0)
@@ -139,6 +141,7 @@ export default {
                     this.responses[this.responses.length - 1],
                     currentProfile._profile.profile_id,
                 )
+                currentProfile._profile.responses = this.responses
                 try {
                     await this.verifySession(hashedAccessToken)
                 } catch (err) {

frontend/src/views/SurveyCompleteView.vue

@@ -14,7 +14,15 @@ main.view--surveycomplete
             p {{ aspectResponse.response }}
             br
         br
-        w-button.ma1(@click="changeAnswers") Change Answers
+        // TODO: Bring user to another View.vue page that allows 
+        // them to change their answers to the survey
+        // OR render radio buttons next to the questions/answers above,
+        // allowing them to return to ONLY that specific survey step 
+        // using this.$emit('somefunc') back up to OnboardingView.vue
+        // Toggling a boolean flag that prevents "SUBMIT" from goToStep(), 
+        // and instead brings them back here...
+        // 
+        // w-button.ma1(@click="changeAnswers") Change Answers
 </template>
 
 <script>
@@ -33,8 +41,6 @@ export default {
         aspectResponses: [],
     }),
     created() {
-        // TODO: Troubleshoot bug where not all responses are returned
-        console.log('currentProfile :=>', currentProfile)
         this.parseSurvey(this.surveySteps)
         this.aspectResponses = this.grabAspectResponses(
             currentProfile._profile.responses,
@@ -59,6 +65,10 @@ export default {
                 }
             })
         },
+<<<<<<< HEAD
+=======
+        // Grabs all responses to questions that are NOT aspect questions
+>>>>>>> brian_dev_survey_complete
         grabResponsesFromProfile(aspectQuestions) {
             const aspectQuestionsKeys = Object.keys(aspectQuestions).map(Number)
             const responses = currentProfile._profile.responses
@@ -98,6 +108,7 @@ export default {
                     return typeof res === 'object'
                 })
         },
+        // changeAnswers() {},
     },
 }
 </script>