Merge pull request #143 from buituananhdev/feat/booking/dialogflow

fix: dialogflow service

Author: buituananhdev

src/Services/Booking/Booking.API/Controllers/TicketController.cs

@@ -35,4 +35,18 @@ public async Task<IActionResult> GetPassengerDetailsByTicketIdAsync(Guid ticketI
         var passengerDetails = await _passengerInfoService.GetPassengerDetailsByTicketIdAsync(ticketId);
         return Ok(passengerDetails);
     }
+
+    [HttpGet("{ticketId}/cancel")]
+    public async Task<IActionResult> CancelTicketAsync(Guid ticketId)
+    {
+        await _ticketService.CancelTicketAsync(ticketId);
+        return NoContent();
+    }
+
+    [HttpGet("{ticketId}")]
+    public async Task<IActionResult> GetTicketByIdAsync(Guid ticketId)
+    {
+        var ticket = await _ticketService.GetByIdAsync(ticketId);
+        return Ok(ticket);
+    }
 }

src/Services/Booking/Booking.Application/Dtos/TicketDto.cs

@@ -8,7 +8,7 @@ public class TicketDto : BaseDto
     public string TicketNumber { get; set; }
     public Guid? PassengerId { get; set; }
     public Guid TrainId { get; set; }
-    public Seat? SeatInformation {  get; set; }
+    public List<Seat>? SeatInformations {  get; set; }
     public Guid TrainScheduleId { get; set; }
     public DateTime BookingDate { get; set; } = DateTime.Now;
     public DateTime JourneyDate { get; set; }

src/Services/Booking/Booking.Application/Services/DialogflowService/DialogflowService.cs

@@ -252,21 +252,24 @@ public string GenerateTicketInfoMessage(TicketDto ticket)
             }
 
             var passengerNames = GetPassengerNames(ticket);
-            var trainInfo = ticket.SeatInformation?.TrainCar?.Train?.TrainName ?? "N/A";
-            var carNumber = ticket.SeatInformation?.TrainCar?.CarNumber?.ToString() ?? "N/A";
-            var seatTypeText = GetSeatTypeText(ticket.SeatInformation?.TrainCar?.SeatType ?? 0);
-            var seatNumber = ticket.SeatInformation?.SeatNumber.ToString() ?? "N/A";
-            var totalSeats = ticket.TicketSeats?.Count ?? 0;
+            var seatDetails = ticket.SeatInformations?.Select(seat =>
+            {
+                var train = seat.TrainCar?.Train?.TrainName ?? "N/A";
+                var carNumber = seat.TrainCar?.CarNumber?.ToString() ?? "N/A";
+                var seatType = GetSeatTypeText(seat.TrainCar?.SeatType ?? 0);
+                var seatNumber = seat.SeatNumber.ToString() ?? "N/A";
+
+                return $"🚂 Tàu: {train} - 🚃 Toa: {carNumber} - 💺 Ghế: {seatNumber} ({seatType})";
+            }) ?? new List<string> { "Không có thông tin ghế." };
+
             var statusText = GetStatusText(ticket.Status);
             var bookingDateText = ticket.BookingDate.ToString("dd/MM/yyyy HH:mm", CultureInfo.InvariantCulture);
 
             var message = $"🎫 **THÔNG TIN VÉ TÀU**<br/>" +
                          $"━━━━━━━━━━━<br/>" +
                          $"🆔 Mã vé: {ticket.TicketNumber}<br/>" +
-                         $"🚂 Tàu: {trainInfo}<br/>" +
-                         $"🚃 Toa: {carNumber}<br/>" +
-                         $"💺 Ghế: {seatNumber} ({seatTypeText})<br/>" +
-                         $"📊 Số lượng ghế: {totalSeats}<br/>" +
+                         string.Join("<br/>", seatDetails) + "<br/>" +
+                         $"📊 Số lượng ghế: {ticket.SeatInformations?.Count ?? 0}<br/>" +
                          $"🗓️ Ngày khởi hành: {ticket.JourneyDate:dd/MM/yyyy}<br/>" +
                          $"📅 Ngày đặt vé: {bookingDateText}<br/>" +
                          $"💵 Tổng tiền: {ticket.TotalPrice:N0} VNĐ<br/>" +

src/Services/Booking/Booking.Application/Services/TicketService/TicketService.cs

@@ -87,7 +87,7 @@ private async Task<TicketDto> BookSingleSeatAsync(AddTicketDto createDto)
                         }
 
                         BookingOrderDto bookingOrder;
-                        if(createDto.TicketType == TicketTypeEnum.Normal)
+                        if (createDto.TicketType == TicketTypeEnum.Normal)
                         {
                             bookingOrder = await _bookingOrderService.CreateAsync(new AddBookingOrderDto());
                         }
@@ -333,7 +333,7 @@ public async Task<List<TicketDto>> GetTicketWithPassengerInfoAsync(Guid bookingO
             {
                 var request = new GetSeatInformationRequest { SeatId = ticket.TicketSeats.FirstOrDefault()?.SeatId.ToString() };
                 var seatInformation = await _adminGrpcServiceClient.GetSeatInformationAsync(request);
-                ticket.SeatInformation = _mapper.Map<Seat>(seatInformation);
+                ticket.SeatInformations.Add(_mapper.Map<Seat>(seatInformation));
             }
             return tickets;
         }
@@ -344,6 +344,12 @@ public Task<TicketDto> GetTicketByTicketNumberAsync(string ticketNumber)
             return GetTicketAsync(specification);
         }
 
+        public override Task<TicketDto> GetByIdAsync(Guid ticketId)
+        {
+            var specification = new TicketIdSpecification(ticketId);
+            return GetTicketAsync(specification);
+        }
+
         private async Task<TicketDto> GetTicketAsync(Specification<Ticket> specification)
         {
             var includes = new List<Expression<Func<Ticket, object>>>
@@ -355,9 +361,13 @@ private async Task<TicketDto> GetTicketAsync(Specification<Ticket> specification
             var ticket = await _bookingUnitOfWork.TicketRepository
                 .FirstOrDefaultAsync(specification, includes);
             var ticketDto = _mapper.Map<TicketDto>(ticket);
-            var request = new GetSeatInformationRequest { SeatId = ticket.TicketSeats.FirstOrDefault().SeatId.ToString() };
-            var seatInformation = await _adminGrpcServiceClient.GetSeatInformationAsync(request);
-            ticketDto.SeatInformation = _mapper.Map<Seat>(seatInformation);
+            var seatInformation = new List<Seat>();
+            foreach (var ticketSeat in ticket.TicketSeats)
+            {
+                var request = new GetSeatInformationRequest { SeatId = ticketSeat.SeatId.ToString() };
+                var seat = await _adminGrpcServiceClient.GetSeatInformationAsync(request);
+                seatInformation.Add(_mapper.Map<Seat>(seatInformation));
+            }
             return ticketDto;
         }
 
@@ -406,6 +416,10 @@ public async Task<double> GetTicketPricesByBookingOrderAsync(Guid bookingOrderId
             return tickets.Sum(t => (double)t.TotalPrice);
         }
 
-        public Task CancelTicketAsync(Guid ticketId) => throw new NotImplementedException();
+        public async Task CancelTicketAsync(Guid ticketId)
+        {
+            var ticket = await _bookingUnitOfWork.TicketRepository.GetByIdAsync(ticketId);
+            ticket.Status = TicketStatusEnum.Cancelled;
+        }
     }
 }