Merge pull request #1452 from serlo/Xr3ZO-kulla-2024-05-02-19-38

refactor(notification): Remove fetchScopeOfNotificationEvent()

packages/server/src/schema/authorization/utils.ts

@@ -78,23 +78,6 @@ export async function fetchScopeOfUuid(
   return Scope.Serlo
 }
 
-export async function fetchScopeOfNotificationEvent(
-  {
-    id,
-  }: {
-    id: number
-  },
-  context: Context,
-): Promise<Scope> {
-  const event = await context.dataSources.model.serlo.getNotificationEvent({
-    id,
-  })
-  if (event === null)
-    throw new UserInputError('Notification event does not exist.')
-
-  return await fetchScopeOfUuid({ id: event.objectId }, context)
-}
-
 export function resolveScopedRoles(user: Model<'User'>): Model<'ScopedRole'>[] {
   return user.roles.map(legacyRoleToRole).filter(isDefined)
 }

packages/server/src/schema/notifications/resolvers.ts

@@ -12,7 +12,7 @@ import {
   createNamespace,
 } from '~/internals/graphql'
 import { NotificationDecoder } from '~/model/decoder'
-import { fetchScopeOfNotificationEvent } from '~/schema/authorization/utils'
+import { fetchScopeOfUuid } from '~/schema/authorization/utils'
 import { resolveConnection } from '~/schema/connection/utils'
 import { Resolvers } from '~/types'
 
@@ -151,18 +151,20 @@ export const resolvers: Resolvers = {
         { userId },
         context,
       )
-      const eventIds = ids.map((id) => {
+      const events = ids.map((id) => {
         const notification = notifications.find((n) => n.id === id)
         if (!notification) {
           throw new ForbiddenError(
             'You are only allowed to set your own notification states.',
           )
         }
-        return notification.event.id
+        return notification.event
       })
 
       const scopes = await Promise.all(
-        eventIds.map((id) => fetchScopeOfNotificationEvent({ id }, context)),
+        events.map(({ objectId }) =>
+          fetchScopeOfUuid({ id: objectId }, context),
+        ),
       )
 
       await assertUserIsAuthorized({