Restore original statement

And change variable name
PoApper · Feb 11, 2024 · f321347 · f321347
1 parent 017a269
commit f321347
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/popo/reservation/equip/reserve.equip.controller.ts b/src/popo/reservation/equip/reserve.equip.controller.ts
@@ -172,10 +172,10 @@ export class ReserveEquipController {
     } else {
       if (reservation.booker_id == user.uuid) {
         // if the reservation is in the past, deny delete
-        const reservation_time = reservation.date + reservation.start_time;
+        const reservation_start_time = reservation.date + reservation.start_time;
         const current_time = moment().tz('Asia/Seoul').format('YYYYMMDDHHmm');
 
-        if (reservation_time < current_time) {
+        if (reservation_start_time < current_time) {
           throw new BadRequestException('Cannot delete past reservation');
         } else {
           await this.reserveEquipService.remove(uuid);

diff --git a/src/popo/reservation/place/reserve.place.controller.ts b/src/popo/reservation/place/reserve.place.controller.ts
@@ -283,7 +283,7 @@ export class ReservePlaceController {
     const reservation = await this.reservePlaceService.findOneByUuidOrFail(uuid);
     const user = req.user;
 
-    if (false) {
+    if (user.userType == UserType.admin || user.userType == UserType.staff) {
       await this.reservePlaceService.remove(uuid);
     } else {
       if (reservation.booker_id == user.uuid) {