* 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>
298 lines
7.2 KiB
TypeScript
298 lines
7.2 KiB
TypeScript
import { describe, expect, it, vi, beforeEach } from "vitest";
|
|
|
|
import type { readonlyPrisma } from "@calcom/prisma";
|
|
|
|
import { buildBaseWhereCondition } from "./buildBaseWhereCondition";
|
|
|
|
const mockTeamFindMany = vi.fn();
|
|
const mockMembershipFindMany = vi.fn();
|
|
|
|
const mockInsightsDb = {
|
|
team: {
|
|
findMany: mockTeamFindMany,
|
|
},
|
|
membership: {
|
|
findMany: mockMembershipFindMany,
|
|
},
|
|
} as unknown as typeof readonlyPrisma;
|
|
|
|
const createMockContext = (overrides = {}) => ({
|
|
userIsOwnerAdminOfParentTeam: false,
|
|
userOrganizationId: null,
|
|
insightsDb: mockInsightsDb,
|
|
...overrides,
|
|
});
|
|
|
|
describe("buildBaseWhereCondition", () => {
|
|
beforeEach(() => {
|
|
vi.resetAllMocks();
|
|
});
|
|
|
|
describe("Basic filtering", () => {
|
|
it("should set eventTypeId condition when eventTypeId is provided", async () => {
|
|
const ctx = createMockContext();
|
|
const result = await buildBaseWhereCondition({
|
|
eventTypeId: 123,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
OR: [{ eventTypeId: 123 }, { eventParentId: 123 }],
|
|
});
|
|
});
|
|
|
|
it("should set userId condition when memberUserId is provided", async () => {
|
|
const ctx = createMockContext();
|
|
const result = await buildBaseWhereCondition({
|
|
memberUserId: 456,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
userId: 456,
|
|
});
|
|
});
|
|
|
|
it("should set userId and teamId conditions when userId is provided", async () => {
|
|
const ctx = createMockContext();
|
|
const result = await buildBaseWhereCondition({
|
|
userId: 789,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
userId: 789,
|
|
teamId: null,
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Organization-wide queries", () => {
|
|
it("should return appropriate where condition when no teams found in organization", async () => {
|
|
mockTeamFindMany.mockResolvedValue([]);
|
|
|
|
const ctx = createMockContext({
|
|
userIsOwnerAdminOfParentTeam: true,
|
|
userOrganizationId: 100,
|
|
});
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
isAll: true,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
OR: [
|
|
{
|
|
teamId: { in: [100] },
|
|
isTeamBooking: true,
|
|
},
|
|
],
|
|
});
|
|
});
|
|
|
|
it("should build complex where condition for organization-wide query", async () => {
|
|
mockTeamFindMany.mockResolvedValue([{ id: 101 }, { id: 102 }]);
|
|
mockMembershipFindMany.mockResolvedValue([{ userId: 201 }, { userId: 202 }]);
|
|
|
|
const ctx = createMockContext({
|
|
userIsOwnerAdminOfParentTeam: true,
|
|
userOrganizationId: 100,
|
|
});
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
isAll: true,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
OR: [
|
|
{
|
|
teamId: {
|
|
in: [100, 101, 102],
|
|
},
|
|
isTeamBooking: true,
|
|
},
|
|
{
|
|
userId: {
|
|
in: [201, 202],
|
|
},
|
|
isTeamBooking: false,
|
|
},
|
|
],
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Team-specific queries", () => {
|
|
it("should build where condition for team-specific query", async () => {
|
|
mockMembershipFindMany.mockResolvedValue([{ userId: 301 }, { userId: 302 }]);
|
|
|
|
const ctx = createMockContext();
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
teamId: 200,
|
|
isAll: false,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
OR: [
|
|
{
|
|
teamId: 200,
|
|
isTeamBooking: true,
|
|
},
|
|
{
|
|
userId: {
|
|
in: [301, 302],
|
|
},
|
|
isTeamBooking: false,
|
|
},
|
|
],
|
|
});
|
|
});
|
|
|
|
it("should apply both team and eventTypeId conditions when both are provided", async () => {
|
|
mockMembershipFindMany.mockResolvedValue([{ userId: 301 }, { userId: 302 }]);
|
|
|
|
const ctx = createMockContext();
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
teamId: 200,
|
|
eventTypeId: 500,
|
|
isAll: false,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
AND: [
|
|
{
|
|
OR: [{ eventTypeId: 500 }, { eventParentId: 500 }],
|
|
},
|
|
{
|
|
OR: [
|
|
{
|
|
teamId: 200,
|
|
isTeamBooking: true,
|
|
},
|
|
{
|
|
userId: {
|
|
in: [301, 302],
|
|
},
|
|
isTeamBooking: false,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Combined filtering", () => {
|
|
it("should combine eventTypeId and memberUserId conditions", async () => {
|
|
const ctx = createMockContext();
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
eventTypeId: 123,
|
|
memberUserId: 456,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
AND: [
|
|
{
|
|
OR: [{ eventTypeId: 123 }, { eventParentId: 123 }],
|
|
},
|
|
{
|
|
userId: 456,
|
|
},
|
|
],
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Invalid parameters", () => {
|
|
it("should handle missing parameters and return restrictive where condition", async () => {
|
|
const ctx = createMockContext();
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({ id: -1 });
|
|
});
|
|
|
|
it("should handle null teamId with restrictive where condition", async () => {
|
|
const ctx = createMockContext();
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
teamId: null,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({ id: -1 });
|
|
});
|
|
|
|
it("should handle empty team members with proper team condition", async () => {
|
|
mockMembershipFindMany.mockResolvedValue([]);
|
|
|
|
const ctx = createMockContext();
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
teamId: 200,
|
|
isAll: false,
|
|
ctx,
|
|
});
|
|
|
|
expect(result.whereCondition).toEqual({
|
|
OR: [
|
|
{
|
|
teamId: 200,
|
|
isTeamBooking: true,
|
|
},
|
|
{
|
|
userId: {
|
|
in: [],
|
|
},
|
|
isTeamBooking: false,
|
|
},
|
|
],
|
|
});
|
|
});
|
|
|
|
it("should handle rejected team membership differently from empty team", async () => {
|
|
mockMembershipFindMany.mockImplementation((params) => {
|
|
if (params?.where?.accepted === true) {
|
|
// No accepted members
|
|
return Promise.resolve([]);
|
|
}
|
|
return Promise.resolve([{ userId: 601 }, { userId: 602 }]);
|
|
});
|
|
|
|
const ctx = createMockContext();
|
|
|
|
const result = await buildBaseWhereCondition({
|
|
teamId: 200,
|
|
isAll: false,
|
|
ctx,
|
|
});
|
|
|
|
// Should only include team bookings since there are no accepted members
|
|
expect(result.whereCondition).toEqual({
|
|
OR: [
|
|
{
|
|
teamId: 200,
|
|
isTeamBooking: true,
|
|
},
|
|
{
|
|
userId: {
|
|
in: [], // Empty because no accepted members
|
|
},
|
|
isTeamBooking: false,
|
|
},
|
|
],
|
|
});
|
|
});
|
|
});
|
|
});
|