refactor: change route search to accept cityId instead of addressId

Server/Configurations/MapperInitializer.cs

@@ -1,4 +1,3 @@
-using System.Dynamic;
 using AutoMapper;
 using Server.Models;
 using SharedModels.DataTransferObjects;

Server/Controllers/AutomationController.cs

@@ -1,30 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Server.Services;
-
-namespace Server.Controllers;
-
-[Route("api/[controller]")]
-[ApiController]
-public class AutomationController : ControllerBase
-{
-    private readonly AutomationService _automationService;
-
-    public AutomationController(AutomationService automationService)
-    {
-        _automationService = automationService;
-    }
-
-    [HttpGet]
-    public async Task<IActionResult> GetRoute(int from, int to, DateTime date)
-    {
-        var result = await _automationService.GetRoute(from, to, date);
-
-        if (!result.isSucceed)
-        {
-            return result.actionResult;
-        }
-
-        return Ok(result.result);
-    }
-}
-

Server/Controllers/VehicleEnrollmentSearchController.cs

@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Mvc;
+using Server.Services;
+
+namespace Server.Controllers;
+
+[Route("api/search")]
+[ApiController]
+public class VehicleEnrollmentSearchController : ControllerBase
+{
+    private readonly VehicleEnrollmentSearchService _vehicleEnrollmentSearchService;
+
+    public VehicleEnrollmentSearchController(VehicleEnrollmentSearchService vehicleEnrollmentSearchService)
+    {
+        _vehicleEnrollmentSearchService = vehicleEnrollmentSearchService;
+    }
+
+    [HttpGet]
+    public async Task<IActionResult> GetRoute(int from, int to, DateTime date)
+    {
+        var result = await _vehicleEnrollmentSearchService.GetRoute(from, to, date);
+
+        if (!result.isSucceed)
+        {
+            return result.actionResult;
+        }
+
+        return Ok(result.result);
+    }
+}
+

Server/Program.cs

@@ -56,8 +56,7 @@ services.AddSwaggerGen(options => {
 });
 
 services.AddCors(options => {
-    options.AddDefaultPolicy(policy => policy.AllowAnyOrigin()
+    options.AddDefaultPolicy(policy => policy.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod());
-        .AllowAnyHeader().AllowAnyMethod());
 });
 
 services.AddIdentityCore<User>(options =>
@@ -146,7 +145,7 @@ services.AddScoped<IDataShaper<ExpandoObject>, DataShaper<ExpandoObject>>();
 services.AddScoped<ISortHelper<ExpandoObject>, SortHelper<ExpandoObject>>();
 services.AddScoped<IPager<ExpandoObject>, Pager<ExpandoObject>>();
 
-services.AddScoped<AutomationService>();
+services.AddScoped<VehicleEnrollmentSearchService>();
 services.AddScoped<IReportService, ReportService>();
 services.AddScoped<IStatisticsService, StatisticsService>();
 
@@ -170,7 +169,7 @@ if (Convert.ToBoolean(configuration["UseApiExplorer"]))
 }
 
 /*
-app.UseHttpsRedirection();
+pp.UseHttpsRedirection();
 */
 
 app.UseAuthentication();

Server/Services/AddressManagementService.cs

@@ -153,7 +153,9 @@ public class AddressManagementService : IAddressManagementService
             }
         }
 
-        var dbAddress = await _dbContext.Addresses.FirstAsync(a => a.Id == address.Id);
+        var dbAddress = await _dbContext.Addresses.Where(a => a.Id == address.Id)
+            .Include(a => a.City).ThenInclude(c => c.State)
+            .ThenInclude(s => s.Country).FirstAsync();
         
         return (true, null, _mapper.Map<AddressDto>(dbAddress));
     }

Server/Services/VehicleEnrollmentSearchService.cs

@@ -4,23 +4,21 @@ using Microsoft.EntityFrameworkCore;
 using Server.Data;
 using Server.Helpers;
 using Server.Models;
+using SharedModels.Responses;
 
 namespace Server.Services;
 
-public class AutomationService
+public class VehicleEnrollmentSearchService
 {
     private readonly ApplicationDbContext _dbContext;
-    private readonly ISortHelper<ExpandoObject> _sortHelper;
 
-    public AutomationService(ApplicationDbContext dbContext, 
+    public VehicleEnrollmentSearchService(ApplicationDbContext dbContext)
-        ISortHelper<ExpandoObject> sortHelper)
     {
         _dbContext = dbContext;
-        _sortHelper = sortHelper;
     }
 
-    public async Task<(bool isSucceed, IActionResult? actionResult, List<ExpandoObject> result)> GetRoute(
+    public async Task<(bool isSucceed, IActionResult? actionResult, IList<EnrollmentGroup> result)>
-        int from, int to, DateTime date)
+        GetRoute(int fromCityId, int toCityId, DateTime date)
     {
         var dbEnrollments = await _dbContext.VehicleEnrollments
             .Include(ve => ve.Tickets)
@@ -36,20 +34,20 @@ public class AutomationService
 
         var toBeRemovedEnrollmentsIds = new List<int>();
         
+        // Find routes without transfers
+        
         var directEnrollments = new List<VehicleEnrollment>();
 
         foreach (var e in dbEnrollments)
         {
-            if (e.Route.RouteAddresses.Count(ra => ra.AddressId == from) == 0 ||
+            if (e.Route.RouteAddresses.Count(ra => ra.Address.CityId == fromCityId) == 0 ||
-                e.Route.RouteAddresses.Count(ra => ra.AddressId == to) == 0)
+                e.Route.RouteAddresses.Count(ra => ra.Address.CityId == toCityId) == 0)
             {
                     continue;
             }
             
-            var fromOrder = e.Route.RouteAddresses.FirstOrDefault(rad => 
+            var fromOrder = e.Route.RouteAddresses.First(ra => ra.Address.CityId == fromCityId).Order;
-                rad.AddressId == from)?.Order;
+            var toOrder = e.Route.RouteAddresses.First(ra => ra.Address.CityId == toCityId).Order;
-            var toOrder = e.Route.RouteAddresses.FirstOrDefault(rad => 
-                rad.AddressId == to)?.Order;
                 
             if (fromOrder < toOrder)
             {
@@ -65,10 +63,8 @@ public class AutomationService
         {
             var routeAddresses = de.Route.RouteAddresses;
             
-            var fromOrder = 
+            var fromOrder = routeAddresses.First(ra => ra.Address.CityId == fromCityId).Order;
-                routeAddresses.First(ra => ra.AddressId == from).Order;
+            var toOrder = routeAddresses.First(ra => ra.Address.CityId == toCityId).Order;
-            var toOrder = 
-                routeAddresses.First(ra => ra.AddressId == to).Order;
 
             directEnrollments[directEnrollments.IndexOf(de)].Route.RouteAddresses = routeAddresses
                 .OrderBy(ra => ra.Order)
@@ -80,18 +76,20 @@ public class AutomationService
                 .DepartureDateTimeUtc = GetDepartureTime(de);
         }
         
+        // Find routes with one transfer
         
+        // Find enrollments with departure city
         
         var enrollmentsWithFrom = new List<VehicleEnrollment>();
         
         foreach (var e in dbEnrollments)
         {
-            if (e.Route.RouteAddresses.Count(ra => ra.AddressId == from) == 0)
+            if (e.Route.RouteAddresses.Count(ra => ra.Address.CityId == fromCityId) == 0)
             {
                 continue;
             }
             
-            if (e.Route.RouteAddresses.Any(ra => ra.AddressId == from))
+            if (e.Route.RouteAddresses.Any(ra => ra.Address.CityId == fromCityId))
             {
                 enrollmentsWithFrom.Add(e);
                 toBeRemovedEnrollmentsIds.Add(e.Id);
@@ -105,25 +103,25 @@ public class AutomationService
         {
             var routeAddresses = ef.Route.RouteAddresses;
 
-            var fromOrder = 
+            var fromOrder = routeAddresses.First(ra => ra.Address.CityId == fromCityId).Order;
-                routeAddresses.First(ra => ra.AddressId == from).Order;
 
             enrollmentsWithFrom[enrollmentsWithFrom.IndexOf(ef)].Route.RouteAddresses = routeAddresses
                 .OrderBy(ra => ra.Order)
                 .SkipWhile(ra => ra.Order < fromOrder).ToList();
         }
         
+        // Find enrollments with arrival city
         
         var enrollmentsWithTo = new List<VehicleEnrollment>();
         
         foreach (var e in dbEnrollments)
         {
-            if (e.Route.RouteAddresses.Count(ra => ra.AddressId == to) == 0)
+            if (e.Route.RouteAddresses.Count(ra => ra.Address.CityId == toCityId) == 0)
             {
                 continue;
             }
             
-            if (e.Route.RouteAddresses.Any(ra => ra.AddressId == to))
+            if (e.Route.RouteAddresses.Any(ra => ra.Address.CityId == toCityId))
             {
                 enrollmentsWithTo.Add(e);
                 toBeRemovedEnrollmentsIds.Add(e.Id);
@@ -137,14 +135,16 @@ public class AutomationService
         {
             var routeAddresses = et.Route.RouteAddresses;
 
-            var toOrder = 
+            var toOrder = routeAddresses.First(ra => ra.Address.CityId == toCityId).Order;
-                routeAddresses.First(ra => ra.AddressId == to).Order;
 
             enrollmentsWithTo[enrollmentsWithTo.IndexOf(et)].Route.RouteAddresses = routeAddresses
                 .OrderBy(ra => ra.Order)
                 .TakeWhile(ra => ra.Order <= toOrder).ToList();
         }
         
+        // Find intersection of
+        // enrollments with only departure city and
+        // enrollments with only arrival city
         
         var oneTransferPath = new List<List<VehicleEnrollment>>();
 
@@ -159,10 +159,13 @@ public class AutomationService
                     etRouteAddresses.Select(x => x.AddressId),
                     x => x.AddressId).FirstOrDefault()?.AddressId;
 
-                var toOrder = efRouteAddresses.First(ra => 
+                if (intersectionAddressId == null)
-                        ra.AddressId == intersectionAddressId).Order;
+                {
-                var fromOrder = etRouteAddresses.First(ra => 
+                    continue;
-                    ra.AddressId == intersectionAddressId).Order;
+                }
+
+                var toOrder = efRouteAddresses.First(ra => ra.AddressId == intersectionAddressId).Order;
+                var fromOrder = etRouteAddresses.First(ra => ra.AddressId == intersectionAddressId).Order;
 
                 enrollmentsWithFrom[enrollmentsWithFrom.IndexOf(ef)].Route.RouteAddresses =
                     efRouteAddresses.OrderBy(ra => ra.Order)
@@ -182,69 +185,69 @@ public class AutomationService
                 }
             }
         }
+        
+        // Combine enrollments with transfers and enrollments without transfers
 
         foreach (var directEnrollment in directEnrollments)
         {
             oneTransferPath.Add(new List<VehicleEnrollment> {directEnrollment});
         }
         
-        var result = new List<ExpandoObject>();
+        // Form an object that will be returned
+        
+        var result = new SearchEnrollmentResponse();
 
-        int i = 1;
         foreach (var path in oneTransferPath)
         {
-            
+            var enrollmentGroup = new EnrollmentGroup();
-            var shapedPath = new ExpandoObject();
-            var enrollmentGroup = new ExpandoObject();
-
             int j = 1;
             foreach (var vehicleEnrollment in path)
             {
-                var enrollment = new ExpandoObject();
+                enrollmentGroup.Enrollments.Add(new FlattenedEnrollment
+                {
+                    Id = vehicleEnrollment.Id,
+                    
+                    DepartureAddressId = vehicleEnrollment.Route.RouteAddresses.First().AddressId,
+                    DepartureTime = GetDepartureTime(vehicleEnrollment),
+                    DepartureAddressName = vehicleEnrollment.Route.RouteAddresses.First().Address.Name,
+                    DepartureCityName = vehicleEnrollment.Route.RouteAddresses.First().Address.City.Name,
+                    DepartureStateName = vehicleEnrollment.Route.RouteAddresses.First().Address.City.State.Name,
+                    DepartureCountryName = vehicleEnrollment.Route.RouteAddresses.First().Address.City.State.Country.Name,
+                    DepartureAddressFullName = vehicleEnrollment.Route.RouteAddresses.First().Address.GetFullName(),
+                    
+                    ArrivalAddressId = vehicleEnrollment.Route.RouteAddresses.Last().AddressId,
+                    ArrivalTime = GetArrivalTime(vehicleEnrollment),
+                    ArrivalAddressName = vehicleEnrollment.Route.RouteAddresses.Last().Address.Name,
+                    ArrivalCityName = vehicleEnrollment.Route.RouteAddresses.Last().Address.City.Name,
+                    ArrivalStateName = vehicleEnrollment.Route.RouteAddresses.Last().Address.City.State.Name,
+                    ArrivalCountryName = vehicleEnrollment.Route.RouteAddresses.Last().Address.City.State.Country.Name,
+                    ArrivalAddressFullName = vehicleEnrollment.Route.RouteAddresses.Last().Address.GetFullName(),
+                    
+                    Order = j,
+                    
+                    VehicleId = vehicleEnrollment.VehicleId,
+                    VehicleNumber = vehicleEnrollment.Vehicle.Number,
+                    VehicleType = vehicleEnrollment.Vehicle.Type,
+                    
+                    CompanyId = vehicleEnrollment.Vehicle.CompanyId,
+                    CompanyName = vehicleEnrollment.Vehicle.Company.Name
+                });
 
-                enrollment.TryAdd("id", vehicleEnrollment.Id);
-                enrollment.TryAdd("departureTime", GetDepartureTime(vehicleEnrollment));
-                enrollment.TryAdd("arrivalTime", GetArrivalTime(vehicleEnrollment));
-                enrollment.TryAdd("departureAddressName", vehicleEnrollment.Route.RouteAddresses.First().Address.Name);
-                enrollment.TryAdd("departureAddressFullName", vehicleEnrollment.Route.RouteAddresses.First().Address.GetFullName());
-                enrollment.TryAdd("departureAddressId", vehicleEnrollment.Route.RouteAddresses.First().AddressId);
-                enrollment.TryAdd("arrivalAddressName", vehicleEnrollment.Route.RouteAddresses.Last().Address.Name);
-                enrollment.TryAdd("arrivalAddressFullName", vehicleEnrollment.Route.RouteAddresses.Last().Address.GetFullName());
-                enrollment.TryAdd("arrivalAddressId", vehicleEnrollment.Route.RouteAddresses.Last().AddressId);
-                enrollment.TryAdd("order", j);
-
-                var vehicle = new ExpandoObject();
-
-                vehicle.TryAdd("type", vehicleEnrollment.Vehicle.Type);
-                vehicle.TryAdd("number", vehicleEnrollment.Vehicle.Number);
-                
-                enrollment.TryAdd("vehicle", vehicle);
-                
-                var company = new ExpandoObject();
-
-                company.TryAdd("name", vehicleEnrollment.Vehicle.Company.Name);
-                
-                enrollment.TryAdd("company", company);
-                
-                
-                
-                enrollmentGroup.TryAdd($"enrollment{j}", enrollment);
-                
                 j++;
             }
 
-            enrollmentGroup.TryAdd("totalDuration", GetTotalDuration(path));
+            enrollmentGroup.Cost = GetTotalCost(path);
-            enrollmentGroup.TryAdd("totalCost", GetTotalCost(path));
+            enrollmentGroup.Duration = GetTotalDuration(path);
             
-            shapedPath.TryAdd($"enrollmentGroup{i}", enrollmentGroup);
+            result.EnrollmentGroups.Add(enrollmentGroup);
-            result.Add(shapedPath);
-
-            i++;
         }
 
-        // result = _sortHelper.ApplySort(result[].AsQueryable(), "+cost").ToList();
+        if (result.EnrollmentGroups.Count == 0)
+        {
+            return (false, new NotFoundResult(), null!);
+        }
         
-        return (true, null, result);
+        return (true, null, result.EnrollmentGroups);
 
         DateTime GetDepartureTime(VehicleEnrollment enrollment)
         {

SharedModels/DataTransferObjects/AddressDto.cs

@@ -36,6 +36,7 @@ public class InCityAddressDto
     public string Name { get; set; } = null!;
     public double Latitude { get; set; }
     public double Longitude { get; set; }
+    public int CityId { get; set; }
 }
 
 public class CreateAddressInRouteAddress

SharedModels/Responses/SearchEnrollmentResponse.cs

@@ -0,0 +1,53 @@
+namespace SharedModels.Responses;
+
+public class SearchEnrollmentResponse
+{
+    public SearchEnrollmentResponse()
+    {
+        EnrollmentGroups = new List<EnrollmentGroup>();
+    }
+    
+    public IList<EnrollmentGroup> EnrollmentGroups { get; set; }
+}
+
+public class EnrollmentGroup
+{
+    public EnrollmentGroup()
+    {
+        Enrollments = new List<FlattenedEnrollment>();
+    }
+    
+    public IList<FlattenedEnrollment> Enrollments { get; set; }
+    public TimeSpan Duration { get; set; }
+    public double Cost { get; set; }
+}
+
+public class FlattenedEnrollment
+{
+    public int Id { get; set; }
+    
+    public int DepartureAddressId { get; set; }
+    public DateTime DepartureTime { get; set; }
+    public string DepartureAddressName { get; set; } = null!;
+    public string DepartureCityName { get; set; } = null!;
+    public string DepartureStateName { get; set; } = null!;
+    public string DepartureCountryName { get; set; } = null!;
+    public string DepartureAddressFullName { get; set; } = null!;
+    
+    public int ArrivalAddressId { get; set; }
+    public DateTime ArrivalTime { get; set; }
+    public string ArrivalAddressName { get; set; } = null!;
+    public string ArrivalCityName { get; set; } = null!;
+    public string ArrivalStateName { get; set; } = null!;
+    public string ArrivalCountryName { get; set; } = null!;
+    public string ArrivalAddressFullName { get; set; } = null!;
+    
+    public int Order { get; set; }
+
+    public int CompanyId { get; set; }
+    public string CompanyName { get; set; } = null!;
+
+    public int VehicleId { get; set; }
+    public string VehicleType { get; set; } = null!;
+    public string VehicleNumber { get; set; } = null!;
+}