FIX Update Distance & Time of TRavel

- content
FullStackMap · Mar 31, 2024 · 7137c93 · 7137c93
1 parent 6f31918
commit 7137c93
Show file tree

Hide file tree

Showing 15 changed files with 641 additions and 50 deletions.
diff --git a/Map.Api/AutoMapperProfies/TravelProfiles.cs b/Map.Api/AutoMapperProfies/TravelProfiles.cs
@@ -1,6 +1,5 @@
 using AutoMapper;
 using Map.Domain.Entities;
-using Map.Domain.Models.AddTravel;
 using Map.Domain.Models.Travels;
 
 namespace Map.API.AutoMapperProfies;

diff --git a/Map.Api/Controllers/TravelController.cs b/Map.Api/Controllers/TravelController.cs
@@ -4,7 +4,7 @@
 using FluentValidation.Results;
 using Map.Domain.Entities;
 using Map.Domain.ErrorCodes;
-using Map.Domain.Models.AddTravel;
+using Map.Domain.Models.Travels;
 using Map.Platform.Interfaces;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/Map.Api/Extension/ServiceCollectionExtensions.cs b/Map.Api/Extension/ServiceCollectionExtensions.cs
@@ -10,10 +10,10 @@
 using Map.API.Validator.TripValidator;
 using Map.API.Validator.UserValidator;
 using Map.Domain.Entities;
-using Map.Domain.Models.AddTravel;
 using Map.Domain.Models.Auth;
 using Map.Domain.Models.Step;
 using Map.Domain.Models.Testimonial;
+using Map.Domain.Models.Travels;
 using Map.Domain.Models.Trip;
 using Map.Domain.Models.User;
 using Map.Domain.Settings;

diff --git a/Map.Api/Validator/StepValidator/AddStepValidator.cs b/Map.Api/Validator/StepValidator/AddStepValidator.cs
@@ -1,8 +1,8 @@
 using FluentValidation;
 using Map.API.Extension;
 using Map.Domain.ErrorCodes;
-using Map.Domain.Models.AddTravel;
 using Map.Domain.Models.Step;
+using Map.Domain.Models.Travels;
 
 namespace Map.API.Validator.StepValidator;
 

diff --git a/Map.Api/Validator/TravelValidator/AddTravelValidator.cs b/Map.Api/Validator/TravelValidator/AddTravelValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
 using Map.Domain.Entities;
 using Map.Domain.ErrorCodes;
-using Map.Domain.Models.AddTravel;
+using Map.Domain.Models.Travels;
 using Map.Platform.Interfaces;
 
 namespace Map.API.Validator.TravelValidator;

diff --git a/Map.Api/wwwroot/swagger/swagger.json b/Map.Api/wwwroot/swagger/swagger.json
@@ -4782,12 +4782,12 @@
             "nullable": true
           },
           "distance": {
-            "type": "number",
-            "format": "double"
+            "type": "integer",
+            "format": "int32"
           },
           "duration": {
-            "type": "number",
-            "format": "double"
+            "type": "integer",
+            "format": "int32"
           },
           "originStepId": {
             "type": "integer",
@@ -5142,12 +5142,12 @@
             "nullable": true
           },
           "distance": {
-            "type": "number",
-            "format": "double"
+            "type": "integer",
+            "format": "int32"
           },
           "duration": {
-            "type": "number",
-            "format": "double"
+            "type": "integer",
+            "format": "int32"
           },
           "travelRoad": {
             "$ref": "#/components/schemas/TravelRoadDto"
@@ -5175,12 +5175,12 @@
             "nullable": true
           },
           "distance": {
-            "type": "number",
-            "format": "double"
+            "type": "integer",
+            "format": "int32"
           },
           "duration": {
-            "type": "number",
-            "format": "double"
+            "type": "integer",
+            "format": "int32"
           },
           "travelRoad": {
             "$ref": "#/components/schemas/TravelRoadDto"

diff --git a/Map.Domain/Entities/Travel.cs b/Map.Domain/Entities/Travel.cs
@@ -12,8 +12,8 @@ public class Travel
     public virtual Step? DestinationStep { get; set; }
 
     public string TransportMode { get; set; }
-    public decimal Distance { get; set; }
-    public decimal Duration { get; set; }
+    public int Distance { get; set; }
+    public int Duration { get; set; }
 
     public virtual TravelRoad? TravelRoad { get; set; }
 }
diff --git a/Map.Domain/Models/Travels/AddTravelDto.cs b/Map.Domain/Models/Travels/AddTravelDto.cs
@@ -1,9 +1,9 @@
-namespace Map.Domain.Models.AddTravel;
+namespace Map.Domain.Models.Travels;
 public class AddTravelDto
 {
     public string TransportMode { get; set; }
-    public decimal Distance { get; set; }
-    public decimal Duration { get; set; }
+    public int Distance { get; set; }
+    public int Duration { get; set; }
     public int OriginStepId { get; set; }
     public int DestinationStepId { get; set; }
 

diff --git a/Map.Domain/Models/Travels/TravelDto.cs b/Map.Domain/Models/Travels/TravelDto.cs
@@ -11,8 +11,8 @@ public class TravelDto
     public virtual StepDto? DestinationStep { get; set; }
 
     public string TransportMode { get; set; }
-    public decimal Distance { get; set; }
-    public decimal Duration { get; set; }
+    public int Distance { get; set; }
+    public int Duration { get; set; }
 
     public virtual TravelRoadDto? TravelRoad { get; set; }
 }
diff --git a/Map.Domain/Models/Travels/TravelDtoList.cs b/Map.Domain/Models/Travels/TravelDtoList.cs
@@ -7,8 +7,8 @@ public class TravelDtoList
     public int DestinationStepId { get; set; }
 
     public string TransportMode { get; set; }
-    public decimal Distance { get; set; }
-    public decimal Duration { get; set; }
+    public int Distance { get; set; }
+    public int Duration { get; set; }
 
     public virtual TravelRoadDto? TravelRoad { get; set; }
 }
diff --git a/Map.EFCore/Data/DBInitializer.cs b/Map.EFCore/Data/DBInitializer.cs
@@ -117,7 +117,6 @@ private async Task AddSingleUserAsync()
             PhoneNumberConfirmed = true,
         };
 
-
         IdentityResult resultAddUser = await _userManager.CreateAsync(simpleUser, _password);
         if (!resultAddUser.Succeeded)
             throw new ApplicationException("Adding user '" + simpleUser.UserName + "' failed with error(s): " + resultAddUser.Errors);
@@ -131,7 +130,7 @@ private async Task AddSingleUserAsync()
 
     private async Task AddUsersAsync()
     {
-        List<MapUser> mapUsers = new List<MapUser>
+        List<MapUser> mapUsers = new()
         {
             new MapUser
             {
@@ -175,7 +174,7 @@ private async Task AddUsersAsync()
             },
         };
 
-        Random random = new Random();
+        Random random = new();
         foreach (MapUser user in mapUsers)
         {
             user.EmailConfirmed = random.Next(2) == 0;
@@ -199,7 +198,7 @@ private async Task AddTripsAsync()
             int numTrips = _random.Next(2, 11);
             for (int i = 0; i < numTrips; i++)
             {
-                Trip trip = new Trip
+                Trip trip = new()
                 {
                     User = user,
                     Name = $"Trip {i + 1} for {user.UserName}",
@@ -212,17 +211,17 @@ private async Task AddTripsAsync()
                 await _context.Trip.AddAsync(trip);
 
                 int numSteps = _random.Next(5, 15);
-                List<Step> steps = new List<Step>();
+                List<Step> steps = new();
 
                 for (int j = 0; j < numSteps; j++)
                 {
-                    Step step = new Step
+                    Step step = new()
                     {
                         TripId = trip.TripId,
                         Order = j + 1,
                         Name = $"Step {j + 1} for Trip {i + 1} of user {user.UserName}",
-                        Longitude = (decimal)(_random.NextDouble() * 360 - 180),
-                        Latitude = (decimal)(_random.NextDouble() * 180 - 90),
+                        Longitude = (decimal)((_random.NextDouble() * 360) - 180),
+                        Latitude = (decimal)((_random.NextDouble() * 180) - 90),
                         Description = $"Description for Step {j + 1} for Trip {i + 1}",
                         StartDate = DateTime.Now.AddDays(j),
                         EndDate = DateTime.Now.AddDays(j + 1),
@@ -237,16 +236,16 @@ private async Task AddTripsAsync()
 
                 for (int k = 0; k < steps.Count - 1; k++)
                 {
-                    Travel travel = new Travel
+                    Travel travel = new()
                     {
                         TripId = trip.TripId,
                         OriginStep = steps[k],
                         DestinationStep = steps[k + 1],
                         TransportMode = "plane",
-                        Distance = (decimal)_random.NextDouble() * 1000,
-                        Duration = (decimal)_random.NextDouble() * 24
+                        Distance = (int)_random.Next() * 1000,
+                        Duration = (int)_random.Next() * 60
                     };
-                    TravelRoad travelRoad = new TravelRoad
+                    TravelRoad travelRoad = new()
                     {
                         TravelId = travel.TravelId,
                         Travel = travel,
@@ -268,7 +267,7 @@ private async Task GenerateTestimonialsAsync()
             int numTestimonials = _random.Next(1, 4);
             for (int i = 0; i < numTestimonials; i++)
             {
-                Testimonial testimonial = new Testimonial
+                Testimonial testimonial = new()
                 {
                     FeedBack = GenerateRandomFeedback(),
                     UserId = user.Id,
@@ -299,6 +298,5 @@ private string GenerateRandomFeedback()
         return feedbacks[_random.Next(feedbacks.Length)];
     }
 
-
 }
 
diff --git a/Map.EFCore/MapContext.cs b/Map.EFCore/MapContext.cs
@@ -86,8 +86,6 @@ protected override void OnModelCreating(ModelBuilder builder)
             s.Property(s => s.StartDate).IsRequired(false);
             s.Property(s => s.EndDate).IsRequired(false);
 
-
-
             s.HasOne(s => s.Trip)
                 .WithMany(t => t.Steps)
                 .HasForeignKey(s => s.TripId)
@@ -112,8 +110,8 @@ protected override void OnModelCreating(ModelBuilder builder)
             t.Property(t => t.OriginStepId).IsRequired();
             t.Property(t => t.DestinationStepId).IsRequired();
             t.Property(t => t.TransportMode).IsRequired();
-            t.Property(t => t.Distance).HasPrecision(18, 12).IsRequired();
-            t.Property(t => t.Duration).HasPrecision(18, 12).IsRequired();
+            t.Property(t => t.Distance).IsRequired();
+            t.Property(t => t.Duration).IsRequired();
 
             t.HasOne(t => t.OriginStep)
                 .WithOne(s => s.TravelAfter)