fix: add default schedule while creating org member #16855

vijayraghav-io · 2024-09-27T08:25:41Z

What does this PR do?

BeforeChanges :
https://www.loom.com/share/232fd6ddfdc8407f93d1a967fe6c191f?sid=c9da5ff0-1f45-4d2a-b8fc-e8053a557be1

AfterChanges :
https://www.loom.com/share/26e808cb4d6b4d8abd4288ed096bfd14?sid=514088a9-9244-442f-8265-cca21a23bf38

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have added a Docs issue here if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

vercel · 2024-09-27T08:25:46Z

@vijayraghav-io is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

graphite-app · 2024-09-27T08:30:10Z

Graphite Automations

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

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

"Add community label" took an action on this PR • (09/27/24)

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

"Add platform team as reviewer" took an action on this PR • (09/27/24)

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

Ryukemeister · 2024-09-28T19:25:07Z

packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts

@@ -307,6 +310,8 @@ export async function createNewUsersConnectToOrgIfExists({

        const isBecomingAnOrgMember = parentId || isOrg;

+        const availability = getAvailabilityFromSchedule(DEFAULT_SCHEDULE);


How about we rename this to defaultScheduleAvailability or defaultAvailability?

Ryukemeister · 2024-09-28T19:25:42Z

packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts

@@ -340,6 +345,21 @@ export async function createNewUsersConnectToOrgIfExists({
                accepted: autoAccept, // If the user is invited to a child team, they are automatically accepted
              },
            },
+            // Default schedule


I think its alright if you remove the comment

github-actions · 2024-10-14T00:22:05Z

This PR is being marked as stale due to inactivity.

github-actions · 2024-10-31T00:21:45Z

This PR is being marked as stale due to inactivity.

vijayraghav-io · 2024-11-01T12:10:45Z

Gentle reminder!

…53_addAutoAcceptedInvite

vijayraghav-io · 2024-11-09T15:36:14Z

added an e2e test

github-actions · 2024-11-11T06:44:54Z

E2E results are ready!

Workflow #38412.1 latest results

anikdhabal

LGTM!!

supalarry · 2024-12-19T09:10:23Z

@anikdhabal @vijayraghav-io the created schedules are missing timeZone. Anik, hasn't this caused any issues?

When createNewUsersConnectToOrgIfExists is invoked we are passing timeZone to it, so we should also use same time zone in the schedules create call for the default working schedules.

Furthermore, if timeZone is not passed for the User model it defaults to "Europe/London" but for Schedule model to nothing, so I think it makes sense to update prisma schema for Schedule to also have "Europe/London" timeZone as default.

anikdhabal · 2024-12-19T10:02:34Z

Hey @supalarry, I don't think it causes issues. We've done it in other places as well, e.g., in the userRepository. What issue are you anticipating? But yes, adding the timezone would make sense here. @vijayraghav-io, could you check it and do a follow-up?

vijayraghav-io · 2024-12-19T10:18:12Z

Hey @supalarry, I don't think it causes issues. We've done it in other places as well, e.g., in the userRepository. What issue are you anticipating? But yes, adding the timezone would make sense here. @vijayraghav-io, could you check it and do a follow-up?

@anikdhabal, sure will check this and do a follow-up.

vijayraghav-io · 2024-12-20T05:59:44Z

Hi @supalarry, @anikdhabal, i checked and verified this , even if timezone is not explicitly input, the schedule is created and availability shown as per default timezone - Europe/London.

Updated to create schedule as per input timezone, if timezone is input for createNewUsersConnectToOrgIfExists else timezone is saved with default value - Europe/London.

#18288

add default schedule while creating org user

3754733

graphite-app bot requested a review from a team September 27, 2024 08:25

graphite-app bot added the community Created by Linear-GitHub Sync label Sep 27, 2024

github-actions bot added organizations area: organizations, orgs teams area: teams, round robin, collective, managed event-types 🐛 bug Something isn't working labels Sep 27, 2024

dosubot bot added the platform Anything related to our platform plan label Sep 27, 2024

graphite-app bot requested a review from a team September 27, 2024 08:26

Ryukemeister reviewed Sep 28, 2024

View reviewed changes

naming as per review comments

6687000

github-actions bot added the Stale label Oct 14, 2024

CarinaWolli requested a review from Ryukemeister October 14, 2024 16:41

github-actions bot removed the Stale label Oct 15, 2024

hariombalhara added the Urgent Created by Linear-GitHub Sync label Oct 16, 2024

github-actions bot added the Stale label Oct 31, 2024

github-actions bot removed the Stale label Nov 2, 2024

keithwillcode added this to the v4.7 milestone Nov 3, 2024

Merge branch 'main' of https://github.com/calcom/cal.com into fix_168…

7990f0c

…53_addAutoAcceptedInvite

keithwillcode assigned keithwillcode and anikdhabal and unassigned keithwillcode Nov 6, 2024

vijayraghav-io added 2 commits November 7, 2024 20:45

Merge branch 'main' of https://github.com/calcom/cal.com into fix_168…

f04ec7e

…53_addAutoAcceptedInvite

added e2e test

8022fae

github-actions bot added the High priority Created by Linear-GitHub Sync label Nov 8, 2024

Merge branch 'main' of https://github.com/calcom/cal.com into fix_168…

31d3dd8

…53_addAutoAcceptedInvite

Merge branch 'main' into fix_16853_addAutoAcceptedInvite

ba402c3

anikdhabal added the ready-for-e2e label Nov 11, 2024

move bookTeamEvent and expectPageNotFound to testUtils

4f8a69e

keithwillcode removed the platform Anything related to our platform plan label Nov 11, 2024

keithwillcode modified the milestones: v4.7, v4.8 Nov 18, 2024

dosubot bot modified the milestone: v4.8 Nov 18, 2024

anikdhabal added 5 commits November 18, 2024 17:53

Merge branch 'main' into fix_16853_addAutoAcceptedInvite

39f68d2

Update EventTeamAssignmentTab.tsx

122ea4f

Update AddMembersWithSwitch.tsx

6779c6a

Update utils.ts

8ee780b

Merge branch 'main' into fix_16853_addAutoAcceptedInvite

6f3471e

anikdhabal enabled auto-merge (squash) November 18, 2024 13:06

anikdhabal added 2 commits November 18, 2024 19:07

update

8127ed1

revert

160ddf7

anikdhabal approved these changes Nov 18, 2024

View reviewed changes

anikdhabal merged commit 7b94822 into calcom:main Nov 18, 2024
32 of 36 checks passed

vijayraghav-io mentioned this pull request Dec 20, 2024

fix: accomodate input timezone while create user without on-boarding and default timezone #18288

Open

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: add default schedule while creating org member #16855

fix: add default schedule while creating org member #16855

vijayraghav-io commented Sep 27, 2024 •

edited

Loading

vercel bot commented Sep 27, 2024

graphite-app bot commented Sep 27, 2024

Ryukemeister Sep 28, 2024 •

edited

Loading

Ryukemeister Sep 28, 2024

github-actions bot commented Oct 14, 2024

github-actions bot commented Oct 31, 2024

vijayraghav-io commented Nov 1, 2024

vijayraghav-io commented Nov 9, 2024

github-actions bot commented Nov 11, 2024 •

edited

Loading

anikdhabal left a comment

supalarry commented Dec 19, 2024 •

edited

Loading

anikdhabal commented Dec 19, 2024

vijayraghav-io commented Dec 19, 2024

vijayraghav-io commented Dec 20, 2024

		@@ -307,6 +310,8 @@ export async function createNewUsersConnectToOrgIfExists({

		const isBecomingAnOrgMember = parentId \|\| isOrg;

		const availability = getAvailabilityFromSchedule(DEFAULT_SCHEDULE);

fix: add default schedule while creating org member #16855

fix: add default schedule while creating org member #16855

Conversation

vijayraghav-io commented Sep 27, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

vercel bot commented Sep 27, 2024

graphite-app bot commented Sep 27, 2024

Graphite Automations

Ryukemeister Sep 28, 2024 • edited Loading

Choose a reason for hiding this comment

Ryukemeister Sep 28, 2024

Choose a reason for hiding this comment

github-actions bot commented Oct 14, 2024

github-actions bot commented Oct 31, 2024

vijayraghav-io commented Nov 1, 2024

vijayraghav-io commented Nov 9, 2024

github-actions bot commented Nov 11, 2024 • edited Loading

E2E results are ready!

anikdhabal left a comment

Choose a reason for hiding this comment

supalarry commented Dec 19, 2024 • edited Loading

anikdhabal commented Dec 19, 2024

vijayraghav-io commented Dec 19, 2024

vijayraghav-io commented Dec 20, 2024

vijayraghav-io commented Sep 27, 2024 •

edited

Loading

Ryukemeister Sep 28, 2024 •

edited

Loading

github-actions bot commented Nov 11, 2024 •

edited

Loading

supalarry commented Dec 19, 2024 •

edited

Loading