Skip to content

Commit

Permalink
Hotfix: metadata parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
zomars committed Oct 17, 2022
1 parent 9842c18 commit 8fb5c1a
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions packages/trpc/server/routers/viewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { deleteStripeCustomer } from "@calcom/app-store/stripepayment/lib/custom
import { getCustomerAndCheckoutSession } from "@calcom/app-store/stripepayment/lib/getCustomerAndCheckoutSession";
import stripe, { closePayments } from "@calcom/app-store/stripepayment/lib/server";
import getApps, { getLocationOptions } from "@calcom/app-store/utils";
import { getEventTypeAppData } from "@calcom/app-store/utils";
import { cancelScheduledJobs } from "@calcom/app-store/zapier/lib/nodeScheduler";
import { getCalendarCredentials, getConnectedCalendars } from "@calcom/core/CalendarManager";
import { DailyLocationType } from "@calcom/core/location";
Expand Down Expand Up @@ -39,7 +38,7 @@ import {
updateWebUser as syncServicesUpdateWebUser,
} from "@calcom/lib/sync/SyncServiceManager";
import prisma, { baseEventTypeSelect, baseUserSelect, bookingMinimalSelect } from "@calcom/prisma";
import { userMetadata, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
import { EventTypeMetaDataSchema, userMetadata } from "@calcom/prisma/zod-utils";
import { resizeBase64Image } from "@calcom/web/server/lib/resizeBase64Image";

import { TRPCError } from "@trpc/server";
Expand Down Expand Up @@ -349,10 +348,13 @@ const loggedInViewerRouter = createProtectedRouter()
throw new TRPCError({ code: "INTERNAL_SERVER_ERROR" });
}

const userEventTypes = user.eventTypes.map((eventType) => ({
const mapEventType = (eventType: typeof user.eventTypes[number]) => ({
...eventType,
metadata: EventTypeMetaDataSchema.parse(eventType.metadata),
}));
// @FIXME: cc @hariombalhara This is failing with production data
// metadata: EventTypeMetaDataSchema.parse(eventType.metadata),
});

const userEventTypes = user.eventTypes.map(mapEventType);
// backwards compatibility, TMP:
const typesRaw = (
await prisma.eventType.findMany({
Expand All @@ -369,10 +371,7 @@ const loggedInViewerRouter = createProtectedRouter()
},
],
})
).map((eventType) => ({
...eventType,
metadata: EventTypeMetaDataSchema.parse(eventType.metadata),
}));
).map(mapEventType);

type EventTypeGroup = {
teamId?: number | null;
Expand Down Expand Up @@ -420,10 +419,7 @@ const loggedInViewerRouter = createProtectedRouter()
membershipCount: membership.team.members.length,
readOnly: membership.role === MembershipRole.MEMBER,
},
eventTypes: membership.team.eventTypes.map((eventType) => ({
...eventType,
metadata: EventTypeMetaDataSchema.parse(eventType.metadata),
})),
eventTypes: membership.team.eventTypes.map(mapEventType),
}))
);
return {
Expand Down

1 comment on commit 8fb5c1a

@vercel
Copy link

@vercel vercel bot commented on 8fb5c1a Oct 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

cal – ./

app.cal.com
cal-git-production-cal.vercel.app
app.calendso.com
cal-cal.vercel.app

Please sign in to comment.