mokhtar/shellphone.app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow switching phone numbers but delete previous phone number

Browse Source
This commit is contained in:
m5r
2021-10-19 23:49:28 +02:00
parent 29d24f9fb4
commit fd003f461b
4 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/settings/mutations/set-phone-number.ts
View File

@ -1,4 +1,4 @@
import { resolver } from "blitz";
import { NotFoundError, resolver } from "blitz";
import { z } from "zod";
import twilio from "twilio";
import RestException from "twilio/lib/base/RestException";
@ -24,15 +24,35 @@ export default resolver.pipe(resolver.zod(Body), resolver.authorize(), async ({
organization.twilioAccountSid,
organization.twilioAuthToken,
).incomingPhoneNumbers.list();
const phoneNumber = phoneNumbers.find((phoneNumber) => phoneNumber.sid === phoneNumberSid)!;
const twilioPhoneNumber = phoneNumbers.find((phoneNumber) => phoneNumber.sid === phoneNumberSid);
if (!twilioPhoneNumber) {
throw new NotFoundError();
}
const organizationId = organization.id;
await db.phoneNumber.create({
data: {
organizationId,
id: phoneNumberSid,
number: phoneNumber.phoneNumber,
},
});
const orgCurrentlyActivePhoneNumber = await db.phoneNumber.findFirst({ where: { organizationId } });
if (orgCurrentlyActivePhoneNumber) {
// TODO: delete this and allow switching phone numbers easily
await db.phoneNumber.delete({
where: {
organizationId_id: {
organizationId,
id: orgCurrentlyActivePhoneNumber.id,
},
},
});
}
const phoneNumber = await db.phoneNumber.findFirst({ where: { id: phoneNumberSid } });
if (!phoneNumber) {
await db.phoneNumber.create({
data: {
organizationId,
id: phoneNumberSid,
number: twilioPhoneNumber.phoneNumber,
},
});
}
let newApiKey;
const mainTwilioClient = twilio(organization.twilioAccountSid, organization.twilioAuthToken);
@ -61,7 +81,7 @@ export default resolver.pipe(resolver.zod(Body), resolver.authorize(), async ({
}
const phoneNumberId = phoneNumberSid;
let promises = [
let promises: Promise<any>[] = [
setTwilioWebhooks.enqueue(
{ organizationId, phoneNumberId },
{ id: `set-twilio-webhooks-${organizationId}-${phoneNumberId}` },
@ -71,6 +91,14 @@ export default resolver.pipe(resolver.zod(Body), resolver.authorize(), async ({
const hasActiveSubscription = organization.subscriptions.length > 0;
if (hasActiveSubscription) {
promises.push(
db.processingPhoneNumber.create({
data: {
organizationId,
phoneNumberId,
hasFetchedMessages: false,
hasFetchedCalls: false,
},
}),
fetchMessagesQueue.enqueue(
{ organizationId, phoneNumberId },
{ id: `fetch-messages-${organizationId}-${phoneNumberId}` },

12
app/settings/mutations/set-twilio-api-fields.ts
View File

@ -26,17 +26,5 @@ export default resolver.pipe(
twilioAuthToken: twilioAuthToken,
},
});
const phoneNumber = await db.phoneNumber.findFirst({ where: { organizationId } });
if (phoneNumber) {
await db.phoneNumber.delete({
where: {
organizationId_id: {
organizationId,
id: phoneNumber.id,
},
},
});
}
},
);