melabidi/carmanagement
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

clear error deploy prod

Browse Source
This commit is contained in:
root
2026-05-20 16:42:36 -04:00
parent d138949a12
commit 32170acbb3
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/src/routes/customers.ts
+4 -3
View File
@@ -80,11 +80,12 @@ router.get('/:id', async (req, res, next) => {
router.patch('/:id', requireRole('MANAGER'), async (req, res, next) => { router.patch('/:id', requireRole('MANAGER'), async (req, res, next) => {
try { try {
const { id } = z.object({ id: z.string() }).parse(req.params)
const body = customerSchema.partial().parse(req.body) const body = customerSchema.partial().parse(req.body)
const updated = await prisma.customer.updateMany({ where: { id: req.params.id, companyId: req.companyId }, data: { ...body, dateOfBirth: body.dateOfBirth ? new Date(body.dateOfBirth) : undefined, licenseExpiry: body.licenseExpiry ? new Date(body.licenseExpiry) : undefined, licenseIssuedAt: body.licenseIssuedAt ? new Date(body.licenseIssuedAt) : undefined } as any }) const updated = await prisma.customer.updateMany({ where: { id, companyId: req.companyId }, data: { ...body, dateOfBirth: body.dateOfBirth ? new Date(body.dateOfBirth) : undefined, licenseExpiry: body.licenseExpiry ? new Date(body.licenseExpiry) : undefined, licenseIssuedAt: body.licenseIssuedAt ? new Date(body.licenseIssuedAt) : undefined } as any })
if (updated.count === 0) return res.status(404).json({ error: 'not_found', message: 'Customer not found', statusCode: 404 }) if (updated.count === 0) return res.status(404).json({ error: 'not_found', message: 'Customer not found', statusCode: 404 })
if (body.licenseExpiry) await validateAndFlagLicense(req.params.id).catch(() => null) if (body.licenseExpiry) await validateAndFlagLicense(id).catch(() => null)
const customer = await prisma.customer.findUniqueOrThrow({ where: { id: req.params.id } }) const customer = await prisma.customer.findUniqueOrThrow({ where: { id } })
res.json({ data: customer }) res.json({ data: customer })
} catch (err) { next(err) } } catch (err) { next(err) }
}) })
apps/api/src/routes/offers.ts
+6 -5
View File
@@ -61,19 +61,20 @@ router.get('/:id', async (req, res, next) => {
router.patch('/:id', requireRole('MANAGER'), async (req, res, next) => { router.patch('/:id', requireRole('MANAGER'), async (req, res, next) => {
try { try {
const { id } = z.object({ id: z.string() }).parse(req.params)
const { vehicleIds, ...body } = offerSchema.partial().parse(req.body) const { vehicleIds, ...body } = offerSchema.partial().parse(req.body)
const existing = await prisma.offer.findFirst({ where: { id: req.params.id, companyId: req.companyId } }) const existing = await prisma.offer.findFirst({ where: { id, companyId: req.companyId } })
if (!existing) return res.status(404).json({ error: 'not_found', message: 'Offer not found', statusCode: 404 }) if (!existing) return res.status(404).json({ error: 'not_found', message: 'Offer not found', statusCode: 404 })
await prisma.$transaction(async (tx) => { await prisma.$transaction(async (tx) => {
await tx.offer.update({ where: { id: req.params.id }, data: { ...body, validFrom: body.validFrom ? new Date(body.validFrom) : undefined, validUntil: body.validUntil ? new Date(body.validUntil) : undefined } }) await tx.offer.update({ where: { id }, data: { ...body, validFrom: body.validFrom ? new Date(body.validFrom) : undefined, validUntil: body.validUntil ? new Date(body.validUntil) : undefined } })
if (vehicleIds !== undefined) { if (vehicleIds !== undefined) {
await tx.offerVehicle.deleteMany({ where: { offerId: req.params.id } }) await tx.offerVehicle.deleteMany({ where: { offerId: id } })
if (vehicleIds.length > 0) { if (vehicleIds.length > 0) {
await tx.offerVehicle.createMany({ data: vehicleIds.map((vehicleId) => ({ offerId: req.params.id, vehicleId })) }) await tx.offerVehicle.createMany({ data: vehicleIds.map((vehicleId) => ({ offerId: id, vehicleId })) })
} }
} }
}) })
const updated = await prisma.offer.findUniqueOrThrow({ where: { id: req.params.id }, include: { vehicles: true } }) const updated = await prisma.offer.findUniqueOrThrow({ where: { id }, include: { vehicles: true } })
res.json({ data: updated }) res.json({ data: updated })
} catch (err) { next(err) } } catch (err) { next(err) }
}) })
apps/api/src/routes/vehicles.ts
+9 -6
View File
@@ -98,8 +98,9 @@ router.post('/:id/photos', requireRole('MANAGER'), upload.array('photos', 10), a
router.delete('/:id/photos/:idx', requireRole('MANAGER'), async (req, res, next) => { router.delete('/:id/photos/:idx', requireRole('MANAGER'), async (req, res, next) => {
try { try {
const vehicle = await prisma.vehicle.findFirstOrThrow({ where: { id: req.params.id, companyId: req.companyId } }) const { id, idx: idxParam } = z.object({ id: z.string(), idx: z.string() }).parse(req.params)
const idx = parseInt(req.params.idx) const vehicle = await prisma.vehicle.findFirstOrThrow({ where: { id, companyId: req.companyId } })
const idx = parseInt(idxParam, 10)
const photos = vehicle.photos.filter((_: string, i: number) => i !== idx) const photos = vehicle.photos.filter((_: string, i: number) => i !== idx)
const updated = await prisma.vehicle.update({ where: { id: vehicle.id }, data: { photos } }) const updated = await prisma.vehicle.update({ where: { id: vehicle.id }, data: { photos } })
res.json({ data: updated }) res.json({ data: updated })
@@ -217,6 +218,7 @@ router.get('/:id/calendar', async (req, res, next) => {
router.post('/:id/calendar/blocks', requireRole('MANAGER'), async (req, res, next) => { router.post('/:id/calendar/blocks', requireRole('MANAGER'), async (req, res, next) => {
try { try {
const { id } = z.object({ id: z.string() }).parse(req.params)
const body = z.object({ const body = z.object({
startDate: z.string().datetime({ offset: true }).or(z.string().regex(/^\d{4}-\d{2}-\d{2}$/)), startDate: z.string().datetime({ offset: true }).or(z.string().regex(/^\d{4}-\d{2}-\d{2}$/)),
endDate: z.string().datetime({ offset: true }).or(z.string().regex(/^\d{4}-\d{2}-\d{2}$/)), endDate: z.string().datetime({ offset: true }).or(z.string().regex(/^\d{4}-\d{2}-\d{2}$/)),
@@ -228,11 +230,11 @@ router.post('/:id/calendar/blocks', requireRole('MANAGER'), async (req, res, nex
const end = new Date(body.endDate) const end = new Date(body.endDate)
if (end <= start) return res.status(400).json({ error: 'invalid_range', message: 'endDate must be after startDate', statusCode: 400 }) if (end <= start) return res.status(400).json({ error: 'invalid_range', message: 'endDate must be after startDate', statusCode: 400 })
await prisma.vehicle.findFirstOrThrow({ where: { id: req.params.id, companyId: req.companyId } }) await prisma.vehicle.findFirstOrThrow({ where: { id, companyId: req.companyId } })
const block = await prisma.vehicleCalendarBlock.create({ const block = await prisma.vehicleCalendarBlock.create({
data: { data: {
vehicleId: req.params.id, vehicleId: id,
startDate: start, startDate: start,
endDate: end, endDate: end,
reason: body.reason, reason: body.reason,
@@ -262,6 +264,7 @@ router.get('/:id/maintenance', async (req, res, next) => {
router.post('/:id/maintenance', requireRole('MANAGER'), async (req, res, next) => { router.post('/:id/maintenance', requireRole('MANAGER'), async (req, res, next) => {
try { try {
const { id } = z.object({ id: z.string() }).parse(req.params)
const body = z.object({ const body = z.object({
type: z.string().min(1), type: z.string().min(1),
description: z.string().optional(), description: z.string().optional(),
@@ -273,8 +276,8 @@ router.post('/:id/maintenance', requireRole('MANAGER'), async (req, res, next) =
}).parse(req.body) }).parse(req.body)
// Validate vehicle belongs to company // Validate vehicle belongs to company
await prisma.vehicle.findFirstOrThrow({ where: { id: req.params.id, companyId: req.companyId } }) await prisma.vehicle.findFirstOrThrow({ where: { id, companyId: req.companyId } })
const log = await prisma.maintenanceLog.create({ data: { ...body, vehicleId: req.params.id, performedAt: new Date(body.performedAt), nextDueAt: body.nextDueAt ? new Date(body.nextDueAt) : undefined } }) const log = await prisma.maintenanceLog.create({ data: { ...body, vehicleId: id, performedAt: new Date(body.performedAt), nextDueAt: body.nextDueAt ? new Date(body.nextDueAt) : undefined } })
res.status(201).json({ data: log }) res.status(201).json({ data: log })
} catch (err) { next(err) } } catch (err) { next(err) }
}) })