fix: doing [0] on a promise, rather than on the awaited result

nrkno · Oct 6, 2023 · 0c7104e · 0c7104e
1 parent ef4a86f
commit 0c7104e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/meteor/server/api/ExternalMessageQueue.ts b/meteor/server/api/ExternalMessageQueue.ts
@@ -29,15 +29,14 @@ function updateExternalMessageQueueStatus(): void {
 					statusCode: StatusCode.GOOD,
 				}
 				if (messagesOnQueueCount > 0) {
-					// TODO - this is fetching ALL of the docs that match the query, then only using the first
-					const messagesOnQueueExample = await ExternalMessageQueue.findOneAsync(query)[0]
+					const messagesOnQueueExample = await ExternalMessageQueue.findOneAsync(query)
 					status = {
 						statusCode: StatusCode.WARNING_MAJOR,
 						messages: [
 							`There are ${messagesOnQueueCount} unsent messages on queue (one of the unsent messages has the error message: "${
-								messagesOnQueueExample.errorMessage
-							}", to receiver "${messagesOnQueueExample.type}", "${JSON.stringify(
-								messagesOnQueueExample.receiver
+								messagesOnQueueExample?.errorMessage
+							}", to receiver "${messagesOnQueueExample?.type}", "${JSON.stringify(
+								messagesOnQueueExample?.receiver
 							)}")`,
 						],
 					}

diff --git a/meteor/server/api/cleanup.ts b/meteor/server/api/cleanup.ts
@@ -454,7 +454,9 @@ async function isAllowedToRunCleanup(): Promise<string | void> {
 
 	const studios = await Studios.findFetchAsync({}, { fields: { _id: 1 } })
 	for (const studio of studios) {
-		const activePlaylist: RundownPlaylist | undefined = await getActiveRundownPlaylistsInStudioFromDb(studio._id)[0]
+		const activePlaylist: DBRundownPlaylist | undefined = (
+			await getActiveRundownPlaylistsInStudioFromDb(studio._id)
+		)[0]
 		if (activePlaylist) {
 			return `There is an active RundownPlaylist: "${activePlaylist.name}" in studio "${studio.name}" (${activePlaylist._id}, ${studio._id})`
 		}