Merge pull request #1 from Task-Manager-Pro/Refactor

Refactor: Aplicando conceito de Domain.

Author: Romulo-Queiroz

Controllers/TaskManagerController.cs

@@ -94,7 +94,7 @@ public IActionResult GetById([FromRoute] int id)
         [Authorize]
         [HttpPost("/insertTask/{userId}")]
         public IActionResult Post(
-        [FromBody] TaskEntity model,
+        [FromBody] TaskModel model,
         [FromRoute] int userId)
         {
             try
@@ -111,7 +111,7 @@ public IActionResult Post(
         [HttpPut("/edit/{id:int}")]
         public IActionResult Put(
         [FromRoute] int id,
-        [FromBody] TaskEntity model)
+        [FromBody] TaskModel model)
         {
            try
            {
@@ -156,7 +156,7 @@ public IActionResult Done(
         [Authorize]
         [HttpPost("/asignTask")]
         public IActionResult AsignTask(
-            [FromBody] TaskEntity model)
+            [FromBody] TaskModel model)
         {
             try
             {

Data/AppDbContext.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Todo.Models;
+using Todo.Domain;
 
 namespace Todo.Data {
     public class AppDbContext : DbContext {

Models/CategorieTaskEntity.cs Entitys/CategorieTaskEntity.csModels/CategorieTaskEntity.cs renamed to Entitys/CategorieTaskEntity.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Todo.Models
+namespace Todo.Domain
 {
     public class CategorieTaskEntity
     {

Models/TaskEntity.cs Entitys/TaskEntity.csModels/TaskEntity.cs renamed to Entitys/TaskEntity.cs

@@ -1,13 +1,13 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Todo.Models;
+namespace Todo.Domain;
 
  public class TaskEntity
- {
+{
     public int Id { get; set; }
     public string? Title { get; set; }
-    public string? Description {get; set;}
+    public string? Description { get; set; }
     public bool Done { get; set; }
     public DateTime CreatedAt { get; set; }
     public DateTime FinishedAt { get; set; }
@@ -20,4 +20,5 @@ public class TaskEntity
     public virtual UserEntity? User { get; set; }
 
     public int UserId { get; set; }
+
 }

Models/UserEntity.cs Entitys/UserEntity.csModels/UserEntity.cs renamed to Entitys/UserEntity.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Todo.Models
+namespace Todo.Domain
 {
     public class UserEntity
     {

Models/CategorieTaskModel.cs

@@ -0,0 +1,11 @@
+namespace Todo.Models
+{
+    public class CategorieTaskModel
+    {
+
+        public int Id { get; set; }
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+
+    }
+}

Models/TaskModel.cs

@@ -0,0 +1,17 @@
+namespace Todo.Models
+{
+    public class TaskModel
+    {
+        public int Id { get; set; }
+        public string? Title { get; set; }
+        public string? Description { get; set; }
+        public bool Done { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public DateTime FinishedAt { get; set; }
+        public int CategorieTaskId { get; set; }
+        public int UserId { get; set; }
+
+        public string? Category { get; set; }
+        public string? UserName { get; set; }
+    }
+}

Services/TaskManagerServices.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Todo.Data;
+using Todo.Domain;
 using Todo.Models;
 
 namespace Todo.Services
@@ -94,11 +95,11 @@ public IActionResult GetTasksByUser (int userId)
 
         public IActionResult GetById(int id)
         {
-           TaskEntity task = context.Tasks.FirstOrDefault(x => x.Id == id);
+           TaskModel task = context.Tasks.FirstOrDefault(x => x.Id == id);
 
             if (task == null) return new NotFoundResult();
 
-            TaskEntity taskDetails = new TaskEntity()
+            TaskModel taskDetails = new TaskModel()
             {
                 Title = task.Title,
                 Description = task.Description,
@@ -109,7 +110,7 @@ public IActionResult GetById(int id)
             return Ok(taskDetails);
         }
 
-        public IActionResult InsertTask (TaskEntity model, int userId)
+        public IActionResult InsertTask (TaskModel model, int userId)
         {
             try
             {
@@ -120,7 +121,7 @@ public IActionResult InsertTask (TaskEntity model, int userId)
                     return BadRequest("Categoria ou modelo inválido.");
                 }
 
-                TaskEntity updateTask = new TaskEntity
+                TaskEntity newTask = new TaskEntity
                 {
                     Title = model.Title,
                     Description = model.Description,
@@ -131,10 +132,10 @@ public IActionResult InsertTask (TaskEntity model, int userId)
                     UserId = userId
                 };
 
-                context.Tasks.Add(updateTask);
+                context.Tasks.Add(newTask);
                 context.SaveChanges();
 
-                return Ok(new { taskId = updateTask.Id });
+                return Ok(new { taskId = newTask.Id });
             }
             catch (Exception ex)
             {
@@ -145,7 +146,7 @@ public IActionResult InsertTask (TaskEntity model, int userId)
             }
         }
 
-        public IActionResult EditTask (TaskEntity model, int id)
+        public IActionResult EditTask (TaskModel model, int id)
         {
             TaskEntity taskToEdit = context.Tasks.FirstOrDefault(x => x.Id == id);
 
@@ -186,9 +187,10 @@ public IActionResult DoneTask (int id)
 
             return Ok(task);
         }
-        public IActionResult AsignTask (TaskEntity model)
+        public IActionResult AsignTask (TaskModel model)
         {
             var user = context.Users.FirstOrDefault(x => x.Id == model.UserId);
+            var category = context.CategorieTasks.FirstOrDefault(x => x.Id == model.CategorieTaskId);
 
             if (user == null) return new BadRequestResult();
 
@@ -199,7 +201,7 @@ public IActionResult AsignTask (TaskEntity model)
                 Done = false,
                 CreatedAt = DateTime.Now,
                 CategorieTaskId = model.CategorieTaskId,
-                Category = context.CategorieTasks.FirstOrDefault(c => c.Id == model.CategorieTaskId),
+                Category = category,
                 UserId = model.UserId
             };