mirror of
https://github.com/hanzoai/calendar.git
synced 2026-10-30 14:46:43 +00:00
* Move TeamBillingRepositories * WIP refactor team internal billing service * Remove duplicate billing repository files * Remove logic check in repository for billing is enabled * Rename repository to `TeamBillingData` * Use repository factory in main service * Fix new import paths * Rename to * Ensure `IS_TEAM_BILLING_ENABLED` is of type boolean * Rename classes to TeamBillingService and TeamBillingServiceFactory * Implement DI in `BookingServiceFactory` * `TeamBillingService` use repository in `getOrgIfNeeded` * DI `isTeamBillingEnabled` to `TeamBillingServiceFactory` * Rename files for consistency * Return stub BillingRepository if billing is not enabled * Move Stripe billing service to service folder * Rename file * `StripeBillingService.getSubscriptionStatus` return `SubscriptionStatus` * Type fices in StripeBillingService * Type fix in `stubTeamBillingService` * DI the `BillingProviderService` into the `TeamBillingService` * Implement DI in `skipTeamTrials.handler` * Implement DI for team billing in `inviteMember.handler` * `skipTeamTrials.handler` use `team.isOrganization` * Implement DI for billing in `hasActiveTeamPlan.handler` * Type fixes * Implement DI in `bulkDeleteUsers.handler` * Implement `BillingProviderServiceFactory` in `updateProfile.handler` * Implment `BillingProviderServiceFactory` in `buyCredits.handler` * Fix import in `stripeCustomer.handler` * Add a constructor to `teamBillingServiceFactory` * Add DI to `PrismaTeamBillingRepository` * Add DI to `StripeBillingService` * Implement singleton in `BillingProviderServiceFactory` * Add DI folder and contents to billing folder * Use `getTeamBillingServiceFactory` in `inviteMember.handler` * Add `saveTeamBilling` method to `ITeamBillingService` * Implement DI in new team route * Implement DI in `teamService` * Implement DI in `OrganizationPaymentService` * Implement DI in `credit-service` * In `StripeBillingService` remove `static` from status methods * Implemnt DI in `_invoice.paid.org` * Refactor `hasActiveTeamPlan` to use `getTeamBillingFactory` * Refactor `skipTeamTrials` to use `getTeamBillingFactory` * Refactor `skipTeamTrials` to use `getTeamBillingServiceFactory` * `stripeCustomer.handler` to use `getBillingProviderService` * Remove old factories * Type fix * Remove unused factory * Refactor `updateProfile.handler` to use `getBillingProviderService` * Change name to `TeamBillingDataRepositoryFactory` * Type Prisma return in `prisma.module` * Type fix * Refactor `buyCredits.handler` to use `getBillingProviderService` * Refactor `credit-service` to use billing DI containers * Type fix * Add `getTeamBillingDataRepository` * Refactor `_invoice.paid.org` to use DI container * Refactor `_customer.subscription.deleted.team-plan` to use DI container * Refactor `calcomHandler` to use DI container * Refactor `getCustomerAndCheckoutSession` to use DI container * Refactor `verify-email` to use DI containers * Refactor `api/create/route` to use DI container * Refactor downgradeUsers to use DI container * Type fix * Clean up console.logs * Add await to `this.billingRepository.create` in `saveTeamBilling` Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> * Fix type errors * Address comments * fix: update tests to work with new DI pattern - Update teamBillingService.test.ts to properly inject DI dependencies - Remove unused billingModule import and mock - Fix import naming in teamService.integration-test.ts (remove unused rename) - Fix import path for TeamBillingPublishResponseStatus All tests now properly mock IBillingProviderService, ITeamBillingDataRepository, and IBillingRepository instead of using the old BillingRepositoryFactory pattern. Co-Authored-By: [email protected] <[email protected]> * fix: add compatibility layer and env setup for unit tests - Add STRIPE_PRIVATE_KEY dummy value to vitest.config.ts to prevent DI module errors - Fix import paths in credit-service.test.ts (StripeBillingService, TeamBillingService) - Create compatibility barrel at packages/features/ee/billing/teams/index.ts for test mocking Co-Authored-By: [email protected] <[email protected]> * fix: update unit tests to mock DI container properly - Update teamService.test.ts to mock getTeamBillingServiceFactory() instead of TeamBilling.findAndInit - Update teamService.alternative.test.ts to mock DI container - Update credit-service.test.ts to mock getBillingProviderService() and use SubscriptionStatus enum values - Update OrganizationPaymentService.test.ts to mock DI container instead of direct StripeBillingService import - Remove all 'as any' type casting to comply with Cal.com coding standards - Fix unused variable warnings by prefixing with underscore All 53 tests now passing (16 + 1 + 30 + 6) Co-Authored-By: [email protected] <[email protected]> * fix: update remaining unit tests to use DI pattern - Fix StripeBillingService.test.ts to inject mock Stripe client directly - Fix teamBillingFactory.test.ts to mock getTeamBillingServiceFactory() from DI container - Fix skipTeamTrials.test.ts to mock DI container and use SubscriptionStatus enum All 11 previously failing tests now pass (5 + 5 + 1) Co-Authored-By: [email protected] <[email protected]> * Undo changes made to Prisma module * fix: address test-related PR comments - Fix OrganizationPaymentService.test.ts mock path from @calcom/ee to @calcom/features/ee - Refactor teamBillingFactory.test.ts to test real factory logic instead of mocking container - Remove duplicate teamBillingService.test..ts file with incorrect double-dot filename All three test files now pass successfully with proper DI patterns. Co-Authored-By: [email protected] <[email protected]> * Address feedback * fix: update teamService integration test to mock new DI factory pattern Co-Authored-By: [email protected] <[email protected]> * refactor: remove duplicate imports in credit-service.test.ts Co-Authored-By: [email protected] <[email protected]> * Remove unused index file * `getBySubscriptionId` to return team or null * Address feedback * Merge fix * Refactor file names * fix: correct mockStripe variable name to stripeMock in StripeBillingService.test.ts Co-Authored-By: [email protected] <[email protected]> * refactor: update internal-team-billing.test.ts to use new DI structure with TeamBillingService - Replace InternalTeamBilling with TeamBillingService - Use constructor injection with mock dependencies instead of factory pattern - Remove BillingRepositoryFactory mock and import - Update all test cases to use mockBillingProviderService, mockTeamBillingDataRepository, and mockBillingRepository - Simplify saveTeamBilling tests to focus on repository.create calls - All 11 tests now pass with the new DI structure Co-Authored-By: [email protected] <[email protected]> * fix: update createWithPaymentIntent.handler.test.ts to mock DI container's getBillingProviderService - OrganizationPaymentService now uses getBillingProviderService() from DI container - Test was mocking @calcom/features/ee/payments/server/stripe directly, which no longer works - Added mock for @calcom/features/ee/billing/di/containers/Billing module - Mock returns fake billing provider that delegates to mockSharedStripe - Preserves all existing test assertions and helpers - Fixed lint error by prefixing unused lastCreatedSessionId with underscore - All 11 tests now pass (1 skipped as expected) Co-Authored-By: [email protected] <[email protected]> --------- Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Syed Ali Shahbaz <[email protected]>
134 lines
4.0 KiB
TypeScript
134 lines
4.0 KiB
TypeScript
import { describe, expect, it, vi, beforeEach } from "vitest";
|
|
|
|
import { SubscriptionStatus } from "@calcom/ee/billing/repository/billing/IBillingRepository";
|
|
import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
|
|
import { prisma } from "@calcom/prisma";
|
|
|
|
import { skipTeamTrialsHandler } from "./skipTeamTrials.handler";
|
|
|
|
// Instead of completely mocking the handler, we'll use the real implementation
|
|
// and mock its dependencies
|
|
vi.mock("./skipTeamTrials.handler", async () => {
|
|
const actual = await vi.importActual<typeof import("./skipTeamTrials.handler")>("./skipTeamTrials.handler");
|
|
return {
|
|
...actual,
|
|
// We keep this for spying purposes
|
|
skipTeamTrialsHandler: vi.fn().mockImplementation(actual.skipTeamTrialsHandler),
|
|
};
|
|
});
|
|
|
|
// Mock dependencies
|
|
vi.mock("@calcom/lib/constants", () => ({
|
|
IS_SELF_HOSTED: false,
|
|
IS_PRODUCTION: false,
|
|
CALCOM_ENV: "test",
|
|
WEBAPP_URL: "http://localhost:3000",
|
|
IS_CALCOM: false,
|
|
HOSTED_CAL_FEATURES: true,
|
|
}));
|
|
|
|
vi.mock("@calcom/prisma", () => ({
|
|
prisma: {
|
|
user: {
|
|
update: vi.fn().mockResolvedValue({}),
|
|
},
|
|
},
|
|
}));
|
|
|
|
vi.mock("@calcom/lib/logger", () => ({
|
|
default: {
|
|
getSubLogger: () => ({
|
|
info: vi.fn(),
|
|
error: vi.fn(),
|
|
}),
|
|
},
|
|
}));
|
|
|
|
vi.mock("@calcom/features/membership/repositories/MembershipRepository", () => ({
|
|
MembershipRepository: {
|
|
findAllAcceptedTeamMemberships: vi.fn(),
|
|
},
|
|
}));
|
|
|
|
const mockGetSubscriptionStatus = vi.fn();
|
|
const mockEndTrial = vi.fn().mockResolvedValue(true);
|
|
const mockInit = vi.fn();
|
|
|
|
vi.mock("@calcom/ee/billing/di/containers/Billing", () => ({
|
|
getTeamBillingServiceFactory: vi.fn(() => ({
|
|
init: mockInit,
|
|
})),
|
|
}));
|
|
|
|
describe("skipTeamTrialsHandler", () => {
|
|
const mockCtx = {
|
|
user: {
|
|
id: 1,
|
|
email: "[email protected]",
|
|
},
|
|
};
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
mockInit.mockReturnValue({
|
|
getSubscriptionStatus: mockGetSubscriptionStatus,
|
|
endTrial: mockEndTrial,
|
|
});
|
|
});
|
|
|
|
it("should set user's trialEndsAt to null", async () => {
|
|
vi.mocked(MembershipRepository.findAllAcceptedTeamMemberships).mockResolvedValueOnce([]);
|
|
|
|
// @ts-expect-error - simplified context for testing
|
|
await skipTeamTrialsHandler({ ctx: mockCtx, input: {} });
|
|
|
|
expect(prisma.user.update).toHaveBeenCalledWith({
|
|
where: {
|
|
id: 1,
|
|
},
|
|
data: {
|
|
trialEndsAt: null,
|
|
},
|
|
});
|
|
});
|
|
|
|
it("should end trials for all teams where user is OWNER", async () => {
|
|
// Mock teams where user is owner
|
|
const mockTeams = [
|
|
{ id: 101, name: "Team 1", isOrganization: false, parentId: null, metadata: null },
|
|
{ id: 102, name: "Team 2", isOrganization: false, parentId: null, metadata: null },
|
|
];
|
|
|
|
vi.mocked(MembershipRepository.findAllAcceptedTeamMemberships).mockResolvedValueOnce(mockTeams);
|
|
|
|
mockGetSubscriptionStatus
|
|
.mockResolvedValueOnce(SubscriptionStatus.TRIALING) // First team is in trial
|
|
.mockResolvedValueOnce(SubscriptionStatus.ACTIVE); // Second team is active
|
|
|
|
// @ts-expect-error - simplified context for testing
|
|
await skipTeamTrialsHandler({ ctx: mockCtx, input: {} });
|
|
|
|
expect(prisma.user.update).toHaveBeenCalled();
|
|
|
|
expect(MembershipRepository.findAllAcceptedTeamMemberships).toHaveBeenCalledWith(mockCtx.user.id, {
|
|
role: "OWNER",
|
|
});
|
|
|
|
expect(mockInit).toHaveBeenCalledTimes(2);
|
|
expect(mockInit).toHaveBeenNthCalledWith(1, mockTeams[0]);
|
|
expect(mockInit).toHaveBeenNthCalledWith(2, mockTeams[1]);
|
|
|
|
expect(mockGetSubscriptionStatus).toHaveBeenCalledTimes(2);
|
|
expect(mockEndTrial).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("should handle errors gracefully", async () => {
|
|
vi.mocked(prisma.user.update).mockRejectedValueOnce(new Error("Database error"));
|
|
|
|
// @ts-expect-error - simplified context for testing
|
|
const result = await skipTeamTrialsHandler({ ctx: mockCtx, input: {} });
|
|
|
|
expect(result).toEqual({ success: false, error: "Failed to skip team trials" });
|
|
});
|
|
});
|