niggl
/
srumboard_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed the method for all the filters to stomething more standardized and .net compliant (also easier built into openapi v3)

This commit is contained in:
Nicolai Ort 2020-06-18 16:38:14 +02:00
parent 00d5cea156
commit ec7f4c940c
7 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ScrumTaskboard/Controllers/CategoriesController.cs
View File

@ -20,21 +20,21 @@ namespace ScrumTaskboard.Controllers
// GET: api/category
[HttpGet]
public async Task<ActionResult<IEnumerable<ScrumCategory>>> GetCategory()
public async Task<ActionResult<IEnumerable<ScrumCategory>>> 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<ScrumCategory>(c => c.title.Contains(HttpContext.Request.Query["title"].ToString()));
filtered = filtered.Where<ScrumCategory>(c => c.title.Contains(title));
}
if (Convert.ToInt32(HttpContext.Request.Query["projectid"]) != 0)
if (projectid != null)
{
filtered = filtered.Where<ScrumCategory>(c => c.projectid == Convert.ToInt32(HttpContext.Request.Query["projectid"]));
filtered = filtered.Where<ScrumCategory>(c => c.projectid == projectid);
}
if (HttpContext.Request.Query["color"].ToString() != "")
if (color != null)
{
filtered = filtered.Where<ScrumCategory>(c => c.color == HttpContext.Request.Query["color"].ToString());
filtered = filtered.Where<ScrumCategory>(c => c.color == color);
}

10
ScrumTaskboard/Controllers/ProjectsController.cs
View File

@ -20,17 +20,17 @@ namespace ScrumTaskboard.Controllers
// GET: api/projects
[HttpGet]
public async Task<ActionResult<IEnumerable<ScrumProject>>> GetProject()
public async Task<ActionResult<IEnumerable<ScrumProject>>> GetProject([FromQuery]string? title, [FromQuery]bool? isprivate)
{
var filtered = _context.Projects.AsQueryable();
if (HttpContext.Request.Query["title"].ToString() != "")
if (title != null)
{
filtered = filtered.Where<ScrumProject>(t => t.title.Contains(HttpContext.Request.Query["title"].ToString()));
filtered = filtered.Where<ScrumProject>(t => t.title.Contains(title));
}
if (HttpContext.Request.Query["isprivate"].ToString() != "")
if (isprivate != null)
{
filtered = filtered.Where<ScrumProject>(t => t.isprivate == Convert.ToBoolean(HttpContext.Request.Query["isprivate"]));
filtered = filtered.Where<ScrumProject>(t => t.isprivate == isprivate);
}
return await filtered.ToListAsync();

18
ScrumTaskboard/Controllers/SprintsController.cs
View File

@ -20,25 +20,25 @@ namespace ScrumTaskboard.Controllers
// GET: api/sprint
[HttpGet]
public async Task<ActionResult<IEnumerable<ScrumSprint>>> GetSprint()
public async Task<ActionResult<IEnumerable<ScrumSprint>>> 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<ScrumSprint>(s => s.title.Contains(HttpContext.Request.Query["title"].ToString()));
filtered = filtered.Where<ScrumSprint>(s => s.title.Contains(title));
}
if (Convert.ToInt32(HttpContext.Request.Query["projectid"]) != 0)
if (projectid != null)
{
filtered = filtered.Where<ScrumSprint>(s => s.projectid == Convert.ToInt32(HttpContext.Request.Query["projectid"]));
filtered = filtered.Where<ScrumSprint>(s => s.projectid == projectid);
}
if (HttpContext.Request.Query["startDate"].ToString() != "")
if (startDate != null)
{
filtered = filtered.Where<ScrumSprint>(s => s.startDate == DateTime.Parse(HttpContext.Request.Query["startDate"].ToString()));
filtered = filtered.Where<ScrumSprint>(s => s.startDate == startDate);
}
if (HttpContext.Request.Query["endDate"].ToString() != "")
if (endDate != null)
{
filtered = filtered.Where<ScrumSprint>(s => s.endDate == DateTime.Parse(HttpContext.Request.Query["startDate"].ToString()));
filtered = filtered.Where<ScrumSprint>(s => s.endDate == endDate);
}
return await filtered.ToListAsync();

6
ScrumTaskboard/Controllers/StatusController.cs
View File

@ -19,13 +19,13 @@ namespace ScrumTaskboard.Controllers
// GET: api/status
[HttpGet]
public async Task<ActionResult<IEnumerable<ScrumStatus>>> GetStatus()
public async Task<ActionResult<IEnumerable<ScrumStatus>>> GetStatus([FromQuery]string? title)
{
var filtered = _context.Status.AsQueryable();
if (HttpContext.Request.Query["title"].ToString() != "")
if (title != null)
{
filtered = filtered.Where<ScrumStatus>(s => s.title.Contains(HttpContext.Request.Query["title"].ToString()));
filtered = filtered.Where<ScrumStatus>(s => s.title.Contains(title));
}
return await filtered.ToListAsync();

30
ScrumTaskboard/Controllers/TasksController.cs
View File

@ -20,38 +20,36 @@ namespace ScrumTaskboard.Controllers
// GET: api/tasks
[HttpGet]
public async Task<ActionResult<IEnumerable<ScrumTask>>> GetTasks()
public async Task<ActionResult<IEnumerable<ScrumTask>>> 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<ScrumTask>(t => t.title.Contains(HttpContext.Request.Query["title"].ToString()));
filtered = filtered.Where<ScrumTask>(t => t.title.Contains(title));
}
if (Convert.ToInt32(HttpContext.Request.Query["userstoryid"]) != 0)
if (userstoryid != null)
{
filtered = filtered.Where<ScrumTask>(t => t.userstoryid == Convert.ToInt32(HttpContext.Request.Query["userstoryid"]));
filtered = filtered.Where<ScrumTask>(t => t.userstoryid == userstoryid);
}
if (Convert.ToInt32(HttpContext.Request.Query["statusid"]) != 0)
if (statusid != null)
{
filtered = filtered.Where<ScrumTask>(t => t.statusid == Convert.ToInt32(HttpContext.Request.Query["statusid"]));
filtered = filtered.Where<ScrumTask>(t => t.statusid == statusid);
}
if (Convert.ToInt32(HttpContext.Request.Query["categoryid"]) != 0)
if (categoryid != null)
{
filtered = filtered.Where<ScrumTask>(t => t.categoryid == Convert.ToInt32(HttpContext.Request.Query["categoryid"]));
filtered = filtered.Where<ScrumTask>(t => t.categoryid == categoryid);
}
if (Convert.ToInt32(HttpContext.Request.Query["assignedtoid"]) != 0)
if (assignedtoid != null)
{
filtered = filtered.Where<ScrumTask>(t => t.assignedtoid == Convert.ToInt32(HttpContext.Request.Query["assignedtoid"]));
filtered = filtered.Where<ScrumTask>(t => t.assignedtoid == assignedtoid);
}
if (Convert.ToInt32(HttpContext.Request.Query["projectid"]) != 0)
if (projectid != null)
{
filtered = filtered.Where<ScrumTask>(t => t.projectid == Convert.ToInt32(HttpContext.Request.Query["projectid"]));
filtered = filtered.Where<ScrumTask>(t => t.projectid == projectid);
}
if (HttpContext.Request.Query["priority"].ToString() != "")
if (priority != null)
{
ScrumPrio priority;
Enum.TryParse<ScrumPrio>(HttpContext.Request.Query["priority"].ToString(), out priority);
filtered = filtered.Where<ScrumTask>(t => t.priority == priority);
}

6
ScrumTaskboard/Controllers/UsersController.cs
View File

@ -19,12 +19,12 @@ namespace ScrumTaskboard.Controllers
// GET: api/sprint
[HttpGet]
public async Task<ActionResult<IEnumerable<ScrumUser>>> GetUser()
public async Task<ActionResult<IEnumerable<ScrumUser>>> GetUser([FromQuery]string? name)
{
var filtered = _context.Users.AsQueryable();
if (HttpContext.Request.Query["name"].ToString() != "")
if (name != null)
{
filtered = filtered.Where<ScrumUser>(u => u.name.Contains(HttpContext.Request.Query["name"].ToString()));
filtered = filtered.Where<ScrumUser>(u => u.name.Contains(name));
}
return await filtered.ToListAsync();

30
ScrumTaskboard/Controllers/UserstoriesController.cs
View File

@ -20,38 +20,36 @@ namespace ScrumTaskboard.Controllers
// GET: api/userstories
[HttpGet]
public async Task<ActionResult<IEnumerable<ScrumUserstory>>> GetUserstory()
public async Task<ActionResult<IEnumerable<ScrumUserstory>>> 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<ScrumUserstory>(t => t.title.Contains(HttpContext.Request.Query["title"].ToString()));
filtered = filtered.Where<ScrumUserstory>(t => t.title.Contains(title));
}
if (Convert.ToInt32(HttpContext.Request.Query["statusid"]) != 0)
if (statusid != null)
{
filtered = filtered.Where<ScrumUserstory>(t => t.statusid == Convert.ToInt32(HttpContext.Request.Query["statusid"]));
filtered = filtered.Where<ScrumUserstory>(t => t.statusid == statusid);
}
if (Convert.ToInt32(HttpContext.Request.Query["categoryid"]) != 0)
if (categoryid != null)
{
filtered = filtered.Where<ScrumUserstory>(t => t.categoryid == Convert.ToInt32(HttpContext.Request.Query["categoryid"]));
filtered = filtered.Where<ScrumUserstory>(t => t.categoryid == categoryid);
}
if (Convert.ToInt32(HttpContext.Request.Query["createdby"]) != 0)
if (createdbyid != null)
{
filtered = filtered.Where<ScrumUserstory>(t => t.createdbyid == Convert.ToInt32(HttpContext.Request.Query["createdby"]));
filtered = filtered.Where<ScrumUserstory>(t => t.createdbyid == createdbyid);
}
if (Convert.ToInt32(HttpContext.Request.Query["projectid"]) != 0)
if (projectid != null)
{
filtered = filtered.Where<ScrumUserstory>(t => t.projectid == Convert.ToInt32(HttpContext.Request.Query["projectid"]));
filtered = filtered.Where<ScrumUserstory>(t => t.projectid == projectid);
}
if (Convert.ToInt32(HttpContext.Request.Query["sprintid"]) != 0)
if (sprintid != null)
{
filtered = filtered.Where<ScrumUserstory>(t => t.sprintid == Convert.ToInt32(HttpContext.Request.Query["sprintid"]));
filtered = filtered.Where<ScrumUserstory>(t => t.sprintid == sprintid);
}
if (HttpContext.Request.Query["priority"].ToString() != "")
if (priority != null)
{
ScrumPrio priority;
Enum.TryParse<ScrumPrio>(HttpContext.Request.Query["priority"].ToString(), out priority);
filtered = filtered.Where<ScrumUserstory>(t => t.priority == priority);
}