Merge branch 'master' into 714-feature-end-to-end-enter-room

backend/jest.config.json

@@ -14,9 +14,9 @@
   "coverageThreshold": {
     "global": {
       "statements": 96,
-      "branches": 88,
-      "functions": 98,
-      "lines": 97
+      "branches": 86,
+      "functions": 96,
+      "lines": 96
     }
   },
   "modulePathIgnorePatterns": ["<rootDir>/build/"],

backend/src/config/config.ts

@@ -32,6 +32,7 @@ const BREVO = {
 const BBB = {
   BBB_SHARED_SECRET: process.env.BBB_SHARED_SECRET ?? 'unknown',
   BBB_URL: process.env.BBB_URL ?? 'https://my.url',
+  BBB_PULL_MEETINGS: process.env.NODE_ENV !== 'test' && process.env.BBB_URL,
 }
 
 export const CONFIG = {

backend/src/graphql/resolvers/RoomResolver.spec.ts

@@ -97,7 +97,7 @@ describe('RoomResolver', () => {
         }
       `
       describe('No room in DB', () => {
-        it('returns null', async () => {
+        it('throws an Error', async () => {
           await expect(
             testServer.executeOperation({
               query,
@@ -110,9 +110,8 @@ describe('RoomResolver', () => {
             body: {
               kind: 'single',
               singleResult: {
-                data: { joinRoom: null },
-
-                errors: undefined,
+                data: null,
+                errors: [expect.objectContaining({ message: 'Room does not exist' })],
               },
             },
           })

backend/src/graphql/resolvers/RoomResolver.ts

@@ -153,6 +153,7 @@ export class RoomResolver {
           m,
           joinMeetingLink({
             fullName: user.name,
+
             meetingID: m.meetingID,
             password: pw?.attendeePW ? pw.attendeePW : '',
           }),
@@ -162,17 +163,17 @@ export class RoomResolver {
     return []
   }
 
-  @Query(() => String, { nullable: true })
+  @Query(() => String)
   async joinRoom(
     @Arg('userName') userName: string,
     @Arg('roomId', () => Int) roomId: number,
-  ): Promise<string | null> {
+  ): Promise<string> {
     const meeting = await prisma.meeting.findUnique({
       where: {
         id: roomId,
       },
     })
-    if (!meeting) return null
+    if (!meeting) throw new Error('Room does not exist')
     return joinMeetingLink({
       fullName: userName,
       meetingID: meeting.meetingID,

backend/src/graphql/resolvers/dal/handleOpenRooms.ts

@@ -22,3 +22,8 @@ export const handleOpenRooms = async (): Promise<void> => {
     },
   })
 }
+
+export const checkForOpenRooms = (): void => {
+  void handleOpenRooms()
+  setTimeout(checkForOpenRooms, 60 * 1000)
+}

backend/src/graphql/schema.ts

@@ -1,12 +1,16 @@
 import { GraphQLSchema } from 'graphql'
 import { buildSchema } from 'type-graphql'
 
+import { CONFIG } from '#config/config'
 import { authChecker } from '#src/auth/authChecker'
 
 import { ContactFormResolver } from './resolvers/ContactFormResolver'
+import { checkForOpenRooms } from './resolvers/dal/handleOpenRooms'
 import { NewsletterSubscriptionResolver } from './resolvers/NewsletterSubscriptionResolver'
 import { RoomResolver } from './resolvers/RoomResolver'
 
+if (CONFIG.BBB_PULL_MEETINGS) void checkForOpenRooms()
+
 export const schema = async (): Promise<GraphQLSchema> => {
   return buildSchema({
     resolvers: [ContactFormResolver, NewsletterSubscriptionResolver, RoomResolver],

backend/src/index.ts

@@ -1,20 +1,13 @@
 // eslint-disable-next-line import/no-unassigned-import
 import 'reflect-metadata'
-import { handleOpenRooms } from '#graphql/resolvers/dal/handleOpenRooms'
 
 import logger from './logger'
 import { prisma } from './prisma'
 import { listen } from './server/server'
 
-const checkForOpenRooms = (): void => {
-  void handleOpenRooms()
-  setTimeout(checkForOpenRooms, 60 * 1000)
-}
-
 export const main = async (): Promise<void> => {
   const url = await listen(4000)
   logger.info(`🚀 Server is ready at ${url}`)
-  checkForOpenRooms()
 }
 
 void main()

frontend/src/pages/join-room/+Page.vue

@@ -38,6 +38,7 @@ import { ref } from 'vue'
 import MainButton from '#components/buttons/MainButton.vue'
 import { usePageContext } from '#context/usePageContext'
 import DefaultLayout from '#layouts/DefaultLayout.vue'
+import GlobalErrorHandler from '#plugins/globalErrorHandler'
 import { joinRoomQuery } from '#queries/joinRoomQuery'
 
 const pageContext = usePageContext()
@@ -47,7 +48,6 @@ const userName = ref('')
 const form = ref<HTMLFormElement>()
 const {
   result: joinRoomQueryResult,
-  error: joinRoomQueryError,
   refetch: joinRoomQueryRefetch,
   loading,
 } = useQuery(
@@ -63,17 +63,13 @@ const {
 )
 
 const getRoomLink = async () => {
-  await joinRoomQueryRefetch()
-  if (joinRoomQueryError.value) {
-    // eslint-disable-next-line no-console
-    console.log('Error', joinRoomQueryError.value.message)
-  } else {
-    if (joinRoomQueryResult.value.joinRoom) {
+  try {
+    await joinRoomQueryRefetch()
+    if (joinRoomQueryResult.value) {
       window.location.href = joinRoomQueryResult.value.joinRoom
-    } else {
-      // eslint-disable-next-line no-console
-      console.log('Room not found')
     }
+  } catch (error) {
+    GlobalErrorHandler.error('room link not found', error)
   }
 }
 </script>

frontend/src/pages/join-room/Page.test.ts

@@ -1,10 +1,12 @@
-import { mount } from '@vue/test-utils'
+import { ApolloError } from '@apollo/client/errors'
+import { flushPromises, mount } from '@vue/test-utils'
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Component, h } from 'vue'
 import { VApp } from 'vuetify/components'
 
 import { joinRoomQuery } from '#queries/joinRoomQuery'
 import { mockClient } from '#tests/mock.apolloClient'
+import { errorHandlerSpy } from '#tests/plugin.globalErrorHandler'
 
 import JoinRoomPage from './+Page.vue'
 import Route from './+route'
@@ -67,29 +69,19 @@ describe('JoinRoomPage', () => {
       })
     })
 
-    describe('Null returned', () => {
-      const consoleLogSpy = vi.spyOn(console, 'log')
-      beforeEach(async () => {
-        joinRoomQueryMock.mockResolvedValue({ data: { joinRoom: null } })
-        vi.clearAllMocks()
-        await wrapper.find('form').trigger('submit')
-      })
-
-      it('logs Room not found', () => {
-        expect(consoleLogSpy).toBeCalledWith('Room not found')
-      })
-    })
-
-    describe.skip('Error returned', () => {
-      const consoleLogSpy = vi.spyOn(console, 'log')
+    describe('Error returned', () => {
       beforeEach(async () => {
         joinRoomQueryMock.mockRejectedValue({ message: 'autsch' })
+        await flushPromises()
         vi.clearAllMocks()
         await wrapper.find('form').trigger('submit')
       })
 
       it('logs Room not found', () => {
-        expect(consoleLogSpy).toBeCalledWith('Error', 'autsch')
+        expect(errorHandlerSpy).toBeCalledWith(
+          'room link not found',
+          new ApolloError({ errorMessage: 'autsch' }),
+        )
       })
     })
   })