(#438) events: udpate application commands and dto

SaintAngeLs · Oct 27, 2024 · d7cd309 · d7cd309
1 parent 3a232c9
commit d7cd309
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Application/Commands/CreateEvent.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Application/Commands/CreateEvent.cs
@@ -23,6 +23,8 @@ public class CreateEvent : ICommand
         public string City { get; set; }
         public string ZipCode { get; set; }
         public string Country { get; set; }  
+        public double Latitude { get; set; }  
+        public double Longitude { get; set; } 
         public IEnumerable<string> MediaFilesUrl { get; set; }
         public string BannerUrl { get; set; } 
         public string Description { get; set; }

diff --git a/....Events/src/MiniSpace.Services.Events.Application/Commands/Handlers/CreateEventHandler.cs b/....Events/src/MiniSpace.Services.Events.Application/Commands/Handlers/CreateEventHandler.cs
@@ -78,7 +78,16 @@ public async Task HandleAsync(CreateEvent command, CancellationToken cancellatio
             _eventValidator.ValidateDates(startDate, endDate, "event_start_date", "event_end_date");
 
             // Create Address object
-            var address = new Address(command.BuildingName, command.Street, command.BuildingNumber, command.ApartmentNumber, command.City, command.ZipCode, command.Country);
+            var address = new Address(
+                command.BuildingName, 
+                command.Street, 
+                command.BuildingNumber, 
+                command.ApartmentNumber, 
+                command.City, 
+                command.ZipCode, 
+                command.Country, 
+                command.Latitude,
+                command.Longitude);  
 
             // Validate Capacity and Fee
             _eventValidator.ValidateCapacity(command.Capacity);

diff --git a/....Events/src/MiniSpace.Services.Events.Application/Commands/Handlers/UpdateEventHandler.cs b/....Events/src/MiniSpace.Services.Events.Application/Commands/Handlers/UpdateEventHandler.cs
@@ -55,8 +55,9 @@ public async Task HandleAsync(UpdateEvent command, CancellationToken cancellatio
             _eventValidator.ValidateDates(now, startDate, "now", "event_start_date");
             _eventValidator.ValidateDates(startDate, endDate, "event_start_date", "event_end_date");
 
-            var address = @event.Location.Update(command.BuildingName, command.Street, command.BuildingNumber, 
-                command.ApartmentNumber, command.City, command.ZipCode, command.Country);
+             var address = @event.Location.Update(command.BuildingName, command.Street, command.BuildingNumber, 
+                command.ApartmentNumber, command.City, command.ZipCode, command.Country, command.Latitude, command.Longitude);
+
             _eventValidator.ValidateCapacity(command.Capacity);
             _eventValidator.ValidateFee(command.Fee);
             var category = _eventValidator.ParseCategory(command.Category);

diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Application/Commands/UpdateEvent.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Application/Commands/UpdateEvent.cs
@@ -23,6 +23,8 @@ public class UpdateEvent : ICommand
         public string City { get; }
         public string ZipCode { get; }
         public string Country { get; }  
+        public double Latitude { get; }   
+        public double Longitude { get; }
         public IEnumerable<string> MediaFilesUrl { get; }
         public string BannerUrl { get; } 
         public string Description { get; }
@@ -35,9 +37,9 @@ public class UpdateEvent : ICommand
 
         public UpdateEvent(Guid eventId, string name, OrganizerType organizerType, Guid organizerId, Guid organizationId, 
             Guid rootOrganizationId, string startDate, string endDate, string buildingName, string street, 
-            string buildingNumber, string apartmentNumber, string city, string zipCode, string country, IEnumerable<string> mediaFiles, 
-            string bannerUrl, string description, int capacity, decimal fee, string category, string publishDate, 
-            Visibility visibility, EventSettings settings)
+            string buildingNumber, string apartmentNumber, string city, string zipCode, string country, double latitude, 
+            double longitude, IEnumerable<string> mediaFiles, string bannerUrl, string description, int capacity, 
+            decimal fee, string category, string publishDate, Visibility visibility, EventSettings settings)
         {
             EventId = eventId;
             Name = name;
@@ -54,6 +56,8 @@ public UpdateEvent(Guid eventId, string name, OrganizerType organizerType, Guid
             City = city;
             ZipCode = zipCode;
             Country = country; 
+            Latitude = latitude;    
+            Longitude = longitude; 
             MediaFilesUrl = mediaFiles;
             BannerUrl = bannerUrl; 
             Description = description;

diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Application/DTO/AddressDto.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Application/DTO/AddressDto.cs
@@ -6,19 +6,22 @@ namespace MiniSpace.Services.Events.Application.DTO
     [ExcludeFromCodeCoverage]
     public class AddressDto
     {
+        // Properties
         public string BuildingName { get; set; }
         public string Street { get; set; }
         public string BuildingNumber { get; set; }
         public string ApartmentNumber { get; set; }
         public string City { get; set; }
         public string ZipCode { get; set; }
         public string Country { get; set; }
+        public double Latitude { get; set; }   
+        public double Longitude { get; set; }  
 
-
+        // Default constructor
         public AddressDto()
         {
         }
-        
+
         public AddressDto(Address address)
         {
             BuildingName = address.BuildingName;
@@ -28,6 +31,8 @@ public AddressDto(Address address)
             City = address.City;
             ZipCode = address.ZipCode;
             Country = address.Country;
+            Latitude = address.Latitude;
+            Longitude = address.Longitude;
         }
     }
-}
+}