bme
/
covidok-backend
3
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity
Browse Source

Exposed priority change as separate API endpoint
gitea-bme/covidok-backend/pipeline/head This commit looks good
Details

master
Daniel Gyulai 4 years ago
parent
41428195c9
commit
cd787605f3
6 changed files with 216 additions and 159 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      CoviDok/Api/Request/CasePriority.cs
  2. 1
      CoviDok/Api/Request/CaseUpdate.cs
  3. 56
      CoviDok/BLL/User/Handlers/ICaseHandler.cs
  4. 21
      CoviDok/BLL/User/Managers/CaseManager.cs
  5. 21
      CoviDok/Controllers/CaseController.cs
  6. 262
      CoviDok/Data/MySQL/MySqlCaseHandler.cs

14
CoviDok/Api/Request/CasePriority.cs
View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CoviDok.Api.Request
{
public class CasePriority
{
public int CaseId { get; set; }
public string SessionId { get; set; }
public Priority Priority { get; set; }
}
}

1
CoviDok/Api/Request/CaseUpdate.cs
View File

@ -11,6 +11,5 @@ namespace CoviDok.Api.Request
public string UpdateMsg { get; set; } public string UpdateMsg { get; set; }
public List<string> Images {get;set;} public List<string> Images {get;set;}
public string SessionId { get; set; } public string SessionId { get; set; }
public Priority Priority { get; set; }
} }
} }

56
CoviDok/BLL/User/Handlers/ICaseHandler.cs
View File

@ -1,27 +1,29 @@
using CoviDok.Api.Request; using CoviDok.Api;
using CoviDok.BLL.User.Managers; using CoviDok.Api.Request;
using CoviDok.Data.Model; using CoviDok.BLL.User.Managers;
using System; using CoviDok.Data.Model;
using System.Collections.Generic; using System;
using System.Linq; using System.Collections.Generic;
using System.Threading.Tasks; using System.Linq;
using System.Threading.Tasks;
namespace CoviDok.BLL.User.Handlers
{ namespace CoviDok.BLL.User.Handlers
public interface ICaseHandler {
{ public interface ICaseHandler
public Task<List<Case>> Filter(CaseFilter filter); {
public Task<Case> GetCase(int id); public Task<List<Case>> Filter(CaseFilter filter);
public Task<Case> GetCase(int id);
public Task<Case> AddCase(Case c);
public Task<Case> AddCase(Case c);
public Task UpdateCase(int id, Case Case, Update update);
public Task UpdateCase(int id, Case Case, Update update);
public Task SetCase(int id, CaseStatus status, Update message);
public bool IsAuthorized(int Id, Case c); public Task SetCase(int id, CaseStatus status, Update message);
public bool IsAuthorized(int Id, Case c);
public List<Update> GetUpdatesForCase(int id);
public Update GetUpadte(int id); public List<Update> GetUpdatesForCase(int id);
public bool IsAssistantOfDoctor(int id, int doctorId); public Update GetUpadte(int id);
} public Task SetPriority(int id, Priority priority);
} public bool IsAssistantOfDoctor(int id, int doctorId);
}
}

21
CoviDok/BLL/User/Managers/CaseManager.cs
View File

@ -1,4 +1,5 @@
using CoviDok.Api.Request; using CoviDok.Api;
using CoviDok.Api.Request;
using CoviDok.BLL.Sessions; using CoviDok.BLL.Sessions;
using CoviDok.BLL.Storage; using CoviDok.BLL.Storage;
using CoviDok.BLL.User.Handlers; using CoviDok.BLL.User.Handlers;
@ -113,6 +114,20 @@ namespace CoviDok.BLL.User.Managers
} }
} }
public async Task SetPriority(Session s, int id, Priority priority)
{
Case c = await handler.GetCase(id);
if (c == null) throw new KeyNotFoundException();
if (handler.IsAuthorized(s.Id, c))
{
await handler.SetPriority(id, priority);
}
else
{
throw new UnauthorizedAccessException();
}
}
public async Task<Case> CreateCase(Session s, int DoctorId, int ChildId, string Title, DateTime startDate, Api.Priority priority) public async Task<Case> CreateCase(Session s, int DoctorId, int ChildId, string Title, DateTime startDate, Api.Priority priority)
{ {
// TODO szülő csak saját gyereket jelenthet // TODO szülő csak saját gyereket jelenthet
@ -131,7 +146,7 @@ namespace CoviDok.BLL.User.Managers
return await handler.AddCase(c); return await handler.AddCase(c);
} }
public async Task UpdateCase(Session s, int id, string updateMsg, List<string> Images, Api.Priority priority) public async Task UpdateCase(Session s, int id, string updateMsg, List<string> Images)
{ {
Case c = await handler.GetCase(id); Case c = await handler.GetCase(id);
if (c == null) throw new KeyNotFoundException("Case Id not found: " + id); if (c == null) throw new KeyNotFoundException("Case Id not found: " + id);
@ -146,7 +161,7 @@ namespace CoviDok.BLL.User.Managers
if (s.Id == c.ParentId) c.Assignee = c.DoctorId; // Ha szülő updatel, az assignee az orvos lesz if (s.Id == c.ParentId) c.Assignee = c.DoctorId; // Ha szülő updatel, az assignee az orvos lesz
// TODO Ha a doki VAGY asszisztense frissít // TODO Ha a doki VAGY asszisztense frissít
if (s.Id == c.DoctorId) c.Assignee = c.ParentId; // Ha doki frissít, a szülőhöz kerül if (s.Id == c.DoctorId) c.Assignee = c.ParentId; // Ha doki frissít, a szülőhöz kerül
c.Priority = priority;
c.LastModificationDate = DateTime.Now; c.LastModificationDate = DateTime.Now;
Update update = new Update { Update update = new Update {
CaseId = c.Id, CaseId = c.Id,

21
CoviDok/Controllers/CaseController.cs
View File

@ -41,6 +41,25 @@ namespace CoviDok.Controllers
} }
} }
[HttpPost("{id}/priority")]
public async Task<IActionResult> PostPriorityChange(int id, CasePriority priority)
{
try
{
Session s = await Handler.GetSession(priority.SessionId);
await mgr.SetPriority(s, id, priority.Priority);
return Ok();
}
catch (KeyNotFoundException)
{
return NotFound();
}
catch (UnauthorizedAccessException)
{
return Unauthorized();
}
}
// POST /api/Case/{id}/update // POST /api/Case/{id}/update
[HttpPut("{id}/update")] [HttpPut("{id}/update")]
@ -49,7 +68,7 @@ namespace CoviDok.Controllers
try try
{ {
Session s = await Handler.GetSession(data.SessionId); Session s = await Handler.GetSession(data.SessionId);
await mgr.UpdateCase(s, id, data.UpdateMsg, data.Images, data.Priority); await mgr.UpdateCase(s, id, data.UpdateMsg, data.Images);
return Ok(); return Ok();
} }
catch (UnauthorizedAccessException) catch (UnauthorizedAccessException)

262
CoviDok/Data/MySQL/MySqlCaseHandler.cs
View File

@ -1,127 +1,135 @@
using CoviDok.Api.Request; using CoviDok.Api;
using CoviDok.BLL; using CoviDok.Api.Request;
using CoviDok.BLL.User.Handlers; using CoviDok.BLL;
using CoviDok.BLL.User.Managers; using CoviDok.BLL.User.Handlers;
using CoviDok.Data.Model; using CoviDok.BLL.User.Managers;
using System; using CoviDok.Data.Model;
using System.Collections.Generic; using System;
using System.Linq; using System.Collections.Generic;
using System.Reflection; using System.Linq;
using System.Threading.Tasks; using System.Reflection;
using System.Threading.Tasks;
namespace CoviDok.Data.MySQL
{ namespace CoviDok.Data.MySQL
public class MySqlCaseHandler : ICaseHandler {
{ public class MySqlCaseHandler : ICaseHandler
private readonly MySqlContext context = new MySqlContext(); {
public async Task<Case> AddCase(Case c) private readonly MySqlContext context = new MySqlContext();
{ public async Task<Case> AddCase(Case c)
context.Cases.Add(c); {
await context.SaveChangesAsync(); context.Cases.Add(c);
return c; await context.SaveChangesAsync();
} return c;
}
public async Task SetCase(int id, CaseStatus status, Update message)
{ public async Task SetCase(int id, CaseStatus status, Update message)
Case c = await context.Cases.FindAsync(id); {
message.CaseId = c.Id; Case c = await context.Cases.FindAsync(id);
context.Updates.Add(message); message.CaseId = c.Id;
c.CaseStatus = status; context.Updates.Add(message);
c.LastModificationDate = DateTime.Now; c.CaseStatus = status;
c.Updates.Add(message); c.LastModificationDate = DateTime.Now;
await context.SaveChangesAsync(); c.Updates.Add(message);
} await context.SaveChangesAsync();
}
public List<Update> GetUpdatesForCase(int id)
{ public async Task SetPriority(int id, Priority priority)
List<Update> updates = (from u in context.Updates where u.CaseId == id select u).ToList(); {
foreach (Update update in updates) Case c = await context.Cases.FindAsync(id);
{ c.Priority = priority;
update.Images = (from i in context.Images where i.UpdateId == update.Id select i.ImageId).ToList(); await context.SaveChangesAsync();
} }
return updates;
} public List<Update> GetUpdatesForCase(int id)
{
public Update GetUpadte(int id) List<Update> updates = (from u in context.Updates where u.CaseId == id select u).ToList();
{ foreach (Update update in updates)
Update update = (from u in context.Updates where u.Id == id select u).First(); {
if (update != null) update.Images = (from i in context.Images where i.UpdateId == update.Id select i.ImageId).ToList();
{ }
update.Images = (from i in context.Images where i.UpdateId == update.Id select i.ImageId).ToList(); return updates;
} }
return update;
} public Update GetUpadte(int id)
{
public bool IsAssistantOfDoctor(int id, int doctorId) Update update = (from u in context.Updates where u.Id == id select u).First();
{ if (update != null)
return context.Assistants.Any( (a) => a.Id == id && a.DoctorId == doctorId); {
} update.Images = (from i in context.Images where i.UpdateId == update.Id select i.ImageId).ToList();
}
public async Task<List<Case>> Filter(CaseFilter filter) return update;
{ }
List<Case> ret = new List<Case>();
public bool IsAssistantOfDoctor(int id, int doctorId)
await Task.Run(() => { {
var query = from c in context.Cases select c; return context.Assistants.Any( (a) => a.Id == id && a.DoctorId == doctorId);
if (filter.ChildId != int.MinValue) }
{
query = query.Where(c => c.ChildId == filter.ChildId); public async Task<List<Case>> Filter(CaseFilter filter)
} {
if (filter.DoctorId != int.MinValue) List<Case> ret = new List<Case>();
{
query = query.Where(c => c.DoctorId == filter.DoctorId); await Task.Run(() => {
} var query = from c in context.Cases select c;
if (filter.ParentId != int.MinValue) if (filter.ChildId != int.MinValue)
{ {
query = query.Where(c => c.ParentId == filter.ParentId); query = query.Where(c => c.ChildId == filter.ChildId);
} }
if (filter.Assignee != int.MinValue) if (filter.DoctorId != int.MinValue)
{ {
query = query.Where(c => c.Assignee == filter.Assignee); query = query.Where(c => c.DoctorId == filter.DoctorId);
} }
if (filter.Title != null) if (filter.ParentId != int.MinValue)
{ {
query = query.Where(c => c.Title.Contains(filter.Title)); query = query.Where(c => c.ParentId == filter.ParentId);
} }
ret = query.ToList(); if (filter.Assignee != int.MinValue)
}); {
return ret; query = query.Where(c => c.Assignee == filter.Assignee);
} }
if (filter.Title != null)
public async Task<Case> GetCase(int id) {
{ query = query.Where(c => c.Title.Contains(filter.Title));
return await context.Cases.FindAsync(id); }
} ret = query.ToList();
});
public async Task UpdateCase(int id, Case Case, Update update) return ret;
{ }
Case c = await context.Cases.FindAsync(id);
context.Entry(c).State = Microsoft.EntityFrameworkCore.EntityState.Modified; public async Task<Case> GetCase(int id)
string[] forbidden = { "Updates" }; {
PropertyCopier<Case>.Copy(Case, c, forbidden); return await context.Cases.FindAsync(id);
context.Updates.Add(update); }
await context.SaveChangesAsync();
foreach (string ImageId in update.Images) public async Task UpdateCase(int id, Case Case, Update update)
{ {
Image image = new Image Case c = await context.Cases.FindAsync(id);
{ context.Entry(c).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
UpdateId = update.Id, string[] forbidden = { "Updates" };
ImageId = ImageId PropertyCopier<Case>.Copy(Case, c, forbidden);
}; context.Updates.Add(update);
context.Images.Add(image); await context.SaveChangesAsync();
} foreach (string ImageId in update.Images)
update.CreatedDate = DateTime.Now; {
c.Updates.Add(update); Image image = new Image
await context.SaveChangesAsync(); {
} UpdateId = update.Id,
ImageId = ImageId
public bool IsAuthorized(int Id, Case c) };
{ context.Images.Add(image);
if (Id == c.DoctorId || Id == c.ParentId) return true; }
// Ha van olyan Asszisztens, akinek; update.CreatedDate = DateTime.Now;
// - a dokija egyezik az ügy dokijával c.Updates.Add(update);
// - azonosítója a bejelentezett user azonosítója await context.SaveChangesAsync();
return (context.Assistants.Any(a => a.Id == Id && a.DoctorId == c.DoctorId)); }
}
} public bool IsAuthorized(int Id, Case c)
} {
if (Id == c.DoctorId || Id == c.ParentId) return true;
// Ha van olyan Asszisztens, akinek;
// - a dokija egyezik az ügy dokijával
// - azonosítója a bejelentezett user azonosítója
return (context.Assistants.Any(a => a.Id == Id && a.DoctorId == c.DoctorId));
}
}
}

Write Preview
Loading…
Cancel
Save