* chore: Upgrade prisma to 6.7.0 * Build fixes * type fixes Signed-off-by: Omar López <zomars@me.com> * Update schema.prisma * Patching * Revert "Update schema.prisma" This reverts commit 47d8618bf89ef4d007b30084df766f17281e21a1. * Revert "Patching" This reverts commit a1d2e3040e71690a44d4324db95d73b4d68c6adb. * Revert schema changes Signed-off-by: Omar López <zomars@me.com> * WIP Signed-off-by: Omar López <zomars@me.com> * Update getPublicEvent.ts * Update imports Signed-off-by: Omar López <zomars@me.com> * Update gitignore Signed-off-by: Omar López <zomars@me.com> * update remaining imports Signed-off-by: Omar López <zomars@me.com> * Delete .cursor/config.json * Discard changes to packages/features/eventtypes/lib/getPublicEvent.ts * Update _get.ts * Update user.ts * Update .gitignore * update * Update WorkflowStepContainer.tsx * Update next-auth-custom-adapter.ts * Update getPublicEvent.ts * Update workflow.ts * Update next-auth-custom-adapter.ts * Update next-auth-options.ts * Update bookingScenario.ts * fix missing imports * upgrades prismock Signed-off-by: Omar López <zomars@me.com> * patches prismock Signed-off-by: Omar López <zomars@me.com> * Update reschedule.test.ts * Update prisma.ts * patch prismock Signed-off-by: Omar López <zomars@me.com> * fix enums imports Signed-off-by: Omar López <zomars@me.com> * Revert "Update prisma.ts" This reverts commit 64edcf8db54171ff4456c209d563b5d431d99619. * Revert "patch prismock" This reverts commit e95819113dc9d88e7130947aa120cd42710977c8. * fix patch * Fix test that overrun the boundary, it shouldn't test too much * Move prisma import to changeSMSLockState * Bring back broken test without illegal imports * Merge with main and fix filter hosts by same round robin host * Fixed buildDryRunBooking fn tests * Fix and move ooo create or update handler test * Fix packages/features/eventtypes/lib/isCurrentlyAvailable.test.ts * Fix packages/trpc/server/routers/viewer/organizations/listMembers.handler.test.ts * Mock @calcom/prisma * Fix: verify-email.test.ts * fix: Moved WebhookService test and fixed default import mock * Fix: Added missing prisma mock, handleNewBooking uses that of course * We're not testing createContext here * fix: Prisma mock fix for listMembers.test.ts * More fixes to broken testcases * Forgot to remove borked test * Prevent the need to mock a lot of dependencies by moving out buildBaseWhereCondition to its own file * Temporarily skip getCalendarEvents, needs a rewrite * Fix: turns out you can access protected in testcases * fix further mocks * Added packages/features/insights/server/buildBaseWhereCondition.ts, types * Always great to have a mock and then not use it * And one less again. * fix: confirm.handler.test, didn't mock prisma * fix: Address minor nit by @eunjae & fix ImpersonationProvider test * Updated isPrismaAvailableCheck that doesn't crash on import * fix: Get Prisma directly from the client, it usually involves the Validator and does not need 'local' inclusion * Add zod-prisma-types without the generator enabled (commented out) * Uncomment and see what happens * Change method of import as imports did not work in Input Schemas * Remove custom 'zod' booking model, it does not belong with Prisma * Fix all other global Model imports * Rewrite most schema includes AND remove barrel file * Add bookingCreateBodySchema to features/bookings * Flurry of type fixes for compatibility with new zod gen * Refactor out the custom prisma type createEventTypeInput * Work around nullable eventTypeLocations * HandlePayment type fix * More fixes, final fix remaining is CompleteEventType * Should fix a bunch more booking related type errors * Missed one * Some props missing from BookingCreateBodySchema * Fix location type in handleChildrenEventTypes * Little bit hacky imo but it works * Final type error \o/ * Forgot to include Prisma * Do not include zod-utils in booker/types * Oops, was already including Booker/types * Fix membership type, also disallow updating createdAt/updatedAt, make part of patch/post * Fix api v1 type errors * Fix EventTypeDescription typings * Remove getParserWithGeneric, use userBodySchema with UserSchema * use centralized timeZoneSchema * Implement feedback by @zomars * Couple of WIP pushes * Fix tests * Type fixes in `handleChildrenEventTypes` test * Try and parse metadata before use * Change zod-prisma-types configuration for optimal performance * Fix prisma validator error in `prisma/selects/credential` * Disable seperate relations model, hits a bug * Import absolute - this makes rollup work in @platform/libraries * Attempt at removing resolutions override * Refactor using `Prisma.validator` to `satisfies` * Build atoms using @calcom/prisma/client * Build atoms using @calcom/prisma/client * fixes * Update eventTypeSelect.ts * Adjust `eventTypeMetaDataSchemaWithUntypedApps` from `unknown` to `record(any)` * `EventTypeDescription` rely on `descriptionAsSafeHTML` instead of `description` * Add `seatsPerTimeSlot` to event type public select * Fix typing in `users-public-view` getServerSide props * Add missing `schedulingType` to prop * chore: bump platform libraries * Function return type is illegal, not sure how this passed eslint (#21567) * Merged with main * Update updateTokenObject.ts * Update handleResponse.ts * Update index.ts * Update handleChildrenEventTypes.ts * Update booking-idempotency-key.ts * Update WebhookService.test.ts * Update events.test.ts * Update queued-response.test.ts * Update events.test.ts * Update getRoutedUrl.test.ts * fix: type checks Signed-off-by: Omar López <zomars@me.com> * fixes Signed-off-by: Omar López <zomars@me.com> * chore: bump platform libraries * Update yarn.lock * more fixes Signed-off-by: Omar López <zomars@me.com> * fixes Signed-off-by: Omar López <zomars@me.com> * biuld fixes * chore: bump platform libraries * Update conferencing.repository.ts * Update conferencing.repository.ts * Update getCalendarsEvents.test.ts * Update vite.config.js * chore: bump platform libraries * Update users.ts * Discard changes to docs/api-reference/v2/openapi.json * Update vite.config.ts * updated platform libraries * Update get.handler.test.ts * Update get.handler.test.ts * Update schema.prisma * Discard changes to docs/api-reference/v2/openapi.json * Update next-auth-custom-adapter.ts * Update team.ts * Flurry of type fixes * Fix majority of insight related type errors * Type fixes for unlink of account * Make user nullable again * Fixed a bunch of unit tests and one type error * Attempted mock fix * Attempted fix for Attribute type * Ensure default import becomes prisma, but not direct usage * Import default as prisma in prisma.module * Add attributeOption to attribute type * Fix calcom/prisma mock * Refactor Prisma client imports to @calcom/prisma/client Updated all imports from '@prisma/client' to '@calcom/prisma/client' across tests and repository files for consistency and to use the correct Prisma client package. This change improves maintainability and ensures the correct client is referenced throughout the codebase. * Undo removal of max-warnings=0 to get main to merge * Remove unit tests for e2e fixtures, provide new prisma mock * Mock @calcom/prisma in event manager * Mock @calcom/prisma in event manager * Add correct format even with --no-verify * Mock prisma in CalendarManager * Add mock for permission-check.service * Better injection in PrismaApiKeyRepository imports * More mock fixes :) * Fix listMembers.handler.test * Fix User import * Appropriately adjust all types to be imported as types, there were a lot of types imported as normal deps * Why was this a thing? * Strictly speaking; Not using prismock anymore * Ditched patch file for prismock * Fix output.service.ts platform type imports, need concrete for plainToClass * Better typing and tests for unlinkConnectedAccount.handler * Small type fix * Disable calendar cache tests as they are dependent on prismock * chore: bump platform lib * getRoutedUrl test remove of unused import * Extract select to external const on getEventTypesFromDB * Direct select of userSelect from selects/user * fix type error from merging 23653 * Fixed integration tests by removing hardcoded values that were possible due to mocking, but as its now directly hitting the db no longer * fix: vite config atoms prisma client type location * revert: example app prisma client * revert: example app prisma client * bump platform libs * fix: use class instead of type for DI of PlatformBookingsService * update platform libs * remove unused variable * chore: generate prisma client for api v2 * fix: api v2 e2e * fix: atoms e2e * fix: atoms e2e * fix: atoms e2e * fix: api v2 e2e * fix: tsconfig apiv2 enums * publish libraries * Simplify check for existence teamId --------- Signed-off-by: Omar López <zomars@me.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com>
165 lines
6.1 KiB
TypeScript
165 lines
6.1 KiB
TypeScript
import type { ConfigType } from "@calcom/dayjs";
|
|
import dayjs from "@calcom/dayjs";
|
|
import type { Availability } from "@calcom/prisma/client";
|
|
import type { Schedule, TimeRange, WorkingHours } from "@calcom/types/schedule";
|
|
|
|
import { nameOfDay } from "./weekday";
|
|
|
|
// sets the desired time in current date, needs to be current date for proper DST translation
|
|
export const defaultDayRange: TimeRange = {
|
|
start: new Date(new Date().setUTCHours(9, 0, 0, 0)),
|
|
end: new Date(new Date().setUTCHours(17, 0, 0, 0)),
|
|
};
|
|
|
|
export const DEFAULT_SCHEDULE: Schedule = [
|
|
[],
|
|
[defaultDayRange],
|
|
[defaultDayRange],
|
|
[defaultDayRange],
|
|
[defaultDayRange],
|
|
[defaultDayRange],
|
|
[],
|
|
];
|
|
|
|
export function getAvailabilityFromSchedule(schedule: Schedule): Availability[] {
|
|
return schedule.reduce((availability: Availability[], times: TimeRange[], day: number) => {
|
|
const addNewTime = (time: TimeRange) =>
|
|
({
|
|
days: [day],
|
|
startTime: time.start,
|
|
endTime: time.end,
|
|
} as Availability);
|
|
|
|
const filteredTimes = times.filter((time) => {
|
|
let idx;
|
|
if (
|
|
(idx = availability.findIndex(
|
|
(schedule) =>
|
|
schedule.startTime.toString() === time.start.toString() &&
|
|
schedule.endTime.toString() === time.end.toString()
|
|
)) !== -1
|
|
) {
|
|
availability[idx].days.push(day);
|
|
return false;
|
|
}
|
|
return true;
|
|
});
|
|
filteredTimes.forEach((time) => {
|
|
availability.push(addNewTime(time));
|
|
});
|
|
return availability;
|
|
}, [] as Availability[]);
|
|
}
|
|
|
|
export const MINUTES_IN_DAY = 60 * 24;
|
|
export const MINUTES_DAY_END = MINUTES_IN_DAY - 1;
|
|
export const MINUTES_DAY_START = 0;
|
|
|
|
/**
|
|
* Allows "casting" availability (days, startTime, endTime) given in UTC to a timeZone or utcOffset
|
|
*/
|
|
export function getWorkingHours(
|
|
relativeTimeUnit: {
|
|
timeZone?: string;
|
|
utcOffset?: number;
|
|
},
|
|
availability: { userId?: number | null; days: number[]; startTime: ConfigType; endTime: ConfigType }[]
|
|
) {
|
|
if (!availability.length) {
|
|
return [];
|
|
}
|
|
const utcOffset =
|
|
relativeTimeUnit.utcOffset ??
|
|
(relativeTimeUnit.timeZone ? dayjs().tz(relativeTimeUnit.timeZone).utcOffset() : 0);
|
|
|
|
const workingHours = availability.reduce((currentWorkingHours: WorkingHours[], schedule) => {
|
|
// Include only recurring weekly availability, not date overrides
|
|
if (!schedule.days.length) return currentWorkingHours;
|
|
// Get times localised to the given utcOffset/timeZone
|
|
const startTime =
|
|
dayjs.utc(schedule.startTime).get("hour") * 60 +
|
|
dayjs.utc(schedule.startTime).get("minute") -
|
|
utcOffset;
|
|
const endTime =
|
|
dayjs.utc(schedule.endTime).get("hour") * 60 + dayjs.utc(schedule.endTime).get("minute") - utcOffset;
|
|
// add to working hours, keeping startTime and endTimes between bounds (0-1439)
|
|
const sameDayStartTime = Math.max(MINUTES_DAY_START, Math.min(MINUTES_DAY_END, startTime));
|
|
const sameDayEndTime = Math.max(MINUTES_DAY_START, Math.min(MINUTES_DAY_END, endTime));
|
|
if (sameDayEndTime < sameDayStartTime) {
|
|
return currentWorkingHours;
|
|
}
|
|
if (sameDayStartTime !== sameDayEndTime) {
|
|
const newWorkingHours: WorkingHours = {
|
|
days: schedule.days,
|
|
startTime: sameDayStartTime,
|
|
endTime: sameDayEndTime,
|
|
};
|
|
if (schedule.userId) newWorkingHours.userId = schedule.userId;
|
|
currentWorkingHours.push(newWorkingHours);
|
|
}
|
|
// check for overflow to the previous day
|
|
// overflowing days constraint to 0-6 day range (Sunday-Saturday)
|
|
if (startTime < MINUTES_DAY_START || endTime < MINUTES_DAY_START) {
|
|
const newWorkingHours: WorkingHours = {
|
|
days: schedule.days.map((day) => (day - 1 >= 0 ? day - 1 : 6)),
|
|
startTime: startTime + MINUTES_IN_DAY,
|
|
endTime: Math.min(endTime + MINUTES_IN_DAY, MINUTES_DAY_END),
|
|
};
|
|
if (schedule.userId) newWorkingHours.userId = schedule.userId;
|
|
currentWorkingHours.push(newWorkingHours);
|
|
}
|
|
// else, check for overflow in the next day
|
|
else if (startTime > MINUTES_DAY_END || endTime > MINUTES_IN_DAY) {
|
|
const newWorkingHours: WorkingHours = {
|
|
days: schedule.days.map((day) => (day + 1) % 7),
|
|
startTime: Math.max(startTime - MINUTES_IN_DAY, MINUTES_DAY_START),
|
|
endTime: endTime - MINUTES_IN_DAY,
|
|
};
|
|
if (schedule.userId) newWorkingHours.userId = schedule.userId;
|
|
currentWorkingHours.push(newWorkingHours);
|
|
}
|
|
|
|
return currentWorkingHours;
|
|
}, []);
|
|
|
|
workingHours.sort((a, b) => a.startTime - b.startTime);
|
|
return workingHours;
|
|
}
|
|
|
|
export function availabilityAsString(
|
|
availability: Pick<Availability, "days" | "startTime" | "endTime">,
|
|
{ locale, hour12 }: { locale?: string; hour12?: boolean }
|
|
) {
|
|
const weekSpan = (availability: Pick<Availability, "days" | "startTime" | "endTime">) => {
|
|
const days = availability.days.slice(1).reduce(
|
|
(days, day) => {
|
|
if (days[days.length - 1].length === 1 && days[days.length - 1][0] === day - 1) {
|
|
// append if the range is not complete (but the next day needs adding)
|
|
days[days.length - 1].push(day);
|
|
} else if (days[days.length - 1][days[days.length - 1].length - 1] === day - 1) {
|
|
// range complete, overwrite if the last day directly precedes the current day
|
|
days[days.length - 1] = [days[days.length - 1][0], day];
|
|
} else {
|
|
// new range
|
|
days.push([day]);
|
|
}
|
|
return days;
|
|
},
|
|
[[availability.days[0]]] as number[][]
|
|
);
|
|
return days
|
|
.map((dayRange) => dayRange.map((day) => nameOfDay(locale, day, "short")).join(" - "))
|
|
.join(", ");
|
|
};
|
|
|
|
const timeSpan = (availability: Pick<Availability, "days" | "startTime" | "endTime">) => {
|
|
return `${new Intl.DateTimeFormat(locale, { hour: "numeric", minute: "numeric", hour12 }).format(
|
|
new Date(availability.startTime.toISOString().slice(0, -1))
|
|
)} - ${new Intl.DateTimeFormat(locale, { hour: "numeric", minute: "numeric", hour12 }).format(
|
|
new Date(availability.endTime.toISOString().slice(0, -1))
|
|
)}`;
|
|
};
|
|
|
|
return `${weekSpan(availability)}, ${timeSpan(availability)}`;
|
|
}
|