* Partial push of new filters * Let's always return the passed host array when a filter doesn't need to be applied * fix: isFixed typing in same round robin host check * Add main bulk of rewritten logic for routed fairness support * Remove console.log * Add getAttributeWithEnabledWeights to AttributeRepository * Add OOO entry repository * Use getOrderedListOfLuckyUsers in lead threshold filtering * Shortfall already includes weight * test against minShortfall * first attempt to fix fallbacks * Added testcase updates * Partially fix filterHosts test * Some test updates * Removed email field from normalization * fix no available users found error * fix unit test * remove fallback from same host reschedule return * fixes and improvements for findQualifiedHosts * include fallback logic in handleNewBooking * use fallback in handleNewBooking * fix for contact owner in handleNewBooking * WIP - comment * pass routingFormResponseId * fix type error * pass routingFormResponse * fixes in treshold logic * remove reason * merge qualified and fallback availabilities * fix type error * add and fix tests * clean up test file * fix filterHostsBySameRoundRobinHost tests * fix findQualifiedHosts.test.ts * fix getRoutedUsers.test.ts * fix tests * fix isRerouting check * fix start time for two weeks check * fix fallback hosts * fix test * fallback hosts should also include qualified hosts * fix type error * fix typos * add contact owner to fallbacks * fix typo * fix qualifiedRRUsers * set fixed users when no hosts * add tets + code clean up * add test for reschedule with same host * fix typo * add more tests for findQualifiedHosts * remove skip from test * add comment * remove unused code * fix fallback users in loadAndValidateUsers * improve naming for fallback * rename missed fallback variable * fix reschedule with same rr host in handleNewBooking * fixes for fallback slots * add more tests + small fixes for contact owner * fix tests and type errors * add logs for fallback * add type:json to logger * Fix small merge issue * fix end time if two weeks are cut off * add more tests for contact owner availability check * add new logic for two weeks fallback * fix reschedule same RR host test --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
157 lines
4.8 KiB
TypeScript
157 lines
4.8 KiB
TypeScript
import type { Prisma } from "@prisma/client";
|
|
import type { IncomingMessage } from "http";
|
|
import type { Logger } from "tslog";
|
|
|
|
import { findQualifiedHosts } from "@calcom/lib/bookings/findQualifiedHosts";
|
|
import { HttpError } from "@calcom/lib/http-error";
|
|
import { getPiiFreeUser } from "@calcom/lib/piiFreeData";
|
|
import { safeStringify } from "@calcom/lib/safeStringify";
|
|
import type { RoutingFormResponse } from "@calcom/lib/server/getLuckyUser";
|
|
import { withSelectedCalendars } from "@calcom/lib/server/repository/user";
|
|
import { userSelect } from "@calcom/prisma";
|
|
import prisma from "@calcom/prisma";
|
|
import { SchedulingType } from "@calcom/prisma/enums";
|
|
import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
|
|
|
|
import { loadUsers } from "./loadUsers";
|
|
import type { NewBookingEventType } from "./types";
|
|
|
|
type Users = (Awaited<ReturnType<typeof loadUsers>>[number] & {
|
|
isFixed?: boolean;
|
|
metadata?: Prisma.JsonValue;
|
|
createdAt?: Date;
|
|
})[];
|
|
|
|
type EventType = Pick<
|
|
NewBookingEventType,
|
|
| "hosts"
|
|
| "users"
|
|
| "id"
|
|
| "userId"
|
|
| "schedulingType"
|
|
| "maxLeadThreshold"
|
|
| "team"
|
|
| "assignAllTeamMembers"
|
|
| "assignRRMembersUsingSegment"
|
|
| "rrSegmentQueryValue"
|
|
| "isRRWeightsEnabled"
|
|
| "rescheduleWithSameRoundRobinHost"
|
|
>;
|
|
|
|
type InputProps = {
|
|
req: IncomingMessage;
|
|
eventType: EventType;
|
|
eventTypeId: number;
|
|
dynamicUserList: string[];
|
|
logger: Logger<unknown>;
|
|
routedTeamMemberIds: number[] | null;
|
|
contactOwnerEmail: string | null;
|
|
rescheduleUid: string | null;
|
|
routingFormResponse: RoutingFormResponse | null;
|
|
};
|
|
|
|
export async function loadAndValidateUsers({
|
|
req,
|
|
eventType,
|
|
eventTypeId,
|
|
dynamicUserList,
|
|
logger,
|
|
routedTeamMemberIds,
|
|
contactOwnerEmail,
|
|
rescheduleUid,
|
|
routingFormResponse,
|
|
}: InputProps): Promise<{ qualifiedRRUsers: Users; additionalFallbackRRUsers: Users; fixedUsers: Users }> {
|
|
let users: Users = await loadUsers({
|
|
eventType,
|
|
dynamicUserList,
|
|
req,
|
|
routedTeamMemberIds,
|
|
contactOwnerEmail,
|
|
});
|
|
const isDynamicAllowed = !users.some((user) => !user.allowDynamicBooking);
|
|
if (!isDynamicAllowed && !eventTypeId) {
|
|
logger.warn({
|
|
message: "NewBooking: Some of the users in this group do not allow dynamic booking",
|
|
});
|
|
throw new HttpError({
|
|
message: "Some of the users in this group do not allow dynamic booking",
|
|
statusCode: 400,
|
|
});
|
|
}
|
|
|
|
// If this event was pre-relationship migration
|
|
// TODO: Establish whether this is dead code.
|
|
if (!users.length && eventType.userId) {
|
|
const eventTypeUser = await prisma.user.findUnique({
|
|
where: {
|
|
id: eventType.userId,
|
|
},
|
|
select: {
|
|
credentials: {
|
|
select: credentialForCalendarServiceSelect,
|
|
}, // Don't leak to client
|
|
...userSelect.select,
|
|
},
|
|
});
|
|
if (!eventTypeUser) {
|
|
logger.warn({ message: "NewBooking: eventTypeUser.notFound" });
|
|
throw new HttpError({ statusCode: 404, message: "eventTypeUser.notFound" });
|
|
}
|
|
users.push(withSelectedCalendars(eventTypeUser));
|
|
}
|
|
|
|
if (!users) throw new HttpError({ statusCode: 404, message: "eventTypeUser.notFound" });
|
|
// map fixed users
|
|
users = users.map((user) => ({
|
|
...user,
|
|
isFixed:
|
|
user.isFixed === false
|
|
? false
|
|
: user.isFixed || eventType.schedulingType !== SchedulingType.ROUND_ROBIN,
|
|
}));
|
|
const { qualifiedRRHosts, allFallbackRRHosts, fixedHosts } = await findQualifiedHosts({
|
|
eventType,
|
|
routedTeamMemberIds: routedTeamMemberIds || [],
|
|
rescheduleUid,
|
|
contactOwnerEmail,
|
|
routingFormResponse,
|
|
});
|
|
|
|
let qualifiedRRUsers: Users = [];
|
|
let allFallbackRRUsers: Users = [];
|
|
let fixedUsers: Users = [];
|
|
|
|
if (qualifiedRRHosts.length) {
|
|
// remove users that are not in the qualified hosts array
|
|
const qualifiedHostIds = new Set(qualifiedRRHosts.map((qualifiedHost) => qualifiedHost.user.id));
|
|
qualifiedRRUsers = users.filter((user) => qualifiedHostIds.has(user.id));
|
|
}
|
|
|
|
if (allFallbackRRHosts?.length) {
|
|
const fallbackHostIds = new Set(allFallbackRRHosts.map((fallbackHost) => fallbackHost.user.id));
|
|
allFallbackRRUsers = users.filter((user) => fallbackHostIds.has(user.id));
|
|
}
|
|
|
|
if (fixedHosts?.length) {
|
|
const fixedHostIds = new Set(fixedHosts.map((fixedHost) => fixedHost.user.id));
|
|
fixedUsers = users.filter((user) => fixedHostIds.has(user.id));
|
|
}
|
|
|
|
logger.debug(
|
|
"Concerned users",
|
|
safeStringify({
|
|
users: users.map(getPiiFreeUser),
|
|
})
|
|
);
|
|
|
|
const additionalFallbackRRUsers = allFallbackRRUsers.filter(
|
|
(fallbackUser) => !qualifiedRRUsers.find((qualifiedUser) => qualifiedUser.id === fallbackUser.id)
|
|
);
|
|
|
|
return {
|
|
qualifiedRRUsers,
|
|
additionalFallbackRRUsers, // without qualified
|
|
fixedUsers: !qualifiedRRUsers.length && !fixedUsers.length ? users : fixedUsers,
|
|
};
|
|
}
|