Tidy up question types and remove warnings

PeterKneale · Jun 29, 2024 · c17f04d · c17f04d
1 parent c7b8093
commit c17f04d
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 70 deletions.
diff --git a/src/Simple.App/Surveys/Queries/ListQuestions.cs b/src/Simple.App/Surveys/Queries/ListQuestions.cs
@@ -30,8 +30,8 @@ public async Task<IEnumerable<Result>> Handle(Query query, CancellationToken can
 
             return survey.Questions.Select(q =>
             {
-                var type = q.Info.Type;
-                var result = new Result(q.QuestionId, q.Info.Title, q.Info.Mandatory, type);
+                var type = q.Type.Type;
+                var result = new Result(q.QuestionId, q.Type.Title, q.Type.Mandatory, type);
                 return result;
             });
         }

diff --git a/src/Simple.Domain/Surveys/Question.cs b/src/Simple.Domain/Surveys/Question.cs
@@ -1,4 +1,6 @@
-namespace Simple.Domain.Surveys;
+using Simple.Domain.Surveys.Questions;
+
+namespace Simple.Domain.Surveys;
 
 public class Question
 {
@@ -7,55 +9,26 @@ private Question()
         // EF
     }
 
-    private Question(SurveyId surveyId, QuestionInfo info)
+    private Question(SurveyId surveyId, QuestionType type)
     {
         SurveyId = surveyId;
         QuestionId = new QuestionId(Guid.NewGuid());
-        Info = info;
+        Type = type;
         CreatedAt = SystemTime.UtcNow();
     }
 
     public static Question CreateTextQuestion(SurveyId surveyId, string title, bool mandatory, int maxLength)
     {
-        return new Question(surveyId, new TextQuestionInfo
-        {
-            Title = title,
-            Mandatory = mandatory,
-            MaxLength = maxLength
-        });
+        return new Question(surveyId, new TextQuestionType(title, mandatory, maxLength));
     }
 
     public static Question CreateListQuestion(SurveyId surveyId, string title, bool mandatory, IEnumerable<string> options, bool single)
     {
-        return new Question(surveyId, new ListQuestionInfo
-        {
-            Title = title,
-            Mandatory = mandatory,
-            Options = options,
-            Single = single
-        });
+        return new Question(surveyId, new ListQuestionType(title, mandatory, options, single));
     }
 
-    public SurveyId SurveyId { get; init; }
-    public QuestionInfo Info { get; init; }
-    public QuestionId QuestionId { get; init; }
+    public SurveyId SurveyId { get; init; } = null!;
+    public QuestionType Type { get; init; } = null!;
+    public QuestionId QuestionId { get; init; } = null!;
     public DateTimeOffset CreatedAt { get; init; }
-}
-
-public abstract class QuestionInfo(string type)
-{
-    public string Type { get; init; } = type;
-    public string Title { get; init; }
-    public bool Mandatory { get; init; }
-}
-
-public class ListQuestionInfo() : QuestionInfo("list")
-{
-    public IEnumerable<string> Options { get; init; }
-    public bool Single { get; init; }
-}
-
-public class TextQuestionInfo() : QuestionInfo("text")
-{
-    public int MaxLength { get; init; }
 }
diff --git a/src/Simple.Domain/Surveys/Questions/ListQuestionType.cs b/src/Simple.Domain/Surveys/Questions/ListQuestionType.cs
@@ -0,0 +1,14 @@
+namespace Simple.Domain.Surveys.Questions;
+
+public class ListQuestionType(string title, bool mandatory, IEnumerable<string> options, bool single)
+    : QuestionType(QuestionTypeNames.List, title, mandatory)
+{
+    public IEnumerable<string> Options { get; init; } = options;
+    public bool Single { get; init; } = single;
+}
+
+public static class QuestionTypeNames
+{
+    public const string List = "list";
+    public const string Text = "text";
+}
diff --git a/src/Simple.Domain/Surveys/Questions/QuestionType.cs b/src/Simple.Domain/Surveys/Questions/QuestionType.cs
@@ -0,0 +1,8 @@
+namespace Simple.Domain.Surveys.Questions;
+
+public abstract class QuestionType(string type, string title, bool mandatory)
+{
+    public string Type { get; private init; } = type;
+    public string Title { get; private init; } = title;
+    public bool Mandatory { get; private init; } = mandatory;
+}
diff --git a/src/Simple.Domain/Surveys/Questions/TextQuestionType.cs b/src/Simple.Domain/Surveys/Questions/TextQuestionType.cs
@@ -0,0 +1,7 @@
+namespace Simple.Domain.Surveys.Questions;
+
+public class TextQuestionType(string title, bool mandatory, int maxLength)
+    : QuestionType(QuestionTypeNames.Text, title, mandatory)
+{
+    public int MaxLength { get; init; } = maxLength;
+}
diff --git a/src/Simple.Domain/Surveys/Survey.cs b/src/Simple.Domain/Surveys/Survey.cs
@@ -38,11 +38,11 @@ public void RemoveQuestion(QuestionId questionId)
         _questions.Remove(_questions.Single(q => q.QuestionId == questionId));
     }
 
-    public SurveyId SurveyId { get; init; }
+    public SurveyId SurveyId { get; init; } = null!;
 
-    public SurveyName Name { get; init; }
+    public SurveyName Name { get; init; } = null!;
 
-    public TenantId TenantId { get; init; }
+    public TenantId TenantId { get; init; } = null!;
 
     public DateTimeOffset CreatedAt { get; init; }
 

diff --git a/src/Simple.Domain/Tenants/Tenant.cs b/src/Simple.Domain/Tenants/Tenant.cs
@@ -1,9 +1,6 @@
-using Simple.Domain.Surveys;
-using Simple.Domain.Users;
+namespace Simple.Domain.Tenants;
 
-namespace Simple.Domain.Tenants;
-
-public partial class Tenant : IAggregateRoot
+public class Tenant : IAggregateRoot
 {
     private Tenant()
     {
@@ -17,13 +14,9 @@ public Tenant(TenantId id, TenantName name)
         CreatedAt = SystemTime.UtcNow();
     }
 
-    public TenantId TenantId { get; private init; }
+    public TenantId TenantId { get; private init; } = null!;
 
     public TenantName TenantName { get; private init; } = null!;
 
     public DateTimeOffset CreatedAt { get; private init; }
-
-    public virtual ICollection<Survey> Surveys { get; set; } = new List<Survey>();
-
-    public virtual ICollection<User> Users { get; set; } = new List<User>();
 }
diff --git a/src/Simple.Domain/Users/User.cs b/src/Simple.Domain/Users/User.cs
@@ -24,9 +24,9 @@ public void ChangeName(Name name)
         Name = name;
     }
 
-    public UserId UserId { get; init; }
+    public UserId UserId { get; init; } = null!;
 
-    public TenantId TenantId { get; init; }
+    public TenantId TenantId { get; init; } = null!;
 
     public Name Name { get; private set; } = null!;
 

diff --git a/src/Simple.Infra/Database/Configuration/QuestionConfiguration.cs b/src/Simple.Infra/Database/Configuration/QuestionConfiguration.cs
@@ -18,7 +18,7 @@ public void Configure(EntityTypeBuilder<Question> builder)
             .HasColumnName(SurveyIdColumn)
             .HasConversion<SurveyIdConverter>();
 
-        builder.Property(e => e.Info)
+        builder.Property(e => e.Type)
             .HasColumnName(InfoColumn)
             .HasColumnType("jsonb")
             .HasConversion<QuestionInfoConverter>();

diff --git a/src/Simple.Infra/Database/Converters/QuestionInfoConverter.cs b/src/Simple.Infra/Database/Converters/QuestionInfoConverter.cs
@@ -2,40 +2,37 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Simple.Domain.Surveys;
+using Simple.Domain.Surveys.Questions;
 
 namespace Simple.Infra.Database.Converters;
 
-public class QuestionInfoConverter() : ValueConverter<QuestionInfo, string>(
+public class QuestionInfoConverter() : ValueConverter<QuestionType, string>(
     x => JsonConvert.SerializeObject(x),
-    x => JsonConvert.DeserializeObject<QuestionInfo>(x, new QuestionInfoDeserializer())!
+    x => JsonConvert.DeserializeObject<QuestionType>(x, new QuestionInfoDeserializer())!
 );
 
 public class QuestionInfoDeserializer : JsonConverter
 {
     public override bool CanConvert(Type objectType)
     {
-        return typeof(QuestionInfo).IsAssignableFrom(objectType);
+        return typeof(QuestionType).IsAssignableFrom(objectType);
     }
 
-    public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+    public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
     {
-        JObject jo = JObject.Load(reader);
-
+        var jo = JObject.Load(reader);
         var type = (string)jo["Type"]!;
-        switch (type)
+        return type switch
         {
-            case "text":
-                return jo.ToObject<TextQuestionInfo>()!;
-            case "list":
-                return jo.ToObject<ListQuestionInfo>()!;
-            default:
-                throw new NotSupportedException($"Type is not supported '{type}'");
-        }
+            QuestionTypeNames.Text => jo.ToObject<TextQuestionType>()!,
+            QuestionTypeNames.List => jo.ToObject<ListQuestionType>()!,
+            _ => throw new NotSupportedException($"Type is not supported '{type}'")
+        };
     }
 
     public override bool CanWrite => false;
 
-    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
     {
         throw new NotImplementedException();
     }