public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean code

pr/2623
CarinaWolli 2022-04-26 00:28:14 +02:00
parent 69ae2dcb46
commit cd96e22990
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/web/pages/api/cancel.ts
View File

@ -149,24 +149,26 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
}, },
}); });
const subscribers = await getSubscribers({ const subscriberPromises = [
getSubscribers({
...subscriberOptions, ...subscriberOptions,
subscriptionType: SubscriptionType.WEBHOOK, subscriptionType: SubscriptionType.WEBHOOK,
}); }),
//const allSubscribersPromises = [getSubscribers(subscriberOptions)] ];
if (zapierAppInstalled) { if (zapierAppInstalled) {
const zapierSubscribers = await getSubscribers({ subscriberPromises.push(
getSubscribers({
...subscriberOptions, ...subscriberOptions,
subscriptionType: SubscriptionType.ZAPIER, subscriptionType: SubscriptionType.ZAPIER,
}); })
subscribers.push(...zapierSubscribers); );
//allSubscribersPromises.push(getZapierSubscribers(subscriberOptions));
} }
//await Promise.all(allSubscribersPromises) const allSubscribers = await Promise.all(subscriberPromises);
const promises = subscribers.map((sub) => const promises = allSubscribers.map((subArray) =>
subArray.map((sub) =>
sendPayload( sendPayload(
eventTrigger, eventTrigger,
new Date().toISOString(), new Date().toISOString(),
@ -177,7 +179,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
).catch((e) => { ).catch((e) => {
console.error(`Error executing webhook for event: ${eventTrigger}, URL: ${sub.subscriberUrl}`, e); console.error(`Error executing webhook for event: ${eventTrigger}, URL: ${sub.subscriberUrl}`, e);
}) })
)
); );
await Promise.all(promises); await Promise.all(promises);
// by cancelling first, and blocking whilst doing so; we can ensure a cancel // by cancelling first, and blocking whilst doing so; we can ensure a cancel