✨ Add EditionInEventDto and update event queries to include current edition

Author: Beelzenef

TaleEngine/TaleEngine.API.Contracts/Dtos/EditionInEventDto.cs

@@ -0,0 +1,7 @@
+namespace TaleEngine.API.Contracts.Dtos {
+    public class EditionInEventDto {
+        public int EditionId { get; set; }
+        public int EventId { get; set; }
+        public string EventTitle { get; set; }
+    }
+}

TaleEngine/TaleEngine.Application/ActivityService.cs

@@ -165,9 +165,21 @@ private List<ActivityEntity> GetActivitiesByStatus(int editionId, int statusId)
 
         private List<ActivityEntity> GetLastThreeActivities(int edition, int numberOfActivities)
         {
-            var query = GetActiveActivitiesWithFilter(0, null, edition, null);
+            try {
 
-            return query.OrderByDescending(a => a.CreateDateTime).Take(numberOfActivities).ToList();
+                IEnumerable<ActivityEntity> query = GetActiveActivitiesWithFilter(0, null, edition, null);
+
+            return query
+                //.OrderByDescending(a => a.CreateDateTime)
+                .Take(numberOfActivities)
+                .Select(a => a)
+                .ToList()
+                ;
+            }
+            catch (Exception ex) {
+                var e = ex.Message;
+                return null;
+            }
         }
 
         private IEnumerable<ActivityEntity> GetActiveActivitiesWithFilter(int type, List<int> timeframes, int edition, string title)

TaleEngine/TaleEngine.Bussiness/Contracts/IEventQueries.cs

@@ -6,6 +6,7 @@ namespace TaleEngine.CQRS.Contracts
     public interface IEventQueries
     {
         List<EventDto> EventsNoFilterQuery();
-        EventDto EventQuery(int eventId);
+        EventDto GetEvent(int eventId);
+        EditionInEventDto GetCurrentEdition(int eventId);
     }
 }

TaleEngine/TaleEngine.Bussiness/Mappers/EventMapper.cs

@@ -13,5 +13,13 @@ public static EventDto Map(EventEntity eventModel)
                 Title = eventModel.Title
             };
         }
+
+        public static EditionInEventDto MapWithCurrentEdition(EventEntity eventModel) {
+            return new EditionInEventDto {
+                EventId = eventModel.Id,
+                EventTitle = eventModel.Title,
+                EditionId = eventModel.CurrentEditionId
+            };
+        }
     }
 }

TaleEngine/TaleEngine.Bussiness/Queries/EventQueries.cs

@@ -29,13 +29,21 @@ public List<EventDto> EventsNoFilterQuery()
             return eventDtos;
         }
 
-        public EventDto EventQuery(int eventId)
+        public EventDto GetEvent(int eventId)
         {
             var ev = _service.GetById(eventId);
 
             var result = EventMapper.Map(ev);
 
             return result;
         }
+
+        public EditionInEventDto GetCurrentEdition(int eventId) {
+            var ev = _service.GetById(eventId);
+
+            var result = EventMapper.MapWithCurrentEdition(ev);
+
+            return result;
+        }
     }
 }

TaleEngine/TaleEngine.Data.Contracts/Entities/EditionEntity.cs

@@ -11,6 +11,8 @@ public class EditionEntity : BaseEntity
         public int EventId { get; set; }
         public EventEntity Event { get; set; }
 
+        public EventEntity? IsCurrentEditionInEvent { get; set; }
+
         public List<ActivityEntity> Activities { get; set; }
     }
 }

TaleEngine/TaleEngine.Data.Contracts/Entities/EventEntity.cs

@@ -7,6 +7,10 @@ public class EventEntity : BaseEntity
         public string Title { get; set; }
 
         public List<EditionEntity> Editions { get; set; }
+
+        public int CurrentEditionId { get; set; }
+        public EditionEntity CurrentEdition { get; set; }
+
         public List<RoleEntity> Roles { get; set; }
     }
 }

TaleEngine/TaleEngine.Data/DatabaseContext.cs

@@ -62,6 +62,10 @@ protected override void OnModelCreating(ModelBuilder builder)
             builder.Entity<EventEntity>()
                 .Property(e => e.Id)
                 .ValueGeneratedOnAdd();
+            builder.Entity<EventEntity>()
+                .HasOne(ev => ev.CurrentEdition)
+                .WithOne(ed => ed.IsCurrentEditionInEvent)
+                .OnDelete(DeleteBehavior.NoAction);
             builder.Entity<EventEntity>()
                 .ToTable("Event");