:gear: tweaking imports for ava | adding rudimentary login service tests

frontend/src/services/grouping.service.js

@@ -1,5 +1,5 @@
-import { db } from '../utils/db'
-import { Grouping, Profile } from '../entities'
+import { db } from '../utils/db.js'
+import { Grouping, Profile } from '../entities/index.js'
 
 /**
  * Get Memberships associated with a single Profile from the database and

frontend/src/services/index.js

@@ -1,9 +1,8 @@
-export * from './user.service'
-export * from './profile.service'
-export * from './grouping.service'
-export * from './survey.service'
-export * from './queue.service'
-export * from './chat.service'
-export * from './notification.service'
-export * from './login.service'
-
+export * from './user.service.js'
+export * from './profile.service.js'
+export * from './grouping.service.js'
+export * from './survey.service.js'
+export * from './queue.service.js'
+export * from './chat.service.js'
+export * from './notification.service.js'
+export * from './login.service.js'

frontend/src/services/login.service.js

@@ -4,8 +4,8 @@ import {
     fetchResponsesByProfileId,
     Chatter,
     StonkAlert,
-} from '../services'
-import { surveyFactory } from '../utils'
+} from '../services/index.js'
+import { surveyFactory } from '../utils/index.js'
 
 /**
  * Logged in profile state manager
@@ -146,4 +146,4 @@ class Login {
 
 const currentProfile = new Login()
 
-export { currentProfile }
+export { currentProfile, Login }

frontend/src/services/notification.service.js

@@ -1,4 +1,4 @@
-import { remote } from '../utils/db'
+import { remote } from '../utils/db.js'
 
 /**
  * Base notifier class

frontend/src/services/profile.service.js

@@ -1,5 +1,5 @@
-import { db } from '../utils/db'
-import { Profile } from '../entities/profile'
+import { db } from '../utils/db.js'
+import { Profile } from '../entities/profile/profile.js'
 
 /**
  * Get Profiles associated with a single user from the database and
@@ -30,4 +30,8 @@ const fetchProfileByProfileId = async profileId => {
     return profile
 }
 
-export { fetchProfilesByUserId, fetchProfileByProfileId, createProfileForUserId }
+export {
+    fetchProfilesByUserId,
+    fetchProfileByProfileId,
+    createProfileForUserId,
+}

frontend/src/services/queue.service.js

@@ -1,5 +1,5 @@
-import { db } from '../utils/db'
-import { Profile } from '../entities'
+import { db } from '../utils/db.js'
+import { Profile } from '../entities/index.js'
 
 /**
  * Get a match queue of profiles

frontend/src/services/survey.service.js

@@ -1,4 +1,4 @@
-import { db } from '../utils/db'
+import { db } from '../utils/db.js'
 
 /**
  * Get Survey for first time profile creation from the database and

frontend/src/services/user.service.js

@@ -1,4 +1,4 @@
-import { db } from '../utils/db'
+import { db } from '../utils/db.js'
 
 /**
  * Signup a new user
@@ -8,7 +8,7 @@ const signupUser = async user => {
     const payload = {
         user_name: user.name,
         user_email: user.email,
-        is_poster: user.seeking == 'position' ? 0 : 1
+        is_poster: user.seeking == 'position' ? 0 : 1,
     }
     return await db.post(`/user/signup`, payload)
 }

frontend/src/utils/index.js

@@ -1,18 +1,18 @@
 import Joi from 'joi'
+import { Connector } from './db.js'
+import { SurveyFactory } from './survey.js'
+import { possible } from './lang.js'
+import { pidMixin, cardMixin } from './mixins.js'
 
-import { Connector } from './db'
-import { SurveyFactory } from './survey'
-import { possible } from './lang'
-import { pidMixin, cardMixin } from './mixins'
-
-import { possibleZipcodes } from '../../../backend/db/data-generator/config.json'
+import config from '../../../backend/db/data-generator/config.json' assert { type: 'json' }
+const possibleZipcodes = config.possibleZipcodes
 
 const api = new Connector('kittens')
 
 const validatorMapping = {
     'input-string': Joi.string(),
     'tag-cloud': Joi.string(),
-    'checklist': Joi.string(),
+    checklist: Joi.string(),
     'input-slide': Joi.string(),
 }
 
@@ -22,10 +22,8 @@ const makeKebob = input => {
 
 const surveyFactory = new SurveyFactory(possible['usa'])
 
-
 const mixins = { pidMixin, cardMixin }
 
-
 const randomNumber = max => {
     return Math.floor(Math.random() * max) < 1
         ? 1
@@ -75,26 +73,37 @@ const randomMedia = () => {
 
 const randomSurveyResponses = count => {
     const surveyResponses = [
-        { id: null, "idOrPrompt": "email", "val": `${randomEmail()}` },
-        { id: null, "idOrPrompt": "name", "val": `john test-${count}` },
-        { id: 99, "idOrPrompt": 15, "val": randomValFrom(possible.usa.pronouns) },
-        { id: null, "idOrPrompt": "seeking", "val": Math.random() > 0.2 ? possible.usa.seeking[0] : possible.usa.seeking[1] },
-        { id: 99, "idOrPrompt": 13, "val": randomValFrom(possible.usa.urgency) },
-        { id: null, "idOrPrompt": "experience", "val": randomValFrom(possible.usa.experience) },
-        { id: 99, "idOrPrompt": 14, "val": "swe" },
-        { id: 99, "idOrPrompt": 10, "val": randomValFrom(possible.usa.duration) },
-        { id: 99, "idOrPrompt": 9, "val": randomValFrom(possible.usa.language) },
-        { id: 99, "idOrPrompt": 11, "val": randomValFrom(possible.usa.presence) },
-        { id: 99, "idOrPrompt": 7, "val": `${randomValFrom(possibleZipcodes)}` },
-        { id: 99, "idOrPrompt": 16, "val": `${randomNumber(55)}` },
-        { id: 99, "idOrPrompt": 12, "val": "this is a test of the survey signup" },
-        { id: 99, "idOrPrompt": 8, "val": randomMedia() },
-        { id: 99, "idOrPrompt": 1, "val": `${randomNumber(3) - randomNumber(3)}` },
-        { id: 99, "idOrPrompt": 2, "val": `${randomNumber(3) - randomNumber(3)}` },
-        { id: 99, "idOrPrompt": 3, "val": `${randomNumber(3) - randomNumber(3)}` },
-        { id: 99, "idOrPrompt": 4, "val": `${randomNumber(3) - randomNumber(3)}` },
-        { id: 99, "idOrPrompt": 5, "val": `${randomNumber(3) - randomNumber(3)}` },
-        { id: 99, "idOrPrompt": 6, "val": `${randomNumber(3) - randomNumber(3)}` }
+        { id: null, idOrPrompt: 'email', val: `${randomEmail()}` },
+        { id: null, idOrPrompt: 'name', val: `john test-${count}` },
+        { id: 99, idOrPrompt: 15, val: randomValFrom(possible.usa.pronouns) },
+        {
+            id: null,
+            idOrPrompt: 'seeking',
+            val:
+                Math.random() > 0.2
+                    ? possible.usa.seeking[0]
+                    : possible.usa.seeking[1],
+        },
+        { id: 99, idOrPrompt: 13, val: randomValFrom(possible.usa.urgency) },
+        {
+            id: null,
+            idOrPrompt: 'experience',
+            val: randomValFrom(possible.usa.experience),
+        },
+        { id: 99, idOrPrompt: 14, val: 'swe' },
+        { id: 99, idOrPrompt: 10, val: randomValFrom(possible.usa.duration) },
+        { id: 99, idOrPrompt: 9, val: randomValFrom(possible.usa.language) },
+        { id: 99, idOrPrompt: 11, val: randomValFrom(possible.usa.presence) },
+        { id: 99, idOrPrompt: 7, val: `${randomValFrom(possibleZipcodes)}` },
+        { id: 99, idOrPrompt: 16, val: `${randomNumber(55)}` },
+        { id: 99, idOrPrompt: 12, val: 'this is a test of the survey signup' },
+        { id: 99, idOrPrompt: 8, val: randomMedia() },
+        { id: 99, idOrPrompt: 1, val: `${randomNumber(3) - randomNumber(3)}` },
+        { id: 99, idOrPrompt: 2, val: `${randomNumber(3) - randomNumber(3)}` },
+        { id: 99, idOrPrompt: 3, val: `${randomNumber(3) - randomNumber(3)}` },
+        { id: 99, idOrPrompt: 4, val: `${randomNumber(3) - randomNumber(3)}` },
+        { id: 99, idOrPrompt: 5, val: `${randomNumber(3) - randomNumber(3)}` },
+        { id: 99, idOrPrompt: 6, val: `${randomNumber(3) - randomNumber(3)}` },
     ]
     return surveyResponses
 }
@@ -110,5 +119,5 @@ export {
     randomValFrom,
     randomMedia,
     randomName,
-    randomEmail
+    randomEmail,
 }

frontend/src/utils/survey.js

@@ -1,5 +1,5 @@
-import { Survey } from '../entities'
-import { fetchQuestions } from '../services'
+import { Survey } from '../entities/index.js'
+import { fetchQuestions } from '../services/index.js'
 
 class SurveyFactory {
     constructor(responses) {
@@ -7,39 +7,53 @@ class SurveyFactory {
         this.questionsFromDb = []
     }
     _setSteps(langFile) {
-        const stepsToProcess = [...Object.values(langFile) ]
+        const stepsToProcess = [...Object.values(langFile)]
         const seenIds = []
         const stepsInCommon = stepsToProcess.map(step => {
             // Match question to step
-            const match = this.questionsFromDb.filter(q => q.response_key_prompt == step)[0]
-            if(match) { seenIds.push(match.response_key_id) }
+            const match = this.questionsFromDb.filter(
+                q => q.response_key_prompt == step,
+            )[0]
+            if (match) {
+                seenIds.push(match.response_key_id)
+            }
             return {
-                response_key_id: match ? match.response_key_id: null,
-                response_key_category: match ? match.response_key_category: 'profile',
-                response_key_prompt: match ? match.response_key_prompt: step,
-                response_key_description: match ? match.response_key_description: null,
-                responses: this.responsesByCategory[step] ? this.responsesByCategory[step] : [] 
+                response_key_id: match ? match.response_key_id : null,
+                response_key_category: match
+                    ? match.response_key_category
+                    : 'profile',
+                response_key_prompt: match ? match.response_key_prompt : step,
+                response_key_description: match
+                    ? match.response_key_description
+                    : null,
+                responses: this.responsesByCategory[step]
+                    ? this.responsesByCategory[step]
+                    : [],
             }
         })
-        const unseen = this.questionsFromDb.filter(q => !seenIds.includes(q.response_key_id))
+        const unseen = this.questionsFromDb.filter(
+            q => !seenIds.includes(q.response_key_id),
+        )
         return [...stepsInCommon, ...unseen]
     }
     async getQuestions() {
         try {
             this.questionsFromDb = await fetchQuestions()
             return this.questionsFromDb
-        } catch(err) {
+        } catch (err) {
             console.error(err)
         }
     }
     async createSurvey(langFile, roleTree) {
-        if(!this.questionsFromDb.length) {
+        if (!this.questionsFromDb.length) {
             const res = await this.getQuestions()
-            console.warn(`Attempted to create a survey before getting questions: retrieved ${res.length} questions`)
+            console.warn(
+                `Attempted to create a survey before getting questions: retrieved ${res.length} questions`,
+            )
         }
         const steps = this._setSteps(langFile)
         return new Survey(steps, roleTree)
     }
 }
 
-export { SurveyFactory }
+export { SurveyFactory }

frontend/tests/login.service.spec.js

@@ -0,0 +1,58 @@
+import test from 'ava'
+import { Login } from '../src/services/login.service.js'
+
+test('Make sure we can instantiate login service', async t => {
+    const currentProfile = new Login()
+
+    t.is(currentProfile.isLoggedIn, false)
+    t.is(currentProfile.isComplete, false)
+    t.is(currentProfile.hasResponses, 0)
+
+    currentProfile.id.value = 99
+    currentProfile._loading.value = false
+    t.is(currentProfile.isLoggedIn, true)
+})
+
+test('Make sure login.tags can be set', async t => {
+    const currentProfile = new Login()
+    const testTags = ['x', 'y', 'z']
+    currentProfile.setTags(testTags)
+    t.is(currentProfile.tags, testTags)
+})
+
+test('Make sure login.responses can be set', async t => {
+    const currentProfile = new Login()
+    const testResponses = ['100', '200', '300']
+    currentProfile.setResponses(testResponses)
+    t.is(currentProfile.responses, testResponses)
+})
+
+test('Make sure login.groupings work correctly', async t => {
+    const currentProfile = new Login()
+    const testGroupings = [
+        { name: 'a', is_paired: false },
+        { name: 'b', is_paired: false },
+        { name: 'c', is_paired: true },
+    ]
+    currentProfile.groupings = testGroupings
+    t.deepEqual(
+        currentProfile.pendingGroupings.map(g => g.name),
+        ['a', 'b'],
+    )
+    t.deepEqual(
+        currentProfile.pairedGroupings.map(g => g.name),
+        ['c'],
+    )
+})
+
+test('Make sure login.logout() works', async t => {
+    const currentProfile = new Login()
+    currentProfile.id.value = 99
+
+    currentProfile.toaster = { name: 'dummy_toaster', stop: () => {} }
+    currentProfile.chatter = { name: 'dummy_chatter', stop: () => {} }
+    t.is(currentProfile.chatter.name, 'dummy_chatter')
+
+    currentProfile.logout()
+    t.is(currentProfile.id.value, null)
+})