Illia Krauchenia

api/Controllers/ReservationController.cs

@@ -6,7 +6,7 @@
 namespace Controllers
 {
     [Tags("Reservations"), Route("reservation")]
-    public class ReservationController : Controller
+    public class ReservationController : StaffAccessController
     {
         private ReservationRepository _repo { get; set; }
 
@@ -18,14 +18,24 @@ public ReservationController(ReservationRepository reservationRepository)
         [HttpGet, Produces("application/json"), Route("")]
         public async Task<ActionResult<Reservation>> GetReservations()
         {
-            var reservations = await _repo.GetReservations();
+            if (IsNotStaff(Request, out ActionResult? result))
+            {
+                return result!;
+            }
+
+            var reservations = await _repo.GetUpcomingReservations();
 
             return Json(reservations);
         }
 
         [HttpGet, Produces("application/json"), Route("{reservationId}")]
         public async Task<ActionResult<Reservation>> GetRoom(Guid reservationId)
         {
+            if (IsNotStaff(Request, out ActionResult? result))
+            {
+                return result!;
+            }
+
             try
             {
                 var reservation = await _repo.GetReservation(reservationId);
@@ -56,7 +66,19 @@ [FromBody] Reservation newBooking
             try
             {
                 var createdReservation = await _repo.CreateReservation(newBooking);
-                return Created($"/reservation/${createdReservation.Id}", createdReservation);
+                return Created($"/reservation/{createdReservation.Id}", createdReservation);
+            }
+            catch (ReservationConflictException ex)
+            {
+                return Conflict(ex.Message);
+            }
+            catch (InvalidReservationException ex)
+            {
+                return BadRequest(ex.Message);
+            }
+            catch (NotFoundException ex)
+            {
+                return BadRequest(ex.Message);
             }
             catch (Exception ex)
             {
@@ -74,5 +96,35 @@ public async Task<IActionResult> DeleteReservation(Guid reservationId)
 
             return result ? NoContent() : NotFound();
         }
+
+        [HttpPost, Produces("application/json"), Route("{reservationId}/check-in")]
+        public async Task<ActionResult<Reservation>> CheckInReservation(
+            Guid reservationId,
+            [FromBody] CheckInReservationRequest request
+        )
+        {
+            if (IsNotStaff(Request, out ActionResult? result))
+            {
+                return result!;
+            }
+
+            try
+            {
+                var checkedInReservation = await _repo.CheckInReservation(
+                    reservationId,
+                    request.GuestEmail
+                );
+
+                return Json(checkedInReservation);
+            }
+            catch (NotFoundException)
+            {
+                return NotFound();
+            }
+            catch (InvalidCheckInException ex)
+            {
+                return BadRequest(ex.Message);
+            }
+        }
     }
 }

api/Controllers/StaffAccessController.cs

@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Controllers
+{
+    public abstract class StaffAccessController : Controller
+    {
+        protected const string StaffAccessCookieName = "access";
+
+        /// <summary>
+        /// Checks if the request is from a staff member, if not returns true and a 403 result
+        /// </summary>
+        protected bool IsNotStaff(HttpRequest request, out ActionResult? result)
+        {
+            // TODO explore UseAuthentication
+            request.Cookies.TryGetValue(StaffAccessCookieName, out string? accessValue);
+
+            if (accessValue == null || accessValue == "0")
+            {
+                result = StatusCode(403);
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+    }
+}

api/Controllers/StaffController.cs

@@ -3,7 +3,7 @@
 namespace Controllers
 {
     [Route("staff")]
-    public class StaffController : Controller
+    public class StaffController : StaffAccessController
     {
         private IConfiguration Config { get; set; }
 
@@ -12,25 +12,6 @@ public StaffController(IConfiguration config)
             Config = config;
         }
 
-        /// <summary>
-        /// Checks if the request is from a staff member, if not returns true and a 403 result
-        /// </summary>
-        /// <param name="request"></param>
-        private bool IsNotStaff(HttpRequest request, out IActionResult? result)
-        {
-            // TODO explore UseAuthentication
-            request.Cookies.TryGetValue("access", out string? accessValue);
-
-            if (accessValue == null || accessValue == "0")
-            {
-                result = StatusCode(403);
-                return true;
-            }
-
-            result = null;
-            return false;
-        }
-
         [HttpGet, Route("login")]
         public IActionResult CheckCode([FromHeader(Name = "X-Staff-Code")] string accessCode)
         {
@@ -41,15 +22,15 @@ public IActionResult CheckCode([FromHeader(Name = "X-Staff-Code")] string access
                 return NoContent();
             }
             Response.Cookies.Append(
-                "access",
+                StaffAccessCookieName,
                 "1",
                 new CookieOptions
                 // TODO evaluate cookie options & auth mechanism for best security practices
                 {
                     IsEssential = true,
                     SameSite = SameSiteMode.Strict,
                     HttpOnly = true,
-                    Secure = true
+                    Secure = Request.IsHttps
                 }
             );
             return NoContent();
@@ -58,7 +39,7 @@ public IActionResult CheckCode([FromHeader(Name = "X-Staff-Code")] string access
         [HttpGet, Route("check")]
         public IActionResult CheckCookie()
         {
-            if (IsNotStaff(Request, out IActionResult? result))
+            if (IsNotStaff(Request, out ActionResult? result))
             {
                 return result!;
             }

api/Models/CheckInReservationRequest.cs

@@ -0,0 +1,7 @@
+namespace Models
+{
+    public class CheckInReservationRequest
+    {
+        public required string GuestEmail { get; set; }
+    }
+}

api/Models/Errors/InvalidCheckInException.cs

@@ -0,0 +1,8 @@
+namespace Models.Errors
+{
+    public class InvalidCheckInException : Exception
+    {
+        public InvalidCheckInException(string message)
+            : base(message) { }
+    }
+}

api/Models/Errors/InvalidReservationException.cs

@@ -0,0 +1,8 @@
+namespace Models.Errors
+{
+    public class InvalidReservationException : Exception
+    {
+        public InvalidReservationException(string message)
+            : base(message) { }
+    }
+}

api/Models/Errors/ReservationConflictException.cs

@@ -0,0 +1,8 @@
+namespace Models.Errors
+{
+    public class ReservationConflictException : Exception
+    {
+        public ReservationConflictException(string message)
+            : base(message) { }
+    }
+}

api/Models/Room.cs

@@ -29,8 +29,28 @@ public static string FormatRoomNumber(int number)
             return number.ToString().PadLeft(3, '0');
         }
 
+        public static bool IsValidRoomNumber(string roomNumber)
+        {
+            if (roomNumber.Length != 3)
+            {
+                return false;
+            }
+
+            if (!roomNumber.All(char.IsAsciiDigit))
+            {
+                return false;
+            }
+
+            return roomNumber[1] != '0' || roomNumber[2] != '0';
+        }
+
         public static int ConvertRoomNumberToInt(string roomNumber)
         {
+            if (!IsValidRoomNumber(roomNumber))
+            {
+                throw new InvalidRoomNumber(roomNumber);
+            }
+
             var success = int.TryParse(roomNumber, out int roomNumberInt);
             if (!success)
             {