736 fix location field error displayng

EventsExpress.Core/DTOs/EventDTO.cs

@@ -31,11 +31,7 @@ public class EventDto
 
         public bool? IsPublic { get; set; }
 
-        public Point Point { get; set; }
-
-        public LocationType Type { get; set; }
-
-        public Uri OnlineMeeting { get; set; }
+        public LocationDto Location { get; set; }
 
         public IEnumerable<CategoryDto> Categories { get; set; }
 

EventsExpress.Core/DTOs/LocationDTO.cs

@@ -10,8 +10,8 @@ public class LocationDto
 
         public Point Point { get; set; }
 
-        public Uri OnlineMeeting { get; set; }
+        public string OnlineMeeting { get; set; }
 
-        public LocationType Type { get; set; }
+        public LocationType? Type { get; set; }
     }
 }

EventsExpress.Core/IServices/ILocationService.cs

@@ -15,6 +15,6 @@ public interface ILocationService
 
         LocationDto LocationByPoint(Point point);
 
-        LocationDto LocationByURI(Uri uri);
+        LocationDto LocationByURI(string uri);
     }
 }

EventsExpress.Core/Services/EventService.cs

@@ -26,7 +26,6 @@ public class EventService : BaseService<Event>, IEventService
         private readonly ILocationService _locationService;
         private readonly IMediator _mediator;
         private readonly IEventScheduleService _eventScheduleService;
-        private readonly IValidator<Event> _validator;
         private readonly ISecurityContext _securityContextService;
 
         public EventService(
@@ -36,15 +35,13 @@ public EventService(
             IPhotoService photoService,
             ILocationService locationService,
             IEventScheduleService eventScheduleService,
-            IValidator<Event> validator,
             ISecurityContext securityContextService)
             : base(context, mapper)
         {
             _photoService = photoService;
             _locationService = locationService;
             _mediator = mediator;
             _eventScheduleService = eventScheduleService;
-            _validator = validator;
             _securityContextService = securityContextService;
         }
 
@@ -156,7 +153,7 @@ public async Task<Guid> Create(EventDto eventDTO)
             eventDTO.DateFrom = (eventDTO.DateFrom == DateTime.MinValue) ? DateTime.Today : eventDTO.DateFrom;
             eventDTO.DateTo = (eventDTO.DateTo < eventDTO.DateFrom) ? eventDTO.DateFrom : eventDTO.DateTo;
 
-            var locationDTO = Mapper.Map<EventDto, LocationDto>(eventDTO);
+            var locationDTO = eventDTO.Location;
             var locationId = await _locationService.AddLocationToEvent(locationDTO);
 
             var ev = Mapper.Map<EventDto, Event>(eventDTO);
@@ -230,10 +227,9 @@ public async Task<Guid> Edit(EventDto e)
                 .Include(e => e.EventSchedule)
                 .FirstOrDefault(x => x.Id == e.Id);
 
-            if (e.OnlineMeeting != null || e.Point != null)
+            if (e.Location != null)
             {
-                var locationDTO = Mapper.Map<EventDto, LocationDto>(e);
-                var locationId = await _locationService.AddLocationToEvent(locationDTO);
+                var locationId = await _locationService.AddLocationToEvent(e.Location);
                 ev.EventLocationId = locationId;
             }
 
@@ -287,38 +283,17 @@ public async Task<Guid> Publish(Guid eventId)
                    .ThenInclude(c => c.Category)
                .FirstOrDefault(x => x.Id == eventId);
 
-            if (ev == null)
-            {
-                throw new EventsExpressException("Not found");
-            }
-
-            Dictionary<string, string> exept = new Dictionary<string, string>();
-            var result = _validator.Validate(ev);
-
-            if (result.IsValid)
-            {
-                ev.StatusHistory.Add(
+            ev.StatusHistory.Add(
                     new EventStatusHistory
                     {
                         EventStatus = EventStatus.Active,
                         CreatedOn = DateTime.UtcNow,
                         UserId = CurrentUserId(),
                     });
-                await Context.SaveChangesAsync();
-                EventDto dtos = Mapper.Map<Event, EventDto>(ev);
-                await _mediator.Publish(new EventCreatedMessage(dtos));
-                return ev.Id;
-            }
-            else
-            {
-                var p = result.Errors.Select(e => new KeyValuePair<string, string>(e.PropertyName, e.ErrorMessage));
-                foreach (var x in p)
-                {
-                    exept.Add(x.Key, x.Value);
-                }
-
-                throw new EventsExpressException("validation failed", exept);
-            }
+            await Context.SaveChangesAsync();
+            EventDto dtos = Mapper.Map<Event, EventDto>(ev);
+            await _mediator.Publish(new EventCreatedMessage(dtos));
+            return ev.Id;
         }
 
         public async Task<Guid> EditNextEvent(EventDto eventDTO)

EventsExpress.Core/Services/LocationService.cs

@@ -51,7 +51,7 @@ public LocationDto LocationByPoint(Point point)
             return locationDTO;
         }
 
-        public LocationDto LocationByURI(Uri uri)
+        public LocationDto LocationByURI(string uri)
         {
             var locationDTO = Mapper.Map<LocationDto>(Context.EventLocations
                 .Where(e =>

EventsExpress.Db/Entities/EventLocation.cs

@@ -14,9 +14,9 @@ public class EventLocation : BaseEntity
         public Point Point { get; set; }
 
         [Track]
-        public Uri OnlineMeeting { get; set; }
+        public string OnlineMeeting { get; set; }
 
         [Track]
-        public LocationType Type { get; set; }
+        public LocationType? Type { get; set; }
     }
 }

EventsExpress.Test/ControllerTests/EventControllerTests.cs

@@ -16,8 +16,11 @@
 using EventsExpress.Db.Bridge;
 using EventsExpress.Db.Entities;
 using EventsExpress.Db.Enums;
+using EventsExpress.ExtensionMethods;
 using EventsExpress.ViewModels;
+using EventsExpress.ViewModels.Base;
 using FluentValidation;
+using FluentValidation.Results;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -34,6 +37,7 @@ internal class EventControllerTests
         private Mock<ISecurityContext> mockSecurityContextService;
         private Mock<IPhotoService> mockPhotoservice;
         private Mock<IValidator<IFormFile>> mockValidator;
+        private Mock<IValidator<EventViewModel>> mockEventViewModelValidator;
         private UserDto _userDto;
         private Guid _idUser = Guid.NewGuid();
         private Guid _eventId = Guid.NewGuid();
@@ -51,6 +55,7 @@ protected void Initialize()
             mockPhotoservice = new Mock<IPhotoService>();
             service = new Mock<IEventService>();
             mockValidator = new Mock<IValidator<IFormFile>>();
+            mockEventViewModelValidator = new Mock<IValidator<EventViewModel>>();
             eventController = new EventController(service.Object, MockMapper.Object, mockSecurityContextService.Object, mockPhotoservice.Object);
             eventController.ControllerContext = new ControllerContext();
             eventController.ControllerContext.HttpContext = new DefaultHttpContext();
@@ -194,5 +199,17 @@ public void VisitedEvents_OkResult()
             var expected = eventController.VisitedEvents(_idUser, 1);
             Assert.IsInstanceOf<OkObjectResult>(expected);
         }
+
+        [Test]
+        public void Publish_OkResult()
+        {
+            mockEventViewModelValidator.Setup(v => v.Validate(It.IsAny<EventViewModel>()))
+                .Returns(new ValidationResult() { });
+            MockMapper.Setup(m => m.Map<EventViewModel>(It.IsAny<EventDto>())).Returns(new EventViewModel() { });
+            service.Setup(e => e.EventById(_eventId)).Returns(new EventDto() { });
+            service.Setup(e => e.Publish(_eventId)).Returns(Task.FromResult(Guid.NewGuid()));
+            var expected = eventController.Publish(_eventId, mockEventViewModelValidator.Object);
+            Assert.IsInstanceOf<OkObjectResult>(expected.Result);
+        }
     }
 }

EventsExpress.Test/MapperTests/EventMapperProfileTests.cs

@@ -176,8 +176,12 @@ private EventDto GetEventDto()
                     },
                 },
 
-                Type = LocationType.Map,
-                Point = new Point(8, 3),
+                Location = new LocationDto
+                {
+                    Type = LocationType.Map,
+                    Point = new Point(8, 3),
+                },
+
                 Visitors = new List<UserEvent>()
                 {
                     new UserEvent
@@ -343,9 +347,9 @@ public void EventMapperProfile_EventToEventDto()
             var e = Mapper.Map<Event, EventDto>(firstEvent);
 
             Assert.That(e.Photo, Is.Null);
-            Assert.That(e.Point, Is.EqualTo(firstEvent.EventLocation.Point));
-            Assert.That(e.Type, Is.EqualTo(firstEvent.EventLocation.Type));
-            Assert.That(e.OnlineMeeting, Is.EqualTo(firstEvent.EventLocation.OnlineMeeting));
+            Assert.That(e.Location.Point, Is.EqualTo(firstEvent.EventLocation.Point));
+            Assert.That(e.Location.Type, Is.EqualTo(firstEvent.EventLocation.Type));
+            Assert.That(e.Location.OnlineMeeting, Is.EqualTo(firstEvent.EventLocation.OnlineMeeting));
             Assert.That(e.Owners, Has.All.Matches<User>(ex =>
                                                         firstEvent.Owners
                                                         .All(f =>
@@ -407,10 +411,10 @@ public void EventMapperProfile_EventDtoToEventPreviewViewModel()
                                                       .All(f =>
                                                           ex.Id == f.Id &&
                                                           ex.Name == f.Name)));
-            Assert.That(resEven.Location.Type, Is.EqualTo(firstEventDto.Type));
-            Assert.That(resEven.Location.OnlineMeeting, Is.EqualTo(firstEventDto.OnlineMeeting));
-            Assert.That(resEven.Location.Latitude, Is.EqualTo(firstEventDto.Point.X));
-            Assert.That(resEven.Location.Longitude, Is.EqualTo(firstEventDto.Point.Y));
+            Assert.That(resEven.Location.Type, Is.EqualTo(firstEventDto.Location.Type));
+            Assert.That(resEven.Location.OnlineMeeting, Is.EqualTo(firstEventDto.Location.OnlineMeeting));
+            Assert.That(resEven.Location.Latitude, Is.EqualTo(firstEventDto.Location.Point.X));
+            Assert.That(resEven.Location.Longitude, Is.EqualTo(firstEventDto.Location.Point.Y));
             Assert.That(resEven.CountVisitor, Is.EqualTo(visitorCount));
             Assert.That(resEven.MaxParticipants, Is.EqualTo(firstEventDto.MaxParticipants));
             Assert.That(resEven.Members, Has.All.Matches<UserPreviewViewModel>(ex =>
@@ -448,10 +452,10 @@ public void EventMapperProfile_EventDtoToEventViewModel()
                                                           ex.UnitOfMeasuring.Id == f.UnitOfMeasuring.Id &&
                                                           ex.UnitOfMeasuring.ShortName == f.UnitOfMeasuring.ShortName &&
                                                           ex.UnitOfMeasuring.UnitName == f.UnitOfMeasuring.UnitName)));
-            Assert.That(resView.Location.Type, Is.EqualTo(firstEventDto.Type));
-            Assert.That(resView.Location.OnlineMeeting, Is.EqualTo(firstEventDto.OnlineMeeting));
-            Assert.That(resView.Location.Latitude, Is.EqualTo(firstEventDto.Point.X));
-            Assert.That(resView.Location.Longitude, Is.EqualTo(firstEventDto.Point.Y));
+            Assert.That(resView.Location.Type, Is.EqualTo(firstEventDto.Location.Type));
+            Assert.That(resView.Location.OnlineMeeting, Is.EqualTo(firstEventDto.Location.OnlineMeeting));
+            Assert.That(resView.Location.Latitude, Is.EqualTo(firstEventDto.Location.Point.X));
+            Assert.That(resView.Location.Longitude, Is.EqualTo(firstEventDto.Location.Point.Y));
             Assert.That(resView.Visitors, Has.All.Matches<UserPreviewViewModel>(ex =>
                                                       firstEventDto.Visitors
                                                       .All(f =>
@@ -495,11 +499,11 @@ public void EventMapperProfile_EventEditViewModelToEventDto()
                                                       firstEventEditViewModel.Owners
                                                       .All(f =>
                                                           ex == f.Id)));
-            Assert.That(resDto.Point, Is.EqualTo(firstEventEditViewModel.Location.Type == LocationType.Map ?
+            Assert.That(resDto.Location.Point, Is.EqualTo(firstEventEditViewModel.Location.Type == LocationType.Map ?
                  new Point(firstEventEditViewModel.Location.Latitude.Value, firstEventEditViewModel.Location.Longitude.Value) { SRID = 4326 } : null));
-            Assert.That(resDto.OnlineMeeting, Is.EqualTo(firstEventEditViewModel.Location.Type == LocationType.Online ?
-                 new Uri(firstEventEditViewModel.Location.OnlineMeeting) : null));
-            Assert.That(resDto.Type, Is.EqualTo(firstEventEditViewModel.Location.Type));
+            Assert.That(resDto.Location.OnlineMeeting, Is.EqualTo(firstEventEditViewModel.Location.Type == LocationType.Online ?
+                 firstEventEditViewModel.Location.OnlineMeeting : null));
+            Assert.That(resDto.Location.Type, Is.EqualTo(firstEventEditViewModel.Location.Type));
             Assert.That(resDto.Visitors, Is.EqualTo(default(string)));
         }
 
@@ -518,11 +522,11 @@ public void EventMapperProfile_EventCreateViewModelToEventDto()
                                                       firstEventCreateViewModel.Owners
                                                       .All(f =>
                                                           ex == f.Id)));
-            Assert.That(resDto.Point, Is.EqualTo(firstEventCreateViewModel.Location.Type == LocationType.Map ?
+            Assert.That(resDto.Location.Point, Is.EqualTo(firstEventCreateViewModel.Location.Type == LocationType.Map ?
                  new Point(firstEventCreateViewModel.Location.Latitude.Value, firstEventCreateViewModel.Location.Longitude.Value) { SRID = 4326 } : null));
-            Assert.That(resDto.OnlineMeeting, Is.EqualTo(firstEventCreateViewModel.Location.Type == LocationType.Online ?
-                 new Uri(firstEventCreateViewModel.Location.OnlineMeeting) : null));
-            Assert.That(resDto.Type, Is.EqualTo(firstEventCreateViewModel.Location.Type));
+            Assert.That(resDto.Location.OnlineMeeting, Is.EqualTo(firstEventCreateViewModel.Location.Type == LocationType.Online ?
+                 firstEventCreateViewModel.Location.OnlineMeeting : null));
+            Assert.That(resDto.Location.Type, Is.EqualTo(firstEventCreateViewModel.Location.Type));
             Assert.That(resDto.Periodicity, Is.EqualTo(firstEventCreateViewModel.Periodicity));
             Assert.That(resDto.IsReccurent, Is.EqualTo(firstEventCreateViewModel.IsReccurent));
             Assert.That(resDto.Inventories, Has.All.Matches<InventoryDto>(ex =>