Commit 9f61d439 authored by Filip Karlíček's avatar Filip Karlíček
Browse files

fix: reservations endpoints, NOTE: fix updating toolInstance's list of reservation

parent ceea3dac
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ export const reservationRepository = {
                },
            });

            /*
            await prismaClient.user.update({
                where: {
                    userId: deletedReservation.userId,
@@ -177,6 +178,7 @@ export const reservationRepository = {
                    editedAt: new Date(),
                },
            });
            */

            return Result.ok(deletedReservation as ReservationWithToolInstance);
        }
@@ -201,6 +203,11 @@ export const reservationRepository = {
                    toolInstance: true,
                },
            });

            if (reservationFound === null) {
                return Result.err(new NotFoundError());
            }

            return Result.ok(reservationFound as ReservationWithToolInstance);
        }
        catch (e) {
+3 −3
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ import {
const reservationRouter = Router();

reservationRouter.post('/', createNewReservation);
reservationRouter.put('/:id', updateReservation);
reservationRouter.delete('/:id', deleteReservation);
reservationRouter.put('/:reservationId', updateReservation);
reservationRouter.delete('/:reservationId', deleteReservation);

reservationRouter.get('/', getAllReservations);
reservationRouter.get('/:id', getReservationById);
reservationRouter.get('/:reservationId', getReservationById);

export default reservationRouter;
+20 −4
Original line number Diff line number Diff line
@@ -84,7 +84,11 @@ export const toolInstanceRepository = {
                },
                include: {
                    tool: true, 
                    reservations: true,
                    reservations: {
                        where: {
                            deletedAt: null,
                        },
                    },
                },
            });

@@ -135,7 +139,11 @@ export const toolInstanceRepository = {
                },
                include: {
                    tool: true,
                    reservations: true,
                    reservations: {
                        where: {
                            deletedAt: null,
                        },
                    },
                },
            });

@@ -189,7 +197,11 @@ export const toolInstanceRepository = {
                },
                include: {
                    tool: true,
                    reservations: true
                    reservations: {
                        where: {
                            deletedAt: null,
                        },
                    },
                },
            });

@@ -230,7 +242,11 @@ export const toolInstanceRepository = {
                    toolInstances: {
                        include: {
                            tool: true,
                            reservations: true,
                            reservations: {
                                where: {
                                    deletedAt: null,
                                },
                            },
                        },
                    },
                },