change booking response

Author: pablolambo

TableBooking.Api/Services/BookingService.cs

@@ -28,7 +28,9 @@ public async Task<IActionResult> CreateBookingAsync(CreateBookingDto request, Gu
             DurationInMinutes = request.DurationInMinutes,
             TableId = table.Id,
             AppUserId = userId,
-            AmountOfPeople = request.AmountOfPeople
+            AmountOfPeople = request.AmountOfPeople,
+            Id = Guid.NewGuid(),
+            RestaurantId = table.RestaurantId
         };
 
         await _unitOfWork.BookingRepository.InsertAsync(newBooking);
@@ -40,7 +42,8 @@ public async Task<IActionResult> CreateBookingAsync(CreateBookingDto request, Gu
             Date = newBooking.Date,
             DurationInMinutes = newBooking.DurationInMinutes,
             AmountOfPeople = newBooking.AmountOfPeople,
-            AppUserId = userId
+            AppUserId = userId,
+            RestaurantId = newBooking.RestaurantId
         };
         return new CreatedResult(string.Empty, bookingDto);
     }
@@ -59,25 +62,46 @@ public async Task<IActionResult> DeleteBookingAsync(Guid bookingId, Guid userId)
 
     public async Task<IActionResult> GetBookingByIdAsync(Guid bookingId, Guid userId)
     {
-        
         var booking = await _unitOfWork.BookingRepository.GetBookingByIdForSpecificUserAsync(bookingId, userId);
 
         if (booking == null)
             return new BadRequestObjectResult("Bad request: no bookings");
+        
+        if (booking.RestaurantId == Guid.Empty)
+        {
+            var restaurantId= await _unitOfWork.TableRepository.GetRestaurantIdByTableIdAsync(booking.TableId);
+
+            booking.RestaurantId = restaurantId;
+            await _unitOfWork.BookingRepository.Update(booking);
+        }
+        
         var bookingDto = new BookingDto
         {
             Id = booking.Id,
             Date = booking.Date,
             DurationInMinutes = booking.DurationInMinutes,
             AmountOfPeople = booking.AmountOfPeople,
-            AppUserId = userId
+            AppUserId = userId,
+            RestaurantId = booking.RestaurantId
         };
         return new OkObjectResult(bookingDto);
     }
 
     public async Task<IActionResult> GetAllBookings(Guid userId)
     {
         var bookings = await _unitOfWork.BookingRepository.GetAllBookingsForSpecificUserAsync(userId);
+
+        foreach (var booking in bookings)
+        {
+            if (booking.RestaurantId == Guid.Empty)
+            {
+                
+                var restaurantId= await _unitOfWork.TableRepository.GetRestaurantIdByTableIdAsync(booking.TableId);
+
+                booking.RestaurantId = restaurantId;
+                await _unitOfWork.BookingRepository.Update(booking);
+            }
+        }
 
         return new OkObjectResult(bookings);
     }
@@ -87,6 +111,8 @@ public async Task<IActionResult> UpdateBookingAsync(UpdateBookingDto updateBooki
         var booking = await _unitOfWork.BookingRepository.GetBookingByIdForSpecificUserAsync(bookingId, userId);
         if (booking == null)
             return new BadRequestObjectResult($"Booking with id {bookingId} doesn't exist.");
+        
+        // TODO: change tableId when user changed amount of people.
 
         var newBooking = new Booking
         {
@@ -95,7 +121,8 @@ public async Task<IActionResult> UpdateBookingAsync(UpdateBookingDto updateBooki
             DurationInMinutes = updateBookingDto.DurationInMinutes,
             AmountOfPeople = updateBookingDto.AmountOfPeople,
             TableId = booking.TableId,
-            AppUserId = userId
+            AppUserId = userId,
+            RestaurantId = booking.RestaurantId
         };
 
         await _unitOfWork.BookingRepository.Update(newBooking);

TableBooking.Logic/Interfaces/ITableRepository.cs

@@ -6,4 +6,5 @@ public interface ITableRepository : IGenericRepository<Table>
 {
     Task<IEnumerable<Table>> GetTablesByRestaurantIdAsync(Guid restaurantId);
     Task<Table> GetTableByTableIdAsync(Guid tableId);
+    Task<Guid> GetRestaurantIdByTableIdAsync(Guid tableId);
 }

TableBooking.Logic/Repositories/GenericRepository.cs

@@ -54,10 +54,14 @@ public async Task Update(T entity)
 
         if (existingEntity != null)
         {
-            _context.Entry(existingEntity).State = EntityState.Detached;
+            _context.Entry(existingEntity).CurrentValues.SetValues(entity);
+        }
+        else
+        {
+            ObjectSet.Add(entity);
         }
 
-        ObjectSet.Update(entity);
+        await _context.SaveChangesAsync();
     }
 
     private object[] GetKeyValues(T entity)

TableBooking.Logic/Repositories/TableRepository.cs

@@ -19,6 +19,13 @@ public async Task<IEnumerable<Table>> GetTablesByRestaurantIdAsync(Guid restaura
 
     public async Task<Table> GetTableByTableIdAsync(Guid tableId)
     {
-            return (await ObjectSet.FirstOrDefaultAsync(t => t.Id == tableId))!;
-        }
+        return (await ObjectSet.FirstOrDefaultAsync(t => t.Id == tableId))!;
+    }
+
+    public async Task<Guid> GetRestaurantIdByTableIdAsync(Guid tableId)
+    {
+        var table = await ObjectSet.FirstOrDefaultAsync(t => t.Id == tableId);
+
+        return table?.RestaurantId ?? Guid.Empty;
+    }
 }

TableBooking.Model/Dtos/BookingDtos/BookingDto.cs

@@ -7,4 +7,5 @@ public class BookingDto
     public int DurationInMinutes { get; set; }
     public int AmountOfPeople { get; set; }
     public Guid AppUserId { get; set; }
+    public Guid RestaurantId { get; set; }
 }