* Fix membership deletion handling and add tests * fixes * revert api-v2 specific changes * Add more tests * refactor: Move removeMember function into TeamService as private static methods - Moved removeMember and all related helper functions from separate file into TeamService class - Made all functions private static methods instead of exporting them - Deleted the original removeMember.ts file since it's no longer needed - Updated imports to use the new location - All integration tests pass successfully * refactor: Rename memberId to userId in TeamService methods - Renamed memberId parameter to userId in removeMember private method - Renamed memberIds parameter to userIds in removeMembers public method - Updated all calls to removeMembers to use userIds instead of memberIds - Parameter names now accurately reflect that they are user IDs, not membership IDs * test: add service unit tests and simplify e2e tests for membership deletion - Add unit tests for membership deletion services - Remove redundant deletion behavior tests from controllers - Keep only happy path tests in e2e controller tests - Fix unused imports and variables * package.json version * fix unit teswtes * No specs file * fix unit tests * fix: Add platform-libraries build step to E2E API v2 workflow The E2E API v2 tests were failing with TypeScript compilation errors because TeamService imports from @calcom/platform-libraries require the package to be built first to generate the dist/ folder with compiled exports. This adds the same build step that was added to unit-tests.yml to resolve the module resolution errors. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * Making tests clearer and easier to undestand * chore: bump platform libs * chore: bump platform libs --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: cal.com <morgan@cal.com>
125 lines
5.5 KiB
TypeScript
125 lines
5.5 KiB
TypeScript
import { getBookingForReschedule } from "@calcom/features/bookings/lib/get-booking";
|
|
import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";
|
|
import getBookingInfo from "@calcom/features/bookings/lib/getBookingInfo";
|
|
import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
|
|
import * as newBookingMethods from "@calcom/features/bookings/lib/handleNewBooking";
|
|
import { getClientSecretFromPayment } from "@calcom/features/ee/payments/pages/getClientSecretFromPayment";
|
|
import {
|
|
verifyPhoneNumber,
|
|
sendVerificationCode,
|
|
} from "@calcom/features/ee/workflows/lib/reminders/verifyPhoneNumber";
|
|
import { handleCreatePhoneCall } from "@calcom/features/handleCreatePhoneCall";
|
|
import handleMarkNoShow from "@calcom/features/handleMarkNoShow";
|
|
import * as instantMeetingMethods from "@calcom/features/instant-meeting/handleInstantMeeting";
|
|
import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings";
|
|
import { symmetricEncrypt, symmetricDecrypt } from "@calcom/lib/crypto";
|
|
import { getRoutedUrl } from "@calcom/lib/server/getRoutedUrl";
|
|
import { getTeamMemberEmailForResponseOrContactUsingUrlQuery } from "@calcom/lib/server/getTeamMemberEmailFromCrm";
|
|
import { getTranslation } from "@calcom/lib/server/i18n";
|
|
import type { Prisma } from "@calcom/prisma/client";
|
|
import { MembershipRole } from "@calcom/prisma/enums";
|
|
import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
|
|
import { paymentDataSelect } from "@calcom/prisma/selects/payment";
|
|
import { createNewUsersConnectToOrgIfExists } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";
|
|
|
|
export { slugify } from "@calcom/lib/slugify";
|
|
export { getBookingForReschedule };
|
|
|
|
export type { EventBusyDate } from "@calcom/types/Calendar";
|
|
|
|
export { SchedulingType, PeriodType } from "@calcom/prisma/enums";
|
|
|
|
export { getUsernameList } from "@calcom/lib/defaultEvents";
|
|
|
|
const handleNewBooking = newBookingMethods.default;
|
|
export { handleNewBooking };
|
|
const handleInstantMeeting = instantMeetingMethods.default;
|
|
export { handleInstantMeeting };
|
|
|
|
export { handleMarkNoShow };
|
|
export { handleCreatePhoneCall };
|
|
|
|
export { handleNewRecurringBooking } from "@calcom/features/bookings/lib/handleNewRecurringBooking";
|
|
|
|
export { getConnectedDestinationCalendarsAndEnsureDefaultsInDb } from "@calcom/lib/getConnectedDestinationCalendars";
|
|
|
|
export { getBusyCalendarTimes } from "@calcom/lib/CalendarManager";
|
|
|
|
export type { BookingCreateBody, BookingResponse } from "@calcom/features/bookings/types";
|
|
export { HttpError } from "@calcom/lib/http-error";
|
|
|
|
export { MINUTES_TO_BOOK } from "@calcom/lib/constants";
|
|
|
|
export { cityTimezonesHandler } from "@calcom/features/cityTimezones/cityTimezonesHandler";
|
|
export type { CityTimezones } from "@calcom/features/cityTimezones/cityTimezonesHandler";
|
|
|
|
export { TRPCError } from "@trpc/server";
|
|
export { createNewUsersConnectToOrgIfExists };
|
|
|
|
export { getAllUserBookings };
|
|
export { getBookingInfo };
|
|
export { handleCancelBooking };
|
|
|
|
export { userMetadata, bookingMetadataSchema, teamMetadataSchema } from "@calcom/prisma/zod-utils";
|
|
|
|
export { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits";
|
|
|
|
export { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
|
|
export { dynamicEvent } from "@calcom/lib/defaultEvents";
|
|
|
|
export { symmetricEncrypt, symmetricDecrypt };
|
|
|
|
export { getTranslation };
|
|
|
|
export { roundRobinReassignment } from "@calcom/features/ee/round-robin/roundRobinReassignment";
|
|
export { roundRobinManualReassignment } from "@calcom/features/ee/round-robin/roundRobinManualReassignment";
|
|
|
|
export { ErrorCode } from "@calcom/lib/errorCodes";
|
|
|
|
export { validateCustomEventName } from "@calcom/lib/event";
|
|
|
|
export type TeamQuery = Prisma.TeamGetPayload<{
|
|
select: {
|
|
id: true;
|
|
credentials: {
|
|
select: typeof import("@calcom/prisma/selects/credential").credentialForCalendarServiceSelect;
|
|
};
|
|
name: true;
|
|
logoUrl: true;
|
|
members: {
|
|
select: {
|
|
role: true;
|
|
};
|
|
};
|
|
};
|
|
}>;
|
|
|
|
export { credentialForCalendarServiceSelect };
|
|
export { MembershipRole };
|
|
|
|
export { paymentDataSelect };
|
|
export { getClientSecretFromPayment };
|
|
|
|
export { confirmHandler as confirmBookingHandler } from "@calcom/trpc/server/routers/viewer/bookings/confirm.handler";
|
|
export { groupMembershipAttributes } from "@calcom/trpc/server/routers/viewer/attributes/getByUserId.handler";
|
|
export type { GroupedAttribute } from "@calcom/trpc/server/routers/viewer/attributes/getByUserId.handler";
|
|
export { getBookingFieldsWithSystemFields };
|
|
|
|
export { getRoutedUrl };
|
|
|
|
export { getTeamMemberEmailForResponseOrContactUsingUrlQuery };
|
|
|
|
export { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
|
|
export { encryptServiceAccountKey } from "@calcom/lib/server/serviceAccountKey";
|
|
export { createHandler as createApiKeyHandler } from "@calcom/trpc/server/routers/viewer/apiKeys/create.handler";
|
|
export { getCalendarLinks } from "@calcom/lib/bookings/getCalendarLinks";
|
|
|
|
export { findTeamMembersMatchingAttributeLogic } from "@calcom/lib/raqb/findTeamMembersMatchingAttributeLogic";
|
|
export type { TFindTeamMembersMatchingAttributeLogicInputSchema } from "@calcom/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.schema";
|
|
export { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
|
|
|
|
export { verifyPhoneNumber, sendVerificationCode };
|
|
|
|
export { TeamService } from "@calcom/lib/server/service/teamService";
|
|
export { CacheService } from "@calcom/features/calendar-cache/lib/getShouldServeCache";
|