Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [CAL-3578] [CAL-2733] Zoho calendar issues #14905

Merged
merged 19 commits into from
Jun 6, 2024

Conversation

vachmara
Copy link
Contributor

@vachmara vachmara commented May 6, 2024

What does this PR do?

This PR addresses a bug identified in issue #12405 and builds upon the initial work done in PR #13739 by @Pritam-sd-dev.
fixes #12405
/claim #12405

The existing implementation using the free/busy endpoint was found insufficient for accurate availability checks. I've enhanced the getAvailability function to include an event check within the specified time range to ensure more reliable results.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How should this be tested?

The fix was manually tested by adding multiple events to my Zoho calendar and verifying whether these were correctly reflected in the calendar event schedule. Future updates should include automated tests to cover these scenarios.

Mandatory Tasks

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

Checklist

  • My code doesn't follow the style guidelines of this project
  • I haven't added tests that prove my fix is effective or that my feature works

Copy link

vercel bot commented May 6, 2024

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

A member of the Team first needs to authorize it.

@github-actions github-actions bot added app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar High priority Created by Linear-GitHub Sync 🐛 bug Something isn't working 💎 Bounty A bounty on Algora.io labels May 6, 2024
Copy link
Contributor

github-actions bot commented May 6, 2024

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

@graphite-app graphite-app bot requested a review from a team May 6, 2024 20:31
@graphite-app graphite-app bot added the community Created by Linear-GitHub Sync label May 6, 2024
Copy link

graphite-app bot commented May 6, 2024

Graphite Automations

"Add community label" took an action on this PR • (05/06/24)

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

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

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

Copy link
Contributor

github-actions bot commented May 6, 2024

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

PeerRich
PeerRich previously approved these changes May 6, 2024
Copy link
Contributor

@joeauyeung joeauyeung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking this up @vachmara. This is much needed. This still needs some work but we're on the right track.

@vachmara
Copy link
Contributor Author

vachmara commented May 7, 2024

@joeauyeung on it!

@vachmara vachmara requested a review from joeauyeung May 7, 2024 21:04
@keithwillcode keithwillcode added this to the v4.1 milestone May 8, 2024
Copy link
Contributor

@joeauyeung joeauyeung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested this with a VPN to EU servers and this works as expected. I think we should include private events when checking for availabilities and then we should be good to merge this.

As a follow up I think we have to do this for other Zoho apps right?

Co-authored-by: Joe Au-Yeung <[email protected]>
@vachmara
Copy link
Contributor Author

Tested this with a VPN to EU servers and this works as expected. I think we should include private events when checking for availabilities and then we should be good to merge this.

As a follow up I think we have to do this for other Zoho apps right?

The OAuth flow indeed needs to be implemented in the two other apps. However, the getAvailability function does not seem to be useful.

Would you like me to open separate PRs to integrate the OAuth flow into the two other apps, @joeauyeung?

@joeauyeung
Copy link
Contributor

Tested this with a VPN to EU servers and this works as expected. I think we should include private events when checking for availabilities and then we should be good to merge this.
As a follow up I think we have to do this for other Zoho apps right?

The OAuth flow indeed needs to be implemented in the two other apps. However, the getAvailability function does not seem to be useful.

Would you like me to open separate PRs to integrate the OAuth flow into the two other apps, @joeauyeung?

I'm working on a PR that removes unused methods from those apps so don't worry about that part. I would like to see a separate PR changing the OAuth flows of those apps as well. Thanks!

@dosubot dosubot bot modified the milestones: v4.1, v4.2 May 15, 2024
@keithwillcode keithwillcode modified the milestones: v4.1, v4.2 May 15, 2024
@github-actions github-actions bot added the Medium priority Created by Linear-GitHub Sync label May 21, 2024
Copy link
Contributor

github-actions bot commented Jun 5, 2024

This PR is being marked as stale due to inactivity.

@github-actions github-actions bot added the Stale label Jun 5, 2024
Copy link
Contributor

@joeauyeung joeauyeung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good to me. Thanks for again for the contribution @vachmara!

@github-actions github-actions bot removed the Stale label Jun 6, 2024
@keithwillcode keithwillcode added this pull request to the merge queue Jun 6, 2024
Merged via the queue into calcom:main with commit 75edc45 Jun 6, 2024
16 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar 🙋 Bounty claim 💎 Bounty A bounty on Algora.io 🐛 bug Something isn't working community Created by Linear-GitHub Sync High priority Created by Linear-GitHub Sync Medium priority Created by Linear-GitHub Sync
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-3578] [CAL-2733] Zoho calendar issues
5 participants