prepare multiple phone numbers in one account

app/auth/mutations/login.ts

@@ -10,11 +10,7 @@ export const authenticateUser = async (rawEmail: string, rawPassword: string) =>
 		where: { email },
 		include: {
 			memberships: {
-				include: {
+				include: { organization: true },
-					organization: {
-						include: { phoneNumbers: true },
-					},
-				},
 			},
 		},
 	});

app/messages/mutations/send-message.ts

@@ -32,7 +32,7 @@ export default resolver.pipe(resolver.zod(Body), resolver.authorize(), async ({
 		return;
 	}
 
-	const phoneNumber = organization.phoneNumbers[0];
+	const phoneNumber = organization.phoneNumbers[0]; // TODO: use the active number, not the first one
 	if (!phoneNumber) {
 		throw new NotFoundError();
 	}

app/messages/queries/get-conversations.ts

@@ -26,7 +26,7 @@ export default resolver.pipe(
 			throw new NotFoundError();
 		}
 
-		const phoneNumberId = organization.phoneNumbers[0].id;
+		const phoneNumberId = organization.phoneNumbers[0].id; // TODO: use the active number, not the first one
 		const processingState = await db.processingPhoneNumber.findFirst({ where: { organizationId, phoneNumberId } });
 		if (processingState && !processingState.hasFetchedMessages) {
 			return;

app/phone-calls/api/webhook/call.ts

@@ -30,6 +30,7 @@ export default async function incomingCallHandler(req: BlitzApiRequest, res: Bli
 		const recipient = req.body.To;
 		const organizationId = req.body.From.slice("client:".length).split("__")[0];
 		const phoneNumber = await db.phoneNumber.findFirst({
+			// TODO: use the active number, not the first one
 			where: { organizationId },
 			include: {
 				organization: {

app/phone-numbers/queries/get-current-phone-number.ts

@@ -11,6 +11,7 @@ export default resolver.pipe(
 	enforceSuperAdminIfNotCurrentOrganization,
 	async ({ organizationId }) => {
 		return db.phoneNumber.findFirst({
+			// TODO: use the active number, not the first one
 			where: { organizationId },
 			select: {
 				id: true,