fix: Preview queue position and contact owner in preview (#17552)
* wip * Add preview mode in router * only fetch bookings of this month for weighted rr * test set up * only get bookings of current month * reverts test setup * first changes for weight adjustments * reset booking count + adjust calibration * depreciate weightAdjustment * get only bookings created this month * fix typo * make sure createdAt for hosts is correct * use earliest possibel date as fallback * add missing createdAt date to tests * fix typo * clean up changes in tests * fix typo * change end date to current date * fix: Fall back to empty host array when no hosts are found * fix: Restructure code a little * fixed test, incorrectly used now outdated var * perf: remove Dayjs from getLuckyUser * Refactor getHostsWithCalibration for optimised performance, intentionally break test as findMany is always an array * Better mock for host.findMany * Remove team-event-types.test.ts, move to appropriate package * TypeScript cannot auto-infer that an array is non-empty when assigning to a var * fix: Type Fixes and DistributionMethod enum add * Optimise tests * Added test to show that bookings made before a newHost was added affect the lucky user result * Throw error when the usersWithHighestPriority is empty, which should never happen * WIP * remove comment * update migrations * get attributes weights and virtual queue data * use attribute weights and use bookings of virtual queue only * clean up migrations * Add shortfall column and add tests * code clean up from feedback * wrapper function for getLuckyUser * code clean up * fetch routingFormResponse in handleNewBooking * fix type errors * fix type errors in tests * fix getAttributesQueryValue import for tests * fix totalWeight * add test for attributes weights and virtual queues * clean up code * add test for prepareQueuesAndAttributesData * remove console.log * use lazy import * Add more tests and more columns to matching members queue * fix issue from merge * always send usersAndTheirBookingShortfalls --------- Co-authored-by: CarinaWolli <[email protected]> Co-authored-by: Alex van Andel <[email protected]>
This commit is contained in:
28 files changed
+2109
-871
No files matched your search
@@ -775,9 +775,9 @@ const RerouteDialogContentAndFooterWithFormResponse = ({
|
||||
>([]);
|
||||
|
||||
const findTeamMembersMatchingAttributeLogicMutation =
|
||||
trpc.viewer.appRoutingForms.findTeamMembersMatchingAttributeLogic.useMutation({
|
||||
trpc.viewer.routingForms.findTeamMembersMatchingAttributeLogic.useMutation({
|
||||
onSuccess(data) {
|
||||
setTeamMembersMatchingAttributeLogic(data.result);
|
||||
setTeamMembersMatchingAttributeLogic(data.result ? data.result.users : data.result);
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -164,28 +164,6 @@ vi.mock("@calcom/trpc/react", () => ({
|
||||
isPending: false,
|
||||
})),
|
||||
},
|
||||
findTeamMembersMatchingAttributeLogic: {
|
||||
useMutation: vi.fn(({ onSuccess }) => {
|
||||
return {
|
||||
mutate: vi.fn(() => {
|
||||
onSuccess({
|
||||
result: [
|
||||
{
|
||||
id: 1,
|
||||
name: "Matching User 1",
|
||||
email: "[email protected]",
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: "Matching User 2",
|
||||
email: "[email protected]",
|
||||
},
|
||||
],
|
||||
});
|
||||
}),
|
||||
};
|
||||
}),
|
||||
},
|
||||
},
|
||||
eventTypes: {
|
||||
get: {
|
||||
@@ -204,11 +182,37 @@ vi.mock("@calcom/trpc/react", () => ({
|
||||
})),
|
||||
},
|
||||
},
|
||||
routingForms: {
|
||||
findTeamMembersMatchingAttributeLogic: {
|
||||
useMutation: vi.fn(({ onSuccess }) => {
|
||||
return {
|
||||
mutate: vi.fn(() => {
|
||||
onSuccess({
|
||||
result: {
|
||||
users: [
|
||||
{
|
||||
id: 1,
|
||||
name: "Matching User 1",
|
||||
email: "[email protected]",
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: "Matching User 2",
|
||||
email: "[email protected]",
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
}),
|
||||
};
|
||||
}),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}));
|
||||
|
||||
const mockMutateFn = vi.fn(({ __testOnSuccess }) => {
|
||||
const mockReactQueryMutateFn = vi.fn(({ __testOnSuccess }) => {
|
||||
__testOnSuccess({
|
||||
uid: "RESCHEDULED_BOOKING_UID_SAME_TIMESLOT",
|
||||
});
|
||||
@@ -218,7 +222,7 @@ vi.mock("@tanstack/react-query", () => ({
|
||||
useMutation: vi.fn(({ onSuccess }) => {
|
||||
return {
|
||||
mutate: vi.fn((payload) => {
|
||||
mockMutateFn({
|
||||
mockReactQueryMutateFn({
|
||||
...payload,
|
||||
__testOnSuccess: onSuccess,
|
||||
});
|
||||
@@ -441,7 +445,7 @@ describe("RerouteDialog", () => {
|
||||
);
|
||||
clickVerifyNewRouteButton();
|
||||
clickRescheduleWithSameTimeslotOfChosenEventButton();
|
||||
expect(mockMutateFn).toHaveBeenCalledWith(
|
||||
expect(mockReactQueryMutateFn).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
rescheduleUid: mockBooking.uid,
|
||||
// Shouldn't include the user who booked the booking
|
||||
|
||||
Reference in new issue
Block a user