fix(trucks): skip active-site check when PATCH leaves site unchanged

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-15 11:53:32 +08:00
co-authored by Claude Sonnet 5.5
parent 5f1d7a6ed4
commit 17c32ecd04
3 changed files with 24 additions and 1 deletions
+1 -1
View File
@@ -83,7 +83,7 @@ export async function PATCH(request: NextRequest) {
const [before] = await asAdmin(db => const [before] = await asAdmin(db =>
db.select().from(trucks).where(eq(trucks.id, body.id!)).limit(1) db.select().from(trucks).where(eq(trucks.id, body.id!)).limit(1)
) )
if (set.siteId && !(await activeSiteExists(set.siteId))) if (set.siteId && set.siteId !== before?.siteId && !(await activeSiteExists(set.siteId)))
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 }) return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
try { try {
+12
View File
@@ -128,6 +128,18 @@ describe('PATCH /api/admin/trucks', () => {
expect((await PATCH(req('PATCH', { id: 't1', site_id: SITE }))).status).toBe(422) expect((await PATCH(req('PATCH', { id: 't1', site_id: SITE }))).status).toBe(422)
expect(setSpy).not.toHaveBeenCalled() expect(setSpy).not.toHaveBeenCalled()
}) })
it('skips the active-site check when the site is unchanged', async () => {
selectQueue.push([{ id: 't1', siteId: SITE }])
const res = await PATCH(req('PATCH', { id: 't1', truck_no: 'NEW 1', site_id: SITE }))
expect(res.status).toBe(200)
expect(setSpy).toHaveBeenCalledWith({ truckNo: 'NEW 1', siteId: SITE })
})
it('422 when moving a site-less truck to an inactive site', async () => {
selectQueue.push([{ id: 't1', siteId: null }], [])
const res = await PATCH(req('PATCH', { id: 't1', site_id: SITE }))
expect(res.status).toBe(422)
expect(setSpy).not.toHaveBeenCalled()
})
it('409 for a duplicate truck number', async () => { it('409 for a duplicate truck number', async () => {
selectQueue.push([{ id: 't1' }]) selectQueue.push([{ id: 't1' }])
txError.code = '23505' txError.code = '23505'
@@ -60,6 +60,17 @@ describe('TruckManager site link', () => {
expect(labels).toEqual(['No site', 'Site A', 'Site B']) expect(labels).toEqual(['No site', 'Site A', 'Site B'])
}) })
it('keeps the inactive site selectable for a truck already linked to it', () => {
const oldTrucks: Truck[] = [
{ id: 't9', truck_no: 'OLD 9', carrier: null, site_id: 'site-old', active: true },
]
render(<TruckManager trucks={oldTrucks} sites={sites} />)
fireEvent.click(screen.getAllByRole('button', { name: 'Edit' })[0])
const select = screen.getByLabelText('Site') as HTMLSelectElement
const labels = Array.from(select.options).map(o => o.textContent)
expect(labels).toEqual(['No site', 'Site A', 'Site B', 'Old Site'])
})
it('sends site_id when adding a truck', async () => { it('sends site_id when adding a truck', async () => {
render(<TruckManager trucks={trucks} sites={sites} />) render(<TruckManager trucks={trucks} sites={sites} />)
fireEvent.click(screen.getByRole('button', { name: /Add Truck/ })) fireEvent.click(screen.getByRole('button', { name: /Add Truck/ }))