Closes #60

Introduce Item - List mapping

Makefile

@@ -4,5 +4,8 @@ dev:
 no-reload:
 	docker compose --profile without-hot-reload up --build
 
-.PHONY: dev no-reload
+db:
+	docker compose up db -d
+
+.PHONY: dev no-reload db
 .DEFAULT_GOAL := dev

backend/bruno/KSummarized/ToDo/Items/Create.bru

@@ -44,7 +44,8 @@ body:json {
         "tags": [],
         "subtasks": []
       }
-    ]
+    ],
+    "listId": {{listId}}
   }
 }
 

backend/src/api/Responses/TodoList.cs

@@ -1,8 +1,10 @@
+using core;
+
 namespace api.Resonses;
 
-public record TodoList(int Id, string Name);
+public record TodoList(int Id, string Name, IEnumerable<TodoItem> Items);
 
 public static class MapExtensions
 {
-    public static TodoList ToResponse(this core.TodoList list) => new TodoList(list.Id, list.Name);
+    public static TodoList ToResponse(this core.TodoList list) => new TodoList(list.Id, list.Name, list.Items);
 }

backend/src/core/TodoItem.cs

@@ -4,9 +4,10 @@ public record TodoItem
 {
     public int? Id { get; set; }
     public required string Name { get; set; }
-    public bool Compleated {get; set;}
-    public DateTime Deadline {get; set;}
+    public bool Compleated { get; set; }
+    public DateTime Deadline { get; set; }
     public string Notes { get; set; } = null!;
     public required IEnumerable<Tag> Tags { get; set; }
     public required IEnumerable<TodoItem> Subtasks { get; set; }
-}
+    public int ListId { get; set; }
+}

backend/src/core/TodoList.cs

@@ -5,6 +5,5 @@ public class TodoList
     public int Id { get; set; }
     public required string Name { get; set; }
     public required Guid Owner { get; set; }
-
-    public bool IsAuthorized(Guid person) => Owner.Equals(person);
+    public required IEnumerable<TodoItem> Items { get; set; }
 }

backend/src/infrastructure/Data/ApplicationDbContext.cs

@@ -6,5 +6,5 @@ public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options
 {
     public required DbSet<TodoListModel> TodoLists { get; set; }
     public required DbSet<TodoItemModel> Todos { get; set; }
-    public required DbSet<Tag> Tags { get; set; }
+    public required DbSet<TagModel> Tags { get; set; }
 }

backend/src/infrastructure/Data/Tag.cs

@@ -4,7 +4,7 @@
 namespace infrastructure.Data;
 
 [Table("Tags")]
-public class Tag
+public class TagModel
 {
     [Key]
     public int Id { get; set; }

backend/src/infrastructure/Data/TodoItemModel.cs

@@ -13,8 +13,10 @@ public class TodoItemModel
     public DateTime Deadline { get; set; }
     [MaxLength(4096)]
     public string Notes { get; set; } = null!;
-    public required ICollection<Tag> Tags { get; set; }
+    public required ICollection<TagModel> Tags { get; set; }
     public required ICollection<TodoItemModel> Subtasks { get; set; }
     public int? MainTaskId { get; set; }
     public TodoItemModel? MainTask { get; set; }
+    public int ListId { get; set; }
+    public TodoListModel? List { get; set; }
 }

backend/src/infrastructure/Data/TodoListModel.cs

@@ -11,4 +11,5 @@ public class TodoListModel
     [MaxLength(512)]
     public required string Name { get; set; }
     public required Guid Owner { get; set; }
+    public required ICollection<TodoItemModel> Items { get; set; }
 }

backend/src/infrastructure/Data/TodoService.cs

@@ -21,25 +21,40 @@ public IEnumerable<TodoList> GetLists(Guid user)
     {
         return _context.TodoLists.AsNoTracking()
                                  .Where(list => list.Owner.Equals(user))
-                                 .Select(list => new TodoList { Id = list.Id, Name = list.Name, Owner = list.Owner })
+                                 .Select(list => new TodoList
+                                 {
+                                     Id = list.Id,
+                                     Name = list.Name,
+                                     Owner = list.Owner,
+                                     Items = Enumerable.Empty<TodoItem>()
+                                 })
                                  .AsEnumerable();
     }
 
     public TodoList? GetList(Guid user, int id)
     {
         var list = _context.TodoLists.AsNoTracking()
+                                 .Include(l => l.Items)
                                  .SingleOrDefault(l => l.Owner.Equals(user) && l.Id == id);
-        //TODO: Consider creating a mapper instead of this manual new
-        if (list is not null) { return new() { Id = list.Id, Name = list.Name, Owner = list.Owner }; }
+        if (list is not null)
+        {
+            return new()
+            {
+                Id = list.Id,
+                Name = list.Name,
+                Owner = list.Owner,
+                Items = list.Items.Select(i => MapTodoItem(i)).ToList()
+            };
+        };
         return null;
     }
 
     public async Task<TodoList> CreateList(Guid user, string name)
     {
-        var newList = new TodoListModel() { Name = name, Owner = user };
+        var newList = new TodoListModel() { Name = name, Owner = user, Items = [] };
         _context.TodoLists.Add(newList);
         await _context.SaveChangesAsync();
-        return new TodoList() { Id = newList.Id, Name = newList.Name, Owner = newList.Owner };
+        return new TodoList() { Id = newList.Id, Name = newList.Name, Owner = newList.Owner, Items = [] };
     }
 
     public bool DeleteList(Guid user, int id)
@@ -73,7 +88,8 @@ public async Task<TodoItem> CreateItem(Guid user, TodoItem item)
             Deadline = item.Deadline,
             Notes = item.Notes,
             Subtasks = [],
-            Tags = []
+            Tags = [],
+            ListId = item.ListId
         };
         foreach (var st in item.Subtasks)
         {
@@ -85,7 +101,8 @@ public async Task<TodoItem> CreateItem(Guid user, TodoItem item)
                 Deadline = st.Deadline,
                 Notes = st.Notes,
                 Tags = [],
-                Subtasks = []
+                Subtasks = [],
+                ListId = item.ListId
             };
             newItem.Subtasks.Add(newSubtask);
         }
@@ -204,7 +221,7 @@ public async Task<bool> UpdateItem(Guid user, TodoItem item)
 
     private static TodoItem MapTodoItem(infrastructure.Data.TodoItemModel item)
     {
-        Log.Information("Mapped {item}", JsonSerializer.Serialize(item, new JsonSerializerOptions() { ReferenceHandler = ReferenceHandler.Preserve }));
+        Log.Debug("Mapped {item}", JsonSerializer.Serialize(item, new JsonSerializerOptions() { ReferenceHandler = ReferenceHandler.Preserve }));
         return new TodoItem()
         {
             Id = item.Id,