Merge branch 'master' into schemas

backend/lib/routes/membership/join.js

@@ -62,7 +62,6 @@ module.exports = {
                 // TODO: LIMIT the amount of groupings by checking type
                 // !: You should only be able to match with the target_id ONCE
                 // !: You should only be associated with a single company too
-                console.log('---')
 
                 /** User membership service method to create membership */
                 const memberships = await membershipService.joinGrouping(
@@ -72,6 +71,7 @@ module.exports = {
                     role,
                 )
                 // console.log(memberships)
+
                 return h
                     .response({
                         ok: true,

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

@@ -51,7 +51,7 @@ module.exports = {
             const { include_profile, reinsert } = request.query
             const { profileService, matchQueueService } =
                 request.server.services()
-            console.log('reinsert', reinsert)
+            // console.log('reinsert', reinsert)
             const updatedQueue = await matchQueueService.markAsDeleted(
                 profile_id,
                 target_id,

backend/lib/routes/profile/queue.js

@@ -59,14 +59,6 @@ module.exports = {
                 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)
             }

backend/lib/routes/profile/score.js

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

backend/lib/routes/user/current.js

@@ -30,8 +30,6 @@ module.exports = {
         tags: ['api'],
         auth: 'default_jwt',
         handler: async function (request, h) {
-            // console.log('current')
-            // console.log(request)
             try {
                 const auth = {
                     credentials: request.auth.credentials,

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

@@ -68,7 +68,6 @@ module.exports = {
                 userId,
                 type,
             )
-            console.log('get profiles - const profiles / in list-profiles.js', profiles)
             try {
                 return {
                     ok: true,

backend/lib/services/match.js

@@ -51,7 +51,6 @@ class Person {
         }
 
         this.swapWith = p => {
-            console.log('%s & %s swap partners', this.name, p.name)
             const thisFiance = this.fiance
             const pFiance = p.fiance
             this.engageTo(pFiance)
@@ -80,7 +79,6 @@ module.exports = class MatchService extends Schmervice.Service {
         for (let d = 0; d < diff; d++) {
             smallerList.push({ profile_id: `${d}-dummy`, queue: [] })
         }
-        console.log('---')
         let allPeople = [...seekers, ...posters]
         const queuesById = allPeople.reduce((queuesById, profile) => {
             queuesById[profile.profile_id] = profile.queue

backend/lib/services/matchqueue.js

@@ -13,7 +13,7 @@ module.exports = class MatchQueueService extends Schmervice.Service {
         const { MatchQueue } = this.server.models()
         return await MatchQueue.query()
             .where('profile_id', profileId)
-            .andWhere('is_deleted', false)
+            .where('is_deleted', 0)
     }
     /**
      * Returns queues by profile id by user type

backend/lib/services/profile.js

@@ -116,15 +116,24 @@ module.exports = class ProfileService extends Schmervice.Service {
 
     async getProfilesFor(profileIdArray, type) {
         const { Profile } = this.server.models()
-
+        // profilesEntries is profiles in database row order 
         const profilesEntries = await Profile.query()
             .whereIn('profile_id', profileIdArray)
             .withGraphFetched('responses')
             .withGraphFetched('user')
 
-        return profilesEntries.map(profile => {
-            return new CompleteProfile(profile, type)
-        })
+        // taking the info from profilesEntries
+        // to repack into completeProfiles
+        // in same order as profileIdArray
+        const completeProfiles = []
+        profileIdArray.forEach(pid => {
+            profilesEntries.forEach(entry => {
+                if (entry.profile_id == pid) {
+                    completeProfiles.push(new CompleteProfile(entry, type))
+                }
+            })
+        })  
+        return completeProfiles
     }
 
     /**
@@ -299,7 +308,7 @@ module.exports = class ProfileService extends Schmervice.Service {
             parseInt(zipCode),
         )
         if (!zipInfo) {
-            console.log('zip:', zipCode)
+            console.error('zip:', zipCode)
         }
 
         return {

frontend/package.json

@@ -9,28 +9,28 @@
         "format": "prettier .  --write"
     },
     "dependencies": {
-        "joi": "^17.4.0",
         "pubnub": "^5.0.0",
-        "vue": "^3.0.5",
-        "vue-router": "^4.0.12"
+        "joi": "^17.6.0",
+        "vue": "^3.2.31",
+        "vue-router": "^4.0.14"
     },
     "devDependencies": {
-        "@prettier/plugin-pug": "^1.17.3",
-        "@vitejs/plugin-vue": "^1.2.2",
-        "@vue/compiler-sfc": "^3.0.5",
-        "autoprefixer": "^10.2.5",
-        "eslint": "^8.3.0",
-        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-vue": "^8.1.1",
-        "naive-ui": "^2.20.3",
-        "postcss": "^8.2.13",
-        "postcss-calc": "^8.0.0",
-        "postcss-import": "^14.0.1",
+        "@prettier/plugin-pug": "^1.19.2",
+        "@vitejs/plugin-vue": "^2.2.4",
+        "@vue/compiler-sfc": "^3.2.31",
+        "autoprefixer": "^10.4.2",
+        "eslint": "^8.11.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-vue": "^8.5.0",
+        "naive-ui": "^2.26.4",
+        "postcss": "^8.4.8",
+        "postcss-calc": "^8.2.4",
+        "postcss-import": "^14.0.2",
         "precss": "^4.0.0",
         "pug": "^3.0.2",
         "pug-plain-loader": "^1.1.0",
-        "sugarss": "^3.0.3",
-        "vite": "^2.2.3",
+        "sugarss": "^4.0.1",
+        "vite": "^2.8.6",
         "vite-fs": "^0.0.2",
         "watch": "^1.0.2"
     }

frontend/src/components/ProfileCardList.vue

@@ -3,15 +3,16 @@ section.profile_card_list.w-full
     .profile_card_list_container.w-full
         .swipe(
             :config='config'
-            :key='profile.uid'
+            :key='profile.pid'
             @throwout='swipped(profile)'
-            v-for='profile in profiles'
+            v-for='(profile, i) in profiles'
+            :style='{"z-index": 1000-i}'
         )
             .card.b-solid.rounded.p-0.bg-cover(
                 :style='{ "background-image": `url(${profile.avatar})` }'
             )
                 .card__content
-                    h3.p-1.mv-0.b-solid.rounded {{ profile.name }}
+                    h3.p-1.mv-0.b-solid.rounded {{ profile.pid  }} {{ profile.name }}
                 nav.swipe_icons.w-full.f-row.between
                     //- Accept
                     button.p-1(@click='accept') Accept
@@ -22,9 +23,10 @@ section.profile_card_list.w-full
 </template>
 
 <script setup>
-import { computed, defineProps } from 'vue'
-import { updateQueueByProfileId } from '../services/queue.service'
+import { computed, defineProps, defineEmits } from 'vue'
+import { updateQueueByProfileId, fetchMembershipsByProfileId, postMembershipByProfileId } from '../services'
 
+const emit = defineEmits(['reloadQueue'])
 // TODO: Please review this conversion from script to script setup
 // converted from the props section
 const props = defineProps({
@@ -32,14 +34,14 @@ const props = defineProps({
         type: [Object, Array],
         default: () => [
             {
-                uid: '1',
+                pid: '1',
                 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!' },
             },
         ],
     },
-    uid: {
+    pid: {
         type: Number,
         default: 9999,
     },
@@ -54,7 +56,7 @@ const reject = () => {
 
 
 const swipped = profile => {
-    const index = props.profiles.findIndex(u => u.uid == profile.uid)
+    const index = props.profiles.findIndex(u => u.pid == profile.pid)
     // TODO: bug, fix this
     props.profiles.splice(index, 1)
     profile.id = Date.now() + (Math.random() * 100000).toFixed()
@@ -67,16 +69,23 @@ const onRequest = () => {
     const data = { ...currentCard }
 }
 // AHP Button behavior
-const accept = () => {
+
+const accept = async () => {
     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
+    const profileId = props.pid
+    const targetId = props.profiles[0].pid
     updateQueueByProfileId(profileId, targetId, false)
     // TODO: next step is grouping/membership
+    const checkMembership = await fetchMembershipsByProfileId(profileId)
+    if (!checkMembership.length) {
+        console.log('Make membership')
+        postMembershipByProfileId({ profileId, targetId })
+    }
+    emit('reloadQueue')
 }
 const hold = () => {
     console.log('held? do we need this?')
@@ -84,9 +93,10 @@ const hold = () => {
 const pass = () => {
     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
+    const profileId = props.pid
+    const targetId = props.profiles[0].pid
     updateQueueByProfileId(profileId, targetId, true)
+    emit('reloadQueue')
 }
 
 // from the data() section

frontend/src/components/Sidebar.vue

@@ -1,12 +1,16 @@
 <template lang="pug">
-
-aside.sidebar.p-1
+aside.sidebar.p-1.f-col.between
     h3 Messages
     .search
         input
         label search
 
     messages(:title="title" :users="users")
+    .spacer.f-grow
+    .temp-control-box.f-row.start.center
+        p.t-up.p-0 current user
+        input(v-model='mypid' style="width: 50px")
+        button(@click="$emit('updatePid', mypid)").t-up.p-0 switch
 </template>
 
 <script>
@@ -16,7 +20,7 @@ export default {
     components: { messages }, 
     data: () => ({
         title:'Messages from Matches',
-        uid: 111,
+        mypid: 45,
         users: [
             {
                 name: 'Bob McRob',
@@ -32,6 +36,9 @@ export default {
             },
         ],
     }),
+    created() {
+        this.$emit('updatePid', this.mypid)
+    }
 }
 </script>
 

frontend/src/components/form.vue

@@ -107,7 +107,7 @@ const isValid = step => {
 /**
  * Save or take the-nNext step in the form
  */
-const next = e => {
+const next = async e => {
     const validity = isValid(state.step - 1)
     if (validity.error) return console.error(validity.error)
     if (state.step === props.form.length) {
@@ -128,12 +128,10 @@ 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
+        const maxDistance = 100
         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) {

frontend/src/services/grouping.service.js

@@ -25,11 +25,13 @@ const postMembershipByProfileId = async ({
     targetId,
     groupingType = 'match',
 }) => {
+    const utcDateInSeconds = Date.now()/1000
     const membership = {
         target_id: targetId,
         grouping_type: groupingType,
-        grouping_name: `delete_${profileId}_${targetId}`,
+        grouping_name: `${utcDateInSeconds}_${profileId}_${targetId}`,
     }
+    console.log('Membership Created')
     const createdMembershipRecord = await db.post(
         `/membership/${profileId}/join`,
         membership,

frontend/src/services/queue.service.js

@@ -22,7 +22,7 @@ const updateQueueByProfileId = async (profileId, targetId, reinsert) => {
     // 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(
+    const updateQueue = await db.patch(
         `/profile/${profileId}/queue/${targetId}/delete?include_profile=true&reinsert=${reinsert}`,
         // HELP: responseScheme says the structure should be array of either:
         // 1) NUMBER

frontend/src/services/survey.service.js

@@ -71,7 +71,7 @@ const updateSurveyByProfileId = async (surveyResponses, profileId) => {
 }
 
 const scoreSurveyByProfileId = async (profileId, maxDistance) => {
-    const scoreSurvey = db.get(`/profile/${profileId}/score?max_distance=${maxDistance}`)
+    const scoreSurvey = await db.get(`/profile/${profileId}/score?max_distance=${maxDistance}`)
     return scoreSurvey
 }
 

frontend/src/views/Matches.vue

@@ -1,19 +1,21 @@
 <template lang="pug">
-article.match
-    h1 Match Page
+sidebar
+main.f-col.start.w-full
+    article.match
+        h1 Match Page
+    mainNav
 </template>
 
 <script>
 import { defineComponent } from 'vue'
+import sidebar from '../components/Sidebar.vue'
+import mainNav from '../components/MainNav.vue'
 
 // import icon from '@/components/icon.vue'
 // import card from '@/components/card.vue'
 
 export default defineComponent({
-    components: {
-        // card,
-        // icon,
-    },
+    components: { sidebar, mainNav },
 })
 </script>
 

frontend/src/views/home.vue

@@ -1,9 +1,10 @@
 <template lang="pug">
-sidebar
+sidebar(@updatePid="setPid")
 main.f-col.start.w-full
-    article#home
+    article#home(v-if='!loading')
         h1(v-if='user') {{ user.user_name }}
-        profile-card-list(:profiles='swipables' :uid='mypid')
+        profile-card-list(:profiles='swipables' :pid='parseInt(mypid)' @reloadQueue='getQueue')
+    p(v-else) Loading...
     main-nav
 </template>
 
@@ -26,6 +27,7 @@ export default {
         swipables: [],
         user: null,
         mypid: null,
+        loading: true
     }),
     mounted() {
         this.setupChatter()
@@ -52,11 +54,21 @@ export default {
             c.setup(testAccountUUID)
             console.log('---')
         },
+        setPid(pid) {
+            this.mypid = pid
+            this.getQueue()
+        },
+        async getQueue() {
+            this.loading = true
+            const queueList = await fetchQueueByProfileId(this.mypid)
+            this.processQueue(queueList)
+            this.loading = false
+        },
         processQueue(queueList) {
             const formattedList = []
             queueList.forEach(profile => {
                 const formatted = {
-                        uid: profile.profile_id,
+                        pid: profile.profile_id,
                         name: profile.user_name,
                         avatar: profile.user_media,
                     }
@@ -86,7 +98,7 @@ export default {
             parsed.profiles.forEach(p => {
                 // console.log(parsed)
                 const user = findUser(p)
-                p.uid = p.profile_id
+                p.pid = p.profile_id
                 p.name = user.user_name
                 p.email = user.user_email
                 p.avatar = p.user_media[0]
@@ -100,7 +112,6 @@ export default {
                 })
                 this.swipables.push(p)
             })
-            console.log('swipables', this.swipables)
         },
     },
 }
@@ -114,4 +125,8 @@ main
         height: 100%
         width: 100%
         flex-direction: column
+
+    input, button
+        position: relative
+        z-index: 1000
 </style>