Lint + moved notifcation type

Author: ErlendSae

apps/rpc/src/modules/notification/notification-repository.ts

@@ -3,10 +3,12 @@ import type {
   Notification,
   NotificationId,
   NotificationWrite,
-  UserId,
   NotificationRecipientId,
   NotificationRecipient,
-} from "@dotkomonline/types"
+  UserNotification,
+} from "./notification"
+
+import type { UserId } from "@dotkomonline/types"
 
 export interface NotificationRepository {
   findById(handle: DBHandle, notificationId: NotificationId): Promise<Notification | null>
@@ -26,8 +28,8 @@ export interface NotificationRepository {
     recipientId: NotificationRecipientId,
     userId: UserId
   ): Promise<NotificationRecipient | null>
-  findAllforUser(handle: DBHandle, userId: UserId): Promise<Notification[]>
-  getUnreadCountforUser(handle: DBHandle, userId: UserId): Promise<number>
+  findAllForUser(handle: DBHandle, userId: UserId): Promise<UserNotification[]>
+  getUnreadCountForUser(handle: DBHandle, userId: UserId): Promise<number>
   markAsRead(handle: DBHandle, notificationId: NotificationId, userId: UserId): Promise<void>
   markAllAsRead(handle: DBHandle, userId: UserId): Promise<void>
 }
@@ -96,17 +98,17 @@ export function getNotificationRepository(): NotificationRepository {
       })
     },
 
-    async getUnreadCountforUser(handle, userId) {
-      await handle.notificationRecipient.count({
-        where: { userId, readAt: null },
-      })
-    },
-
     async getUnreadCountForUser(handle, userId) {
       return handle.notificationRecipient.count({
         where: { userId, readAt: null },
       })
     },
+    async markAsRead(handle, notificationId, userId) {
+      await handle.notificationRecipient.updateMany({
+        where: { notificationId, userId, readAt: null },
+        data: { readAt: new Date() },
+      })
+    },
 
     async markAllAsRead(handle, userId) {
       await handle.notificationRecipient.updateMany({

apps/rpc/src/modules/notification/notification-router.ts

@@ -1,9 +1,9 @@
-import { NotificationSchema, NotificationWriteSchema, UserNotificationSchema } from "@dotkomonline/types"
 import type { inferProcedureInput, inferProcedureOutput } from "@trpc/server"
 import { z } from "zod"
 import { isEditor } from "../../authorization"
 import { withAuditLogEntry, withAuthentication, withAuthorization, withDatabaseTransaction } from "../../middlewares"
 import { procedure, t } from "../../trpc"
+import { NotificationSchema, NotificationWriteSchema } from "./notification"
 
 export type GetNotificationInput = inferProcedureInput<typeof getNotificationProcedure>
 export type GetNotificationOutput = inferProcedureOutput<typeof getNotificationProcedure>

apps/rpc/src/modules/notification/notification-service.ts

@@ -1,6 +1,13 @@
 import type { DBHandle } from "@dotkomonline/db"
-import { NotFoundError } from "../../error"
-import type { Notification, NotificationId } from "@dotkomonline/types"
+import type {
+  Notification,
+  NotificationId,
+  NotificationRecipient,
+  NotificationRecipientId,
+  NotificationWrite,
+  UserNotification,
+} from "./notification"
+import type { UserId } from "@dotkomonline/types"
 import type { NotificationRepository } from "./notification-repository"
 
 export interface NotificationService {
@@ -21,8 +28,8 @@ export interface NotificationService {
     recipientId: NotificationRecipientId,
     userId: UserId
   ): Promise<NotificationRecipient | null>
-  findAllforUser(handle: DBHandle, userId: UserId): Promise<Notification[]>
-  getUnreadCountforUser(handle: DBHandle, userId: UserId): Promise<number>
+  findAllForUser(handle: DBHandle, userId: UserId): Promise<UserNotification[]>
+  getUnreadCountForUser(handle: DBHandle, userId: UserId): Promise<number>
   markAsRead(handle: DBHandle, notificationId: NotificationId, userId: UserId): Promise<void>
   markAllAsRead(handle: DBHandle, userId: UserId): Promise<void>
 }
@@ -37,7 +44,6 @@ export function getNotificationService(notificationRepository: NotificationRepos
     },
 
     async update(handle, notificationId, notificationData) {
-      const notification = await notificationRepository.findById(handle, notificationId)
       return await notificationRepository.update(handle, notificationId, notificationData)
     },
 
@@ -57,12 +63,12 @@ export function getNotificationService(notificationRepository: NotificationRepos
       return await notificationRepository.findRecipient(handle, recipientId, userId)
     },
 
-    async findAllforUser(handle, userId) {
-      return await notificationRepository.findAllforUser(handle, userId)
+    async findAllForUser(handle, userId) {
+      return await notificationRepository.findAllForUser(handle, userId)
     },
 
-    async getUnreadCountforUser(handle, userId) {
-      return await notificationRepository.getUnreadCountforUser(handle, userId)
+    async getUnreadCountForUser(handle, userId) {
+      return await notificationRepository.getUnreadCountForUser(handle, userId)
     },
 
     async markAsRead(handle, notificationId, userId) {

packages/types/src/notification.ts …src/modules/notification/notification.tspackages/types/src/notification.ts renamed to apps/rpc/src/modules/notification/notification.ts packages/types/src/notification.ts renamed to apps/rpc/src/modules/notification/notification.ts

@@ -14,4 +14,3 @@ export * from "./task"
 export * from "./user"
 export * from "./audit-log"
 export * from "./workspace-sync"
-export * from "./notification"