Move over relations to emailAccount

apps/web/app/(app)/automation/onboarding/page.tsx

@@ -24,7 +24,7 @@ export default async function OnboardingPage() {
   );
 }
 
-type UserPreferences = Prisma.UserGetPayload<{
+type UserPreferences = Prisma.EmailAccountGetPayload<{
   select: {
     rules: {
       select: {
@@ -46,16 +46,12 @@ async function getUserPreferences({
   const emailAccount = await prisma.emailAccount.findUnique({
     where: { email },
     select: {
-      user: {
+      rules: {
         select: {
-          rules: {
+          systemType: true,
+          actions: {
             select: {
-              systemType: true,
-              actions: {
-                select: {
-                  type: true,
-                },
-              },
+              type: true,
             },
           },
         },
@@ -66,16 +62,13 @@ async function getUserPreferences({
   if (!emailAccount) return undefined;
 
   return {
-    toReply: getToReplySetting(emailAccount.user.rules),
+    toReply: getToReplySetting(emailAccount.rules),
     coldEmails: getColdEmailSetting(emailAccount.coldEmailBlocker),
-    newsletter: getRuleSetting(SystemType.NEWSLETTER, emailAccount.user.rules),
-    marketing: getRuleSetting(SystemType.MARKETING, emailAccount.user.rules),
-    calendar: getRuleSetting(SystemType.CALENDAR, emailAccount.user.rules),
-    receipt: getRuleSetting(SystemType.RECEIPT, emailAccount.user.rules),
-    notification: getRuleSetting(
-      SystemType.NOTIFICATION,
-      emailAccount.user.rules,
-    ),
+    newsletter: getRuleSetting(SystemType.NEWSLETTER, emailAccount.rules),
+    marketing: getRuleSetting(SystemType.MARKETING, emailAccount.rules),
+    calendar: getRuleSetting(SystemType.CALENDAR, emailAccount.rules),
+    receipt: getRuleSetting(SystemType.RECEIPT, emailAccount.rules),
+    notification: getRuleSetting(SystemType.NOTIFICATION, emailAccount.rules),
   };
 }
 

apps/web/app/(app)/automation/page.tsx

@@ -23,7 +23,8 @@ export const maxDuration = 300; // Applies to the actions
 
 export default async function AutomationPage() {
   const session = await auth();
-  if (!session?.user) redirect("/login");
+  const email = session?.user.email;
+  if (!email) redirect("/login");
 
   // onboarding redirect
   const cookieStore = await cookies();
@@ -32,7 +33,7 @@ export default async function AutomationPage() {
 
   if (!viewedOnboarding) {
     const hasRule = await prisma.rule.findFirst({
-      where: { userId: session.user.id },
+      where: { emailAccountId: email },
       select: { id: true },
     });
 

apps/web/app/(app)/automation/rule/[ruleId]/page.tsx

@@ -13,10 +13,11 @@ export default async function RulePage(props: {
   const searchParams = await props.searchParams;
   const params = await props.params;
   const session = await auth();
-  if (!session?.user) redirect("/login");
+  const email = session?.user.email;
+  if (!email) redirect("/login");
 
   const rule = await prisma.rule.findUnique({
-    where: { id: params.ruleId, userId: session.user.id },
+    where: { id: params.ruleId, emailAccountId: email },
     include: {
       actions: true,
       categoryFilters: true,

apps/web/app/(app)/clean/helpers.ts

@@ -1,20 +1,20 @@
 import prisma from "utils/prisma";
 
 export async function getJobById({
-  userId,
+  email,
   jobId,
 }: {
-  userId: string;
+  email: string;
   jobId: string;
 }) {
   return await prisma.cleanupJob.findUnique({
-    where: { id: jobId, userId },
+    where: { id: jobId, email },
   });
 }
 
-export async function getLastJob(userId: string) {
+export async function getLastJob({ email }: { email: string }) {
   return await prisma.cleanupJob.findFirst({
-    where: { userId },
+    where: { email },
     orderBy: { createdAt: "desc" },
   });
 }

apps/web/app/(app)/clean/page.tsx

@@ -6,9 +6,10 @@ import { Card } from "@/components/ui/card";
 
 export default async function CleanPage() {
   const session = await auth();
-  if (!session?.user.id) return <div>Not authenticated</div>;
+  const email = session?.user.email;
+  if (!email) return <div>Not authenticated</div>;
 
-  const lastJob = await getLastJob(session.user.id);
+  const lastJob = await getLastJob({ email });
   if (!lastJob) redirect("/clean/onboarding");
 
   return (

apps/web/app/(app)/clean/run/page.tsx

@@ -15,20 +15,21 @@ export default async function CleanRunPage(props: {
   const session = await auth();
   if (!session?.user.email) return <div>Not authenticated</div>;
 
-  const userId = session.user.id;
   const userEmail = session.user.email;
 
-  const threads = await getThreadsByJobId(userId, jobId);
+  const threads = await getThreadsByJobId({ emailAccountId: userEmail, jobId });
 
   const job = jobId
-    ? await getJobById({ userId, jobId })
-    : await getLastJob(userId);
+    ? await getJobById({ email: userEmail, jobId })
+    : await getLastJob({ email: userEmail });
 
   if (!job) return <CardTitle>Job not found</CardTitle>;
 
   const [total, done] = await Promise.all([
-    prisma.cleanupThread.count({ where: { jobId, userId } }),
-    prisma.cleanupThread.count({ where: { jobId, userId, archived: true } }),
+    prisma.cleanupThread.count({ where: { jobId, emailAccountId: userEmail } }),
+    prisma.cleanupThread.count({
+      where: { jobId, emailAccountId: userEmail, archived: true },
+    }),
   ]);
 
   return (

apps/web/app/(app)/reply-zero/AwaitingReply.tsx

@@ -4,20 +4,18 @@ import { getPaginatedThreadTrackers } from "./fetch-trackers";
 import type { TimeRange } from "./date-filter";
 
 export async function AwaitingReply({
-  userId,
-  userEmail,
+  email,
   page,
   timeRange,
   isAnalyzing,
 }: {
-  userId: string;
-  userEmail: string;
+  email: string;
   page: number;
   timeRange: TimeRange;
   isAnalyzing: boolean;
 }) {
   const { trackers, totalPages } = await getPaginatedThreadTrackers({
-    userId,
+    email,
     type: ThreadTrackerType.AWAITING,
     page,
     timeRange,
@@ -26,7 +24,7 @@ export async function AwaitingReply({
   return (
     <ReplyTrackerEmails
       trackers={trackers}
-      userEmail={userEmail}
+      email={email}
       type={ThreadTrackerType.AWAITING}
       totalPages={totalPages}
       isAnalyzing={isAnalyzing}

apps/web/app/(app)/reply-zero/NeedsAction.tsx

@@ -17,7 +17,7 @@ export async function NeedsAction({
   isAnalyzing: boolean;
 }) {
   const { trackers, totalPages } = await getPaginatedThreadTrackers({
-    userId,
+    email: userEmail,
     type: ThreadTrackerType.NEEDS_ACTION,
     page,
     timeRange,
@@ -26,7 +26,7 @@ export async function NeedsAction({
   return (
     <ReplyTrackerEmails
       trackers={trackers}
-      userEmail={userEmail}
+      email={userEmail}
       type={ThreadTrackerType.NEEDS_ACTION}
       totalPages={totalPages}
       isAnalyzing={isAnalyzing}

apps/web/app/(app)/reply-zero/NeedsReply.tsx

@@ -4,20 +4,18 @@ import { getPaginatedThreadTrackers } from "./fetch-trackers";
 import type { TimeRange } from "./date-filter";
 
 export async function NeedsReply({
-  userId,
-  userEmail,
+  email,
   page,
   timeRange,
   isAnalyzing,
 }: {
-  userId: string;
-  userEmail: string;
+  email: string;
   page: number;
   timeRange: TimeRange;
   isAnalyzing: boolean;
 }) {
   const { trackers, totalPages } = await getPaginatedThreadTrackers({
-    userId,
+    email,
     type: ThreadTrackerType.NEEDS_REPLY,
     page,
     timeRange,
@@ -26,7 +24,7 @@ export async function NeedsReply({
   return (
     <ReplyTrackerEmails
       trackers={trackers}
-      userEmail={userEmail}
+      email={email}
       type={ThreadTrackerType.NEEDS_REPLY}
       totalPages={totalPages}
       isAnalyzing={isAnalyzing}

apps/web/app/(app)/reply-zero/ReplyTrackerEmails.tsx

@@ -35,14 +35,14 @@ import { useTableKeyboardNavigation } from "@/hooks/useTableKeyboardNavigation";
 
 export function ReplyTrackerEmails({
   trackers,
-  userEmail,
+  email,
   type,
   isResolved,
   totalPages,
   isAnalyzing,
 }: {
   trackers: ThreadTracker[];
-  userEmail: string;
+  email: string;
   type?: ThreadTrackerType;
   isResolved?: boolean;
   totalPages: number;
@@ -179,7 +179,7 @@ export function ReplyTrackerEmails({
             <Row
               key={thread.id}
               message={thread.messages.at(-1)!}
-              userEmail={userEmail}
+              email={email}
               isResolved={isResolved}
               type={type}
               setSelectedEmail={setSelectedEmail}
@@ -257,7 +257,7 @@ export function ReplyTrackerEmails({
 
 function Row({
   message,
-  userEmail,
+  email,
   isResolved,
   type,
   setSelectedEmail,
@@ -269,7 +269,7 @@ function Row({
   rowRef,
 }: {
   message: ParsedMessage;
-  userEmail: string;
+  email: string;
   isResolved?: boolean;
   type?: ThreadTrackerType;
   setSelectedEmail: (email: { threadId: string; messageId: string }) => void;
@@ -307,7 +307,7 @@ function Row({
             }
             subject={message.headers.subject}
             snippet={message.snippet}
-            userEmail={userEmail}
+            userEmail={email}
             threadId={message.threadId}
             messageId={message.id}
             hideViewEmailButton

apps/web/app/(app)/reply-zero/Resolved.tsx

@@ -6,13 +6,11 @@ import { Prisma } from "@prisma/client";
 const PAGE_SIZE = 20;
 
 export async function Resolved({
-  userId,
-  userEmail,
+  email,
   page,
   timeRange,
 }: {
-  userId: string;
-  userEmail: string;
+  email: string;
   page: number;
   timeRange: TimeRange;
 }) {
@@ -24,7 +22,7 @@ export async function Resolved({
     prisma.$queryRaw<Array<{ id: string }>>`
       SELECT MAX(id) as id
       FROM "ThreadTracker"
-      WHERE "userId" = ${userId}
+      WHERE "emailAccountId" = ${email}
       ${dateFilter ? Prisma.sql`AND "sentAt" <= (${dateFilter}->>'lte')::timestamp` : Prisma.empty}
       GROUP BY "threadId"
       HAVING bool_and(resolved) = true
@@ -35,7 +33,7 @@ export async function Resolved({
     prisma.$queryRaw<[{ count: bigint }]>`
       SELECT COUNT(DISTINCT "threadId") as count
       FROM "ThreadTracker"
-      WHERE "userId" = ${userId}
+      WHERE "emailAccountId" = ${email}
       ${dateFilter ? Prisma.sql`AND "sentAt" <= (${dateFilter}->>'lte')::timestamp` : Prisma.empty}
       GROUP BY "threadId"
       HAVING bool_and(resolved) = true
@@ -54,7 +52,7 @@ export async function Resolved({
   return (
     <ReplyTrackerEmails
       trackers={trackers}
-      userEmail={userEmail}
+      email={email}
       totalPages={totalPages}
       isResolved
       isAnalyzing={false}

apps/web/app/(app)/reply-zero/fetch-trackers.ts

@@ -5,12 +5,12 @@ import { getDateFilter, type TimeRange } from "./date-filter";
 const PAGE_SIZE = 20;
 
 export async function getPaginatedThreadTrackers({
-  userId,
+  email,
   type,
   page,
   timeRange = "all",
 }: {
-  userId: string;
+  email: string;
   type: ThreadTrackerType;
   page: number;
   timeRange?: TimeRange;
@@ -21,7 +21,7 @@ export async function getPaginatedThreadTrackers({
   const [trackers, total] = await Promise.all([
     prisma.threadTracker.findMany({
       where: {
-        userId,
+        emailAccountId: email,
         resolved: false,
         type,
         sentAt: dateFilter,
@@ -37,15 +37,15 @@ export async function getPaginatedThreadTrackers({
       ? prisma.$queryRaw<[{ count: bigint }]>`
           SELECT COUNT(DISTINCT "threadId") as count
           FROM "ThreadTracker"
-          WHERE "userId" = ${userId}
+          WHERE "emailAccountId" = ${email}
             AND "resolved" = false
             AND "type" = ${type}::text::"ThreadTrackerType"
             AND "sentAt" <= ${dateFilter.lte}
         `
       : prisma.$queryRaw<[{ count: bigint }]>`
           SELECT COUNT(DISTINCT "threadId") as count
           FROM "ThreadTracker"
-          WHERE "userId" = ${userId}
+          WHERE "emailAccountId" = ${email}
             AND "resolved" = false
             AND "type" = ${type}::text::"ThreadTrackerType"
         `,