Add crud for election rounds

api/src/Feature.CitizenReports/Specifications/GetFormSpecification.cs

@@ -1,4 +1,5 @@
 using Vote.Monitor.Domain.Entities.FormAggregate;
+using Vote.Monitor.Domain.Entities.FormBase;
 
 namespace Feature.CitizenReports.Specifications;
 

api/src/Feature.DataExport/Start/FormSubmissionsFilters.cs

@@ -1,6 +1,7 @@
 using Vote.Monitor.Core.Models;
 using Vote.Monitor.Domain.Entities.ExportedDataAggregate.Filters;
 using Vote.Monitor.Domain.Entities.FormAggregate;
+using Vote.Monitor.Domain.Entities.FormBase;
 using Vote.Monitor.Domain.Entities.FormSubmissionAggregate;
 using Vote.Monitor.Domain.Entities.MonitoringObserverAggregate;
 

api/src/Feature.Form.Submissions/GetAggregated/Endpoint.cs

@@ -6,6 +6,7 @@
 using Vote.Monitor.Core.Services.FileStorage.Contracts;
 using Vote.Monitor.Domain;
 using Vote.Monitor.Domain.Entities.FormAggregate;
+using Vote.Monitor.Domain.Entities.FormBase;
 using Vote.Monitor.Domain.Entities.PollingStationInfoFormAggregate;
 
 namespace Feature.Form.Submissions.GetAggregated;

api/src/Feature.Form.Submissions/ListByObserver/ObserverSubmissionOverview.cs

@@ -8,7 +8,7 @@ public record ObserverSubmissionOverview
     public Guid MonitoringObserverId { get; init; }
     public string ObserverName { get; init; } = default!;
     public string Email { get; init; } = default!;
-    public string PhoneNumber { get; init; } = default!;
+    public string? PhoneNumber { get; init; } = default!;
     public string NgoName { get; init; } = default!;
     public string[] Tags { get; init; } = [];
     public int NumberOfFlaggedAnswers { get; init; }

api/src/Feature.Form.Submissions/ListEntries/FormSubmissionEntry.cs

@@ -2,6 +2,7 @@
 using Ardalis.SmartEnum.SystemTextJson;
 using Vote.Monitor.Core.Models;
 using Vote.Monitor.Domain.Entities.FormAggregate;
+using Vote.Monitor.Domain.Entities.FormBase;
 using Vote.Monitor.Domain.Entities.MonitoringObserverAggregate;
 
 namespace Feature.Form.Submissions.ListEntries;
@@ -28,7 +29,7 @@ public record FormSubmissionEntry
     public Guid MonitoringObserverId { get; init; }
     public string ObserverName { get; init; } = default!;
     public string Email { get; init; } = default!;
-    public string PhoneNumber { get; init; } = default!;
+    public string? PhoneNumber { get; init; } = default!;
     public string NgoName { get; init; } = default!;
     public string[] Tags { get; init; } = [];
     public int NumberOfQuestionsAnswered { get; init; }

api/src/Feature.Form.Submissions/ListEntries/Request.cs

@@ -1,6 +1,7 @@
 using Vote.Monitor.Core.Models;
 using Vote.Monitor.Core.Security;
 using Vote.Monitor.Domain.Entities.FormAggregate;
+using Vote.Monitor.Domain.Entities.FormBase;
 using Vote.Monitor.Domain.Entities.MonitoringObserverAggregate;
 
 namespace Feature.Form.Submissions.ListEntries;

api/src/Feature.FormTemplates/Create/Endpoint.cs

@@ -4,45 +4,25 @@
 namespace Feature.FormTemplates.Create;
 
 public class Endpoint(IRepository<FormTemplate> repository) :
-        Endpoint<Request, Results<Ok<FormTemplateSlimModel>, Conflict<ProblemDetails>>>
+    Endpoint<Request, Ok<FormTemplateFullModel>>
 {
     public override void Configure()
     {
         Post("/api/form-templates");
         Policies(PolicyNames.PlatformAdminsOnly);
     }
 
-    public override async Task<Results<Ok<FormTemplateSlimModel>, Conflict<ProblemDetails>>> ExecuteAsync(Request req, CancellationToken ct)
+    public override async Task<Ok<FormTemplateFullModel>> ExecuteAsync(Request req, CancellationToken ct)
     {
-        var specification = new GetFormTemplateSpecification(req.Code, req.FormType);
-        var duplicatedFormTemplate = await repository.AnyAsync(specification, ct);
-
-        if (duplicatedFormTemplate)
-        {
-            AddError(r => r.Code, "A form template with same parameters already exists");
-            return TypedResults.Conflict(new ProblemDetails(ValidationFailures));
-        }
-
         var questions = req.Questions.Select(QuestionsMapper.ToEntity)
             .ToList()
             .AsReadOnly();
-
-        var formTemplate = Vote.Monitor.Domain.Entities.FormTemplateAggregate.FormTemplate.Create(req.FormType, req.Code, req.DefaultLanguage, req.Name, req.Description, req.Languages, questions);
+
+        var formTemplate = FormTemplate.Create(req.FormType, req.Code, req.DefaultLanguage, req.Name, req.Description,
+            req.Languages, req.Icon, questions);
 
         await repository.AddAsync(formTemplate, ct);
 
-        return TypedResults.Ok(new FormTemplateSlimModel
-        {
-            Id = formTemplate.Id,
-            FormType = formTemplate.FormType,
-            Code = formTemplate.Code,
-            Languages = formTemplate.Languages,
-            DefaultLanguage = formTemplate.DefaultLanguage,
-            Name = formTemplate.Name,
-            Description = formTemplate.Description,
-            Status = formTemplate.Status,
-            CreatedOn = formTemplate.CreatedOn,
-            LastModifiedOn = formTemplate.LastModifiedOn
-        });
+        return TypedResults.Ok(FormTemplateFullModel.FromEntity(formTemplate));
     }
 }

api/src/Feature.FormTemplates/Create/Request.cs

@@ -1,5 +1,6 @@
 using Vote.Monitor.Core.Models;
 using Vote.Monitor.Domain.Entities.FormAggregate;
+using Vote.Monitor.Domain.Entities.FormBase;
 using Vote.Monitor.Form.Module.Requests;
 
 namespace Feature.FormTemplates.Create;
@@ -12,6 +13,7 @@ public class Request
     public TranslatedString Description { get; set; } = new();
     public FormType FormType { get; set; }
     public List<string> Languages { get; set; } = [];
+    public string? Icon { get; set; }
     public List<BaseQuestionRequest> Questions { get; set; } = [];
 
 }

api/src/Feature.FormTemplates/FormTemplateFullModel.cs

@@ -1,8 +1,46 @@
-using Vote.Monitor.Form.Module.Models;
+using Vote.Monitor.Core.Models;
+using Vote.Monitor.Domain.Entities.FormAggregate;
+using Vote.Monitor.Domain.Entities.FormBase;
+using Vote.Monitor.Form.Module.Models;
 
 namespace Feature.FormTemplates;
 
-public record FormTemplateFullModel : FormTemplateSlimModel
+public record FormTemplateFullModel
 {
-    public List<BaseQuestionModel> Questions { get; init; } = [];
+    public TranslatedString Description { get; init; }
+
+    public required Guid Id { get; init; }
+
+    public required FormType FormType { get; init; }
+
+    public required string Code { get; init; }
+    public TranslatedString Name { get; init; }
+
+    public required FormStatus Status { get; init; }
+
+    public required string DefaultLanguage { get; init; }
+    public required string[] Languages { get; init; } = [];
+    public int NumberOfQuestions { get; init; }
+    public string? Icon { get; init; }
+
+    public LanguagesTranslationStatus LanguagesTranslationStatus { get; init; }
+    public IReadOnlyList<BaseQuestionModel> Questions { get; init; } = [];
+
+    public static FormTemplateFullModel FromEntity(FormTemplateAggregate formTemplate) => formTemplate == null
+        ? null
+        : new FormTemplateFullModel
+        {
+            Id = formTemplate.Id,
+            Code = formTemplate.Code,
+            FormType = formTemplate.FormType,
+            Status = formTemplate.Status,
+            DefaultLanguage = formTemplate.DefaultLanguage,
+            Languages = formTemplate.Languages,
+            Name = formTemplate.Name,
+            Questions = formTemplate.Questions.Select(QuestionsMapper.ToModel).ToList(),
+            NumberOfQuestions = formTemplate.NumberOfQuestions,
+            Description = formTemplate.Description,
+            LanguagesTranslationStatus = formTemplate.LanguagesTranslationStatus,
+            Icon = formTemplate.Icon,
+        };
 }

api/src/Feature.FormTemplates/FormTemplateSlimModel.cs

@@ -1,27 +1,30 @@
-using System.Text.Json.Serialization;
-using Ardalis.SmartEnum.SystemTextJson;
-using Vote.Monitor.Core.Models;
+using Vote.Monitor.Core.Models;
 using Vote.Monitor.Domain.Entities.FormAggregate;
-using Vote.Monitor.Domain.Entities.FormTemplateAggregate;
+using Vote.Monitor.Domain.Entities.FormBase;
 
 namespace Feature.FormTemplates;
 
 public record FormTemplateSlimModel
 {
-    public Guid Id { get; init; }
+    public TranslatedString Description { get; set; }
+
+    public required Guid Id { get; init; }
+
+    public required FormType FormType { get; init; }
+
     public required string Code { get; init; }
+    public TranslatedString Name { get; init; }
+    public string? Icon { get; init; }
+
+    public required FormStatus Status { get; init; }
+
     public required string DefaultLanguage { get; init; }
-    public string[] Languages { get; init; } = [];
+    public required string[] Languages { get; init; } = [];
+    public int NumberOfQuestions { get; init; }
+    public required DateTime LastModifiedOn { get; init; }
 
-    public required TranslatedString Name { get; init; }
-    public required TranslatedString Description { get; init; }
+    public string LastModifiedBy { get; init; }
 
-    [JsonConverter(typeof(SmartEnumNameConverter<FormType, string>))]
-    public required FormType FormType { get; init; }
 
-    [JsonConverter(typeof(SmartEnumNameConverter<FormTemplateStatus, string>))]
-    public required FormTemplateStatus Status { get; init; }
-    public int NumberOfQuestions { get; set; }
-    public required DateTime CreatedOn { get; init; }
-    public required DateTime? LastModifiedOn { get; init; }
+    public LanguagesTranslationStatus LanguagesTranslationStatus { get; init; }
 }

api/src/Feature.FormTemplates/Get/Endpoint.cs

@@ -31,27 +31,14 @@ public override async Task<Results<Ok<FormTemplateFullModel>, NotFound>> Execute
             }
         }
 
-        var formTemplate = await repository.SingleOrDefaultAsync(new GetFormTemplateSpecification(req.Id, isNgoAdmin), ct);
+        var formTemplate =
+            await repository.SingleOrDefaultAsync(new GetFormTemplateSpecification(req.Id, isNgoAdmin), ct);
 
         if (formTemplate is null)
         {
             return TypedResults.NotFound();
         }
 
-        return TypedResults.Ok(new FormTemplateFullModel
-        {
-            Id = formTemplate.Id,
-            FormType = formTemplate.FormType,
-            Code = formTemplate.Code,
-            DefaultLanguage = formTemplate.DefaultLanguage,
-            Name = formTemplate.Name,
-            Description = formTemplate.Description,
-            Status = formTemplate.Status,
-            CreatedOn = formTemplate.CreatedOn,
-            LastModifiedOn = formTemplate.LastModifiedOn,
-            Languages = formTemplate.Languages,
-            NumberOfQuestions = formTemplate.NumberOfQuestions,
-            Questions = formTemplate.Questions.Select(QuestionsMapper.ToModel).ToList()
-        });
+        return TypedResults.Ok(FormTemplateFullModel.FromEntity(formTemplate));
     }
 }