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.

Sign up for GitHub

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

Jump to bottom

feat: global booking limits for teams #18

Closed
wants to merge 44 commits into from
Closed

feat: global booking limits for teams #18

wants to merge 44 commits into from

Conversation

lizard-boy
Copy link

What does this PR do?

Adds a new feature for global booking limits for teams. Team global booking limits determine how many time team members can be booked from team event types (collective, round-robin)

Screenshot 2024-09-17 at 6 14 02 PM

Also fixes an existing bug with booking limits when host and attendees were in different timezones. Slots didn't load correctly and when trying to confirm the booking it was throwing Could not book the meeting. Booking Limit for this event type has been reached

Also fixes issues with booking limits (duration and frequency) when event is rescheduled. It sometimes caused slots not to show up or for duration limits slots were correctly shown but it was throwing Could not reschedule the meeting. Duration Limit for this event type has been reached after confirming the bookings

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: Global booking limits for teams calcom/docs#139
  • I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

  • Go to settings/team/[id]/bookingLimits
  • Add some limits
  • book team event types (collective, round-robin, managed) and see if it works as expected

sean-brydon and others added 30 commits September 17, 2024 19:09
@sean-brydon
feat: update vitest version v0.34 to V2.11 (calcom#16676)
e7415fe 
* update version

* fix button to match new spec

* migrate tests to objectContaining

* fix tests

* update RTL

* yarn.lock update

* bump fetch mock to latest vitest version

* update deep mock to use vitest 2.0

* fix mock prisma type cast

* meet base test fn singature for V2

* remove console.log from next test
@keithwillcode
chore: v4.5.1 (calcom#16690)
a53e697
@CarinaWolli
fix: dates in ooo booking redirect email (calcom#16692)
5067f0d
@calcom-bot @replexicabot
feat: update translations (calcom#16693)
5ad7360 
Co-authored-by: Replexica <[email protected]>
@zomars
fix: new user detection for dub analytics (calcom#16695)
3a5325f
@ThyMinimalDev @SomayChauhan
chore: EventTypeWebWrapper base pr (calcom#16550)
2b43d9a 
* chore: EventTypeWebWrapper base pr

* fixup! chore: EventTypeWebWrapper base pr

* fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* wip

* fix: error

* Event type atom wrapper handles app dir

* fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* fixup! fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* remove console log

* review comments

* fixup! review comments

* fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

---------

Co-authored-by: Somay Chauhan <[email protected]>
@supalarry
refactor: v2 and atoms booking fields (calcom#16685)
5b5a42e 
* refactor: define inputs and outputs by separating default and custom fields

* refactor: event type api <-> internal transformers

* refactor: v2 use refactored libraries to transform input and output booking fields

* refactor: dont allow custom slugs with default reserved slugs

* refactor: input service store only specific default system fields

* refactor: atoms display only specific default system fields

* refactor: delete unused system field constants

* fix: tests

* fix: old event types

* fix: imports

* fix: import

* chore: release libraries and use v2 with them

* fix: unit tests

* refactor: push email in case of missing phone

* refactor: satisfies check for event-type locations
@anikdhabal
fix: fixed more flaky e2e tests (round 2) (calcom#16660)
021e5f3 
* fix: fixed more flaky e2e tests (round 2)

* update

* fix and update

* update
@sean-brydon
fix(eslint): Adds eslint-ignore-patterns to eslint config (calcom#16701)
1058c0e
@PeerRich
feat: Retell AI (calcom#16706)
a9ebb0d 
* added retell ai to app store

* added retell ai
@SomayChauhan @ThyMinimalDev
refactor: event setup tab web wrapper (calcom#16672)
abb4fd3 
* chore: EventTypeWebWrapper base pr

* fixup! chore: EventTypeWebWrapper base pr

* fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* wip

* fix: error

* Event type atom wrapper handles app dir

* fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* fixup! fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* remove console log

* refactor: event-type-atom (setup tab)

* review comments

* update: better naming

* fixup! review comments

* revert: defaultMenuIsOpen --will create a separate PR

---------

Co-authored-by: Morgan Vernay <[email protected]>
Co-authored-by: Morgan <[email protected]>
@zomars
feat: per user and team feature flags (calcom#16040)
a2b064b
@hbjORbj
chore: App router migration - (/bookings, /booking) Move `getServ…
019ef6d 
…erSideProps`/`getStaticProps` to `/lib` (calcom#16458)

* booking: Move getServerSideProps to /lib

* remove duplicate

* bookings: Move getStaticProps to /lib

* fix type check

* replace setHeader with a server action call in withEmbedSSR

* Add env variables for booking
@zomars
chore: removes unnecessary prisma env warnings (calcom#16708)
c016241 
* chore: removes unnecessary prisma env warnings

* Revert lockfile

Signed-off-by: zomars <[email protected]>

* Update yarn lock

Signed-off-by: zomars <[email protected]>

---------

Signed-off-by: zomars <[email protected]>
@supalarry @ThyMinimalDev
docs: v2 schedules and event-types swagger (calcom#16608)
44410c8 
* docs: schedules

* docs: wip event-types

* docs:event-types

* docs:event-types

* Delete yarn.lock

* Revert "Delete yarn.lock"

This reverts commit bb3eb23.

---------

Co-authored-by: Morgan <[email protected]>
@supalarry
fix: connect apple calendar atom nested <button>'s (calcom#16715)
63339d8
@hbjORbj
chore: App router - Fix errors in settings pages & add remaining pages (
3ae53a4 
calcom#16648)

* fix settings/admin/page

* remove references to pages for settings/teams

* remove double layouts

* move pages that do not need layout out of (settings) group

* fix

* fix

* fix

* fix

* add sso page and fix layouts
@hariombalhara
Narrow argument type to the specific event being listened to (calcom#…
6d133c2 
…16714)
@Udit-takkar
fix: type error on booking cancelled page (calcom#16716)
d828470
@hariombalhara
Release latest embed (calcom#16713)
bc203d7
@sean-brydon @PeerRich
add create license key to admin tab if IS_CALCOM (calcom#16721)
a60aa1b 
Co-authored-by: Peer Richelsen <[email protected]>
@hbjORbj @joeauyeung
chore: App Router - remove references to /pages for remaining pages…
f8dc7a1 
… in `/auth`, `/insights`, `/d`, `signup` and add missing default `/future` page (calcom#16589)

* remove references to /pages for sso, setup, signin pages in /auth

* remove references to pages for insights

* remove references to pages for d

* remove references to pages for signup

* add page for /future index page

* fix routing-forms

* fix

* add missing defaults

* use getServerSessionForAppDir instead

* fix apps/[slug]/[...pages]

* fix metadata in apps/slug/pages

* refactor

* refactor

* remove duplicate code for PageProps

* remove references to pages for /reschedule

* fix

* fix routing forms

* type fix

* fix routing forms again

* revert changes for app/slug/pages

* revert

* revert changes in yarn lock

---------

Co-authored-by: Joe Au-Yeung <[email protected]>
@calcom-bot @replexicabot
feat: update translations (calcom#16726)
e0922c5 
Co-authored-by: Replexica <[email protected]>
@alishaz-polymath
chore: add granular logging to the logger (calcom#16734)
c4a1382 
* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update turbo.json

* Update trpc-provider.tsx

* Update logger.ts

* update prisma index

* Update trpc.ts

* Update trpc-provider.tsx

* Update trpc.ts

* Update .env.example

* Update logger.ts
@supalarry
feat: onBeforeUpdate AvailabilitySettings prop (calcom#16737)
11f0d48
@alishaz-polymath
feat: Add EXPAND accepting "team" in API V1 Bookings (calcom#16736)
8cb5a70 
* add expand

* add expand to /[id]/_get

* add test

* fix test import

* --

* --

* fix test

* fix test

* revert unintentional commit
@CarinaWolli
fix: bookings ilmits errror (calcom#16739)
b84cdc0 
* use booker timezone

* add test

---------

Co-authored-by: CarinaWolli <[email protected]>
@emrysal
revert: be7d45a (calcom#16742)
97f213f
@ThyMinimalDev
chore: improve api-v2 rate limiting (calcom#16746)
74bed31
@joeauyeung
Default to connected Salesforce account as owner (calcom#16747)
62d579d
SDeVuyst and others added 9 commits September 21, 2024 02:12
@SDeVuyst
fix: more general translation for 'seats 'in NL (calcom#16722)
76a2773
@anikdhabal @zomars
chore: booking verification token and booking rejection logic from em…
1a60afa 
…ail (calcom#16324)

Co-authored-by: Omar López <[email protected]>
@zomars
fix: Flakyness on pages that use a hard refresh (calcom#16752)
6dd8812 
* fix: Flakyness on pages that use a hard refres

Signed-off-by: zomars <[email protected]>

* Update Shell.tsx

---------

Signed-off-by: zomars <[email protected]>
@vijayraghav-io @Amit91848
fix: update zoom integration doc to include user settings scope (calc…
16ca4dd 
…om#16724)

* update zoom integration doc to include user settings scope

* Update README.md

Co-authored-by: Amit Sharma <[email protected]>

* chore: split point 10

---------

Co-authored-by: Amit Sharma <[email protected]>
@alishaz-polymath
Update util.ts (calcom#16753)
2fb1408
@SomayChauhan @ThyMinimalDev
refactor: event limits web wrapper (calcom#16679)
bc34e67 
* chore: EventTypeWebWrapper base pr

* fixup! chore: EventTypeWebWrapper base pr

* fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* wip

* fix: error

* Event type atom wrapper handles app dir

* fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* fixup! fixup! Merge branch 'main' into morgan/cal-4183-eventtypeatom-web-wrapper-base

* remove console log

* review comments

* refactor: event limits tab for atoms

* fixup! review comments

---------

Co-authored-by: Morgan Vernay <[email protected]>
Co-authored-by: Morgan <[email protected]>
@askadityapandey @Amit91848
fix: Issue with zoom meetings getting "invalid Meeting ID" (calcom#16669
f642a6e 
)

* Update VideoApiAdapter.ts

* Update VideoApiAdapter.ts

---------

Co-authored-by: Amit Sharma <[email protected]>
@Ryukemeister @PeerRich
feat: billing tab for platform (calcom#16755)
3371602 
* modules for platform plans and billing pages

* add platform billing and plans related pages

* update platform navigation to include billing tab

* custom hook to upgrade team subscription

* refactors

* export cta row component

* fixup

* only pass in subscription id instead of whole subscription

* refactor :teamId/subscribe endpoint logic, add endpoint for upgrading stripe and shift all webhooks logic into services

* refactor team subscription logic, add logic for upgrading stripe and  webhooks logic from billing controller

---------

Co-authored-by: Peer Richelsen <[email protected]>
@supalarry @ThyMinimalDev
refactor: v2 bookings (calcom#16200)
0eabe7f 
* chore: version existing bookings as 2024-04-15

* feat: initialize bookings version 2024-08-13

* feat: Create and reschedule booking inputs logic

* feat: create booking

* refactor: create booking response

* feat: reschedule booking

* chore: update language input

* feat: recurring booking

* refactor: add booking status in response

* refactor: recurring bookings

* feat: get booking by uid

* wip: get event types

* feat: fetch by multiple status filters and sort

* feat: fetch by teamId, teamIds, eventTypeId, eventTypeIds

* wip: filter by attendee email

* feat: filter by attendee email

* feat: filter by attendee name

* feat: date range filter

* chore: format get bookings output

* chore: finish main merge

* feat: handle instant bookings

* refactor: separate reschedule endpoint

* feat: cancel endpoint

* feat: mark absent host or attendees

* chore: dont expose metadata for now

* chore: add hostId to response

* fix: metadata

* feat: bill bookings

* feat: cancellationReason

* feat: rescheduling reason

* handle already busy booking error

* test: create new booking

* fix: handleNewRecurringBooking ignoring noEmail

* test: recurring bookings

* test: get individual bookings

* fix: cancel email sent if arePlatformEmailsEnabled=false but platformClientId is undefined

* tests: cancel, reschedule, mark absent

* fix: generateIcsFile null pointer exception

* cancel test

* error msg improve

* tests: team event type creation and teamId, teamIds filters

* test: cancel recurring booking

* refactor: make hosts and attendees an array

* sort by asc start

* simplify

* refactor: absent

* fix: make work with api key

* test

* ts remove any

* feat: BookingUidGuard

* fix: recurring booking no email

* fix: legacy bookings recurring noEmail

* add swagger

* retrigger build

* fix: atom booker work with v2

* docs: exclude old controller from docs

* refactor: make eventTypeIds and teamIds getBookings query params comma separated string

* docs: swagger for get bookings query

* swagger docs

* swagger docs

* docs: document authorization header

* refactor: remove unused attendee variable

* refactor: remove unused check

* refactor: remove unused attendee variable

* refactor: spelling

* use published platform libraries

* fix: ci

* fix: ci

* fix: ci

* fix: ci

* cleanup script platform types

* fix: use libraries from npm

* chore: set test env vapid keys

* fix: event type tests

* fix: remove location from system fields

* fix legacy event types

* Revert "fix legacy event types"

This reverts commit e64b473.

* Revert "fix: remove location from system fields"

This reverts commit bee9a15.

* Revert "fix: event type tests"

This reverts commit fab1cb0.

* update libraries

* fix: increase node space for ci runner

* fix: increase node space for ci runner

* fix: increase node space for ci runner

* readd swagger

* ci

* ci

* refactor: increase idle worker memory jest e2e

* fixup! refactor: increase idle worker memory jest e2e

* fixup! fixup! refactor: increase idle worker memory jest e2e

* refactor: split bookings e2e into smaller e2e files

* fixup! refactor: split bookings e2e into smaller e2e files

* fixup! fixup! refactor: split bookings e2e into smaller e2e files

* fixup! fixup! fixup! refactor: split bookings e2e into smaller e2e files

* fixup! Merge branch 'main' into v2-refactor-bookings

* revert event types service

* fix: remove resetModule, maxWorker 2 jest e2e config

---------

Co-authored-by: Morgan Vernay <[email protected]>
Co-authored-by: Morgan <[email protected]>
@lizard-boy lizard-boy closed this Sep 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
❗️ .env changes ❗️ migrations
Projects
None yet
Milestone
No milestone