feat: add utcOffset in webhook payload #12709

jkcs · 2023-12-08T10:50:12Z

What does this PR do?

Fixes #12415
/claim #12415

Requirement/Documentation

If there is a requirement document, please, share it here.
If there is ab UI/UX design document, please, share it here.

Type of change

Bug fix (non-breaking change which fixes an issue)
Chore (refactoring code, technical debt, workflow improvements)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

Mandatory Tasks

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

vercel · 2023-12-08T10:50:18Z

@jkcs is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2023-12-08T10:50:24Z

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

github-actions · 2023-12-08T11:06:51Z

📦 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! 🙌

CarinaWolli

Thank you for contributing 🙏 Left you one comment, everything else looks good

CarinaWolli · 2023-12-15T18:00:40Z

packages/lib/date-fns/index.ts

+  if (!timeZone) return null;
+
+  if (timeZoneWithDST(timeZone)) {
+    return getUTCOffsetInDST(timeZone);


Wouldn't this now always return DST offset of this timezone, even when we are not in DST like now in December?

Wow, you reminded me so well. I was overthinking it. This is not necessary.

CarinaWolli · 2023-12-19T15:23:38Z

packages/lib/date-fns/index.ts

+export function getUTCOffsetByTimezone(timeZone: string) {
+  if (!timeZone) return null;
+
+  return dayjs().tz(timeZone).utcOffset();


But we still do need to take care of DST here.

This should work if we add another parameter to the function for the date:
dayjs(date).tz(timeZone).utcOffset()

jkcs · 2023-12-21T01:58:02Z

Hello, @Shpadoinkle . I suggest that you open a new issue. The changes in this pull request only include the modification mentioned in #12415 "Add the attendee UTC offset as a field, rather than the string of the timezone." As for the issue you mentioned, I think it's worth addressing as well.

Shpadoinkle · 2023-12-21T03:00:16Z

@jkcs ah ignore me all together, the timeZone string was already on the webhook

github-actions · 2024-01-05T00:16:55Z

This PR is being marked as stale due to inactivity.

CarinaWolli · 2024-01-09T18:16:15Z

packages/features/webhooks/lib/sendPayload.ts

+  data: Omit<WebhookDataType, "createdAt" | "triggerEvent">
+): WithUTCOffsetType<WebhookDataType> {
+  if (data.organizer?.timeZone) {
+    (data.organizer as Person & UTCOffset).utcOffset = getUTCOffsetByTimezone(data.organizer.timeZone);


we are missing the date parameter here (data.startTime), otherwise, we will always get the utc offset from the current date (important for DST)

CarinaWolli · 2024-01-09T18:16:17Z

packages/features/webhooks/lib/sendPayload.ts

+
+  if (data?.attendees?.length) {
+    (data.attendees as (Person & UTCOffset)[]).forEach((attendee) => {
+      attendee.utcOffset = getUTCOffsetByTimezone(attendee.timeZone);


CarinaWolli

Looks good now 👍 Thank you for your contribution 🙏

add utcOffset in webhook

7999a97

algora-pbc bot mentioned this pull request Dec 8, 2023

[CAL-2904] Request to add 2 Fields to Webhook Payloads #12415

Closed

algora-pbc bot added the 🙋 Bounty claim label Dec 8, 2023

github-actions bot added api area: API, enterprise API, access token, OAuth Medium priority Created by Linear-GitHub Sync webhooks area: webhooks, callback, webhook payload ✨ feature New feature or request 💎 Bounty A bounty on Algora.io labels Dec 8, 2023

Merge branch 'main' into feat/add_UTCOffset

c4300f6

jkcs changed the title ~~add utcOffset in webhook~~ feat: add utcOffset in webhook Dec 8, 2023

jkcs marked this pull request as draft December 8, 2023 11:00

jkcs and others added 5 commits December 10, 2023 16:29

add utcOffset in webhook

b9c8491

Merge branch 'main' into feat/add_UTCOffset

ba4e2a9

fix type

82d1178

fix type

e0d2efc

fix function error

b5e3f37

jkcs changed the title ~~feat: add utcOffset in webhook~~ feat: add utcOffset in webhook data Dec 10, 2023

jkcs changed the title ~~feat: add utcOffset in webhook data~~ feat: add utcOffset in webhook payload Dec 10, 2023

jkcs marked this pull request as ready for review December 10, 2023 10:01

CarinaWolli requested a review from a team December 12, 2023 21:01

CarinaWolli requested changes Dec 15, 2023

View reviewed changes

jkcs and others added 2 commits December 16, 2023 11:15

fix: UTCOffset DST

4676ff1

Merge branch 'main' into feat/add_UTCOffset

4ee6e40

CarinaWolli requested changes Dec 19, 2023

View reviewed changes

jkcs and others added 2 commits December 20, 2023 09:43

Merge branch 'main' into feat/add_UTCOffset

1c5f079

getUTCOffsetByTimezone support date param

783fc9d

github-actions bot added the Stale label Jan 5, 2024

CarinaWolli self-requested a review January 8, 2024 15:35

github-actions bot removed the Stale label Jan 9, 2024

CarinaWolli requested changes Jan 9, 2024

View reviewed changes

jkcs and others added 2 commits January 10, 2024 11:38

Merge branch 'main' into feat/add_UTCOffset

dcee551

add startTime in getUTCOffsetByTimezone func

bee0052

jkcs requested a review from CarinaWolli January 10, 2024 06:10

CarinaWolli approved these changes Jan 10, 2024

View reviewed changes

Merge branch 'main' into feat/add_UTCOffset

930b652

keithwillcode enabled auto-merge (squash) January 10, 2024 15:43

keithwillcode added this to the v3.7 milestone Jan 10, 2024

Merge branch 'main' into feat/add_UTCOffset

57c66d8

github-actions bot added the linear Sync Github Issue from community members to Linear.app label Jan 11, 2024

PeerRich added 2 commits January 11, 2024 12:45

Merge branch 'main' into feat/add_UTCOffset

6625c18

Merge branch 'main' into feat/add_UTCOffset

b3e42b0

keithwillcode merged commit 026f22f into calcom:main Jan 11, 2024
30 of 37 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add utcOffset in webhook payload #12709

feat: add utcOffset in webhook payload #12709

jkcs commented Dec 8, 2023 •

edited

vercel bot commented Dec 8, 2023

github-actions bot commented Dec 8, 2023 •

edited

github-actions bot commented Dec 8, 2023 •

edited

CarinaWolli left a comment

CarinaWolli Dec 15, 2023

jkcs Dec 16, 2023

CarinaWolli Dec 19, 2023

jkcs Dec 20, 2023

jkcs commented Dec 21, 2023

Shpadoinkle commented Dec 21, 2023 •

edited

github-actions bot commented Jan 5, 2024

CarinaWolli Jan 9, 2024

jkcs Jan 10, 2024

CarinaWolli Jan 9, 2024

jkcs Jan 10, 2024

CarinaWolli left a comment

feat: add utcOffset in webhook payload #12709

feat: add utcOffset in webhook payload #12709

Conversation

jkcs commented Dec 8, 2023 • edited

What does this PR do?

Requirement/Documentation

Type of change

Mandatory Tasks

vercel bot commented Dec 8, 2023

github-actions bot commented Dec 8, 2023 • edited

github-actions bot commented Dec 8, 2023 • edited

📦 Next.js Bundle Analysis for @calcom/web

CarinaWolli left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkcs commented Dec 21, 2023

Shpadoinkle commented Dec 21, 2023 • edited

github-actions bot commented Jan 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CarinaWolli left a comment

Choose a reason for hiding this comment

jkcs commented Dec 8, 2023 •

edited

github-actions bot commented Dec 8, 2023 •

edited

github-actions bot commented Dec 8, 2023 •

edited

Shpadoinkle commented Dec 21, 2023 •

edited