:recycle: creating complete profiles with description, image, language, etc responses

backend/lib/models/profile.js

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

backend/lib/plugins/survey.js

@@ -24,4 +24,5 @@ module.exports = {
 
         await server.route(ResponseQuestionsRoute)
     },
+    models: { ReponseKeyModel }
 }

backend/lib/routes/profile/get.js

@@ -3,6 +3,7 @@
 const Joi = require('joi')
 const apiSchema = require('../../schemas/api')
 const errorSchema = require('../../schemas/errors')
+const profileSchema = require('../../schemas/profiles')
 
 const pluginConfig = {
     handlerType: 'profile',
@@ -13,16 +14,7 @@ const pluginConfig = {
 }
 
 const responseSchemas = {
-    profile: Joi.object({
-        profile_id: Joi.number(),
-        user_id: Joi.number(),
-        user_name: Joi.string(),
-        responses: Joi.array().items(),
-        tags: Joi.array().items(),
-        user_media: Joi.string(),
-        user_type: Joi.any(),
-        user: Joi.object(),
-    }),
+    profile: profileSchema.single,
     error: errorSchema.single,
 }
 

backend/lib/routes/profile/match.js

@@ -3,6 +3,7 @@
 const Joi = require('joi')
 const apiSchema = require('../../schemas/api')
 const errorSchema = require('../../schemas/errors')
+const surveyResponseSchema = require('../../schemas/responses') 
 
 const pluginConfig = {
     handlerType: 'match',
@@ -15,7 +16,7 @@ const pluginConfig = {
 const validators = {}
 
 const responseSchemas = {
-    response: Joi.array().items(Joi.object()),
+    response: surveyResponseSchema.list,
     error: errorSchema.single
 }
 

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

@@ -1,9 +1,9 @@
 'use strict'
 
 const Joi = require('joi')
-
 const apiSchema = require('../../schemas/api')
 const errorSchema = require('../../schemas/errors')
+const profileSchema = require('../../schemas/profiles')
 
 const pluginConfig = {
     handlerType: 'profile',
@@ -17,15 +17,7 @@ const responseSchemas = {
     response: Joi.array().items(
         Joi.alternatives().try(
             Joi.number(),
-            Joi.object({
-                profile_id: Joi.number(),
-                user_id: Joi.number(),
-                user_name: Joi.string(),
-                responses: Joi.array().items(),
-                tags: Joi.array().items(),
-                user_media: Joi.string(),
-                user_type: Joi.any(),
-            }),
+            profileSchema.single,
         ),
     ),
     error: errorSchema.single

backend/lib/routes/profile/queue.js

@@ -3,6 +3,7 @@
 const Joi = require('joi')
 const apiSchema = require('../../schemas/api')
 const errorSchema = require('../../schemas/errors')
+const profileSchema = require('../../schemas/profiles')
 
 const pluginConfig = {
     handlerType: 'profile',
@@ -16,16 +17,7 @@ const responseSchemas = {
     response: Joi.array().items(
         Joi.alternatives().try(
             Joi.number(),
-            Joi.object({
-                profile_id: Joi.number(),
-                user_id: Joi.number(),
-                user_name: Joi.string(),
-                responses: Joi.array().items(),
-                tags: Joi.array().items(),
-                user_media: Joi.string(),
-                user_type: Joi.any(),
-                user: Joi.object()
-            }),
+            profileSchema.single,
         )
     ),
     error: errorSchema.single

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

@@ -36,7 +36,6 @@ const responseSchemas = {
         // and getCompleteProfiles utilizes CompleteProfile
         // and this route utilizes getCompleteProfiles
         user_name: Joi.string(),
-        user_media: Joi.string(),
         tags: Joi.array().items(),
         responses: Joi.array().items(
             Joi.object({

backend/lib/schemas/profiles.js

@@ -0,0 +1,23 @@
+'use strict'
+
+const Joi = require('joi')
+const surveyResponseSchema = require('./responses')
+
+const singleProfile = Joi.object({
+    profile_id: Joi.number(),
+    user_id: Joi.number(),
+    user_name: Joi.string(),
+    responses: surveyResponseSchema.list,
+    tags: Joi.array().items(),
+    user_type: Joi.any(),
+    user: Joi.object(),
+    profile_description: Joi.string().allow(null, ''),
+    profile_prefs: Joi.object(),
+    profile_media: Joi.array().items(),
+    profile_languages: Joi.array().items(),
+}).label('profile_single')
+
+module.exports = {
+    single: singleProfile,
+    list: Joi.array().items(singleProfile).label('profile_list')
+}

backend/lib/schemas/responses.js

@@ -21,4 +21,4 @@ module.exports = {
     list: Joi.array().items(singleResponse).label('response_list'),
     key: singleResponseKey,
     keys: Joi.array().items(singleResponseKey).label('question_list')
-}
+}

backend/lib/services/profile.js

@@ -1,6 +1,8 @@
 const Schmervice = require('@hapipal/schmervice')
 const haversine = require('haversine')
 
+// Keys that are profile data responses
+const _TEMP_RES_KEYS = [8, 9, 10, 11, 12]
 const _ZIPCODEKEY = 7
 const scoreResponses = (seeker, potentialMatch, prescoreLookup) => {
     if (seeker.responses.length != potentialMatch.responses.length)
@@ -8,8 +10,8 @@ const scoreResponses = (seeker, potentialMatch, prescoreLookup) => {
             error: `complete responses for profile: ${seeker.profile_id} unqeual to profile: ${potentialMatch.profile_id} | ${seeker.responses.length}:${potentialMatch.responses.length}`,
         }
 
-    const aRes = [...seeker.responses]
-    const bRes = [...potentialMatch.responses]
+    const aRes = seeker.responses.filter(res => !_TEMP_RES_KEYS.includes(res.response_key_id))
+    const bRes = potentialMatch.responses.filter(res => !_TEMP_RES_KEYS.includes(res.response_key_id))
 
     const composite = []
     while (aRes.length + bRes.length > 0) {
@@ -89,10 +91,25 @@ class CompleteProfile {
         this.user_id = profile.user_id // int user_id
         this.profile_id = profile.profile_id // 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.responses = []
         this.tags = profile.tags // [] of all tags
         this.user_type = type
+
+        // TODO: generalize this for multiple images, and languages
+        this.profile_description = ''
+        this.profile_media = []
+        this.profile_languages = []
+        this.profile_prefs = {}
+        if(profile?.responses?.length) {
+            this.responses = profile.responses.filter(res => !_TEMP_RES_KEYS.includes(res.response_key_id)) // [] of all responses
+            const [image, language, duration, location, description]  = profile.responses.filter(res => _TEMP_RES_KEYS.includes(res.response_key_id))
+            this.profile_prefs.location = location.val
+            this.profile_prefs.duration = duration.val
+            this.profile_prefs.zip = profile.responses.filter(res => res.response_key_id == 7)[0].val // [] of all responses
+            this.profile_description = description.val
+            this.profile_media.push(image.val)
+            this.profile_languages.push(language.val)
+        }
     }
 }
 
@@ -101,6 +118,8 @@ module.exports = class ProfileService extends Schmervice.Service {
         super(...args)
         this.scoreLookup = {}
         this.tagLookup = {}
+
+        // this.responseKeyLookup = ResponseKey.query()
     }
     async _setScoreLookup() {
         if (!Object.keys(this.scoreLookup).length) {
@@ -144,7 +163,7 @@ module.exports = class ProfileService extends Schmervice.Service {
     async getProfile(profileId) {
         const { Profile } = this.server.models()
         await this._setTagLookup()
-
+        
         const matchingProfile = await Profile.query()
             .where('profile_id', profileId)
             .first()
@@ -189,17 +208,12 @@ module.exports = class ProfileService extends Schmervice.Service {
         await this._setTagLookup()
 
         // profilesEntries is profiles in dataaspect_labelsbase row order
-        const profilesEntries = includeResponses
-            ? await Profile.query()
-                  .whereIn('profile_id', profileIdArray)
-                  .withGraphFetched('tags')
-                  .withGraphFetched('responses')
-                  .withGraphFetched('user')
-            : await Profile.query()
-                  .whereIn('profile_id', profileIdArray)
-                  .withGraphFetched('tags')
-                  .withGraphFetched('user')
-
+        const profilesEntries = await Profile.query()
+            .whereIn('profile_id', profileIdArray)
+            .withGraphFetched('tags')
+            .withGraphFetched('responses')
+            .withGraphFetched('user')
+            
         // taking the info from profilesEntries
         // to repack into completeProfiles
         // in same order as profileIdArray

frontend/src/utils/login.js

@@ -29,7 +29,7 @@ class Login {
             return {
                 pid: profile.profile_id,
                 name: profile.user_name,
-                avatar: profile.user_media,
+                avatar: '',
             }
         })
         return formattedList

frontend/src/views/HomeView.vue

@@ -39,7 +39,7 @@ export default {
                 return {
                     pid: profile.profile_id,
                     name: profile.user_name,
-                    avatar: profile.user_media,
+                    avatar: profile.profile_media[0],
                 }
             })
         },
@@ -79,7 +79,7 @@ export default {
                 p.pid = p.profile_id
                 p.name = user.user_name
                 p.email = user.user_email
-                p.avatar = p.user_media[0]
+                p.avatar = p.profile_media[0]
                 p.responses = parsed.responses.filter(
                     r => r.profile_id == p.profile_id,
                 )

frontend/src/views/Matches.vue

@@ -29,7 +29,7 @@ export default {
             return this.matches.map(m => {
                 return {
                     pid: m.profile.profile_id,
-                    avatar: m.profile.user_media,
+                    avatar: m.profile.profile_media[0],
                     name: m.profile.user_name,
                 }
             })

frontend/src/views/home.vue

@@ -0,0 +1,128 @@
+<template lang="pug">
+sidebar(v-if='!loading' :pid="pid" @updatePid="setPid")
+main.f-col.start.w-full
+    article#home(v-if='!loading')
+        h1 Queue Page
+        profile-card-list(:profiles='swipables' :pid='parseInt(pid)' @reload-queue='getQueue')
+    p(v-else) Loading...
+    main-nav(v-if='!loading' :pid="pid")
+</template>
+
+<script>
+import sidebar from '../components/Sidebar.vue'
+import mainNav from '../components/MainNav.vue'
+import profileCardList from '../components/ProfileCardList.vue'
+
+import { Chatter, StonkAlert } from '../services'
+import { loginHandler, authHandler } from '../utils'
+
+import batch_10 from '../../../backend/db/generated/_batch_10.js.ref'
+import batch_20 from '../../../backend/db/generated/_batch_20.js.ref'
+import batch_30 from '../../../backend/db/generated/_batch_30.js.ref'
+
+const DEFAULT_PID = 45
+
+export default {
+    name: 'HomeView',
+    components: { profileCardList, sidebar, mainNav },
+    data: () => ({
+        swipables: [],
+        loading: true,
+        pid: null
+    }),
+    mounted() {
+        // Uncomment below to use API
+        let pid
+        if(!loginHandler.currentProfileId) {
+            pid  = authHandler.currentUser?.pid || DEFAULT_PID
+        } else {
+            pid = loginHandler.currentProfileId
+        }
+        this.setPid(pid)
+
+        // Uncomment below to use for batch file data
+        // this.processProfilesFromBatch(this.parseBatch([batch_10, batch_20, batch_30]))
+
+        this.setupChatter()
+        this.setupToaster()
+    },
+    methods: {
+        setPid(pid) {
+            loginHandler.login(pid)
+            this.pid = loginHandler.currentProfileId
+            this.getQueue()
+        },
+        async getQueue() {
+            this.loading = true
+            try {
+                await loginHandler.getQueue()
+                this.swipables = loginHandler.queue
+            } catch (err) {
+                console.error(err)
+            }
+            this.loading = false
+        },
+        // For push notifications and chat 
+        setupToaster() {
+            const t = new StonkAlert(this.pid)
+        },
+        setupChatter() {
+            const c = new Chatter()
+            const testAccountUUID = import.meta.env.VITE_TEST_ACCOUNT_UUID
+            c.setup(testAccountUUID)
+            console.log('---')
+        },
+        // For Batch Data Parsing & Processing
+        parseBatch(allBatches) {
+            const finished = { profiles: [], users: [], responses: [] }
+            allBatches.forEach(batch => {
+                const split = batch.value.split('\n')
+                split.splice(0, 5)
+                split.unshift('{')
+                const p = JSON.parse(split.join(''))
+                finished.profiles = [...p.profiles, ...finished.profiles]
+                finished.users = [...p.users, ...finished.users]
+                finished.responses = [...p.responses, ...finished.responses]
+            })
+            // console.log('parsed batch', finished)
+            return finished
+        },
+        processProfilesFromBatch(parsed) {
+            const findUser = profile => {
+                return parsed.users.filter(u => u.user_id == profile.user_id)[0]
+            }
+            parsed.profiles.forEach(p => {
+                // console.log(parsed)
+                const user = findUser(p)
+                p.pid = p.profile_id
+                p.name = user.user_name
+                p.email = user.user_email
+                p.avatar = p.profile_media[0]
+                p.responses = parsed.responses.filter(
+                    r => r.profile_id == p.profile_id,
+                )
+                p.responses.forEach(r => {
+                    if (r.response_key_id == 7) {
+                        p.zipcode = r.val
+                    }
+                })
+                this.swipables.push(p)
+            })
+        },
+    },
+}
+</script>
+
+<style lang="postcss">
+main
+    position: relative
+    height: 100%
+    > article
+        height: 100%
+        width: 100%
+        flex-direction: column
+
+    input, button
+        position: relative
+        z-index: 1000
+</style>