:construction: Began connecting survey to Home of app

backend/db/data-generator/mock.js

@@ -430,7 +430,8 @@ module.exports = {
         {
             response_key_id: 1,
             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_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',
@@ -440,7 +441,8 @@ module.exports = {
         {
             response_key_id: 2,
             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_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',
@@ -450,7 +452,8 @@ module.exports = {
         {
             response_key_id: 3,
             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_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',
@@ -460,7 +463,8 @@ module.exports = {
         {
             response_key_id: 4,
             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_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',
@@ -470,7 +474,8 @@ module.exports = {
         {
             response_key_id: 5,
             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_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',
@@ -480,7 +485,8 @@ module.exports = {
         {
             response_key_id: 6,
             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_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',
             aspect: 'guided_vs_self-managed',
             category: 'aspect',
@@ -490,7 +496,8 @@ module.exports = {
         {
             response_key_id: 7,
             response_key_category: 'profile',
-            response_key_prompt: 'First things first, could you provide us with your name? [break] I am called [break] when others address me.',
+            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: 'input',
@@ -500,122 +507,150 @@ module.exports = {
         {
             response_key_id: 8,
             response_key_category: 'profile',
-            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_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: 'input',
             placeholder: 'joe@mailme.com',
-            invalidInputPrompt: 'It looks like that email is not valid, try en email that is formatted like so: joe@joe.com',
+            invalidInputPrompt:
+                'It looks like that email is not valid, try en email that is formatted like so: joe@joe.com',
         },
         {
             response_key_id: 9,
             response_key_category: 'profile',
-            response_key_prompt: 'So far so good! Next we will need you to establish a super secret password. Your password should be at least 14 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_prompt:
+                'So far so good! Next we will need you to establish a super secret password. Your password should be at least 14 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: 'input',
             placeholder: 'supersecr3tp@ssword',
-            invalidInputPrompt: 'That password does not fit our requirements, please follow the above instructions to generate a secure password.',
+            invalidInputPrompt:
+                'That password does not fit our requirements, please follow the above instructions to generate a secure password.',
         },
         {
             response_key_id: 10,
             response_key_category: 'profile',
-            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_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: 'input',
             placeholder: '90012',
-            invalidInputPrompt: 'Oops! That is not a recognized zipcode, please enter a 5 digit zipcode like: 97869',
+            invalidInputPrompt:
+                'Oops! That is not a recognized zipcode, please enter a 5 digit zipcode like: 97869',
         },
         {
             response_key_id: 11,
             response_key_category: 'profile',
-            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_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: 'choice',
             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.',
+            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: 12,
             response_key_category: 'profile',
-            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_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: 'input',
             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.',
+            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: 13,
             response_key_category: 'profile',
-            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',
+            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: 'choice',
             placeholder: null,
-            invalidInputPrompt: 'We try our best to provide results in the language of your choosing. ¿Prefieres ver resultados en español? Ou peut-être parlez-vous français? Or would you prefer to see results in english?',
+            invalidInputPrompt:
+                'We try our best to provide results in the language of your choosing. ¿Prefieres ver resultados en español? Ou peut-être parlez-vous français? Or would you prefer to see results in english?',
         },
         {
             response_key_id: 14,
             response_key_category: 'profile',
-            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',
+            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: 'choice',
             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!',
+            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: 15,
             response_key_category: 'profile',
-            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',
+            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: 'choice',
             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.',
+            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: 16,
             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_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: 'input',
             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.',
+            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: 17,
             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_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: 'choice',
             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.',
+            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: 18,
             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_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: 'choice',
             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.',
+            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: 19,
             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',
+            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: 'input',
             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.',
+            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: [],
@@ -697,5 +732,45 @@ 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
+        // 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,
+            target_id: 46,
+            is_deleted: false,
+        },
+        {
+            match_queue_id: 18,
+            profile_id: 139,
+            target_id: 46,
+            is_deleted: false,
+        },
+        {
+            match_queue_id: 19,
+            profile_id: 139,
+            target_id: 44,
+            is_deleted: false,
+        },
+        {
+            match_queue_id: 20,
+            profile_id: 139,
+            target_id: 43,
+            is_deleted: false,
+        },
+        {
+            match_queue_id: 21,
+            profile_id: 139,
+            target_id: 42,
+            is_deleted: false,
+        },
+        {
+            match_queue_id: 22,
+            profile_id: 139,
+            target_id: 41,
+            is_deleted: false,
+        },
     ],
 }

frontend/src/App.vue

@@ -58,7 +58,8 @@ export default {
             if (currentProfile.isLoggedIn) {
                 currentProfile.logout()
             }
-
+            // TODO: grab JWT from cookie and add JWT as third argument here
+            // (see views/OnboardingView.vue)
             await currentProfile.login(profileId, this.$waveui.notify)
             console.log('---')
 

frontend/src/entities/profile/profile.js

@@ -13,7 +13,6 @@ class Profile extends _baseRecord {
      */
     constructor({ email, ...profileData }) {
         super()
-
         this.type = this.constructor.name.toLowerCase()
 
         /**  Fields */
@@ -29,6 +28,7 @@ class Profile extends _baseRecord {
      * @return {boolean} is it valid or not?
      */
     isValid() {
+        console.log('this :=>', this)
         const validate = profileSchema.validate(this)
 
         /**

frontend/src/services/index.js

@@ -6,3 +6,4 @@ export * from './queue.service.js'
 export * from './chat.service.js'
 export * from './notification.service.js'
 export * from './login.service.js'
+export * from './auth.service.js'

frontend/src/services/login.service.js

@@ -77,13 +77,13 @@ class Login {
      * @param {number} profileId
      * @returns {number} stored reactive id
      */
-    async login(profileId, cb) {
+    async login(profileId, cb, sessionToken = null) {
         this._loading.value = true
         // First check if profile exists
         console.warn('[Login Service warn]: Logging in:', profileId)
 
         // TODO: You can probably use this call to get responses, groupings and tags
-        this._profile = await fetchProfileByProfileId(profileId)
+        this._profile = await fetchProfileByProfileId(profileId, sessionToken)
         this.id.value = this._profile.profile_id
 
         if (!this.id.value) {

frontend/src/views/HomeView.vue

@@ -1,4 +1,5 @@
 <template lang="pug">
+// TODO: Add router link to OnboardingView.vue's survey
 main.view--home
     article.w-flex.sm-column.md-row.align-center
         template(v-if='isLoading')

frontend/src/views/OnboardingView.vue

@@ -34,11 +34,12 @@ main.view--onboarding
 </template>
 
 <script>
-import { Authenticator } from '../services/auth.service.js'
+import { currentProfile, Authenticator } from '../services'
 import { surveyFactory } from '@/utils'
 import stepViews from '@/components/onboarding'
 import SurveyCompleteView from './SurveyCompleteView.vue'
 let hashedAccessToken = null
+// TODO: remove once currentProfile from services is fully enforced
 let currentProfileId = null
 
 export default {
@@ -63,6 +64,18 @@ export default {
         try {
             const sessionData = await this.verifySession(hashedAccessToken)
             currentProfileId = sessionData.profileId
+            await currentProfile.login(
+                currentProfileId,
+                this.$waveui.notify,
+                sessionData.accessToken,
+            )
+            // TODO: responses can now be gotten from currentProfile.responses
+            // TODO: assign token to currentProfile object?
+            console.log('currentProfile :=>', currentProfile)
+            // TODO: create a boolean toggle on currentProfile that determines
+            // whether user has returned to survey from HomeView?
+            this.$router.push('/')
+
             this.responses = sessionData.responses
             this.currentStep = this.responses.length + 3
             this.goToStep(this.currentStep)
@@ -122,6 +135,7 @@ export default {
             }
             // NOTE: If user has finished minimum profile creation,
             // Adds survey answers to responses table and verifies tokens on each step
+            // TODO: currentProfileId can now be gotten from currentProfile.responses
             if (currentProfileId) {
                 await surveyFactory.addNewSurveyAnswer(
                     this.responses[this.responses.length - 1],