feat(applicant): getMyLogistics (hotel+flight+visa) + submitter-match fix
- Fix getMyFinalistConfirmation to resolve project via OR [submittedByUserId, teamMembers] so a lead who submitted but has no TeamMember row can see their card. - Add getMyLogistics query: returns projectTitle, confirmationStatus, hotel (program 1:1), myFlight (caller's AttendingMember.flightDetail), visaVisible flag, and myVisa when visible. Returns null for non-confirmed or unrelated callers. - Tests: confirmed finalist sees hotel/flight/visa; non-finalist gets null; PENDING confirmation gets null. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -2747,7 +2747,13 @@ export const applicantRouter = router({
|
||||
*/
|
||||
getMyFinalistConfirmation: protectedProcedure.query(async ({ ctx }) => {
|
||||
const project = await ctx.prisma.project.findFirst({
|
||||
where: { teamMembers: { some: { userId: ctx.user.id } } },
|
||||
where: {
|
||||
OR: [
|
||||
{ submittedByUserId: ctx.user.id },
|
||||
{ teamMembers: { some: { userId: ctx.user.id } } },
|
||||
],
|
||||
finalistConfirmation: { isNot: null },
|
||||
},
|
||||
include: {
|
||||
program: { select: { id: true, defaultAttendeeCap: true } },
|
||||
teamMembers: {
|
||||
@@ -2858,4 +2864,77 @@ export const applicantRouter = router({
|
||||
projectId: a.confirmation.project.id,
|
||||
}))
|
||||
}),
|
||||
|
||||
/**
|
||||
* Returns logistics info for the caller's confirmed finalist project:
|
||||
* hotel details, the caller's own flight detail, and visa visibility + status.
|
||||
* Returns null when the caller has no confirmed finalist project.
|
||||
*/
|
||||
getMyLogistics: protectedProcedure.query(async ({ ctx }) => {
|
||||
const project = await ctx.prisma.project.findFirst({
|
||||
where: {
|
||||
OR: [
|
||||
{ submittedByUserId: ctx.user.id },
|
||||
{ teamMembers: { some: { userId: ctx.user.id } } },
|
||||
],
|
||||
finalistConfirmation: { isNot: null },
|
||||
},
|
||||
include: {
|
||||
program: {
|
||||
select: { id: true, visaStatusVisibleToMembers: true },
|
||||
},
|
||||
finalistConfirmation: true,
|
||||
},
|
||||
orderBy: { createdAt: 'desc' },
|
||||
})
|
||||
|
||||
if (!project || !project.finalistConfirmation) return null
|
||||
if (project.finalistConfirmation.status !== 'CONFIRMED') return null
|
||||
|
||||
const programId = project.program.id
|
||||
const confirmationId = project.finalistConfirmation.id
|
||||
const visaVisible = project.program.visaStatusVisibleToMembers
|
||||
|
||||
// Hotel (1:1 per program)
|
||||
const hotelRow = await ctx.prisma.hotel.findUnique({
|
||||
where: { programId },
|
||||
select: { name: true, address: true, link: true, notes: true },
|
||||
})
|
||||
const hotel = hotelRow ?? null
|
||||
|
||||
// Caller's own AttendingMember + flight + visa
|
||||
const attendee = await ctx.prisma.attendingMember.findFirst({
|
||||
where: { confirmationId, userId: ctx.user.id },
|
||||
include: {
|
||||
flightDetail: true,
|
||||
visaApplication: visaVisible,
|
||||
},
|
||||
})
|
||||
|
||||
const fd = attendee?.flightDetail ?? null
|
||||
const myFlight = fd
|
||||
? {
|
||||
arrivalAt: fd.arrivalAt,
|
||||
arrivalFlightNumber: fd.arrivalFlightNumber,
|
||||
arrivalAirport: fd.arrivalAirport,
|
||||
departureAt: fd.departureAt,
|
||||
departureFlightNumber: fd.departureFlightNumber,
|
||||
departureAirport: fd.departureAirport,
|
||||
status: fd.status,
|
||||
}
|
||||
: null
|
||||
|
||||
const va = visaVisible ? (attendee?.visaApplication ?? null) : null
|
||||
const myVisa = va ? { status: va.status, nationality: va.nationality } : null
|
||||
|
||||
return {
|
||||
projectTitle: project.title,
|
||||
confirmationStatus: project.finalistConfirmation.status,
|
||||
hotel,
|
||||
myFlight,
|
||||
visaVisible,
|
||||
myVisa,
|
||||
}
|
||||
}),
|
||||
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user