Merge pull request #33 from ApplETS/ftr/report-email

[PS-145] Ftr/report email
ApplETS · Apr 2, 2024 · 3081f80 · 3081f80
2 parents 7bd0675 + aa9fe42
commit 3081f80
Show file tree

Hide file tree

Showing 19 changed files with 1,189 additions and 9 deletions.
diff --git a/core/Controllers/EventsController.cs b/core/Controllers/EventsController.cs
@@ -75,7 +75,7 @@ public IActionResult ReportEvent(Guid id, [FromBody] CreateReportRequestDTO requ
     {
         logger.LogInformation($"Reporting event {id}");
 
-        reportService.ReportEvent(id, request);
+        reportService.ReportEventAsync(id, request);
 
         return Ok();
     }

diff --git a/core/Controllers/ModeratorEventsController.cs b/core/Controllers/ModeratorEventsController.cs
@@ -23,7 +23,7 @@ public IActionResult UpdateEventState(Guid id, [FromQuery] State newState, [From
     }
 
     [HttpGet]
-    public ActionResult<IEnumerable<EventResponseDTO>> GetEventsModerator(
+    public ActionResult<IEnumerable<EventModeratorResponseDTO>> GetEventsModerator(
         [FromQuery] DateTime? startDate,
         [FromQuery] DateTime? endDate,
         [FromQuery] IEnumerable<string>? activityAreas,

diff --git a/core/Data/Entities/Publication.cs b/core/Data/Entities/Publication.cs
@@ -32,6 +32,10 @@ public partial class Publication
 
     public DateTime? PublicationDate { get; set; }
 
+    public int ReportCount { get; set; } = 0;
+
+    public bool HasBeenReported { get; set; } = false;
+
     public Guid? ModeratorId { get; set; }
 
     public Guid OrganizerId { get; set; }

diff --git a/core/Data/Requests/EventRequestDTO.cs b/core/Data/Requests/EventRequestDTO.cs
@@ -6,6 +6,8 @@ public class EventRequestDTO
 
     public string Content { get; set; } = null!;
 
+    public int ReportCount { get; set; }
+
     public DateTime PublicationDate { get; set; }
 
     public DateTime EventStartDate { get; set; }

diff --git a/core/Data/Responses/EventResponseDTO.cs b/core/Data/Responses/EventResponseDTO.cs
@@ -45,7 +45,7 @@ public static EventResponseDTO Map(Event oneEvent)
             Title = oneEvent.Publication.Title,
             Content = oneEvent.Publication.Content,
             ImageUrl = oneEvent.Publication.ImageUrl,
-            ImageAltText = oneEvent.Publication.ImageAltText,
+            ImageAltText = oneEvent.Publication.ImageAltText!,
             Tags = oneEvent.Publication.Tags.Select(TagResponseDTO.Map),
             State = oneEvent.Publication.State,
             Reason = oneEvent.Publication.Reason,
@@ -59,3 +59,31 @@ public static EventResponseDTO Map(Event oneEvent)
         };
     }
 }
+
+public class EventModeratorResponseDTO : EventResponseDTO
+{
+    public int ReportCount { get; set; } = 0;
+
+    public static new EventModeratorResponseDTO Map(Event oneEvent)
+    {
+        return new EventModeratorResponseDTO
+        {
+            Id = oneEvent.Id,
+            Title = oneEvent.Publication.Title,
+            Content = oneEvent.Publication.Content,
+            ImageUrl = oneEvent.Publication.ImageUrl,
+            ImageAltText = oneEvent.Publication.ImageAltText!,
+            Tags = oneEvent.Publication.Tags.Select(TagResponseDTO.Map),
+            State = oneEvent.Publication.State,
+            Reason = oneEvent.Publication.Reason,
+            PublicationDate = oneEvent.Publication.PublicationDate,
+            EventStartDate = oneEvent.EventStartDate,
+            EventEndDate = oneEvent.EventEndDate,
+            ReportCount = oneEvent.Publication.ReportCount,
+            CreatedAt = oneEvent.Publication.CreatedAt,
+            UpdatedAt = oneEvent.Publication.UpdatedAt,
+            Moderator = oneEvent.Publication.Moderator != null ? UserResponseDTO.Map(oneEvent.Publication.Moderator!) : null,
+            Organizer = UserResponseDTO.Map(oneEvent.Publication.Organizer),
+        };
+    }
+}
diff --git a/core/Data/Responses/ReportResponseDTO.cs b/core/Data/Responses/ReportResponseDTO.cs
@@ -32,7 +32,7 @@ public static ReportResponseDTO Map(Report report)
                 Title = report.Publication.Title,
                 Content = report.Publication.Content,
                 ImageUrl = report.Publication.ImageUrl,
-                ImageAltText = report.Publication.ImageAltText,
+                ImageAltText = report.Publication.ImageAltText!,
                 Tags = report.Publication.Tags.Select(TagResponseDTO.Map),
                 State = report.Publication.State,
                 PublicationDate = report.Publication.PublicationDate,