diff --git a/app/features/sendouq/loaders/q.ready.server.ts b/app/features/sendouq/loaders/q.ready.server.ts index 5b96c9b90..270516005 100644 --- a/app/features/sendouq/loaders/q.ready.server.ts +++ b/app/features/sendouq/loaders/q.ready.server.ts @@ -1,6 +1,7 @@ import { redirect } from "react-router"; import { requireUser } from "~/features/auth/core/user.server"; import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server"; +import * as UserCardRepository from "~/features/user-card/UserCardRepository.server"; import { dateToDatabaseTimestamp } from "~/utils/dates"; import { SENDOUQ_LOOKING_PAGE } from "~/utils/urls"; import * as ReadyCheck from "../core/ready-check.server"; @@ -33,6 +34,9 @@ export const loader = async () => { ); return { + ...(await UserCardRepository.findAllByUserIdsCached({ + userIds: ownGroup!.members.map((member) => member.id), + })), group: ownGroup!, expiresAt: dateToDatabaseTimestamp(ReadyCheck.expiresAt(readyCheck)), readyUserIds: readyCheck.members diff --git a/app/features/sendouq/routes/q.ready.test.ts b/app/features/sendouq/routes/q.ready.test.ts index a2f623d12..20a599708 100644 --- a/app/features/sendouq/routes/q.ready.test.ts +++ b/app/features/sendouq/routes/q.ready.test.ts @@ -77,11 +77,13 @@ describe("SendouQ ready check page", () => { "group", "readyUserIds", "theirGroup", + "userCards", ]); const shownUserIds = [ ...data.group.members.map((member) => member.id), ...data.readyUserIds, + ...data.userCards.keys(), ]; for (const member of theirMembers) { expect(shownUserIds).not.toContain(member.id);