not working endpoints repaired

Author: Tomo2433

TableBookingAPI/TableBooking.Logic/Converters/TableConverters/TableToGetConverter.cs

@@ -21,7 +21,8 @@ public GetTablesDto TableToTableDto(Table table)
             {
                 Id = table.Id,
                 RestaurantId = table.RestaurantId,
-                NumberOfSeats = table.NumberOfSeats
+                NumberOfSeats = table.NumberOfSeats,
+                Bookings = table.Bookings
             };
         }
     }

TableBookingAPI/TableBooking.Logic/Repositories/TableRepository.cs

@@ -13,7 +13,7 @@ public TableRepository(TableBookingContext context) : base(context)
         public async Task<IEnumerable<Table>> GetTablesByRestaurantIdAsync(Guid restaurantId)
         {
             return await _objectSet
-                .Include(x => x.RestaurantId)
+                .Include(x => x.Restaurant)
                 .Where(x => x.RestaurantId.Equals(restaurantId))
                 .ToListAsync();
         }

TableBookingAPI/TableBooking.Model/Dtos/RestaurantDtos/RestaurantShortInfoDto.cs

@@ -7,6 +7,7 @@ public class RestaurantShortInfoDto
         public string Name { get; set; }
         public string Type { get; set; }
         public string Description { get; set; }
+        public string Phone { get; set; }
         public string Location { get; set; }
         public string ImageURL { get; set; }
         public int Rating { get; set; }

TableBookingAPI/TableBooking.Model/Dtos/TableDtos/GetTablesDto.cs

@@ -1,9 +1,12 @@
-namespace TableBooking.Model.Dtos.TableDtos
+using TableBooking.Model.Models;
+
+namespace TableBooking.Model.Dtos.TableDtos
 {
     public class GetTablesDto
     {
         public Guid Id { get; set; }
         public int NumberOfSeats { get; set; }
         public Guid RestaurantId { get; set; }
+        public IEnumerable<Booking>? Bookings { get; set; }
     }
 }

TableBookingAPI/TableBooking.Model/Dtos/TableDtos/TableDto.cs

@@ -2,7 +2,7 @@
 
 namespace TableBooking.Model.Dtos.TableDtos
 {
-    public class TableDto : Entity
+    public class TableDto
     {
         public int NumberOfSeats { get; set; }
         public Guid RestaurantId { get; set; }

TableBookingAPI/TableBooking.Model/Models/Table.cs

@@ -5,5 +5,6 @@ public class Table : Entity
         public int NumberOfSeats { get; set; }
         public Guid RestaurantId { get; set; }
         public IEnumerable<Booking>? Bookings { get; set; }
+        public Restaurant Restaurant { get; set; }
     }
 }

TableBookingAPI/TableBooking/Controllers/BookingController.cs

@@ -56,12 +56,12 @@ public async Task<IActionResult> DeleteUserBooking(Guid id)
             return await _bookingService.DeleteBookingAsync(id, userId);
         }
 
-        [HttpPost("CreateBooking")]
-        public async Task<IActionResult> CreateUserBooking([FromBody] CreateBookingDto bookingToCreateDto)
+        [HttpPost("CreateBooking/{restaurantId}")]
+        public async Task<IActionResult> CreateUserBooking([FromBody] CreateBookingDto bookingToCreateDto, Guid restaurantId)
         {
             var userId = Guid.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier));
 
-            return await _bookingService.CreateBookingAsync(bookingToCreateDto, userId);
+            return await _bookingService.CreateBookingAsync(bookingToCreateDto, userId, restaurantId);
         }
 
         [HttpPut("UpdateBooking/{bookingId}")]

TableBookingAPI/TableBooking/Controllers/RestaurantController.cs

@@ -35,16 +35,16 @@ public async Task<IActionResult> CreateRestaurant([FromBody] RestaurantShortInfo
             return await _restaurantService.CreateRestaurantAsync(restaurantShortInfoDto);
         }
 
-        [HttpDelete("DeleteRestaurant/{id:int}")]
+        [HttpDelete("DeleteRestaurant/{id:Guid}")]
         public async Task<IActionResult> DeleteRestaurant(Guid id)
         {
             return await _restaurantService.DeleteRestaurantAsync(id);
         }
 
-        [HttpPut("UpdateRestaurant")]
-        public async Task<IActionResult> UpdateRestaurant()
+        [HttpPut("UpdateRestaurant/{restaurantId}")]
+        public async Task<IActionResult> UpdateRestaurant([FromBody] RestaurantShortInfoDto restaurantShortInfoDto, Guid restaurantId)
         {
-            return Ok();
+            return await _restaurantService.UpdateRestaurantAsync(restaurantShortInfoDto, restaurantId);
         }
 
 

TableBookingAPI/TableBooking/Controllers/TableController.cs

@@ -39,13 +39,13 @@ public async Task<IActionResult> CreateTable([FromBody] TableDto tableDto)
             return await _tableService.CreateTableAsync(tableDto);
         }
 
-        [HttpPut("UpdateTable")]
-        public async Task<IActionResult> UpdateTable([FromBody] TableDto tableDto)
+        [HttpPut("UpdateTable/{tableId}")]
+        public async Task<IActionResult> UpdateTable([FromBody] TableDto tableDto, Guid tableId)
         {
-            return await _tableService.UpdateTableAsync(tableDto);
+            return await _tableService.UpdateTableAsync(tableDto, tableId);
         }
 
-        [HttpDelete("DeleteTable/{id:int}")]
+        [HttpDelete("DeleteTable/{id:Guid}")]
         public async Task<IActionResult> DeleteTable(Guid id)
         {
             return await _tableService.DeleteTableAsync(id);

TableBookingAPI/TableBooking/Interfaces/IBookingService.cs

@@ -7,7 +7,7 @@ public interface IBookingService
     {
         public Task<IActionResult> GetAllBookings(Guid userId);
         public Task<IActionResult> GetBookingByIdAsync(Guid bookingId, Guid userId);
-        public Task<IActionResult> CreateBookingAsync(CreateBookingDto createBookingDto, Guid userId);
+        public Task<IActionResult> CreateBookingAsync(CreateBookingDto createBookingDto, Guid userId, Guid restaurantId);
         public Task<IActionResult> UpdateBookingAsync(UpdateBookingDto updateBookingDto, Guid userId, Guid bookingId);
         public Task<IActionResult> DeleteBookingAsync(Guid bookingId, Guid userId);
     }