removed trip and ticket status entities

AndriyBorkovich · May 1, 2024 · 2e91655 · 2e91655
1 parent 7adfd48
commit 2e91655
Show file tree

Hide file tree

Showing 14 changed files with 968 additions and 169 deletions.
diff --git a/src/BSMS.Application/Contracts/Persistence/ITicketStatusRepository.cs b/src/BSMS.Application/Contracts/Persistence/ITicketStatusRepository.cs
diff --git a/src/BSMS.Application/Contracts/Persistence/ITripStatusRepository.cs b/src/BSMS.Application/Contracts/Persistence/ITripStatusRepository.cs
diff --git a/src/BSMS.Application/MappingProfiles/TicketProfile.cs b/src/BSMS.Application/MappingProfiles/TicketProfile.cs
@@ -1,5 +1,6 @@
 using BSMS.Application.Features.Ticket.Commands.Create;
 using BSMS.Core.Entities;
+using BSMS.Core.Enums;
 using Mapster;
 
 namespace BSMS.Application.MappingProfiles;
@@ -9,9 +10,9 @@ public class TicketProfile : IRegister
     public void Register(TypeAdapterConfig config)
     {
         config.NewConfig<CreateTicketCommand, Ticket>()
-            .AfterMapping((_, dest) =>
+            .AfterMapping((_, dest) => 
             {
-                dest.IsSold = false;
+                dest.Status = TicketStatus.Active;    
             });
     }
-}
+}
diff --git a/src/BSMS.Core/Entities/Ticket.cs b/src/BSMS.Core/Entities/Ticket.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations.Schema;
+using BSMS.Core.Enums;
 
 namespace BSMS.Core.Entities;
 
@@ -12,10 +13,10 @@ public class Ticket
     [Column(TypeName = "decimal(18,2)")]
     public decimal Price { get; set; }
     public bool IsSold { get; set; }
+    public TicketStatus Status {get; set; }
 
     public Stop StartStop { get; set; } = null!;
     public Stop EndStop { get; set; } = null!;
     public Seat Seat { get; set; } = null!;
     public TicketPayment Payment { get; set; } = null!;
-    public List<TicketStatus> Statuses { get; set; }
 }
diff --git a/src/BSMS.Core/Entities/TicketStatus.cs b/src/BSMS.Core/Entities/TicketStatus.cs
diff --git a/src/BSMS.Core/Entities/Trip.cs b/src/BSMS.Core/Entities/Trip.cs
@@ -9,10 +9,16 @@ public class Trip
     public int TripId { get; set; }
     public int BusScheduleEntryId { get; set; }
 
-    public DateTime DepartureTime { get; set; }
-    public DateTime ArrivalTime { get; set; }
+    /// <summary>
+    /// actual time when trip has started
+    /// </summary>
+    public DateTime? DepartureTime { get; set; }
+    /// <summary>
+    /// actual time when trip has ended
+    /// </summary>
+    public DateTime? ArrivalTime { get; set; }
+    public TripStatus Status {get; set; }
 
     public BusScheduleEntry BusScheduleEntry { get; set; }
     public List<TicketPayment> BoughtTickets { get; set; }
-    public List<TripStatus> Statuses { get; set; }
 }
diff --git a/src/BSMS.Core/Entities/TripStatus.cs b/src/BSMS.Core/Entities/TripStatus.cs
diff --git a/src/BSMS.Core/Enums/TripStatus.cs b/src/BSMS.Core/Enums/TripStatus.cs
@@ -4,8 +4,6 @@ public enum TripStatus
 {
     Scheduled = 100,
     InTransit = 200,
-    Delayed = 300,
     Canceled = 400,
-    Disrupted = 500,
-    Completed = 600
+    Completed = 500
 }
diff --git a/src/BSMS.Infrastructure/Persistence/BusStationContext.cs b/src/BSMS.Infrastructure/Persistence/BusStationContext.cs
@@ -27,8 +27,6 @@ public BusStationContext(DbContextOptions<BusStationContext> options)
     public DbSet<Ticket> Tickets { get; set; }
     public DbSet<TicketPayment> TicketPayments { get; set; }
     public DbSet<Trip> Trips { get; set; }
-    public DbSet<TicketStatus> TicketStatuses { get; set; }
-    public DbSet<TripStatus> TripStatuses { get; set; }
     public DbSet<User> Users { get; set; }
     public DbSet<BusDetailsView> BusesDetailsView { get; set; }
 
@@ -42,8 +40,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             .ToTable(tb => tb.UseSqlOutputClause(false));
         modelBuilder.Entity<Ticket>()
             .ToTable(tb => tb.UseSqlOutputClause(false));
-        modelBuilder.Entity<TicketStatus>()
-            .ToTable(tb => tb.UseSqlOutputClause(false));
         modelBuilder.Entity<Route>()
             .ToTable(tb => tb.UseSqlOutputClause(false));
         modelBuilder.Entity<Stop>()
@@ -80,12 +76,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             .HasConversion<string>()
             .HasMaxLength(20);
 
-        modelBuilder.Entity<TicketStatus>()
+        modelBuilder.Entity<Ticket>()
             .Property(ts => ts.Status)
             .HasConversion<string>()
             .HasMaxLength(20);
 
-        modelBuilder.Entity<TripStatus>()
+        modelBuilder.Entity<Trip>()
             .Property(ts => ts.Status)
             .HasConversion<string>()
             .HasMaxLength(20);
@@ -95,15 +91,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             .WithOne(p => p.Ticket)
             .OnDelete(DeleteBehavior.ClientCascade);
 
-        modelBuilder.Entity<Ticket>()
-            .HasMany(t => t.Statuses)
-            .WithOne(s => s.Ticket)
-            .OnDelete(DeleteBehavior.ClientCascade);
-
-        modelBuilder.Entity<Trip>()
-            .HasMany(t => t.Statuses)
-            .WithOne(s => s.Trip)
-            .OnDelete(DeleteBehavior.ClientCascade);
 
         modelBuilder.HasDbFunction(
                 typeof(BusStationContext).GetMethod(nameof(StopsBelongToSameRoute),