public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf: Remove duplicate call for user event types (#10770) 

* perf: Remove duplicate call for user events

* Removed unneeded .map() call

* Remove yarn.lock change

* Renamed variable for clarity
pull/9473/head^2
Keith Williams 2023-08-15 16:46:24 +02:00 committed by GitHub
parent b0d1720d92
commit 06857a4a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
View File

@ -160,24 +160,6 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
});
const userEventTypes = user.eventTypes.map(mapEventType);
// backwards compatibility, TMP:
const typesRaw = (
await prisma.eventType.findMany({
where: {
userId: getPrismaWhereUserIdFromFilter(ctx.user.id, input?.filters),
team: null,
},
select: eventTypeSelect,
orderBy: [
{
position: "desc",
},
{
id: "asc",
},
],
})
).map(mapEventType);
type EventTypeGroup = {
teamId?: number | null;
@ -196,15 +178,9 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
let eventTypeGroups: EventTypeGroup[] = [];
const eventTypesHashMap = userEventTypes.concat(typesRaw).reduce((hashMap, newItem) => {
const oldItem = hashMap[newItem.id];
hashMap[newItem.id] = { ...oldItem, ...newItem };
return hashMap;
}, {} as Record<number, EventTypeGroup["eventTypes"][number]>);
const mergedEventTypes = Object.values(eventTypesHashMap)
.map((eventType) => eventType)
.filter((evType) => evType.schedulingType !== SchedulingType.MANAGED);
const unmanagedEventTypes = userEventTypes.filter(
(evType) => evType.schedulingType !== SchedulingType.MANAGED
);
const image = user?.username ? `${CAL_URL}/${user.username}/avatar.png` : undefined;
@ -216,7 +192,7 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
name: user.name,
image,
},
eventTypes: orderBy(mergedEventTypes, ["position", "id"], ["desc", "asc"]),
eventTypes: orderBy(unmanagedEventTypes, ["position", "id"], ["desc", "asc"]),
metadata: {
membershipCount: 1,
readOnly: false,