Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 14 additions & 12 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions .yarn/plugins/@yarnpkg/plugin-version.cjs

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions .yarn/releases/yarn-3.4.1.cjs

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion apps/api/v1/lib/helpers/captureErrors.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import pino from 'pino'
import { captureException as SentryCaptureException } from "@sentry/nextjs";
import type { NextMiddleware } from "next-api-middleware";
const logger = pino()

export const captureErrors: NextMiddleware = async (_req, res, next) => {
try {
// Catch any errors that are thrown in remaining
// middleware and the API route handler
await next();
} catch (error) {
console.error(error);
logger.error(error);
SentryCaptureException(error);
res.status(500).json({ message: "Something went wrong" });
}
Expand Down
4 changes: 3 additions & 1 deletion apps/api/v1/lib/helpers/safeParseJSON.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import pino from 'pino'
const logger = pino()
export default function parseJSONSafely(str: string) {
try {
return JSON.parse(str);
} catch (e) {
console.error((e as Error).message);
logger.error((e as Error).message);
if ((e as Error).message.includes("Unexpected token")) {
return {
success: false,
Expand Down
6 changes: 4 additions & 2 deletions apps/api/v1/pages/api/slots/_get.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import pino from 'pino'
import prismock from "../../../../../../tests/libs/__mocks__/prisma";
const logger = pino()

import type { Request, Response } from "express";
import type { NextApiRequest, NextApiResponse } from "next";
Expand Down Expand Up @@ -60,7 +62,7 @@ describe("GET /api/slots", () => {
});
buildMockData();
await handler(req, res);
console.log({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
logger.info({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
const response = JSON.parse(res._getData());
expect(response.slots).toEqual(expect.objectContaining({}));
});
Expand All @@ -78,7 +80,7 @@ describe("GET /api/slots", () => {
});
buildMockData();
await handler(req, res);
console.log({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
logger.info({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
const response = JSON.parse(res._getData());
expect(response.slots).toEqual(expect.objectContaining({}));
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import pino from 'pino'
import type { Request, Response } from "express";
import type { NextApiRequest, NextApiResponse } from "next";
import { createMocks } from "node-mocks-http";
import { describe, it, expect, test, beforeAll, afterAll } from "vitest";
const logger = pino()

import { prisma } from "@calcom/prisma";
import type { User, Team, Prisma } from "@calcom/prisma/client";
Expand Down Expand Up @@ -181,13 +183,13 @@ describe("Booking ownership and access in Middleware", () => {
});

afterAll(async () => {
console.log("Cleaning up org", orgRef.id);
logger.info("Cleaning up org", orgRef.id);
await prisma.team.delete({
where: {
id: orgRef.id,
},
});
console.log("Cleaning up users", [
logger.info("Cleaning up users", [
adminUserRef.id,
ownerUserRef.id,
orgOwnerUserRef.id,
Expand All @@ -203,7 +205,7 @@ describe("Booking ownership and access in Middleware", () => {
});

test("should not throw error for bookings where user is an attendee", async () => {
console.log(createEventResult1.bookings[0].id);
logger.info(createEventResult1.bookings[0].id);
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
method: "GET",
query: {
Expand Down
4 changes: 3 additions & 1 deletion apps/api/v1/test/lib/bookings/_get.integration-test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import pino from 'pino'
import type { Request, Response } from "express";
import type { NextApiRequest, NextApiResponse } from "next";
import { createMocks } from "node-mocks-http";
import { describe, expect, it, beforeAll } from "vitest";
import { ZodError } from "zod";
const logger = pino()

import { prisma } from "@calcom/prisma";

Expand Down Expand Up @@ -399,7 +401,7 @@ describe("GET /api/bookings", async () => {
.filter(([_, count]) => count > 1)
.map(([id]) => id);

console.log(`Found duplicate booking IDs: ${duplicates.join(", ")}`);
logger.info(`Found duplicate booking IDs: ${duplicates.join(", ")}`);
}
});
});
Expand Down
8 changes: 5 additions & 3 deletions apps/api/v1/test/lib/bookings/_post.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import pino from 'pino'
const logger = pino()
// TODO: Fix tests (These test were never running due to the vitest workspace config)
import prismaMock from "../../../../../../tests/libs/__mocks__/prismaMock";

Expand Down Expand Up @@ -385,7 +387,7 @@ describe("POST /api/bookings", () => {
});

await handler(req, res);
console.log({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
logger.info({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });

expect(res._getStatusCode()).toBe(400);
expect(JSON.parse(res._getData())).toEqual(
Expand Down Expand Up @@ -453,7 +455,7 @@ describe("POST /api/bookings", () => {
});

await handler(req, res);
console.log({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
logger.info({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
createdBooking = JSON.parse(res._getData());
expect(prismaMock.booking.create).toHaveBeenCalledTimes(1);
});
Expand Down Expand Up @@ -530,7 +532,7 @@ describe("POST /api/bookings", () => {
});

await handler(req, res);
console.log({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
logger.info({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
const rescheduledBooking = JSON.parse(res._getData()) as Booking;
expect(prismaMock.booking.create).toHaveBeenCalledTimes(1);
expect(rescheduledBooking.fromReschedule).toEqual("original-booking-uid");
Expand Down
8 changes: 5 additions & 3 deletions apps/api/v2/scripts/docker-start.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import pino from 'pino'
import { execSync } from "child_process";
const logger = pino()

function checkCommandExists(command: string): boolean {
try {
Expand All @@ -18,18 +20,18 @@ try {
// Try docker compose first (new syntax)
try {
execSync("docker compose version", { stdio: "ignore" });
console.log("Starting containers with docker compose...");
logger.info("Starting containers with docker compose...");
execSync("docker compose up -d", { stdio: "inherit" });
} catch (e) {
// Fall back to docker-compose if the above fails
if (checkCommandExists("docker-compose")) {
console.log("Starting containers with docker-compose...");
logger.info("Starting containers with docker-compose...");
execSync("docker-compose up -d", { stdio: "inherit" });
} else {
throw new Error("Neither 'docker compose' nor 'docker-compose' command is available");
}
}
} catch (error) {
console.error(`Error: ${error instanceof Error ? error.message : "Unknown error occurred"}`);
logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error occurred"}`);
process.exit(1);
}
4 changes: 3 additions & 1 deletion apps/api/v2/src/ee/calendars/services/calendars.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import pino from 'pino'
import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
import { CalendarsCacheService } from "@/ee/calendars/services/calendars-cache.service";
import { AppsRepository } from "@/modules/apps/apps.repository";
import {
const logger = pino()
CredentialsRepository,
CredentialsWithUserEmail,
} from "@/modules/credentials/credentials.repository";
Expand Down Expand Up @@ -75,7 +77,7 @@ export class CalendarsService {
eventTypeId: null,
prisma: this.dbWrite.prisma as unknown as PrismaClient,
});
console.log("saving cache", JSON.stringify(result));
logger.info("saving cache", JSON.stringify(result));
await this.calendarsCacheService.setConnectedAndDestinationCalendarsCache(userId, result);

return result;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pino from 'pino'
import { bootstrap } from "@/app";
import { AppModule } from "@/app.module";
import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
Expand All @@ -21,6 +22,7 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.
import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
import { randomString } from "test/utils/randomString";
import { withApiAuth } from "test/utils/withApiAuth";
const logger = pino()



Expand Down Expand Up @@ -1609,23 +1611,23 @@ describe("Event types Endpoints", () => {
try {
await eventTypesRepositoryFixture.delete(eventType.id);
} catch (e) {
console.log(e);
logger.info(e);
}
try {
await userRepositoryFixture.delete(user.id);
} catch (e) {
console.log(e);
logger.info(e);
}
try {
await userRepositoryFixture.delete(falseTestUser.id);
} catch (e) {
console.log(e);
logger.info(e);
}

try {
await userRepositoryFixture.delete(orgUser.id);
} catch (e) {
console.log(e);
logger.info(e);
}
await app.close();
});
Expand Down Expand Up @@ -2588,12 +2590,12 @@ describe("Event types Endpoints", () => {
await eventTypesRepositoryFixture.delete(legacyEventTypeId1);
await eventTypesRepositoryFixture.delete(legacyEventTypeId2);
} catch (e) {
console.log(e);
logger.info(e);
}
try {
await userRepositoryFixture.delete(user.id);
} catch (e) {
console.log(e);
logger.info(e);
}
await app.close();
});
Expand Down Expand Up @@ -2783,12 +2785,12 @@ describe("Event types Endpoints", () => {
try {
await eventTypesRepositoryFixture.delete(legacyEventTypeId1);
} catch (e) {
console.log(e);
logger.info(e);
}
try {
await userRepositoryFixture.delete(user.id);
} catch (e) {
console.log(e);
logger.info(e);
}
await app.close();
});
Expand Down
6 changes: 4 additions & 2 deletions apps/api/v2/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import pino from 'pino'
import type { AppConfig } from "@/config/type";
import { Logger } from "@nestjs/common";
import { ConfigService } from "@nestjs/config";
import { NestFactory } from "@nestjs/core";
import type { NestExpressApplication } from "@nestjs/platform-express";
import "dotenv/config";
import { WinstonModule } from "nest-winston";
const logger = pino()

import { bootstrap } from "./app";
import { AppModule } from "./app.module";
import { loggerConfig } from "./lib/logger";
import { generateSwaggerForApp } from "./swagger/generate-swagger";

run().catch((error: Error) => {
console.error("Failed to start Cal Platform API", { error: error.stack });
logger.error("Failed to start Cal Platform API", { error: error.stack });
process.exit(1);
});

Expand All @@ -27,7 +29,7 @@ async function run() {
await app.listen(port);
logger.log(`Application started on port: ${port}`);
} catch (error) {
console.error(error);
logger.error(error);
logger.error("Application crashed", {
error,
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pino from 'pino'
import { bootstrap } from "@/app";
import { AppModule } from "@/app.module";
import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/event-types_2024_04_15/constants/constants";
Expand Down Expand Up @@ -25,6 +26,7 @@ import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.r
import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
import { randomString } from "test/utils/randomString";
const logger = pino()

import { SUCCESS_STATUS } from "@calcom/platform-constants";
import { slugify } from "@calcom/platform-libraries";
Expand Down Expand Up @@ -817,17 +819,17 @@ describe("OAuth Client Users Endpoints", () => {
try {
await userRepositoryFixture.delete(postResponseData.user.id);
} catch (e) {
console.log(e);
logger.info(e);
}
try {
await userRepositoryFixture.delete(postResponseData2.user.id);
} catch (e) {
console.log(e);
logger.info(e);
}
try {
await userRepositoryFixture.delete(platformAdmin.id);
} catch (e) {
console.log(e);
logger.info(e);
}
await app.close();
});
Expand Down Expand Up @@ -1036,7 +1038,7 @@ describe("OAuth Client Users Endpoints", () => {
try {
await userRepositoryFixture.delete(postResponseData.user.id);
} catch (e) {
console.log(e);
logger.info(e);
}
await app.close();
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pino from 'pino'
import { API_VERSIONS_VALUES } from "@/lib/api-versions";
import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
Expand All @@ -9,6 +10,7 @@ import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
import {
const logger = pino()
ConferencingAppsOauthUrlOutputDto,
GetConferencingAppsOauthUrlResponseDto,
} from "@/modules/conferencing/outputs/get-conferencing-apps-oauth-url";
Expand Down Expand Up @@ -256,7 +258,7 @@ export class OrganizationsConferencingController {
});
} catch (error) {
if (error instanceof Error) {
console.error(error.message);
logger.error(error.message);
}
return {
url: decodedCallbackState.onErrorReturnTo ?? "",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pino from 'pino'
import { API_VERSIONS_VALUES } from "@/lib/api-versions";
import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
Expand All @@ -10,6 +11,7 @@ import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
import { OrganizationsStripeService } from "@/modules/organizations/stripe/services/organizations-stripe.service";
import {
const logger = pino()
StripConnectOutputDto,
StripConnectOutputResponseDto,
StripCredentialsCheckOutputResponseDto,
Expand Down Expand Up @@ -149,7 +151,7 @@ export class OrganizationsStripeController {
);
} catch (error) {
if (error instanceof Error) {
console.error(error.message);
logger.error(error.message);
}
return {
url: decodedCallbackState.onErrorReturnTo ?? "",
Expand Down
Loading