feat: orgs trigger alert when loading a calendar and no availability is found #14796

sean-brydon · 2024-04-29T12:53:59Z

What does this PR do?

Fixes CAL-3480
Fixes #14609

Loom: https://share.cleanshot.com/B5yBz18n

Type of change

New feature (non-breaking change which adds functionality)

How should this be tested?

Run migrations
Have upstash setup
Enable this setting for orgs
Visit a booking page with 0 availability 2 times
Check mails
Wait for expiry (in dev its 60 seconds)
try again
See email again

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

linear · 2024-04-29T12:54:02Z

CAL-3480 Trigger alert when loading a calendar and no availability is loaded at all

github-actions · 2024-04-29T12:54:12Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

vercel · 2024-04-29T12:55:12Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
ai	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	May 3, 2024 1:25pm
platform-starter-kit	❌ Failed (Inspect)			May 3, 2024 1:25pm

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		May 3, 2024 1:25pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		May 3, 2024 1:25pm

sean-brydon · 2024-04-29T12:55:51Z

packages/trpc/server/routers/viewer/organizations/update.handler.ts

+  if (input.hasOwnProperty("lockEventTypeCreation")) {
+    data.lockEventTypeCreationForUsers = input.lockEventTypeCreation;
+  }
+
+  if (input.hasOwnProperty("adminGetsNoSlotsNotification")) {
+    data.adminGetsNoSlotsNotification = input.adminGetsNoSlotsNotification;
  }


We have to construct data property so we only update what has changed - allows us to pass in only the orgSetting we want to update and not have the previous state of for data before

sean-brydon · 2024-04-29T12:57:49Z

packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts

+const NO_SLOTS_NOTIFICATION_FREQUENCY = IS_PRODUCTION ? 604_800 : 60;
+
+const NO_SLOTS_COUNT_FOR_NOTIFICATION = 2;


We will make these options configureable on a perOrg basis if required.

Will allign with customer to find out what they want initally

graphite-app · 2024-04-29T13:00:12Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (04/29/24)

1 reviewer was added to this PR based on Keith Williams's automation.

sean-brydon · 2024-04-29T13:00:58Z

packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts

+  // We may need to get more data and check the startDate occurrence of this
+  // Not trigger email if the start months are the same
+  const usersExistingNoSlots = await redis.lrange(usersUniqueKey, 0, NO_SLOTS_COUNT_FOR_NOTIFICATION - 1);
+  await redis.lpush(usersUniqueKey, constructDataHash(eventDetails));


lpush creates and pushes to key if no key is found

sean-brydon · 2024-04-29T13:01:48Z

packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts

+  if (!usersExistingNoSlots.length) {
+    await redis.expire(usersUniqueKey, NO_SLOTS_NOTIFICATION_FREQUENCY);
+  }


If this is the first push to the key - we push a expiry date (to the key not each item in the array)

github-actions · 2024-04-29T13:08:35Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

…er-alert-when-loading-a-calendar-and-no-availability-is' into sean/cal-3480-trigger-alert-when-loading-a-calendar-and-no-availability-is

packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts

hariombalhara

PR looks good to me.

What we need to see though is if the latency added to getSchedule due to this is significant or not.

hariombalhara · 2024-05-02T13:00:00Z

Awesome work @sean-brydon 🙏

…alendar-and-no-availability-is

joeauyeung

Giving another reapproval for @hariombalhara

Udit-takkar

LGTM.

keithwillcode · 2024-05-03T13:27:16Z

@sean-brydon Great PR. One suggestion for a follow-up.

Add a test at the util.ts level so we can verify that the logic on https://github.com/calcom/cal.com/pull/14796/files#diff-79280ba0694fc7e34a8239fa701618d6b9b2a91846913f41f0745018cc22ce6bR685 is correct and triggers the function call when desired.

sean-brydon · 2024-05-03T13:34:00Z

@sean-brydon Great PR. One suggestion for a follow-up.

Add a test at the util.ts level so we can verify that the logic on https://github.com/calcom/cal.com/pull/14796/files#diff-79280ba0694fc7e34a8239fa701618d6b9b2a91846913f41f0745018cc22ce6bR685 is correct and triggers the function call when desired.

Great idea - i cant find any tests currently for that file so we'd need to write them before implementing this

shirazdole · 2024-05-08T03:43:08Z

@sean-brydon what a banger, just to double check, if a user within an org is added to an event-type — individual or collective and they don't have a calendar connected, that triggers a notification email to all org owners or admins? Is that programmable in terms of can that be turned on or off? Is there a nice pane to see this within the app outside of the members view which has the long list of apps per user — kind of like a filterable table

sean-brydon added 7 commits April 26, 2024 11:47

Install upstash redis again - base of noficationSender

b6d7db1

Setup email handler etc and use tasker

4c59fbb

Remove logs

12c6bd1

Sending emails and correct format and spacing in emails

530eded

Update email styles

de49b0b

Update email styles

bcee32a

add switch to enable feature

ecfaf52

keithwillcode added the core area: core, team members only label Apr 29, 2024

fix: reset tasker types - will fix in new PR

c042818

vercel bot had a problem deploying to Preview – platform-starter-kit April 29, 2024 12:55 Failure

sean-brydon commented Apr 29, 2024

View reviewed changes

sean-brydon marked this pull request as ready for review April 29, 2024 12:56

graphite-app bot requested a review from a team April 29, 2024 12:56

dosubot bot added the emails area: emails, cancellation email, reschedule email, inbox, spam folder, not getting email label Apr 29, 2024

sean-brydon commented Apr 29, 2024

View reviewed changes

vercel bot deployed to Preview – api April 29, 2024 13:01 View deployment

sean-brydon commented Apr 29, 2024

View reviewed changes

vercel bot deployed to Preview – api May 2, 2024 09:46 View deployment

vercel bot had a problem deploying to Preview – dev May 2, 2024 10:00 Failure

sean-brydon added 2 commits May 2, 2024 11:08

Add try/catch

81475ca

Merge remote-tracking branch 'refs/remotes/origin/sean/cal-3480-trigg…

99ac1d4

…er-alert-when-loading-a-calendar-and-no-availability-is' into sean/cal-3480-trigger-alert-when-loading-a-calendar-and-no-availability-is

vercel bot deployed to Preview – api May 2, 2024 10:15 View deployment

vercel bot had a problem deploying to Preview – dev May 2, 2024 10:21 Failure

fix breaking when option === undefined

2098ac2

vercel bot deployed to Preview – api May 2, 2024 12:47 View deployment

hariombalhara reviewed May 2, 2024

View reviewed changes

packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts Outdated Show resolved Hide resolved

sean-brydon added 2 commits May 2, 2024 13:49

Add missing await to Promise.all

92f0571

Rename data stored in redis to save space

1e5e248

vercel bot deployed to Preview – api May 2, 2024 12:59 View deployment

hariombalhara reviewed May 2, 2024

View reviewed changes

Include thrown error in logs

c6f744a

vercel bot deployed to Preview – api May 2, 2024 13:16 View deployment

vercel bot had a problem deploying to Preview – dev May 2, 2024 13:22 Failure

Merge branch 'main' into sean/cal-3480-trigger-alert-when-loading-a-c…

c7263eb

…alendar-and-no-availability-is

joeauyeung approved these changes May 3, 2024

View reviewed changes

keithwillcode enabled auto-merge (squash) May 3, 2024 13:24

vercel bot deployed to Preview – ai May 3, 2024 13:25 View deployment

Udit-takkar approved these changes May 3, 2024

View reviewed changes

vercel bot deployed to Preview – api May 3, 2024 13:28 View deployment

vercel bot deployed to Preview – dev May 3, 2024 13:35 View deployment

keithwillcode merged commit c478f73 into main May 3, 2024
40 of 41 checks passed

keithwillcode deleted the sean/cal-3480-trigger-alert-when-loading-a-calendar-and-no-availability-is branch May 3, 2024 13:48

keithwillcode changed the title ~~feat: orgs trigger alert when loading a calendar and no availability is~~ feat: orgs trigger alert when loading a calendar and no availability is found May 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: orgs trigger alert when loading a calendar and no availability is found #14796

feat: orgs trigger alert when loading a calendar and no availability is found #14796

sean-brydon commented Apr 29, 2024 •

edited by keithwillcode

linear bot commented Apr 29, 2024

github-actions bot commented Apr 29, 2024 •

edited

vercel bot commented Apr 29, 2024 •

edited

sean-brydon Apr 29, 2024

sean-brydon Apr 29, 2024

graphite-app bot commented Apr 29, 2024

sean-brydon Apr 29, 2024

sean-brydon Apr 29, 2024

github-actions bot commented Apr 29, 2024 •

edited

hariombalhara left a comment

hariombalhara commented May 2, 2024

joeauyeung left a comment

Udit-takkar left a comment

keithwillcode commented May 3, 2024

sean-brydon commented May 3, 2024

shirazdole commented May 8, 2024

		const NO_SLOTS_NOTIFICATION_FREQUENCY = IS_PRODUCTION ? 604_800 : 60;

		const NO_SLOTS_COUNT_FOR_NOTIFICATION = 2;

feat: orgs trigger alert when loading a calendar and no availability is found #14796

feat: orgs trigger alert when loading a calendar and no availability is found #14796

Conversation

sean-brydon commented Apr 29, 2024 • edited by keithwillcode

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

linear bot commented Apr 29, 2024

github-actions bot commented Apr 29, 2024 • edited

vercel bot commented Apr 29, 2024 • edited

sean-brydon Apr 29, 2024

Choose a reason for hiding this comment

sean-brydon Apr 29, 2024

Choose a reason for hiding this comment

graphite-app bot commented Apr 29, 2024

Graphite Automations

sean-brydon Apr 29, 2024

Choose a reason for hiding this comment

sean-brydon Apr 29, 2024

Choose a reason for hiding this comment

github-actions bot commented Apr 29, 2024 • edited

📦 Next.js Bundle Analysis for @calcom/web

hariombalhara left a comment

Choose a reason for hiding this comment

hariombalhara commented May 2, 2024

joeauyeung left a comment

Choose a reason for hiding this comment

Udit-takkar left a comment

Choose a reason for hiding this comment

keithwillcode commented May 3, 2024

sean-brydon commented May 3, 2024

shirazdole commented May 8, 2024

sean-brydon commented Apr 29, 2024 •

edited by keithwillcode

github-actions bot commented Apr 29, 2024 •

edited

vercel bot commented Apr 29, 2024 •

edited

github-actions bot commented Apr 29, 2024 •

edited