diff --git a/Server/Models/TicketGroup.cs b/Server/Models/TicketGroup.cs index de41e67..f310b96 100644 --- a/Server/Models/TicketGroup.cs +++ b/Server/Models/TicketGroup.cs @@ -9,6 +9,7 @@ public class TicketGroup public DateTime PurchaseDateTimeUtc { get; set; } = DateTime.MinValue; public bool IsReturned { get; set; } = false; + public string UserId { get; set; } = null!; public User User { get; set; } = null!; @@ -88,5 +89,6 @@ public class TicketGroup .First(ra => ra.AddressId == Tickets.Last().LastRouteAddressId) .Address; } + public bool IsPurchased() => PurchaseDateTimeUtc != DateTime.MinValue; } \ No newline at end of file diff --git a/Server/Services/TicketGroupManagementService.cs b/Server/Services/TicketGroupManagementService.cs index 56752df..d8e41d6 100644 --- a/Server/Services/TicketGroupManagementService.cs +++ b/Server/Services/TicketGroupManagementService.cs @@ -192,6 +192,7 @@ public class TicketGroupManagementService : ITicketGroupManagementService { Id = ticketGroup.Id, IsReturned = ticketGroup.IsReturned, + IsPurchased = ticketGroup.PurchaseDateTimeUtc != DateTime.MinValue, PurchaseDateTime = ticketGroup.PurchaseDateTimeUtc, DepartureAddressName = ticketGroup.Tickets.First().GetDepartureAddress().Name, DepartureCityName = ticketGroup.Tickets.First().GetDepartureAddress().City.Name, @@ -199,11 +200,11 @@ public class TicketGroupManagementService : ITicketGroupManagementService DepartureCountryName = ticketGroup.Tickets.First().GetDepartureAddress().City.State.Country.Name, DepartureFullName = ticketGroup.Tickets.First().GetDepartureAddress().GetFullName(), DepartureDateTime = ticketGroup.Tickets.First().GetDepartureTime(), - ArrivalAddressName = ticketGroup.Tickets.First().GetArrivalAddress().Name, - ArrivalCityName = ticketGroup.Tickets.First().GetArrivalAddress().City.Name, - ArrivalStateName = ticketGroup.Tickets.First().GetArrivalAddress().City.State.Name, - ArrivalCountryName = ticketGroup.Tickets.First().GetArrivalAddress().City.State.Country.Name, - ArrivalFullName = ticketGroup.Tickets.First().GetArrivalAddress().GetFullName(), + ArrivalAddressName = ticketGroup.Tickets.Last().GetArrivalAddress().Name, + ArrivalCityName = ticketGroup.Tickets.Last().GetArrivalAddress().City.Name, + ArrivalStateName = ticketGroup.Tickets.Last().GetArrivalAddress().City.State.Name, + ArrivalCountryName = ticketGroup.Tickets.Last().GetArrivalAddress().City.State.Country.Name, + ArrivalFullName = ticketGroup.Tickets.Last().GetArrivalAddress().GetFullName(), ArrivalDateTime = ticketGroup.Tickets.Last().GetArrivalTime(), Cost = ticketGroup.GetCost(), Tickets = inGroupTicketDtos diff --git a/SharedModels/DataTransferObjects/DatabaseModels/TicketGroupDto.cs b/SharedModels/DataTransferObjects/DatabaseModels/TicketGroupDto.cs index 3a201a5..4bdd979 100644 --- a/SharedModels/DataTransferObjects/DatabaseModels/TicketGroupDto.cs +++ b/SharedModels/DataTransferObjects/DatabaseModels/TicketGroupDto.cs @@ -9,6 +9,7 @@ public class TicketGroupDto [DataType(DataType.DateTime)] public DateTime PurchaseDateTime { get; set; } public bool IsReturned { get; set; } = false; + public bool IsPurchased { get; set; } public string DepartureAddressName { get; set; } = null!; public string DepartureCityName { get; set; } = null!; diff --git a/SharedModels/QueryParameters/Objects/TicketGroupParameters.cs b/SharedModels/QueryParameters/Objects/TicketGroupParameters.cs index 8e8404f..49b9295 100644 --- a/SharedModels/QueryParameters/Objects/TicketGroupParameters.cs +++ b/SharedModels/QueryParameters/Objects/TicketGroupParameters.cs @@ -3,7 +3,7 @@ namespace SharedModels.QueryParameters.Objects; public class TicketGroupParameters : ParametersBase { public const string DefaultFields = - "id,userId,purchaseDateTime,isReturned,departureAddressName,departureCityName,departureStateName,departureCountryName," + + "id,userId,purchaseDateTime,isReturned,isPurchased,departureAddressName,departureCityName,departureStateName,departureCountryName," + "departureFullName,departureDateTime,arrivalAddressName,arrivalCityName,arrivalStateName,arrivalCountryName,arrivalFullName," + "arrivalDateTime,cost,tickets";