refactor: reserved slot and booking intercation #24670
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
keithwillcode
added
core
|
The latest updates on your projects. Learn more about Vercel for GitHub. |
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
There was a problem hiding this comment.
5 issues found across 29 files
Prompt for AI agents (all 5 issues)
Understand the root cause of the following 5 issues and fix them.
<file name="packages/features/bookings/lib/service/InstantBookingCreateService.ts">
<violation number="1" location="packages/features/bookings/lib/service/InstantBookingCreateService.ts:171">
Rule violated: **Avoid Logging Sensitive Information**
This debug log prints the entire bookingMeta object, which per CreateBookingMeta includes sensitive identifiers (e.g., userId, reservedSlotUid). Logging this data violates our “Avoid Logging Sensitive Information” policy. Please remove the console statement.</violation>
</file>
<file name="docs/api-reference/v2/openapi.json">
<violation number="1" location="docs/api-reference/v2/openapi.json:25457">
The reservedSlotUid description is truncated, ending without the object it refers to. Please complete the sentence so the API docs clearly describe how the value is used.</violation>
</file>
<file name="packages/features/bookings/lib/service/RecurringBookingService.ts">
<violation number="1" location="packages/features/bookings/lib/service/RecurringBookingService.ts:107">
Setting `reservedSlotUid` to `undefined` here drops the reserved slot on the first (non-round-robin) booking, so the reserved slot cookie is never honored for recurring bookings that aren’t round robin. Use the passed-in UID when `key === 0` so the initial booking respects the reservation.</violation>
</file>
<file name="apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts">
<violation number="1" location="apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts:128">
Adding reservedSlotUid to the body alone leaves bookingRequest.reservedSlotUid undefined, so bookings.service ignores the reservation. Please also assign reservedSlotUid on the request object before returning.</violation>
</file>
<file name="packages/features/bookings/lib/handleNewBooking/createBookingWithReservedSlot.ts">
<violation number="1" location="packages/features/bookings/lib/handleNewBooking/createBookingWithReservedSlot.ts:25">
`dayjs(...).utc().format()` drops fractional seconds, so the Date you build loses millisecond precision. When the selected slot was saved with non-zero milliseconds (ISO strings from `Date.toISOString()` include them), the equality filter in `deleteMany` won’t match and the reserved slot record survives, blocking new reservations. Please preserve the original precision (e.g. use `.valueOf()` / `.toDate()` instead of `.format()` on both start and end conversions).</violation>
</file>
React with 👍 or 👎 to teach cubic. Mention @cubic-dev-ai to give feedback, ask questions, or re-run the review.
| deps: IInstantBookingCreateServiceDependencies, | ||
| bookingMeta?: CreateBookingMeta | ||
| ) { | ||
| console.log("asap bookingMeta - will remove by Lauris", bookingMeta); |
There was a problem hiding this comment.
Rule violated: Avoid Logging Sensitive Information
This debug log prints the entire bookingMeta object, which per CreateBookingMeta includes sensitive identifiers (e.g., userId, reservedSlotUid). Logging this data violates our “Avoid Logging Sensitive Information” policy. Please remove the console statement.
Prompt for AI agents
Address the following comment on packages/features/bookings/lib/service/InstantBookingCreateService.ts at line 171:
<comment>This debug log prints the entire bookingMeta object, which per CreateBookingMeta includes sensitive identifiers (e.g., userId, reservedSlotUid). Logging this data violates our “Avoid Logging Sensitive Information” policy. Please remove the console statement.</comment>
<file context>
@@ -163,8 +165,10 @@ const triggerBrowserNotifications = async (args: {
+ deps: IInstantBookingCreateServiceDependencies,
+ bookingMeta?: CreateBookingMeta
) {
+ console.log("asap bookingMeta - will remove by Lauris", bookingMeta);
// TODO: In a followup PR, we aim to remove prisma dependency and instead inject the repositories as dependencies.
const { prismaClient: prisma } = deps;
</file context>
| }, | ||
| "reservedSlotUid": { | ||
| "type": "string", | ||
| "description": "Reserved slot uid for the booking. If passes will prevent double bookings by checking that someone else has not reserved ", |
There was a problem hiding this comment.
The reservedSlotUid description is truncated, ending without the object it refers to. Please complete the sentence so the API docs clearly describe how the value is used.
Prompt for AI agents
Address the following comment on docs/api-reference/v2/openapi.json at line 25457:
<comment>The reservedSlotUid description is truncated, ending without the object it refers to. Please complete the sentence so the API docs clearly describe how the value is used.</comment>
<file context>
@@ -25451,6 +25451,11 @@
+ },
+ "reservedSlotUid": {
+ "type": "string",
+ "description": "Reserved slot uid for the booking. If passes will prevent double bookings by checking that someone else has not reserved ",
+ "example": "430a2525-08e4-456d-a6b7-95ec2b0d22fb"
}
</file context>
| hostname: input.hostname || "", | ||
| forcedSlug: input.forcedSlug as string | undefined, | ||
| ...handleBookingMeta, | ||
| reservedSlotUid: undefined, |
There was a problem hiding this comment.
Setting reservedSlotUid to undefined here drops the reserved slot on the first (non-round-robin) booking, so the reserved slot cookie is never honored for recurring bookings that aren’t round robin. Use the passed-in UID when key === 0 so the initial booking respects the reservation.
Prompt for AI agents
Address the following comment on packages/features/bookings/lib/service/RecurringBookingService.ts at line 107:
<comment>Setting `reservedSlotUid` to `undefined` here drops the reserved slot on the first (non-round-robin) booking, so the reserved slot cookie is never honored for recurring bookings that aren’t round robin. Use the passed-in UID when `key === 0` so the initial booking respects the reservation.</comment>
<file context>
@@ -103,6 +104,7 @@ export const handleNewRecurringBooking = async (
hostname: input.hostname || "",
forcedSlug: input.forcedSlug as string | undefined,
...handleBookingMeta,
+ reservedSlotUid: undefined,
},
});
</file context>
Suggested change
| reservedSlotUid: undefined, | |
| reservedSlotUid: key === 0 ? input.reservedSlotUid : undefined, |
| ...bodyTransformed, | ||
| noEmail: !oAuthClientParams.arePlatformEmailsEnabled, | ||
| creationSource: CreationSource.API_V2, | ||
| reservedSlotUid, |
There was a problem hiding this comment.
Adding reservedSlotUid to the body alone leaves bookingRequest.reservedSlotUid undefined, so bookings.service ignores the reservation. Please also assign reservedSlotUid on the request object before returning.
Prompt for AI agents
Address the following comment on apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts at line 128:
<comment>Adding reservedSlotUid to the body alone leaves bookingRequest.reservedSlotUid undefined, so bookings.service ignores the reservation. Please also assign reservedSlotUid on the request object before returning.</comment>
<file context>
@@ -123,10 +125,16 @@ export class InputBookingsService_2024_08_13 {
...bodyTransformed,
noEmail: !oAuthClientParams.arePlatformEmailsEnabled,
creationSource: CreationSource.API_V2,
+ reservedSlotUid,
};
} else {
</file context>
|
|
||
| const slotUtcStartDate = | ||
| typeof reservedSlot.slotUtcStart === "string" | ||
| ? new Date(dayjs(reservedSlot.slotUtcStart).utc().format()) |
There was a problem hiding this comment.
dayjs(...).utc().format() drops fractional seconds, so the Date you build loses millisecond precision. When the selected slot was saved with non-zero milliseconds (ISO strings from Date.toISOString() include them), the equality filter in deleteMany won’t match and the reserved slot record survives, blocking new reservations. Please preserve the original precision (e.g. use .valueOf() / .toDate() instead of .format() on both start and end conversions).
Prompt for AI agents
Address the following comment on packages/features/bookings/lib/handleNewBooking/createBookingWithReservedSlot.ts at line 25:
<comment>`dayjs(...).utc().format()` drops fractional seconds, so the Date you build loses millisecond precision. When the selected slot was saved with non-zero milliseconds (ISO strings from `Date.toISOString()` include them), the equality filter in `deleteMany` won’t match and the reserved slot record survives, blocking new reservations. Please preserve the original precision (e.g. use `.valueOf()` / `.toDate()` instead of `.format()` on both start and end conversions).</comment>
<file context>
@@ -0,0 +1,43 @@
+
+ const slotUtcStartDate =
+ typeof reservedSlot.slotUtcStart === "string"
+ ? new Date(dayjs(reservedSlot.slotUtcStart).utc().format())
+ : reservedSlot.slotUtcStart;
+ const slotUtcEndDate =
</file context>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary by cubic
Centralized reserved-slot cookie handling and aligned booking flows to consistently use it across API and TRPC. Reservations, availability checks, and slot removal now reliably respect the client’s reserved slot.