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

Introduced Case priority
gitea-bme/covidok-backend/pipeline/head This commit looks good
Details

master
Daniel Gyulai 4 years ago
parent
fbdb7c0ebe
commit
41428195c9
6 changed files with 258 additions and 238 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/Priority.cs
  2. 33
      CoviDok/Api/Request/CaseCreate.cs
  3. 31
      CoviDok/Api/Request/CaseUpdate.cs
  4. 333
      CoviDok/BLL/User/Managers/CaseManager.cs
  5. 4
      CoviDok/Controllers/CaseController.cs
  6. 81
      CoviDok/Data/Model/Case.cs

14
CoviDok/Api/Priority.cs
View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CoviDok.Api
{
public enum Priority
{
Low,
Normal,
High
}
}

33
CoviDok/Api/Request/CaseCreate.cs
View File

@ -1,16 +1,17 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace CoviDok.Api.Request namespace CoviDok.Api.Request
{ {
public class CaseCreate public class CaseCreate
{ {
public string SessionId { get; set; } public string SessionId { get; set; }
public int DoctorId { get; set; } public int DoctorId { get; set; }
public int ChildId { get; set; } public int ChildId { get; set; }
public DateTime StartDate { get; set; } public DateTime StartDate { get; set; }
public string Title { get; set; } public string Title { get; set; }
} public Priority Priority {get; set;}
} }
}

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

@ -1,15 +1,16 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace CoviDok.Api.Request namespace CoviDok.Api.Request
{ {
public class CaseUpdate public class CaseUpdate
{ {
public int CaseId { get; set; } public int CaseId { get; set; }
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; }
} }
}

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

@ -1,166 +1,167 @@
using CoviDok.Api.Request; 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;
using CoviDok.Data.Model; using CoviDok.Data.Model;
using CoviDok.Data.MySQL; using CoviDok.Data.MySQL;
using CoviDok.Data.StorageProviders; using CoviDok.Data.StorageProviders;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace CoviDok.BLL.User.Managers namespace CoviDok.BLL.User.Managers
{ {
public class CaseManager public class CaseManager
{ {
private readonly ICaseHandler handler = new MySqlCaseHandler(); private readonly ICaseHandler handler = new MySqlCaseHandler();
private readonly StorageHandler storage = new StorageHandler(new MinioProvider()); private readonly StorageHandler storage = new StorageHandler(new MinioProvider());
public async Task<List<Case>> FilterCases(Session s, CaseFilter filter) public async Task<List<Case>> FilterCases(Session s, CaseFilter filter)
{ {
// TODO: Jogosultságkezelés // TODO: Jogosultságkezelés
return await handler.Filter(filter); return await handler.Filter(filter);
} }
public async Task<List<Update>> GetUpdatesForCase(Session s, int id) public async Task<List<Update>> GetUpdatesForCase(Session s, int id)
{ {
Case c = await handler.GetCase(id); Case c = await handler.GetCase(id);
if (c == null) throw new KeyNotFoundException(); if (c == null) throw new KeyNotFoundException();
if (handler.IsAuthorized(s.Id, c)) if (handler.IsAuthorized(s.Id, c))
{ {
return handler.GetUpdatesForCase(id); return handler.GetUpdatesForCase(id);
} }
else throw new UnauthorizedAccessException(); else throw new UnauthorizedAccessException();
} }
public async Task SetCertified(Session s, int id) public async Task SetCertified(Session s, int id)
{ {
Case c = await handler.GetCase(id); Case c = await handler.GetCase(id);
if (c == null) throw new KeyNotFoundException(); if (c == null) throw new KeyNotFoundException();
if (handler.IsAuthorized(s.Id, c) && s.Type == Api.Role.Ast) if (handler.IsAuthorized(s.Id, c) && s.Type == Api.Role.Ast)
{ {
Update update = new Update { Update update = new Update {
CaseId = c.Id, CaseId = c.Id,
SenderId = s.Id, SenderId = s.Id,
SenderRole = s.Type, SenderRole = s.Type,
CreatedDate = DateTime.Now, CreatedDate = DateTime.Now,
Content = "Case set to 'Certified'" Content = "Case set to 'Certified'"
}; };
await handler.SetCase(id, CaseStatus.Certified, update); await handler.SetCase(id, CaseStatus.Certified, update);
} }
else else
{ {
throw new UnauthorizedAccessException(); throw new UnauthorizedAccessException();
} }
} }
public async Task SetCured(Session s, int id) public async Task SetCured(Session s, int id)
{ {
Case c = await handler.GetCase(id); Case c = await handler.GetCase(id);
if (c == null) throw new KeyNotFoundException(); if (c == null) throw new KeyNotFoundException();
if (s.Id == c.DoctorId) if (s.Id == c.DoctorId)
{ {
Update update = new Update Update update = new Update
{ {
CaseId = c.Id, CaseId = c.Id,
SenderId = s.Id, SenderId = s.Id,
SenderRole = s.Type, SenderRole = s.Type,
CreatedDate = DateTime.Now, CreatedDate = DateTime.Now,
Content = "Case set to 'Cured'" Content = "Case set to 'Cured'"
}; };
await handler.SetCase(id, CaseStatus.Cured, update); await handler.SetCase(id, CaseStatus.Cured, update);
} }
else else
{ {
throw new UnauthorizedAccessException(); throw new UnauthorizedAccessException();
} }
} }
public async Task<Update> GetUpdate(Session s, int id) public async Task<Update> GetUpdate(Session s, int id)
{ {
// Parent, Doctor, and doctors assistants can access a case // Parent, Doctor, and doctors assistants can access a case
Update u = handler.GetUpadte(id); Update u = handler.GetUpadte(id);
Case c = await handler.GetCase(u.CaseId); Case c = await handler.GetCase(u.CaseId);
if (c == null) throw new KeyNotFoundException(); if (c == null) throw new KeyNotFoundException();
if (handler.IsAuthorized(s.Id, c)) if (handler.IsAuthorized(s.Id, c))
{ {
return u; return u;
} }
else else
{ {
throw new UnauthorizedAccessException(); throw new UnauthorizedAccessException();
} }
} }
public async Task<Case> GetCase(Session s, int id) public async Task<Case> GetCase(Session s, int id)
{ {
// Parent, Doctor, and doctors assistants can access a case // Parent, Doctor, and doctors assistants can access a case
Case c = await handler.GetCase(id); Case c = await handler.GetCase(id);
if (c == null) throw new KeyNotFoundException(); if (c == null) throw new KeyNotFoundException();
if (handler.IsAuthorized(s.Id, c)) if (handler.IsAuthorized(s.Id, c))
{ {
return c; return c;
} }
else else
{ {
throw new UnauthorizedAccessException(); throw new UnauthorizedAccessException();
} }
} }
public async Task<Case> CreateCase(Session s, int DoctorId, int ChildId, string Title, DateTime startDate) 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
Case c = new Case { Case c = new Case {
StartDate = startDate, StartDate = startDate,
ChildId = ChildId, ChildId = ChildId,
ParentId = s.Id, ParentId = s.Id,
DoctorId = DoctorId, DoctorId = DoctorId,
Title = Title, Title = Title,
CreatedDate = DateTime.Now, CreatedDate = DateTime.Now,
LastModificationDate = DateTime.Now, LastModificationDate = DateTime.Now,
CaseStatus = CaseStatus.InProgress, CaseStatus = CaseStatus.InProgress,
Assignee = s.Id Assignee = s.Id,
}; Priority = priority
return await handler.AddCase(c); };
} return await handler.AddCase(c);
}
public async Task UpdateCase(Session s, int id, string updateMsg, List<string> Images)
{ public async Task UpdateCase(Session s, int id, string updateMsg, List<string> Images, Api.Priority priority)
Case c = await handler.GetCase(id); {
if (c == null) throw new KeyNotFoundException("Case Id not found: " + id); Case c = await handler.GetCase(id);
if (handler.IsAuthorized(s.Id, c)) if (c == null) throw new KeyNotFoundException("Case Id not found: " + id);
{ if (handler.IsAuthorized(s.Id, c))
foreach (string ImageId in Images) {
{ foreach (string ImageId in Images)
if (!await storage.ImageExists("test1", ImageId)) throw new InvalidOperationException(ImageId + " not found in storage!"); {
} if (!await storage.ImageExists("test1", ImageId)) throw new InvalidOperationException(ImageId + " not found in storage!");
if (c.CaseStatus == CaseStatus.Certified) throw new ArgumentException("Can't modify closed Case!"); }
if (c.CaseStatus == CaseStatus.Certified) throw new ArgumentException("Can't modify closed Case!");
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 if (s.Id == c.ParentId) c.Assignee = c.DoctorId; // Ha szülő updatel, az assignee az orvos lesz
if (s.Id == c.DoctorId) c.Assignee = c.ParentId; // Ha doki frissít, a szülőhöz kerül // 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
c.LastModificationDate = DateTime.Now; c.Priority = priority;
Update update = new Update { c.LastModificationDate = DateTime.Now;
CaseId = c.Id, Update update = new Update {
SenderId = s.Id, CaseId = c.Id,
SenderRole = s.Type, SenderId = s.Id,
Content = updateMsg, SenderRole = s.Type,
CreatedDate = DateTime.Now, Content = updateMsg,
Images = Images CreatedDate = DateTime.Now,
}; Images = Images
await handler.UpdateCase(id, c, update); };
} await handler.UpdateCase(id, c, update);
else }
{ else
throw new UnauthorizedAccessException(); {
} throw new UnauthorizedAccessException();
} }
} }
} }
}

4
CoviDok/Controllers/CaseController.cs
View File

@ -49,7 +49,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); await mgr.UpdateCase(s, id, data.UpdateMsg, data.Images, data.Priority);
return Ok(); return Ok();
} }
catch (UnauthorizedAccessException) catch (UnauthorizedAccessException)
@ -72,7 +72,7 @@ namespace CoviDok.Controllers
try try
{ {
Session s = await Handler.GetSession(data.SessionId); Session s = await Handler.GetSession(data.SessionId);
Case c = await mgr.CreateCase(s, data.DoctorId, data.ChildId, data.Title, data.StartDate); Case c = await mgr.CreateCase(s, data.DoctorId, data.ChildId, data.Title, data.StartDate, data.Priority);
return CreatedAtAction("PostGetCase", new { id = c.Id }, c); return CreatedAtAction("PostGetCase", new { id = c.Id }, c);
} }
catch (UnauthorizedAccessException) catch (UnauthorizedAccessException)

81
CoviDok/Data/Model/Case.cs
View File

@ -1,39 +1,42 @@
using System; using CoviDok.Api;
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.Data.Model
{ namespace CoviDok.Data.Model
public class Case {
{ public class Case
public int Id { get; set; } {
public int DoctorId { get; set; } public int Id { get; set; }
public int ParentId { get; set; } public int DoctorId { get; set; }
public int ChildId { get; set; } public int ParentId { get; set; }
public int ChildId { get; set; }
public CaseStatus CaseStatus { get; set; }
public CaseStatus CaseStatus { get; set; }
public ICollection<Update> Updates { get; set; }
public Priority Priority { get; set; }
public int Assignee { get; set; }
public ICollection<Update> Updates { get; set; }
public string Title { get; set; }
public DateTime StartDate { get; set; } //amikor a tünetek kezdődtek public int Assignee { get; set; }
public DateTime CreatedDate { get; set; } //amikor a taskot létrehozták
public DateTime LastModificationDate { get; set; } public string Title { get; set; }
public DateTime StartDate { get; set; } //amikor a tünetek kezdődtek
public Case() public DateTime CreatedDate { get; set; } //amikor a taskot létrehozták
{ public DateTime LastModificationDate { get; set; }
Updates= new List<Update>();
} public Case()
{
} Updates= new List<Update>();
}
public enum CaseStatus
{ }
InProgress,
Cured, public enum CaseStatus
Certified {
} InProgress,
} Cured,
Certified
}
}

Write Preview
Loading…
Cancel
Save