Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ describe("getOrderedListOfLuckyUsers Integration tests", () => {
vi.setSystemTime("2024-11-14T00:00:13Z");
});

it("should sort as per availableUsers if no other criteria like weight/priority/calibration (TODO: make it independent of availableUsers order)", async () => {
it("should sort by user id if no other criteria like weight/priority/calibration", async () => {
const [host1, host2, host3] = await Promise.all([
createHostWithBookings({
user: { email: "test-user1@example.com" },
Expand Down Expand Up @@ -480,7 +480,9 @@ describe("getOrderedListOfLuckyUsers Integration tests", () => {
routingFormResponse: null,
});

expectLuckyUsers(luckyUsers, [user2, user1, user3]);
const expectedOrder = [user1, user2, user3].sort((a, b) => a.id - b.id)

expectLuckyUsers(luckyUsers, expectedOrder);

const { users: luckyUsers2 } = await luckyUserService.getOrderedListOfLuckyUsers({
availableUsers: [user3, user1, user2],
Expand All @@ -492,7 +494,7 @@ describe("getOrderedListOfLuckyUsers Integration tests", () => {
allRRHosts: [],
routingFormResponse: null,
});
expectLuckyUsers(luckyUsers2, [user3, user1, user2]);
expectLuckyUsers(luckyUsers2, expectedOrder);
});

describe("should sort as per weights", () => {
Expand Down
3 changes: 2 additions & 1 deletion packages/features/bookings/lib/getLuckyUser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ export class LuckyUserService implements ILuckyUserService {
availableUsers,
bookingsOfAvailableUsers,
organizersWithLastCreated,
eventType,
}: GetLuckyUserParams<T> & {
bookingsOfAvailableUsers: PartialBooking[];
organizersWithLastCreated: { id: number; bookings: { createdAt: Date }[] }[];
Expand Down Expand Up @@ -254,7 +255,7 @@ export class LuckyUserService implements ILuckyUserService {
const leastRecentlyBookedUser = availableUsers.sort((a, b) => {
if (userIdAndAtCreatedPair[a.id] > userIdAndAtCreatedPair[b.id]) return 1;
else if (userIdAndAtCreatedPair[a.id] < userIdAndAtCreatedPair[b.id]) return -1;
else return 0;
else return eventType.isRRWeightsEnabled ? 0 : a.id - b.id;
})[0];

return leastRecentlyBookedUser;
Expand Down
Loading