* 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>
142 lines
4.0 KiB
TypeScript
142 lines
4.0 KiB
TypeScript
import logger from "@calcom/lib/logger";
|
|
import { findTeamMembersMatchingAttributeLogic } from "@calcom/lib/raqb/findTeamMembersMatchingAttributeLogic";
|
|
import type { AttributesQueryValue } from "@calcom/lib/raqb/types";
|
|
import { safeStringify } from "@calcom/lib/safeStringify";
|
|
import { SchedulingType } from "@calcom/prisma/enums";
|
|
|
|
const log = logger.getSubLogger({ prefix: ["[getRoutedUsers]"] });
|
|
|
|
export const getRoutedUsersWithContactOwnerAndFixedUsers = <
|
|
T extends { id: number; isFixed?: boolean; email: string }
|
|
>({
|
|
routedTeamMemberIds,
|
|
users,
|
|
contactOwnerEmail,
|
|
}: {
|
|
routedTeamMemberIds: number[] | null;
|
|
users: T[];
|
|
contactOwnerEmail: string | null;
|
|
}) => {
|
|
// We don't want to enter a scenario where we have no team members to be booked
|
|
// So, let's just fallback to regular flow if no routedTeamMemberIds are provided
|
|
if (!routedTeamMemberIds || !routedTeamMemberIds.length) {
|
|
return users;
|
|
}
|
|
|
|
log.debug(
|
|
"filtering users as per routedTeamMemberIds",
|
|
safeStringify({ routedTeamMemberIds, contactOwnerEmail })
|
|
);
|
|
return users.filter(
|
|
(user) => routedTeamMemberIds.includes(user.id) || user.isFixed || user.email === contactOwnerEmail
|
|
);
|
|
};
|
|
|
|
async function findMatchingTeamMembersIdsForEventRRSegment(eventType: EventType) {
|
|
if (!eventType) {
|
|
return null;
|
|
}
|
|
|
|
const isSegmentationDisabled = !eventType.assignAllTeamMembers || !eventType.assignRRMembersUsingSegment;
|
|
|
|
if (isSegmentationDisabled) {
|
|
return null;
|
|
}
|
|
|
|
if (!eventType.team || !eventType.team.parentId) {
|
|
return null;
|
|
}
|
|
|
|
const { teamMembersMatchingAttributeLogic } = await findTeamMembersMatchingAttributeLogic({
|
|
attributesQueryValue: eventType.rrSegmentQueryValue ?? null,
|
|
teamId: eventType.team.id,
|
|
orgId: eventType.team.parentId,
|
|
});
|
|
if (!teamMembersMatchingAttributeLogic) {
|
|
return teamMembersMatchingAttributeLogic;
|
|
}
|
|
return teamMembersMatchingAttributeLogic.map((member) => member.userId);
|
|
}
|
|
|
|
type BaseUser = {
|
|
id: number;
|
|
email: string;
|
|
};
|
|
|
|
type BaseHost<User extends BaseUser> = {
|
|
isFixed: boolean;
|
|
createdAt: Date;
|
|
priority?: number | null;
|
|
weight?: number | null;
|
|
weightAdjustment?: number | null;
|
|
user: User;
|
|
};
|
|
|
|
export type EventType = {
|
|
assignAllTeamMembers: boolean;
|
|
assignRRMembersUsingSegment: boolean;
|
|
rrSegmentQueryValue: AttributesQueryValue | null | undefined;
|
|
team: { id: number; parentId: number | null } | null;
|
|
};
|
|
|
|
export function getNormalizedHosts<User extends BaseUser, Host extends BaseHost<User>>({
|
|
eventType,
|
|
}: {
|
|
eventType: {
|
|
schedulingType: SchedulingType | null;
|
|
hosts?: Host[];
|
|
users: User[];
|
|
};
|
|
}) {
|
|
if (eventType.hosts?.length && eventType.schedulingType) {
|
|
return {
|
|
hosts: eventType.hosts.map((host) => ({
|
|
isFixed: host.isFixed,
|
|
user: host.user,
|
|
priority: host.priority,
|
|
weight: host.weight,
|
|
createdAt: host.createdAt,
|
|
})),
|
|
fallbackHosts: null,
|
|
};
|
|
} else {
|
|
return {
|
|
hosts: null,
|
|
fallbackHosts: eventType.users.map((user) => {
|
|
return {
|
|
isFixed: !eventType.schedulingType || eventType.schedulingType === SchedulingType.COLLECTIVE,
|
|
email: user.email,
|
|
user: user,
|
|
createdAt: null,
|
|
};
|
|
}),
|
|
};
|
|
}
|
|
}
|
|
|
|
// We don't allow fixed hosts when segment matching is enabled
|
|
// If this ever changes, we need to update this function and return fixed hosts
|
|
export async function findMatchingHostsWithEventSegment<User extends BaseUser>({
|
|
eventType,
|
|
hosts,
|
|
}: {
|
|
eventType: EventType;
|
|
hosts: {
|
|
isFixed: boolean;
|
|
user: User;
|
|
priority?: number | null;
|
|
weight?: number | null;
|
|
createdAt: Date | null;
|
|
}[];
|
|
}) {
|
|
const matchingRRTeamMembers = await findMatchingTeamMembersIdsForEventRRSegment({
|
|
...eventType,
|
|
rrSegmentQueryValue: eventType.rrSegmentQueryValue ?? null,
|
|
});
|
|
const segmentedRoundRobinHosts = hosts.filter((host) => {
|
|
if (!matchingRRTeamMembers) return true;
|
|
return matchingRRTeamMembers.includes(host.user.id);
|
|
});
|
|
return segmentedRoundRobinHosts;
|
|
}
|