diff --git a/ScrumTaskboard/Controllers/CategoriesController.cs b/ScrumTaskboard/Controllers/CategoriesController.cs index 109c22b..fe8b803 100644 --- a/ScrumTaskboard/Controllers/CategoriesController.cs +++ b/ScrumTaskboard/Controllers/CategoriesController.cs @@ -20,21 +20,21 @@ namespace ScrumTaskboard.Controllers // GET: api/category [HttpGet] - public async Task>> GetCategory() + public async Task>> GetCategory([FromQuery]string? title, [FromQuery]int? projectid, [FromQuery] string? color) { var filtered = _context.Categories.AsQueryable(); - if (HttpContext.Request.Query["title"].ToString() != "") + if (title != null) { - filtered = filtered.Where(c => c.title.Contains(HttpContext.Request.Query["title"].ToString())); + filtered = filtered.Where(c => c.title.Contains(title)); } - if (Convert.ToInt32(HttpContext.Request.Query["projectid"]) != 0) + if (projectid != null) { - filtered = filtered.Where(c => c.projectid == Convert.ToInt32(HttpContext.Request.Query["projectid"])); + filtered = filtered.Where(c => c.projectid == projectid); } - if (HttpContext.Request.Query["color"].ToString() != "") + if (color != null) { - filtered = filtered.Where(c => c.color == HttpContext.Request.Query["color"].ToString()); + filtered = filtered.Where(c => c.color == color); } diff --git a/ScrumTaskboard/Controllers/ProjectsController.cs b/ScrumTaskboard/Controllers/ProjectsController.cs index 8149449..64955e5 100644 --- a/ScrumTaskboard/Controllers/ProjectsController.cs +++ b/ScrumTaskboard/Controllers/ProjectsController.cs @@ -20,17 +20,17 @@ namespace ScrumTaskboard.Controllers // GET: api/projects [HttpGet] - public async Task>> GetProject() + public async Task>> GetProject([FromQuery]string? title, [FromQuery]bool? isprivate) { var filtered = _context.Projects.AsQueryable(); - if (HttpContext.Request.Query["title"].ToString() != "") + if (title != null) { - filtered = filtered.Where(t => t.title.Contains(HttpContext.Request.Query["title"].ToString())); + filtered = filtered.Where(t => t.title.Contains(title)); } - if (HttpContext.Request.Query["isprivate"].ToString() != "") + if (isprivate != null) { - filtered = filtered.Where(t => t.isprivate == Convert.ToBoolean(HttpContext.Request.Query["isprivate"])); + filtered = filtered.Where(t => t.isprivate == isprivate); } return await filtered.ToListAsync(); diff --git a/ScrumTaskboard/Controllers/SprintsController.cs b/ScrumTaskboard/Controllers/SprintsController.cs index 2144fcf..043527c 100644 --- a/ScrumTaskboard/Controllers/SprintsController.cs +++ b/ScrumTaskboard/Controllers/SprintsController.cs @@ -20,25 +20,25 @@ namespace ScrumTaskboard.Controllers // GET: api/sprint [HttpGet] - public async Task>> GetSprint() + public async Task>> GetSprint([FromQuery]string? title, [FromQuery]int? projectid, [FromQuery]DateTime? startDate, [FromQuery]DateTime? endDate) { var filtered = _context.Sprints.AsQueryable(); - if (HttpContext.Request.Query["title"].ToString() != "") + if (title != null) { - filtered = filtered.Where(s => s.title.Contains(HttpContext.Request.Query["title"].ToString())); + filtered = filtered.Where(s => s.title.Contains(title)); } - if (Convert.ToInt32(HttpContext.Request.Query["projectid"]) != 0) + if (projectid != null) { - filtered = filtered.Where(s => s.projectid == Convert.ToInt32(HttpContext.Request.Query["projectid"])); + filtered = filtered.Where(s => s.projectid == projectid); } - if (HttpContext.Request.Query["startDate"].ToString() != "") + if (startDate != null) { - filtered = filtered.Where(s => s.startDate == DateTime.Parse(HttpContext.Request.Query["startDate"].ToString())); + filtered = filtered.Where(s => s.startDate == startDate); } - if (HttpContext.Request.Query["endDate"].ToString() != "") + if (endDate != null) { - filtered = filtered.Where(s => s.endDate == DateTime.Parse(HttpContext.Request.Query["startDate"].ToString())); + filtered = filtered.Where(s => s.endDate == endDate); } return await filtered.ToListAsync(); diff --git a/ScrumTaskboard/Controllers/StatusController.cs b/ScrumTaskboard/Controllers/StatusController.cs index 518e920..95f345e 100644 --- a/ScrumTaskboard/Controllers/StatusController.cs +++ b/ScrumTaskboard/Controllers/StatusController.cs @@ -19,13 +19,13 @@ namespace ScrumTaskboard.Controllers // GET: api/status [HttpGet] - public async Task>> GetStatus() + public async Task>> GetStatus([FromQuery]string? title) { var filtered = _context.Status.AsQueryable(); - if (HttpContext.Request.Query["title"].ToString() != "") + if (title != null) { - filtered = filtered.Where(s => s.title.Contains(HttpContext.Request.Query["title"].ToString())); + filtered = filtered.Where(s => s.title.Contains(title)); } return await filtered.ToListAsync(); diff --git a/ScrumTaskboard/Controllers/TasksController.cs b/ScrumTaskboard/Controllers/TasksController.cs index 5859d44..3cfb6f8 100644 --- a/ScrumTaskboard/Controllers/TasksController.cs +++ b/ScrumTaskboard/Controllers/TasksController.cs @@ -20,38 +20,36 @@ namespace ScrumTaskboard.Controllers // GET: api/tasks [HttpGet] - public async Task>> GetTasks() + public async Task>> GetTasks([FromQuery]string? title, [FromQuery]int? userstoryid, [FromQuery]int? statusid, [FromQuery]int? categoryid, [FromQuery]int? assignedtoid, [FromQuery]int? projectid, [FromQuery]ScrumPrio? priority) { var filtered = _context.Tasks.AsQueryable(); - if (HttpContext.Request.Query["title"].ToString() != "") + if (title != null) { - filtered = filtered.Where(t => t.title.Contains(HttpContext.Request.Query["title"].ToString())); + filtered = filtered.Where(t => t.title.Contains(title)); } - if (Convert.ToInt32(HttpContext.Request.Query["userstoryid"]) != 0) + if (userstoryid != null) { - filtered = filtered.Where(t => t.userstoryid == Convert.ToInt32(HttpContext.Request.Query["userstoryid"])); + filtered = filtered.Where(t => t.userstoryid == userstoryid); } - if (Convert.ToInt32(HttpContext.Request.Query["statusid"]) != 0) + if (statusid != null) { - filtered = filtered.Where(t => t.statusid == Convert.ToInt32(HttpContext.Request.Query["statusid"])); + filtered = filtered.Where(t => t.statusid == statusid); } - if (Convert.ToInt32(HttpContext.Request.Query["categoryid"]) != 0) + if (categoryid != null) { - filtered = filtered.Where(t => t.categoryid == Convert.ToInt32(HttpContext.Request.Query["categoryid"])); + filtered = filtered.Where(t => t.categoryid == categoryid); } - if (Convert.ToInt32(HttpContext.Request.Query["assignedtoid"]) != 0) + if (assignedtoid != null) { - filtered = filtered.Where(t => t.assignedtoid == Convert.ToInt32(HttpContext.Request.Query["assignedtoid"])); + filtered = filtered.Where(t => t.assignedtoid == assignedtoid); } - if (Convert.ToInt32(HttpContext.Request.Query["projectid"]) != 0) + if (projectid != null) { - filtered = filtered.Where(t => t.projectid == Convert.ToInt32(HttpContext.Request.Query["projectid"])); + filtered = filtered.Where(t => t.projectid == projectid); } - if (HttpContext.Request.Query["priority"].ToString() != "") + if (priority != null) { - ScrumPrio priority; - Enum.TryParse(HttpContext.Request.Query["priority"].ToString(), out priority); filtered = filtered.Where(t => t.priority == priority); } diff --git a/ScrumTaskboard/Controllers/UsersController.cs b/ScrumTaskboard/Controllers/UsersController.cs index a8d4b7c..ddda017 100644 --- a/ScrumTaskboard/Controllers/UsersController.cs +++ b/ScrumTaskboard/Controllers/UsersController.cs @@ -19,12 +19,12 @@ namespace ScrumTaskboard.Controllers // GET: api/sprint [HttpGet] - public async Task>> GetUser() + public async Task>> GetUser([FromQuery]string? name) { var filtered = _context.Users.AsQueryable(); - if (HttpContext.Request.Query["name"].ToString() != "") + if (name != null) { - filtered = filtered.Where(u => u.name.Contains(HttpContext.Request.Query["name"].ToString())); + filtered = filtered.Where(u => u.name.Contains(name)); } return await filtered.ToListAsync(); diff --git a/ScrumTaskboard/Controllers/UserstoriesController.cs b/ScrumTaskboard/Controllers/UserstoriesController.cs index 861b449..ff2eadb 100644 --- a/ScrumTaskboard/Controllers/UserstoriesController.cs +++ b/ScrumTaskboard/Controllers/UserstoriesController.cs @@ -20,38 +20,36 @@ namespace ScrumTaskboard.Controllers // GET: api/userstories [HttpGet] - public async Task>> GetUserstory() + public async Task>> GetUserstory([FromQuery]string? title, [FromQuery]int? statusid, [FromQuery]int? categoryid, [FromQuery]int? createdbyid, [FromQuery]int? projectid, [FromQuery]int? sprintid, [FromQuery]ScrumPrio? priority) { var filtered = _context.Userstories.AsQueryable(); - if (HttpContext.Request.Query["title"].ToString() != "") + if (title != null) { - filtered = filtered.Where(t => t.title.Contains(HttpContext.Request.Query["title"].ToString())); + filtered = filtered.Where(t => t.title.Contains(title)); } - if (Convert.ToInt32(HttpContext.Request.Query["statusid"]) != 0) + if (statusid != null) { - filtered = filtered.Where(t => t.statusid == Convert.ToInt32(HttpContext.Request.Query["statusid"])); + filtered = filtered.Where(t => t.statusid == statusid); } - if (Convert.ToInt32(HttpContext.Request.Query["categoryid"]) != 0) + if (categoryid != null) { - filtered = filtered.Where(t => t.categoryid == Convert.ToInt32(HttpContext.Request.Query["categoryid"])); + filtered = filtered.Where(t => t.categoryid == categoryid); } - if (Convert.ToInt32(HttpContext.Request.Query["createdby"]) != 0) + if (createdbyid != null) { - filtered = filtered.Where(t => t.createdbyid == Convert.ToInt32(HttpContext.Request.Query["createdby"])); + filtered = filtered.Where(t => t.createdbyid == createdbyid); } - if (Convert.ToInt32(HttpContext.Request.Query["projectid"]) != 0) + if (projectid != null) { - filtered = filtered.Where(t => t.projectid == Convert.ToInt32(HttpContext.Request.Query["projectid"])); + filtered = filtered.Where(t => t.projectid == projectid); } - if (Convert.ToInt32(HttpContext.Request.Query["sprintid"]) != 0) + if (sprintid != null) { - filtered = filtered.Where(t => t.sprintid == Convert.ToInt32(HttpContext.Request.Query["sprintid"])); + filtered = filtered.Where(t => t.sprintid == sprintid); } - if (HttpContext.Request.Query["priority"].ToString() != "") + if (priority != null) { - ScrumPrio priority; - Enum.TryParse(HttpContext.Request.Query["priority"].ToString(), out priority); filtered = filtered.Where(t => t.priority == priority); }