scoreSurvey, updateQueue, buttons to accept/pass

backend/db/mock.js

@@ -36,7 +36,7 @@ module.exports = {
         {
             response_key_id: 6,
             response_key_category: 'respect',
-            response_key_prompt: 'what is your quest',
+            response_key_prompt: 'what kind of schedule are you looking for',
             response_key_description: null,
         },
         {
@@ -45,12 +45,6 @@ module.exports = {
             response_key_prompt: 'what is your zip code',
             response_key_description: null,
         },
-        {
-            response_key_id: 8,
-            response_key_category: 'durationPref',
-            response_key_prompt: 'what kind of schedule are you looking for',
-            response_key_description: null,
-        },
     ],
     responses: [],
     memberships: [],

backend/lib/models/profile.js

@@ -31,6 +31,7 @@ module.exports = class Profile extends Schwifty.Model {
         return Joi.object({
             profile_id: Joi.number(),
             user_id: Joi.number(),
+            user_media: Joi.string(),
         })
     }
 }

backend/lib/routes/profile/patch-queue.js

@@ -15,8 +15,12 @@ const responseSchemas = {
         Joi.alternatives().try(
             Joi.number(),
             Joi.object({
+                // ORIGINAL
                 profile_id: Joi.number(),
                 user_id: Joi.number(),
+                // Added user_name, user_media to account for updated CompleteProfile
+                user_name: Joi.string(),
+                user_media: Joi.string(),
                 responses: Joi.array().items(),
                 user_type: Joi.any(),
             }),
@@ -40,11 +44,13 @@ module.exports = {
         tags: ['api'],
         /** Protect this route with authentication? */
         auth: false,
+        cors: true,
         handler: async function (request, h) {
             const { profile_id, target_id } = request.params
             const { include_profile, reinsert } = request.query
             const { profileService, matchQueueService } =
                 request.server.services()
+            console.log('reinsert', reinsert)
             const updatedQueue = await matchQueueService.markAsDeleted(
                 profile_id,
                 target_id,

backend/lib/routes/profile/queue.js

@@ -17,8 +17,9 @@ const responseSchemas = {
             Joi.object({
                 profile_id: Joi.number(),
                 user_id: Joi.number(),
+                user_name: Joi.string(),
                 responses: Joi.array().items(),
-                profile_image: Joi.string(),
+                user_media: Joi.string(),
                 user_type: Joi.any(),
                 user: Joi.object()
             }),
@@ -42,6 +43,7 @@ module.exports = {
         tags: ['api'],
         /** Protect this route with authentication? */
         auth: false,
+        cors: true,
         handler: async function (request, h) {
             const { profile_id } = request.params
             const { include_profile } = request.query
@@ -50,15 +52,24 @@ module.exports = {
 
             const queue = await matchQueueService.getQueue(profile_id)
             const queueIds = queue.map(entry => entry.target_id)
+            console.log('queueIds', queueIds)
             const res =  {
                 ok:true,
                 handler: pluginConfig.handlerType,
                 data: queueIds
             }
+
+            // HELP: I think there's an issue here
+            // queueIds spits out the queue profiles in the correct order
+            // ~However~ when it goes through getProfilesFor
+            // it comes back in literal database order regardless of is_deleted status
+            console.log(
+                'include_profile results',
+                await profileService.getProfilesFor(queueIds),
+            )
             if(include_profile) {
                 res.data = await profileService.getProfilesFor(queueIds)
             }
-            // console.log(res.data)
             try {
                 return h.response(res).code(200)
             } catch (err) {

backend/lib/routes/profile/respond.js

@@ -50,7 +50,7 @@ module.exports = {
         tags: ['api'],
         /** Protect this route with authentication? */
         auth: false,
-
+        cors: true,
         handler: async function (request, h) {
             const { profileService } = request.services()
 

backend/lib/routes/user/create-profile.js

@@ -32,6 +32,12 @@ const responseSchemas = {
     response: Joi.object({
         profile_id: Joi.number(),
         user_id: Joi.number(),
+        // HELP: not sure if this is right, but attempting to fix
+        // ValidationError data[0].user_name is not allowed
+        // the logic being that CompleteProfile has had user_name added
+        // and getCompleteProfiles utilizes CompleteProfile
+        // and this route utilizes getCompleteProfiles
+        user_name: Joi.string(),
     }),
     error: Joi.object({
         error: Joi.string(),

backend/lib/routes/user/list-profiles.js

@@ -29,6 +29,13 @@ const responseSchemas = {
     profilesList: Joi.object({
         profile_id: Joi.number().integer().greater(0).required(),
         user_id: Joi.number().integer().greater(0).required(),
+        // HELP: not sure if this is right, but attempting to fix
+        // ValidationError data[0].user_name is not allowed
+        // the logic being that CompleteProfile has had user_name added
+        // and getCompleteProfiles utilizes CompleteProfile
+        // and this route utilizes getCompleteProfiles
+        user_name: Joi.string(),
+        user_media: Joi.string(),
         responses: Joi.array().items(
             Joi.object({
                 response_key_id: Joi.number().required(),
@@ -62,6 +69,7 @@ module.exports = {
                 userId,
                 type,
             )
+            console.log('get profiles - const profiles / in list-profiles.js', profiles)
             try {
                 return {
                     ok: true,

backend/lib/services/profile.js

@@ -43,9 +43,10 @@ const scoreAll = (profileList, userProfile) => {
  * Grab the zip code string
  */
 const getZipCodeFromProfile = profile => {
+    console.log('profile getZipCode', profile)
     // There should only be one zip code entry per profile
     let zipRes = profile.responses.filter(
-        // Whatever the zipcode questions
+        // Whatever the zipcode questions is
         response => response.response_key_id == zipcodeKey,
     )[0]
     const responseIndexForZip = profile.responses.indexOf(zipRes)
@@ -65,11 +66,10 @@ class CompleteProfile {
     constructor(profile, type) {
         this.user_id = profile.user_id // int user_id
         this.profile_id = profile.profile_id // int profile_id
-        this.profile_image = profile.user_media // int profile_id
+        this.user_name = profile.user.user_name // string user_name
+        this.user_media = profile.user_media // string user_media
         this.responses = profile.responses // [] of all responses
         this.user_type = type
-        
-        this.user = profile.user
     }
 }
 
@@ -104,6 +104,9 @@ module.exports = class ProfileService extends Schmervice.Service {
         const profilesEntries = await Profile.query()
             .whereIn('profile_id', dedupedProfileIds)
             .withGraphFetched('responses')
+            // CHECKTHIS: Added this because we added user.user_name to CompleteProfile
+            // so without this, we get undefined user_name
+            .withGraphFetched('user')
 
         //** Get responses asociated with each profile_id */
         return profilesEntries.map(profile => {

backend/server/manifest.js

@@ -80,7 +80,7 @@ module.exports = new Confidence.Store({
                                 user: process.env.DB_USER,
                                 password: process.env.DB_ROOT_PASSWORD,
                                 database: process.env.DB_NAME,
-                                port: 3307
+                                port: 3307,
                             },
                         },
                     },

frontend/src/components/MainNav.vue

@@ -3,6 +3,7 @@ nav#main-header.w-full.f-row.around.p-2
     router-link.header__icon.mobile--only(to='/matches') matches
     router-link.header__icon(to='/') home
     router-link.header__icon.mobile--only(to='/profile') profile
+    router-link.header__icon.mobile--only(to='/survey') survey
 </template>
 
 <script>

frontend/src/components/ProfileCardList.vue

@@ -12,24 +12,18 @@ section.profile_card_list.w-full
             )
                 .card__content
                     h3.p-1.mv-0.b-solid.rounded {{ profile.name }}
-
-        //- TODO: Make functional (using match queue endpoints)
-        //- queue.service.js
-        //- Call function that calls service that talks to endpoint
-        //- Will need GET http://localhost:3001/api/profile/1/queue  <- will look like array with profile ids [2, 3, 4, 6]
-        //- Need profile id (logged in profile) and target id (id on card)
-
-        nav.swipe_icons.w-full.f-row.between
-            //- Accept
-            button.p-1(@click='accept') A
-            //- Hold
-            button.p-1(@click='hold') H
-            //- Pass
-            button.p-1(@click='pass') P
+                nav.swipe_icons.w-full.f-row.between
+                    //- Accept
+                    button.p-1(@click='accept') Accept
+                    //- Hold
+                    button.p-1(@click='hold') H
+                    //- Pass
+                    button.p-1(@click='pass') Pass
 </template>
 
 <script setup>
-import { computed } from 'vue'
+import { computed, defineProps } from 'vue'
+import { updateQueueByProfileId } from '../services/queue.service'
 
 // TODO: Please review this conversion from script to script setup
 // converted from the props section
@@ -39,7 +33,7 @@ const props = defineProps({
         default: () => [
             {
                 uid: '1',
-                name: 'Fullname',
+                name: 'Full Name',
                 avatar: 'https://hips.hearstapps.com/hmg-prod.s3.amazonaws.com/images/newborn-baby-boy-sleeping-peacefully-wearing-knit-royalty-free-image-1589459736.jpg?crop=0.669xw:1.00xh;0.228xw,0&resize=640:*',
                 metadata: { age: '21', rawMetadata: 'Some Text Here!' },
             },
@@ -53,14 +47,18 @@ const props = defineProps({
 // from the computed section
 const currentCard = computed(() => props.profiles[props.profiles.length - 1]);
 // from the method section
-const logOut = () => {};
+// const logOut = () => {};
 const reject = () => {
     swipped(currentCard)
 }
+
+
 const swipped = profile => {
     const index = props.profiles.findIndex(u => u.uid == profile.uid)
+    // TODO: bug, fix this
     props.profiles.splice(index, 1)
     profile.id = Date.now() + (Math.random() * 100000).toFixed()
+    // TODO: bug, fix this
     props.profiles.unshift({ ...profile })
 }
 const getUser = () => {
@@ -70,14 +68,25 @@ const onRequest = () => {
 }
 // AHP Button behavior
 const accept = () => {
-    console.log('accepted')
+    console.log('accepted aka do NOT reinsert')
+    // need to pass these arguments (profileId, targetId, status)
+    // the url structure is
+    // const charmander = await db.get(`/profile/{profile_id}/queue/{target_id}/delete?include_profile=true&reinsert=false`)
+    // http://localhost:3001/api/profile/38/queue/9/delete?include_profile=true&reinsert=true
+    const profileId = props.uid
+    const targetId = props.profiles[0].uid
+    updateQueueByProfileId(profileId, targetId, false)
+    // TODO: next step is grouping/membership
 }
 const hold = () => {
-    console.log('held')
+    console.log('held? do we need this?')
 }
 const pass = () => {
-    console.log('passed')
-
+    console.log('passed aka do reinsert')
+    // const charmander = await db.get(`/profile/{profile_id}/queue/{target_id}/delete?include_profile=true&reinsert=true`)
+    const profileId = props.uid
+    const targetId = props.profiles[0].uid
+    updateQueueByProfileId(profileId, targetId, true)
 }
 
 // from the data() section

frontend/src/components/form.vue

@@ -12,12 +12,12 @@
             h3 {{ prompt.question }}?
             .response-wrapper(v-if='prompt.type === "input-string"')
                 label {{ prompt.type }}
-                input(v-model='answers[makeKebob(prompt.question)]')
+                input(v-model='answers[`${prompt.id}-${makeKebob(prompt.question)}`]')
             .response-wrapper(v-else-if='prompt.type === "tag-cloud"')
                 label {{ prompt.type }}
                 button.p-0(
-                    :disabled='response == answers[makeKebob(prompt.question)]'
-                    :prompt-question='makeKebob(prompt.question)'
+                    :disabled='response == answers[`${prompt.id}-${makeKebob(prompt.question)}`]'
+                    :prompt-question='`${prompt.id}-${makeKebob(prompt.question)}`'
                     @click='respondFromTag'
                     v-for='response in prompt.responses'
                 ) {{ response }}
@@ -33,7 +33,7 @@
                         :name='response'
                         :true-value='response'
                         false-value=''
-                        v-model='answers[makeKebob(prompt.question)]')
+                        v-model='answers[`${prompt.id}-${makeKebob(prompt.question)}`]')
                     label(:for='response') {{ response }}
             //- Slider from -3 to 0 to +3 (increments of 1)
             .response-wrapper(v-else-if='prompt.type === "slide"')
@@ -42,8 +42,8 @@
                     type='range'
                     min='-3'
                     max='3'
-                    v-model='answers[makeKebob(prompt.question)]')
-                span {{ answers[makeKebob(prompt.question)] }}
+                    v-model='answers[`${prompt.id}-${makeKebob(prompt.question)}`]')
+                span {{ answers[`${prompt.id}-${makeKebob(prompt.question)}`] }}
 
     footer.f-row.w-full
         button.p-1(:disabled='state.step == 1' @click='back') back
@@ -57,7 +57,7 @@
 import Joi from 'joi'
 import { validatorMapping, makeKebob } from '@/utils'
 import { defineProps, reactive, ref } from 'vue'
-import { saveSurveyByProfileID } from '../services/survey.service'
+import { saveSurveyByProfileID, scoreSurveyByProfileId } from '../services/survey.service'
 
 const slidevalue = ref('0')
 
@@ -98,7 +98,7 @@ const isValid = step => {
     const schema = {}
     const answeredThisStep = {}
     props.form[step].forEach(prompt => {
-        const key = makeKebob(prompt.question)
+        const key = `${prompt.id}-${makeKebob(prompt.question)}`
         schema[key] = validatorMapping[prompt.type]
         answeredThisStep[key] = answers[key]
     })
@@ -114,8 +114,8 @@ const next = e => {
         const questiontoResponseKeyId = {}
         props.form.forEach(step => {
             step.forEach(prompt => {
-                questiontoResponseKeyId[makeKebob(prompt.question)] = prompt.id
-            })
+                questiontoResponseKeyId[`${prompt.id}-${makeKebob(prompt.question)}`] = prompt.id
+                })
         })
         const idWithResponseVal = []
         Object.keys(answers).forEach(answerKey => {
@@ -128,9 +128,13 @@ const next = e => {
         // Bc we don't want to pass the 1st question to backend & we want profileId
         // Necessary atm bc we manually added question in Survey class (entity)
         const profileId = idWithResponseVal.shift().val
-
+        // TODO: pass maxDistance from an input value somewhere later
+        const maxDistance = 10
         saveSurveyByProfileID(idWithResponseVal, profileId)
+        alert('Responses submitted!')
         resetAnswers()
+        // TODO: score here after save survey responses
+        scoreSurveyByProfileId(profileId, maxDistance)
         state.step = 1
     } else if (state.step < props.form.length) {
         state.step++

frontend/src/entities/index.js

@@ -4,4 +4,4 @@ export * from './_modules'
 export * from './response'
 export * from './profile'
 export * from './survey'
-export * from './grouping'
+export * from './grouping'

frontend/src/services/queue.service.js

@@ -1,20 +1,35 @@
 import { db } from '../utils/db'
-// import { Queue } from '../entities/queue'
+import { Profile } from '../entities'
 
 // TODO: queue services
 const fetchQueueByProfileId = async profileId => {
-    const queue = await db.get(`/profile/{profileId}/queue?include_profile=true`)
-
-    const profilelist = []
-
-    // WIP
-    // const myMatchQueue = new Queue(profilelist)
-    // return myMatchQueue
+    const queue = await db.get(
+        `/profile/${profileId}/queue?include_profile=true`,
+    )
+    return queue.map(profileData => {
+        return new Profile({ email: null, ...profileData })
+    })
 }
 
-const saveQueueByProfileId = async (targetId, profileId) => {
-    // const updateQueue = db.patch(`/profile/{profileId}/queue/{targetId}/delete?include_profile=true&reinsert=true`)
-    // return updateQueue
+const updateQueueByProfileId = async (profileId, targetId, reinsert) => {
+    // Arguments
+    // profileId - the id of the profile viewing the queue
+    // targetId - the id of the profile viewed by the profileId
+    // reinsert - if profileId accepted targetId, FALSE reinsert so no reinsert; if profileId passed targetId, TRUE reinsert so reinsert at end
+    //
+    const updateQueue = db.patch(
+        `/profile/${profileId}/queue/${targetId}/delete?include_profile=true&reinsert=${reinsert}`,
+        // HELP: responseScheme says the structure should be array of either:
+        // 1) NUMBER
+        // or
+        // 2) {profile_id, user_id, user_name, user_media, responses, user_type}
+        // ~However~ how do we call (2) here? It seems too much to call another API just to fill out a payload, so I just went with (1)
+        [
+            targetId,
+        ],
+    )
+    console.log('updateQueue', updateQueue)
+    return updateQueue
 }
 
-export { fetchQueueByProfileId, saveQueueByProfileId }
+export { fetchQueueByProfileId, updateQueueByProfileId }

frontend/src/services/survey.service.js

@@ -41,17 +41,14 @@ const fetchSurveyByProfileId = async profileId => {
     return mysurvey
 }
 
-// TODO: separate to newSurvey vs updateSurvey
 const saveSurveyByProfileID = async (surveyResponses, profileId) => {
     surveyResponses.forEach(responseKeyIdwithVal => {
         const keyId = responseKeyIdwithVal.response_key_id
         const val = responseKeyIdwithVal.val
-        console.log('saveSurvey keyId', keyId)
-        console.log('saveSurvey val', val)
         
         // POST
-        // const myresponses = db.post(`/${profileId}/respond?response_key_id=${keyId}&val=${val}`)
-        // return myresponses
+        const myresponses = db.post(`/profile/${profileId}/respond?response_key_id=${keyId}&val=${val}`)
+        return myresponses
     })
 }
 
@@ -59,24 +56,28 @@ const updateSurveyByProfileId = async (surveyResponses, profileId) => {
     surveyResponses.forEach(responseKeyIdwithVal => {
         const keyId = responseKeyIdwithVal.response_key_id
         const val = responseKeyIdwithVal.val
-        console.log('saveSurvey keyId', keyId)
-        console.log('saveSurvey val', val)
         // PATCH
-        // const myresponses = db.patch(`/profile/${profileId}/update/${keyId}`,
-        //     [
-        //         {
-        //             response_id: 2,
-        //             profile_id: profileId,
-        //             response_key_id: keyId,
-        //             val: val,
-        //         },
-        //     ]
-        // )
+        const myresponses = db.patch(`/profile/${profileId}/update/${keyId}`,
+            [
+                {
+                    response_id: 2,
+                    profile_id: profileId,
+                    response_key_id: keyId,
+                    val: val,
+                },
+            ]
+        )
     })
 }
 
+const scoreSurveyByProfileId = async (profileId, maxDistance) => {
+    const scoreSurvey = db.get(`/profile/${profileId}/score?max_distance=${maxDistance}`)
+    return scoreSurvey
+}
+
 export {
     fetchSurveyByProfileId,
     saveSurveyByProfileID,
     updateSurveyByProfileId,
+    scoreSurveyByProfileId,
 }

frontend/src/utils/db.js

@@ -23,7 +23,7 @@ class Connector {
         this.apiPrefix = prefix
     }
     async get(endpoint) {
-        const header = { headerTemplate }
+        const header = { ...headerTemplate }
         header.method = 'GET'
         try {
             console.log(`${remote}${endpoint}`)

frontend/src/views/home.vue

@@ -25,14 +25,31 @@ export default {
         user: null,
         mypid: null,
     }),
-    created() {
+    async created() {
         // this.mypid = auth.currentUser?.mypid || "99999";
-        this.mypid = 21
-        this.processProfiles()
-        // this.queueList = fetchQueueByProfileId(mypid)
-        // console.log('queueList', queueList)
+        this.mypid = 38
+        // Uncomment below to use for batch file data
+        // this.processProfilesFromBatch(this.parseBatch([batch_10, batch_20, batch_30]))
+
+        // Uncomment below to use API
+        const queueList = await fetchQueueByProfileId(this.mypid)
+        console.log('queueList', queueList)
+        this.processQueue(queueList)
     },
     methods: {
+        processQueue(queueList) {
+            const formattedList = []
+            queueList.forEach(profile => {
+                const formatted = {
+                        uid: profile.profile_id,
+                        name: profile.user_name,
+                        avatar: profile.user_media,
+                    }
+                formattedList.push(formatted)
+            })
+            this.swipables = formattedList
+        },
+        // For Batch Data Parsing & Processing
         parseBatch(allBatches) {
             const finished = { profiles: [], users: [], responses: [] }
             allBatches.forEach(batch => {
@@ -47,9 +64,7 @@ export default {
             // console.log('parsed batch', finished)
             return finished
         },
-        processProfiles() {
-            const parsed = this.parseBatch([batch_10, batch_20, batch_30])
-            // const parsed = 
+        processProfilesFromBatch(parsed) {
             const findUser = profile => {
                 return parsed.users.filter(u => u.user_id == profile.user_id)[0]
             }