diff --git a/lib/services/email-service.ts b/lib/services/email-service.ts index 418e13c..1606594 100644 --- a/lib/services/email-service.ts +++ b/lib/services/email-service.ts @@ -632,6 +632,20 @@ async function updateSessionData(userId: string, accountId?: string): Promise> { + const accounts = await prisma.mailCredentials.findMany({ + where: { userId }, + select: { + id: true, + email: true + } + }); + return accounts; +} + /** * Get user's email credentials from database */ diff --git a/lib/services/notifications/email-adapter.ts b/lib/services/notifications/email-adapter.ts index dc2ace4..30a450e 100644 --- a/lib/services/notifications/email-adapter.ts +++ b/lib/services/notifications/email-adapter.ts @@ -2,8 +2,7 @@ import { NotificationAdapter } from './notification-adapter.interface'; import { logger } from '@/lib/logger'; import { Notification, NotificationCount } from '@/lib/types/notification'; import { getRedisClient } from '@/lib/redis'; -import { prisma } from '@/lib/prisma'; -import { getImapConnection, shouldUseGraphAPI } from '@/lib/services/email-service'; +import { getImapConnection, shouldUseGraphAPI, getUserEmailAccounts } from '@/lib/services/email-service'; import { getGraphUnreadCount, fetchGraphEmails } from '@/lib/services/microsoft-graph-mail'; export class EmailAdapter implements NotificationAdapter { @@ -21,13 +20,7 @@ export class EmailAdapter implements NotificationAdapter { */ private async fetchUnreadCounts(userId: string): Promise>> { // Get all accounts from the database - const accounts = await prisma.mailCredentials.findMany({ - where: { userId }, - select: { - id: true, - email: true - } - }); + const accounts = await getUserEmailAccounts(userId); logger.debug('[EMAIL_ADAPTER] Found accounts', { userId, @@ -236,13 +229,7 @@ export class EmailAdapter implements NotificationAdapter { try { // Get all accounts from the database - const accounts = await prisma.mailCredentials.findMany({ - where: { userId }, - select: { - id: true, - email: true - } - }); + const accounts = await getUserEmailAccounts(userId); if (accounts.length === 0) { return [];