cuqmbr/auto.bus_api
1
0
Fork 0
Code Issues Pull Requests Activity

fix: invalid arrival address details in TicketGroupDto; add isPurchased field

Browse Source 
Before this arrival address info in TicketGroupDto was being populated by first ticket arrival address info
This commit is contained in:
cuqmbr 2023-05-25 11:49:37 +03:00
parent 7cf3f34f28
commit 5fecec2d3e
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Server/Models/TicketGroup.cs
View File

@ -9,6 +9,7 @@ public class TicketGroup
public DateTime PurchaseDateTimeUtc { get; set; } = DateTime.MinValue; public DateTime PurchaseDateTimeUtc { get; set; } = DateTime.MinValue;
public bool IsReturned { get; set; } = false; public bool IsReturned { get; set; } = false;
public string UserId { get; set; } = null!; public string UserId { get; set; } = null!;
public User User { get; set; } = null!; public User User { get; set; } = null!;
@ -88,5 +89,6 @@ public class TicketGroup
.First(ra => ra.AddressId == Tickets.Last().LastRouteAddressId) .First(ra => ra.AddressId == Tickets.Last().LastRouteAddressId)
.Address; .Address;
} }
public bool IsPurchased() => PurchaseDateTimeUtc != DateTime.MinValue; public bool IsPurchased() => PurchaseDateTimeUtc != DateTime.MinValue;
} }

11
Server/Services/TicketGroupManagementService.cs
View File

@ -192,6 +192,7 @@ public class TicketGroupManagementService : ITicketGroupManagementService
{ {
Id = ticketGroup.Id, Id = ticketGroup.Id,
IsReturned = ticketGroup.IsReturned, IsReturned = ticketGroup.IsReturned,
IsPurchased = ticketGroup.PurchaseDateTimeUtc != DateTime.MinValue,
PurchaseDateTime = ticketGroup.PurchaseDateTimeUtc, PurchaseDateTime = ticketGroup.PurchaseDateTimeUtc,
DepartureAddressName = ticketGroup.Tickets.First().GetDepartureAddress().Name, DepartureAddressName = ticketGroup.Tickets.First().GetDepartureAddress().Name,
DepartureCityName = ticketGroup.Tickets.First().GetDepartureAddress().City.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, DepartureCountryName = ticketGroup.Tickets.First().GetDepartureAddress().City.State.Country.Name,
DepartureFullName = ticketGroup.Tickets.First().GetDepartureAddress().GetFullName(), DepartureFullName = ticketGroup.Tickets.First().GetDepartureAddress().GetFullName(),
DepartureDateTime = ticketGroup.Tickets.First().GetDepartureTime(), DepartureDateTime = ticketGroup.Tickets.First().GetDepartureTime(),
ArrivalAddressName = ticketGroup.Tickets.First().GetArrivalAddress().Name, ArrivalAddressName = ticketGroup.Tickets.Last().GetArrivalAddress().Name,
ArrivalCityName = ticketGroup.Tickets.First().GetArrivalAddress().City.Name, ArrivalCityName = ticketGroup.Tickets.Last().GetArrivalAddress().City.Name,
ArrivalStateName = ticketGroup.Tickets.First().GetArrivalAddress().City.State.Name, ArrivalStateName = ticketGroup.Tickets.Last().GetArrivalAddress().City.State.Name,
ArrivalCountryName = ticketGroup.Tickets.First().GetArrivalAddress().City.State.Country.Name, ArrivalCountryName = ticketGroup.Tickets.Last().GetArrivalAddress().City.State.Country.Name,
ArrivalFullName = ticketGroup.Tickets.First().GetArrivalAddress().GetFullName(), ArrivalFullName = ticketGroup.Tickets.Last().GetArrivalAddress().GetFullName(),
ArrivalDateTime = ticketGroup.Tickets.Last().GetArrivalTime(), ArrivalDateTime = ticketGroup.Tickets.Last().GetArrivalTime(),
Cost = ticketGroup.GetCost(), Cost = ticketGroup.GetCost(),
Tickets = inGroupTicketDtos Tickets = inGroupTicketDtos

1
SharedModels/DataTransferObjects/DatabaseModels/TicketGroupDto.cs
View File

@ -9,6 +9,7 @@ public class TicketGroupDto
[DataType(DataType.DateTime)] [DataType(DataType.DateTime)]
public DateTime PurchaseDateTime { get; set; } public DateTime PurchaseDateTime { get; set; }
public bool IsReturned { get; set; } = false; public bool IsReturned { get; set; } = false;
public bool IsPurchased { get; set; }
public string DepartureAddressName { get; set; } = null!; public string DepartureAddressName { get; set; } = null!;
public string DepartureCityName { get; set; } = null!; public string DepartureCityName { get; set; } = null!;

2
SharedModels/QueryParameters/Objects/TicketGroupParameters.cs
View File

@ -3,7 +3,7 @@ namespace SharedModels.QueryParameters.Objects;
public class TicketGroupParameters : ParametersBase public class TicketGroupParameters : ParametersBase
{ {
public const string DefaultFields = 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," + "departureFullName,departureDateTime,arrivalAddressName,arrivalCityName,arrivalStateName,arrivalCountryName,arrivalFullName," +
"arrivalDateTime,cost,tickets"; "arrivalDateTime,cost,tickets";