add recipient field to messages and phone calls

app/features/messages/loaders/messages.ts

@@ -1,14 +1,14 @@
 import type { LoaderFunction } from "@remix-run/node";
 import { json } from "superjson-remix";
 import { parsePhoneNumber } from "awesome-phonenumber";
-import { type Message, Prisma, Direction } from "@prisma/client";
+import { type Message, Prisma } from "@prisma/client";
 
 import db from "~/utils/db.server";
 import { requireLoggedIn, type SessionData } from "~/utils/auth.server";
 
 export type MessagesLoaderData = {
 	user: { hasPhoneNumber: boolean };
-	conversations: Record<string, Conversation> | undefined;
+	conversations: Conversations | undefined;
 };
 
 type Conversation = {
@@ -18,23 +18,23 @@ type Conversation = {
 };
 
 const loader: LoaderFunction = async ({ request }) => {
-	const sessionData = await requireLoggedIn(request);
+	const { phoneNumber } = await requireLoggedIn(request);
 	return json<MessagesLoaderData>({
-		user: { hasPhoneNumber: Boolean(sessionData.phoneNumber) },
+		user: { hasPhoneNumber: Boolean(phoneNumber) },
-		conversations: await getConversations(sessionData.phoneNumber),
+		conversations: await getConversations(phoneNumber),
 	});
 };
 
 export default loader;
 
+type Conversations = Record<string, Conversation>;
+
 async function getConversations(sessionPhoneNumber: SessionData["phoneNumber"]) {
 	if (!sessionPhoneNumber) {
 		return;
 	}
 
-	const phoneNumber = await db.phoneNumber.findUnique({
+	const phoneNumber = await db.phoneNumber.findUnique({ where: { id: sessionPhoneNumber.id } });
-		where: { id: sessionPhoneNumber.id },
-	});
 	if (!phoneNumber || phoneNumber.isFetchingMessages) {
 		return;
 	}
@@ -42,34 +42,22 @@ async function getConversations(sessionPhoneNumber: SessionData["phoneNumber"])
 	const messages = await db.message.findMany({
 		where: { phoneNumberId: phoneNumber.id },
 		orderBy: { sentAt: Prisma.SortOrder.desc },
+		distinct: "recipient",
 	});
 
-	let conversations: Record<string, Conversation> = {};
+	return messages.reduce<Conversations>((conversations, message) => {
-	for (const message of messages) {
+		const recipient = message.recipient;
-		let recipient: string;
-		if (message.direction === Direction.Outbound) {
-			recipient = message.to;
-		} else {
-			recipient = message.from;
-		}
 		const formattedPhoneNumber = parsePhoneNumber(recipient).getNumber("international");
 
-		if (!conversations[recipient]) {
+		conversations[recipient] = {
-			conversations[recipient] = {
+			recipient,
-				recipient,
+			formattedPhoneNumber,
-				formattedPhoneNumber,
+			lastMessage: message,
-				lastMessage: message,
+		};
-			};
-		}
-
-		if (message.sentAt > conversations[recipient].lastMessage.sentAt) {
-			conversations[recipient].lastMessage = message;
-		}
 		/*conversations[recipient]!.messages.push({
 			...message,
 			content: decrypt(message.content, organization.encryptionKey),
 		});*/
-	}
+		return conversations;
-
+	}, {});
-	return conversations;
 }

app/features/settings/actions/phone.ts

@@ -4,7 +4,8 @@ import { z } from "zod";
 
 import db from "~/utils/db.server";
 import { type FormError, validate } from "~/utils/validation.server";
-import { requireLoggedIn } from "~/utils/auth.server";
+import { refreshSessionData, requireLoggedIn } from "~/utils/auth.server";
+import { commitSession } from "~/utils/session.server";
 import setTwilioWebhooksQueue from "~/queues/set-twilio-webhooks.server";
 
 type SetPhoneNumberFailureActionData = { errors: FormError<typeof bodySchema>; submitted?: never };
@@ -39,9 +40,16 @@ const action: ActionFunction = async ({ request }) => {
 		phoneNumberId: validation.data.phoneNumberSid,
 		organizationId: organization.id,
 	});
-	console.log("queued");
+	const { session } = await refreshSessionData(request);
 
-	return json<SetPhoneNumberActionData>({ submitted: true });
+	return json<SetPhoneNumberActionData>(
+		{ submitted: true },
+		{
+			headers: {
+				"Set-Cookie": await commitSession(session),
+			},
+		},
+	);
 };
 
 export default action;

app/queues/insert-messages.server.ts

@@ -1,5 +1,5 @@
 import type { MessageInstance } from "twilio/lib/rest/api/v2010/account/message";
-import type { Message } from "@prisma/client";
+import { type Message, Direction } from "@prisma/client";
 
 import { Queue } from "~/utils/queue.server";
 import db from "~/utils/db.server";
@@ -22,20 +22,25 @@ export default Queue<Payload>("insert messages", async ({ data }) => {
 	}
 
 	const sms = messages
-		.map<Message>((message) => ({
+		.map<Message>((message) => {
-			id: message.sid,
+			const status = translateMessageStatus(message.status);
-			phoneNumberId: phoneNumber.id,
+			const direction = translateMessageDirection(message.direction);
-			content: message.body,
+			return {
-			from: message.from,
+				id: message.sid,
-			to: message.to,
+				phoneNumberId: phoneNumber.id,
-			status: translateMessageStatus(message.status),
+				content: message.body,
-			direction: translateMessageDirection(message.direction),
+				recipient: direction === Direction.Outbound ? message.to : message.from,
-			sentAt: new Date(message.dateCreated),
+				from: message.from,
-		}))
+				to: message.to,
+				status,
+				direction,
+				sentAt: new Date(message.dateCreated),
+			};
+		})
 		.sort((a, b) => a.sentAt.getTime() - b.sentAt.getTime());
 
 	const { count } = await db.message.createMany({ data: sms, skipDuplicates: true });
-	logger.info(`inserted ${count} new messages for phoneNumberId=${phoneNumberId}`)
+	logger.info(`inserted ${count} new messages for phoneNumberId=${phoneNumberId}`);
 
 	if (!phoneNumber.isFetchingMessages) {
 		return;

app/queues/insert-phone-calls.server.ts

@@ -1,5 +1,5 @@
 import type { CallInstance } from "twilio/lib/rest/api/v2010/account/call";
-import type { PhoneCall } from "@prisma/client";
+import { type PhoneCall, Direction } from "@prisma/client";
 
 import { Queue } from "~/utils/queue.server";
 import db from "~/utils/db.server";
@@ -22,16 +22,21 @@ export default Queue<Payload>("insert phone calls", async ({ data }) => {
 	}
 
 	const phoneCalls = calls
-		.map<PhoneCall>((call) => ({
+		.map<PhoneCall>((call) => {
-			phoneNumberId,
+			const direction = translateCallDirection(call.direction);
-			id: call.sid,
+			const status = translateCallStatus(call.status);
-			from: call.from,
+			return {
-			to: call.to,
+				phoneNumberId,
-			direction: translateCallDirection(call.direction),
+				id: call.sid,
-			status: translateCallStatus(call.status),
+				recipient: direction === Direction.Outbound ? call.to : call.from,
-			duration: call.duration,
+				from: call.from,
-			createdAt: new Date(call.dateCreated),
+				to: call.to,
-		}))
+				direction,
+				status,
+				duration: call.duration,
+				createdAt: new Date(call.dateCreated),
+			};
+		})
 		.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
 
 	const ddd = await db.phoneCall.createMany({ data: phoneCalls, skipDuplicates: true });

prisma/migrations/20220517184134_init/migration.sql

@@ -118,6 +118,7 @@ CREATE TABLE "Message" (
     "id" TEXT NOT NULL,
     "sentAt" TIMESTAMPTZ NOT NULL,
     "content" TEXT NOT NULL,
+    "recipient" TEXT NOT NULL,
     "from" TEXT NOT NULL,
     "to" TEXT NOT NULL,
     "direction" "Direction" NOT NULL,
@@ -131,6 +132,7 @@ CREATE TABLE "Message" (
 CREATE TABLE "PhoneCall" (
     "id" TEXT NOT NULL,
     "createdAt" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "recipient" TEXT NOT NULL,
     "from" TEXT NOT NULL,
     "to" TEXT NOT NULL,
     "status" "CallStatus" NOT NULL,
@@ -172,11 +174,17 @@ CREATE UNIQUE INDEX "Token_membershipId_key" ON "Token"("membershipId");
 -- CreateIndex
 CREATE UNIQUE INDEX "Token_hashedToken_type_key" ON "Token"("hashedToken", "type");
 
+-- CreateIndex
+CREATE INDEX "Message_phoneNumberId_recipient_idx" ON "Message"("phoneNumberId", "recipient");
+
+-- CreateIndex
+CREATE INDEX "PhoneCall_phoneNumberId_recipient_idx" ON "PhoneCall"("phoneNumberId", "recipient");
+
 -- CreateIndex
 CREATE UNIQUE INDEX "PhoneNumber_organizationId_isCurrent_key" ON "PhoneNumber"("organizationId", "isCurrent") WHERE ("isCurrent" = true);
 
 -- AddForeignKey
-ALTER TABLE "TwilioAccount" ADD CONSTRAINT "TwilioAccount_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "TwilioAccount" ADD CONSTRAINT "TwilioAccount_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 
 -- AddForeignKey

prisma/schema.prisma

@@ -17,7 +17,7 @@ model TwilioAccount {
   twimlAppSid         String?
 
   organizationId String       @unique
-  organization   Organization @relation(fields: [organizationId], references: [id])
+  organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 }
 
 model Organization {
@@ -105,17 +105,21 @@ model Message {
   id            String        @id
   sentAt        DateTime      @db.Timestamptz(6)
   content       String
+  recipient     String
   from          String
   to            String
   direction     Direction
   status        MessageStatus
   phoneNumberId String
   phoneNumber   PhoneNumber   @relation(fields: [phoneNumberId], references: [id], onDelete: Cascade)
+
+  @@index([phoneNumberId, recipient])
 }
 
 model PhoneCall {
   id            String      @id
   createdAt     DateTime    @default(now()) @db.Timestamptz(6)
+  recipient     String
   from          String
   to            String
   status        CallStatus
@@ -123,6 +127,8 @@ model PhoneCall {
   duration      String
   phoneNumberId String
   phoneNumber   PhoneNumber @relation(fields: [phoneNumberId], references: [id], onDelete: Cascade)
+
+  @@index([phoneNumberId, recipient])
 }
 
 model PhoneNumber {