From 3ead6c9d0e65990c2c2c782e462cc19a73ea89c5 Mon Sep 17 00:00:00 2001 From: Daniel Gyulai Date: Thu, 19 Nov 2020 21:06:24 +0100 Subject: [PATCH] Global rename, use "Id", replace picture with image --- CoviDok/Api/Errors.cs | 2 +- CoviDok/Api/Objects/PublicAssistant.cs | 6 +-- CoviDok/Api/Objects/PublicChild.cs | 6 +-- CoviDok/Api/Objects/PublicDoctor.cs | 6 +-- CoviDok/Api/Objects/PublicParent.cs | 6 +-- CoviDok/Api/Request/CaseCreate.cs | 6 +-- CoviDok/Api/Request/CaseFilter.cs | 14 +++---- CoviDok/Api/Request/CaseUpdate.cs | 4 +- CoviDok/Api/Request/ImageGet.cs | 4 +- CoviDok/Api/Request/ImagePost.cs | 2 +- CoviDok/Api/Response/AuthIdentity.cs | 2 +- CoviDok/BLL/Sessions/Session.cs | 2 +- CoviDok/BLL/Sessions/SessionHandler.cs | 22 +++++----- CoviDok/BLL/Storage/StorageHandler.cs | 4 +- CoviDok/BLL/User/Handlers/ICaseHandler.cs | 4 +- CoviDok/BLL/User/Handlers/IChildHandler.cs | 2 +- CoviDok/BLL/User/Handlers/IDoctorHandler.cs | 2 +- CoviDok/BLL/User/Managers/AssistantManager.cs | 4 +- CoviDok/BLL/User/Managers/CaseManager.cs | 42 +++++++++---------- CoviDok/BLL/User/Managers/ChildManager.cs | 12 +++--- CoviDok/BLL/User/Managers/DoctorManager.cs | 6 +-- CoviDok/BLL/User/Managers/ParentManager.cs | 4 +- CoviDok/Controllers/AssistantController.cs | 2 +- CoviDok/Controllers/AuthController.cs | 2 +- CoviDok/Controllers/CaseController.cs | 28 ++++++------- CoviDok/Controllers/ChildController.cs | 14 +++---- CoviDok/Controllers/DoctorController.cs | 6 +-- CoviDok/Controllers/ImagesController.cs | 6 +-- CoviDok/Controllers/ParentController.cs | 10 ++--- CoviDok/Data/Model/Assistant.cs | 6 +-- CoviDok/Data/Model/Case.cs | 6 +-- CoviDok/Data/Model/Child.cs | 6 +-- CoviDok/Data/Model/Doctor.cs | 6 +-- CoviDok/Data/Model/Image.cs | 4 +- CoviDok/Data/Model/Parent.cs | 6 +-- CoviDok/Data/Model/Update.cs | 4 +- CoviDok/Data/Model/User.cs | 2 +- CoviDok/Data/MySQL/MySqlCaseHandler.cs | 34 +++++++-------- CoviDok/Data/MySQL/MySqlChildHandler.cs | 4 +- CoviDok/Data/MySQL/MySqlDoctorHandler.cs | 2 +- 40 files changed, 155 insertions(+), 155 deletions(-) diff --git a/CoviDok/Api/Errors.cs b/CoviDok/Api/Errors.cs index d65e65d..5eb1fc5 100644 --- a/CoviDok/Api/Errors.cs +++ b/CoviDok/Api/Errors.cs @@ -12,6 +12,6 @@ namespace CoviDok.Api EmailTaken, EmailNotValid, SSNExists, - BadImageID + BadImageId } } diff --git a/CoviDok/Api/Objects/PublicAssistant.cs b/CoviDok/Api/Objects/PublicAssistant.cs index fc145ff..a92c175 100644 --- a/CoviDok/Api/Objects/PublicAssistant.cs +++ b/CoviDok/Api/Objects/PublicAssistant.cs @@ -8,13 +8,13 @@ namespace CoviDok.Api.Objects { public class PublicAssistant { - public string SessionID { get; set; } + public string SessionId { get; set; } public int? DoctorId { get; set; } public string FirstName { get; set; } public string LastName { get; set; } public string Email { get; set; } - public int ID { get; set; } - public string PictureID { get; set; } + public int Id { get; set; } + public string ImageId { get; set; } public Role Role { get; set; } } } diff --git a/CoviDok/Api/Objects/PublicChild.cs b/CoviDok/Api/Objects/PublicChild.cs index 5013c82..566b465 100644 --- a/CoviDok/Api/Objects/PublicChild.cs +++ b/CoviDok/Api/Objects/PublicChild.cs @@ -9,15 +9,15 @@ namespace CoviDok.Api.Objects { public class PublicChild { - public string SessionID { get; set; } - public int ID { get; set; } + public string SessionId { get; set; } + public int Id { get; set; } public string FirstName { get; set; } public string LastName { get; set; } public int DoctorId { get; set; } public int ParentId { get; set; } public string SSN { get; set; } public DateTime BirthDate { get; set; } - public string PictureId { get; set; } + public string ImageId { get; set; } public Gender Gender { get; set; } public Role Role { get; set; } } diff --git a/CoviDok/Api/Objects/PublicDoctor.cs b/CoviDok/Api/Objects/PublicDoctor.cs index 4b6c083..3d64c09 100644 --- a/CoviDok/Api/Objects/PublicDoctor.cs +++ b/CoviDok/Api/Objects/PublicDoctor.cs @@ -8,11 +8,11 @@ namespace CoviDok.Api.Objects { public class PublicDoctor { - public string SessionID { get; set; } - public int ID { get; set; } + public string SessionId { get; set; } + public int Id { get; set; } public string FirstName { get; set; } public string LastName { get; set; } - public string PictureID { get; set; } + public string ImageId { get; set; } public string Email { get; set; } public Role Role { get; set; } } diff --git a/CoviDok/Api/Objects/PublicParent.cs b/CoviDok/Api/Objects/PublicParent.cs index f02009e..be78963 100644 --- a/CoviDok/Api/Objects/PublicParent.cs +++ b/CoviDok/Api/Objects/PublicParent.cs @@ -8,13 +8,13 @@ namespace CoviDok.Api.Objects { public class PublicParent { - public string SessionID { get; set; } - public int ID { get; set; } + public string SessionId { get; set; } + public int Id { get; set; } public string FirstName { get; set; } public string LastName { get; set; } public string Email { get; set; } public ICollection Children { get; set; } = new List(); - public string PictureID { get; set; } + public string ImageId { get; set; } public Role Role { get; set; } } } diff --git a/CoviDok/Api/Request/CaseCreate.cs b/CoviDok/Api/Request/CaseCreate.cs index a1c50d6..efc35e3 100644 --- a/CoviDok/Api/Request/CaseCreate.cs +++ b/CoviDok/Api/Request/CaseCreate.cs @@ -7,9 +7,9 @@ namespace CoviDok.Api.Request { public class CaseCreate { - public string SessionID { get; set; } - public int DoctorID { get; set; } - public int ChildID { get; set; } + public string SessionId { get; set; } + public int DoctorId { get; set; } + public int ChildId { get; set; } public DateTime StartDate { get; set; } public string Title { get; set; } } diff --git a/CoviDok/Api/Request/CaseFilter.cs b/CoviDok/Api/Request/CaseFilter.cs index ae45096..7376d17 100644 --- a/CoviDok/Api/Request/CaseFilter.cs +++ b/CoviDok/Api/Request/CaseFilter.cs @@ -8,18 +8,18 @@ namespace CoviDok.Api.Request { public class CaseFilter { - public string SessionID { get; set; } - public int DoctorID { get; set; } - public int ParentID { get; set; } - public int ChildID { get; set; } + public string SessionId { get; set; } + public int DoctorId { get; set; } + public int ParentId { get; set; } + public int ChildId { get; set; } public int Assignee { get; set; } public string Title { get; set; } public CaseFilter() { - DoctorID = int.MinValue; - ParentID = int.MinValue; - ChildID = int.MinValue; + DoctorId = int.MinValue; + ParentId = int.MinValue; + ChildId = int.MinValue; Assignee = int.MinValue; Title = null; } diff --git a/CoviDok/Api/Request/CaseUpdate.cs b/CoviDok/Api/Request/CaseUpdate.cs index c54ef51..37d6aec 100644 --- a/CoviDok/Api/Request/CaseUpdate.cs +++ b/CoviDok/Api/Request/CaseUpdate.cs @@ -7,9 +7,9 @@ namespace CoviDok.Api.Request { public class CaseUpdate { - public int CaseID { get; set; } + public int CaseId { get; set; } public string UpdateMsg { get; set; } public List Images {get;set;} - public string SessionID { get; set; } + public string SessionId { get; set; } } } diff --git a/CoviDok/Api/Request/ImageGet.cs b/CoviDok/Api/Request/ImageGet.cs index c09d1d3..67bb786 100644 --- a/CoviDok/Api/Request/ImageGet.cs +++ b/CoviDok/Api/Request/ImageGet.cs @@ -7,7 +7,7 @@ namespace CoviDok.Api.Request { public class ImageGet { - public string SessionID { get; set; } - public string ImageID { get; set; } + public string SessionId { get; set; } + public string ImageId { get; set; } } } diff --git a/CoviDok/Api/Request/ImagePost.cs b/CoviDok/Api/Request/ImagePost.cs index f013002..2208d64 100644 --- a/CoviDok/Api/Request/ImagePost.cs +++ b/CoviDok/Api/Request/ImagePost.cs @@ -8,7 +8,7 @@ namespace CoviDok.Api.Request { public class ImagePost { - public string SessionID { get; set; } + public string SessionId { get; set; } public string File { get; set; } } } diff --git a/CoviDok/Api/Response/AuthIdentity.cs b/CoviDok/Api/Response/AuthIdentity.cs index ab3e648..e10fde8 100644 --- a/CoviDok/Api/Response/AuthIdentity.cs +++ b/CoviDok/Api/Response/AuthIdentity.cs @@ -8,7 +8,7 @@ namespace CoviDok.Api.Response public class AuthIdentity { public int UserId { get; set; } - public string SessionID { get; set; } + public string SessionId { get; set; } public string FirstName { get; set; } public string LastName { get; set; } public Role Role { get; set; } diff --git a/CoviDok/BLL/Sessions/Session.cs b/CoviDok/BLL/Sessions/Session.cs index 1889234..5b98a1e 100644 --- a/CoviDok/BLL/Sessions/Session.cs +++ b/CoviDok/BLL/Sessions/Session.cs @@ -7,7 +7,7 @@ namespace CoviDok.BLL.Sessions { public class Session { - public int ID { get; set; } + public int Id { get; set; } public Role Type { get; set; } public DateTime LastAccess { get; set; } } diff --git a/CoviDok/BLL/Sessions/SessionHandler.cs b/CoviDok/BLL/Sessions/SessionHandler.cs index 48cbdc5..029724c 100644 --- a/CoviDok/BLL/Sessions/SessionHandler.cs +++ b/CoviDok/BLL/Sessions/SessionHandler.cs @@ -17,38 +17,38 @@ namespace CoviDok.BLL.Sessions SessionStore = Provider; } - public async Task GetSession(string SessionID) + public async Task GetSession(string SessionId) { - string Candidate = SessionStore.Get(SessionID); + string Candidate = SessionStore.Get(SessionId); if (Candidate == null) return null; Session session = null; await Task.Run(() => { session = JsonSerializer.Deserialize(Candidate); session.LastAccess = DateTime.Now; - SessionStore.Set(SessionID, JsonSerializer.Serialize(session)); + SessionStore.Set(SessionId, JsonSerializer.Serialize(session)); }); return session; } - public async Task CreateSession(Role UserType, int UserID) + public async Task CreateSession(Role UserType, int UserId) { - string ID = null; + string Id = null; await Task.Run(() => { Session session = new Session { - ID = UserID, + Id = UserId, Type = UserType, LastAccess = DateTime.Now }; - ID = Cuid.Generate(); - SessionStore.Set(ID, JsonSerializer.Serialize(session)); + Id = Cuid.Generate(); + SessionStore.Set(Id, JsonSerializer.Serialize(session)); }); - return ID; + return Id; } - public void DeleteSession(string SessionID) + public void DeleteSession(string SessionId) { - SessionStore.Del(SessionID); + SessionStore.Del(SessionId); } } } diff --git a/CoviDok/BLL/Storage/StorageHandler.cs b/CoviDok/BLL/Storage/StorageHandler.cs index 64b60fa..f68271c 100644 --- a/CoviDok/BLL/Storage/StorageHandler.cs +++ b/CoviDok/BLL/Storage/StorageHandler.cs @@ -39,9 +39,9 @@ namespace CoviDok.BLL.Storage } } - public async Task GetImage(string bucketName, string ImageID, Action callback) + public async Task GetImage(string bucketName, string ImageId, Action callback) { - await storageProvider.Download(bucketName, ImageID, callback); + await storageProvider.Download(bucketName, ImageId, callback); } } } diff --git a/CoviDok/BLL/User/Handlers/ICaseHandler.cs b/CoviDok/BLL/User/Handlers/ICaseHandler.cs index a6e7ffc..16e382d 100644 --- a/CoviDok/BLL/User/Handlers/ICaseHandler.cs +++ b/CoviDok/BLL/User/Handlers/ICaseHandler.cs @@ -18,10 +18,10 @@ namespace CoviDok.BLL.User.Handlers 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 bool IsAuthorized(int Id, Case c); public List GetUpdatesForCase(int id); public Update GetUpadte(int id); - public bool IsAssistantOfDoctor(int id, int doctorID); + public bool IsAssistantOfDoctor(int id, int doctorId); } } diff --git a/CoviDok/BLL/User/Handlers/IChildHandler.cs b/CoviDok/BLL/User/Handlers/IChildHandler.cs index 053bd8d..1f5fa39 100644 --- a/CoviDok/BLL/User/Handlers/IChildHandler.cs +++ b/CoviDok/BLL/User/Handlers/IChildHandler.cs @@ -13,6 +13,6 @@ namespace CoviDok.BLL.User.Managers public Task GetChild(int id); public Task UpdateChild(int id, Child newData); public Task AddChild(Child newChild); - public List GetChildren(int parentID); + public List GetChildren(int parentId); } } diff --git a/CoviDok/BLL/User/Handlers/IDoctorHandler.cs b/CoviDok/BLL/User/Handlers/IDoctorHandler.cs index 954e80b..c47ed84 100644 --- a/CoviDok/BLL/User/Handlers/IDoctorHandler.cs +++ b/CoviDok/BLL/User/Handlers/IDoctorHandler.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace CoviDok.BLL.User.Managers { - interface IDoctorHandler + interface IdoctorHandler { public List GetDoctors(string firstName = null, string lastName = null); public Task GetDoctor(int id); diff --git a/CoviDok/BLL/User/Managers/AssistantManager.cs b/CoviDok/BLL/User/Managers/AssistantManager.cs index 87646de..6b192fb 100644 --- a/CoviDok/BLL/User/Managers/AssistantManager.cs +++ b/CoviDok/BLL/User/Managers/AssistantManager.cs @@ -23,8 +23,8 @@ namespace CoviDok.Data.MySQL public async Task UpdateAssistant(Session s, int id, PublicAssistant value) { - if (id != value.ID) throw new FormatException(); - if (s.ID != id) throw new UnauthorizedAccessException(); + if (id != value.Id) throw new FormatException(); + if (s.Id != id) throw new UnauthorizedAccessException(); Assistant ast = await handler.GetAssistant(id); if (ast == null) throw new KeyNotFoundException(); diff --git a/CoviDok/BLL/User/Managers/CaseManager.cs b/CoviDok/BLL/User/Managers/CaseManager.cs index 33b754e..8a1a1b3 100644 --- a/CoviDok/BLL/User/Managers/CaseManager.cs +++ b/CoviDok/BLL/User/Managers/CaseManager.cs @@ -25,7 +25,7 @@ namespace CoviDok.BLL.User.Managers { Case c = await handler.GetCase(id); if (c == null) throw new KeyNotFoundException(); - if (handler.IsAuthorized(s.ID, c)) + if (handler.IsAuthorized(s.Id, c)) { return handler.GetUpdatesForCase(id); } @@ -37,11 +37,11 @@ namespace CoviDok.BLL.User.Managers { Case c = await handler.GetCase(id); 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 { - CaseID = c.Id, - SenderID = s.ID, + CaseId = c.Id, + SenderId = s.Id, SenderRole = s.Type, CreatedDate = DateTime.Now, Content = "Case set to 'Certified'" @@ -58,12 +58,12 @@ namespace CoviDok.BLL.User.Managers { Case c = await handler.GetCase(id); if (c == null) throw new KeyNotFoundException(); - if (s.ID == c.DoctorID) + if (s.Id == c.DoctorId) { Update update = new Update { - CaseID = c.Id, - SenderID = s.ID, + CaseId = c.Id, + SenderId = s.Id, SenderRole = s.Type, CreatedDate = DateTime.Now, Content = "Case set to 'Cured'" @@ -80,9 +80,9 @@ namespace CoviDok.BLL.User.Managers { // Parent, Doctor, and doctors assistants can access a case 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 (handler.IsAuthorized(s.ID, c)) + if (handler.IsAuthorized(s.Id, c)) { return u; } @@ -99,7 +99,7 @@ namespace CoviDok.BLL.User.Managers // Parent, Doctor, and doctors assistants can access a case Case c = await handler.GetCase(id); if (c == null) throw new KeyNotFoundException(); - if (handler.IsAuthorized(s.ID, c)) + if (handler.IsAuthorized(s.Id, c)) { return c; } @@ -109,19 +109,19 @@ namespace CoviDok.BLL.User.Managers } } - public async Task CreateCase(Session s, int DoctorID, int ChildID, string Title, DateTime startDate) + public async Task CreateCase(Session s, int DoctorId, int ChildId, string Title, DateTime startDate) { // TODO szülő csak saját gyereket jelenthet Case c = new Case { StartDate = startDate, - ChildID = ChildID, - ParentID = s.ID, - DoctorID = DoctorID, + ChildId = ChildId, + ParentId = s.Id, + DoctorId = DoctorId, Title = Title, CreatedDate = DateTime.Now, LastModificationDate = DateTime.Now, CaseStatus = CaseStatus.InProgress, - Assignee = s.ID + Assignee = s.Id }; return await handler.AddCase(c); } @@ -129,19 +129,19 @@ namespace CoviDok.BLL.User.Managers public async Task UpdateCase(Session s, int id, string updateMsg, List Images) { Case c = await handler.GetCase(id); - if (c == null) throw new KeyNotFoundException("Case ID not found: " + id); - if (handler.IsAuthorized(s.ID, c)) + if (c == null) throw new KeyNotFoundException("Case Id not found: " + id); + if (handler.IsAuthorized(s.Id, c)) { 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 + 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.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.LastModificationDate = DateTime.Now; Update update = new Update { - CaseID = c.Id, - SenderID = s.ID, + CaseId = c.Id, + SenderId = s.Id, SenderRole = s.Type, Content = updateMsg, CreatedDate = DateTime.Now, diff --git a/CoviDok/BLL/User/Managers/ChildManager.cs b/CoviDok/BLL/User/Managers/ChildManager.cs index e50e1d1..aff288c 100644 --- a/CoviDok/BLL/User/Managers/ChildManager.cs +++ b/CoviDok/BLL/User/Managers/ChildManager.cs @@ -18,7 +18,7 @@ namespace CoviDok.Data.MySQL { Child child = await handler.GetChild(id); if (child == null) throw new KeyNotFoundException(); - if (child.DoctorId == s.ID || child.ParentId == s.ID) + if (child.DoctorId == s.Id || child.ParentId == s.Id) { return child.ToPublic(); } @@ -27,10 +27,10 @@ namespace CoviDok.Data.MySQL } } - public List ChildrenOfParent(int parentID) + public List ChildrenOfParent(int parentId) { List ret = new List(); - foreach (Child child in handler.GetChildren(parentID)) + foreach (Child child in handler.GetChildren(parentId)) { ret.Add(child.ToPublic()); } @@ -39,11 +39,11 @@ namespace CoviDok.Data.MySQL public async Task UpdateChild(Session s, int id, PublicChild newData) { - if (id != newData.ID) throw new FormatException(); + if (id != newData.Id) throw new FormatException(); Child child = await handler.GetChild(id); if (child == null) throw new KeyNotFoundException(); - if (child.ParentId == s.ID || child.DoctorId == s.ID) + if (child.ParentId == s.Id || child.DoctorId == s.Id) { child.UpdateSelf(newData); await handler.UpdateChild(id, child); @@ -56,7 +56,7 @@ namespace CoviDok.Data.MySQL public async Task AddChild(Session s, PublicChild newChild) { - if (s.ID != newChild.ParentId) throw new UnauthorizedAccessException(); + if (s.Id != newChild.ParentId) throw new UnauthorizedAccessException(); Child child = new Child(); child.UpdateSelf(newChild); child.RegistrationDate = DateTime.Now; diff --git a/CoviDok/BLL/User/Managers/DoctorManager.cs b/CoviDok/BLL/User/Managers/DoctorManager.cs index 27c346c..64b22ed 100644 --- a/CoviDok/BLL/User/Managers/DoctorManager.cs +++ b/CoviDok/BLL/User/Managers/DoctorManager.cs @@ -14,7 +14,7 @@ namespace CoviDok.Data.MySQL { public class DoctorManager { - private readonly IDoctorHandler handler = new MySqlDoctorHandler(); + private readonly IdoctorHandler handler = new MySqlDoctorHandler(); public async Task> GetDoctors(string firstName = null, string lastName = null) { @@ -38,8 +38,8 @@ namespace CoviDok.Data.MySQL public async Task UpdateDoctor(Session s, int id, PublicDoctor value) { - if (id != value.ID) throw new FormatException(); - if (s.ID != id) throw new UnauthorizedAccessException(); + if (id != value.Id) throw new FormatException(); + if (s.Id != id) throw new UnauthorizedAccessException(); Doctor doc = await handler.GetDoctor(id); if (doc == null) throw new KeyNotFoundException(); diff --git a/CoviDok/BLL/User/Managers/ParentManager.cs b/CoviDok/BLL/User/Managers/ParentManager.cs index d8e152c..79c1f2d 100644 --- a/CoviDok/BLL/User/Managers/ParentManager.cs +++ b/CoviDok/BLL/User/Managers/ParentManager.cs @@ -23,8 +23,8 @@ namespace CoviDok.Data.MySQL public async Task UpdateParent(Session s, int id, PublicParent value) { - if (id != value.ID) throw new FormatException(); - if (s.ID != id) throw new UnauthorizedAccessException(); + if (id != value.Id) throw new FormatException(); + if (s.Id != id) throw new UnauthorizedAccessException(); Parent parent = await handler.GetParent(id); if (parent == null) throw new KeyNotFoundException(); diff --git a/CoviDok/Controllers/AssistantController.cs b/CoviDok/Controllers/AssistantController.cs index f036d37..5c61beb 100644 --- a/CoviDok/Controllers/AssistantController.cs +++ b/CoviDok/Controllers/AssistantController.cs @@ -37,7 +37,7 @@ namespace CoviDok.Controllers [HttpPut("{id}")] public async Task PutAssistant(int id, PublicAssistant ast) { - Session s = await Handler.GetSession(ast.SessionID); + Session s = await Handler.GetSession(ast.SessionId); if (s == null) return Unauthorized(); try { diff --git a/CoviDok/Controllers/AuthController.cs b/CoviDok/Controllers/AuthController.cs index e24c372..6b1f53a 100644 --- a/CoviDok/Controllers/AuthController.cs +++ b/CoviDok/Controllers/AuthController.cs @@ -29,7 +29,7 @@ namespace CoviDok.Controllers { AuthIdentity authIdentity = await Auth.AuthenticateUser(authLogin.Email, authLogin.Password); if (authIdentity == null) return Unauthorized(); - authIdentity.SessionID = await Handler.CreateSession(authIdentity.Role, authIdentity.UserId); + authIdentity.SessionId = await Handler.CreateSession(authIdentity.Role, authIdentity.UserId); return authIdentity; } catch (KeyNotFoundException) diff --git a/CoviDok/Controllers/CaseController.cs b/CoviDok/Controllers/CaseController.cs index a5485d2..48fa038 100644 --- a/CoviDok/Controllers/CaseController.cs +++ b/CoviDok/Controllers/CaseController.cs @@ -25,9 +25,9 @@ namespace CoviDok.Controllers // POST /api/Case/{id} [HttpPost("{id}")] - public async Task> PostGetCase(int id, string SessionID) + public async Task> PostGetCase(int id, string SessionId) { - Session s = await Handler.GetSession(SessionID); + Session s = await Handler.GetSession(SessionId); if (s == null) return Unauthorized(); try { @@ -48,7 +48,7 @@ namespace CoviDok.Controllers [HttpPut("{id}/update")] public async Task PostUpdate(int id, CaseUpdate data) { - Session s = await Handler.GetSession(data.SessionID); + Session s = await Handler.GetSession(data.SessionId); if (s == null) return Unauthorized(); try { @@ -68,12 +68,12 @@ namespace CoviDok.Controllers [HttpPost] public async Task> NewCase(CaseCreate data) { - Session s = await Handler.GetSession(data.SessionID); + Session s = await Handler.GetSession(data.SessionId); if (s == null) return Unauthorized(); try { - 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); return CreatedAtAction("PostGetCase", new { id = c.Id }, c); } catch (UnauthorizedAccessException) @@ -83,9 +83,9 @@ namespace CoviDok.Controllers } [HttpPost("{id}/updates")] - public async Task>> GetUpdatesForCase(int id, string SessionID) + public async Task>> GetUpdatesForCase(int id, string SessionId) { - Session s = await Handler.GetSession(SessionID); + Session s = await Handler.GetSession(SessionId); if (s == null) return Unauthorized(); try { return await mgr.GetUpdatesForCase(s, id); @@ -101,9 +101,9 @@ namespace CoviDok.Controllers } [HttpPost("updates/{id}")] - public async Task> GetUpdate(int id, string SessionID) + public async Task> GetUpdate(int id, string SessionId) { - Session s = await Handler.GetSession(SessionID); + Session s = await Handler.GetSession(SessionId); if (s == null) return Unauthorized(); try { @@ -121,9 +121,9 @@ namespace CoviDok.Controllers // POST /api/Case/{id}/close [HttpPost("{id}/close")] - public async Task PostClose(int id, string SessionID) + public async Task PostClose(int id, string SessionId) { - Session s = await Handler.GetSession(SessionID); + Session s = await Handler.GetSession(SessionId); if (s == null) return Unauthorized(); try { @@ -141,9 +141,9 @@ namespace CoviDok.Controllers } // POST /api/Case/{id}/close [HttpPost("{id}/cure")] - public async Task PostCured(int id, string SessionID) + public async Task PostCured(int id, string SessionId) { - Session s = await Handler.GetSession(SessionID); + Session s = await Handler.GetSession(SessionId); if (s == null) return Unauthorized(); try { @@ -164,7 +164,7 @@ namespace CoviDok.Controllers [HttpPost("filter")] public async Task>> Filter(CaseFilter filters) { - Session s = await Handler.GetSession(filters.SessionID); + Session s = await Handler.GetSession(filters.SessionId); if (s == null) return Unauthorized(); try diff --git a/CoviDok/Controllers/ChildController.cs b/CoviDok/Controllers/ChildController.cs index 0f11189..974a653 100644 --- a/CoviDok/Controllers/ChildController.cs +++ b/CoviDok/Controllers/ChildController.cs @@ -23,9 +23,9 @@ namespace CoviDok.Controllers // POST: api/Child/5 [HttpPost("{id}")] - public async Task> GetPublicChild(int id, string SessionID) + public async Task> GetPublicChild(int id, string SessionId) { - Session s = await Handler.GetSession(SessionID); + Session s = await Handler.GetSession(SessionId); if (s == null) return Unauthorized(); try @@ -48,7 +48,7 @@ namespace CoviDok.Controllers [HttpPut("{id}")] public async Task PutPublicChild(int id, PublicChild publicChild) { - Session s = await Handler.GetSession(publicChild.SessionID); + Session s = await Handler.GetSession(publicChild.SessionId); if (s == null) return Unauthorized(); try { await ChildManager.UpdateChild(s, id, publicChild); @@ -67,11 +67,11 @@ namespace CoviDok.Controllers } [HttpPost("parent")] - public async Task>> GetChildrenOfParent(string SessionID) + public async Task>> GetChildrenOfParent(string SessionId) { - Session s = await Handler.GetSession(SessionID); + Session s = await Handler.GetSession(SessionId); if (s == null) return Unauthorized(); - return ChildManager.ChildrenOfParent(s.ID); + return ChildManager.ChildrenOfParent(s.Id); } // POST: api/Child @@ -80,7 +80,7 @@ namespace CoviDok.Controllers [HttpPost] public async Task> PostPublicChild(PublicChild publicChild) { - Session s = await Handler.GetSession(publicChild.SessionID); + Session s = await Handler.GetSession(publicChild.SessionId); if (s == null ) return Unauthorized(); try { diff --git a/CoviDok/Controllers/DoctorController.cs b/CoviDok/Controllers/DoctorController.cs index 5242614..5c37611 100644 --- a/CoviDok/Controllers/DoctorController.cs +++ b/CoviDok/Controllers/DoctorController.cs @@ -60,7 +60,7 @@ namespace CoviDok.Controllers [HttpPut("{id}")] public async Task PutDoctor(int id, PublicDoctor doctor) { - Session s = await Handler.GetSession(doctor.SessionID); + Session s = await Handler.GetSession(doctor.SessionId); if (s == null) return Unauthorized(); try { @@ -97,9 +97,9 @@ namespace CoviDok.Controllers // GET /api/Doc/{id}/children [HttpPost("{id}/children")] - public async Task>> GetChildrenOfDoctor(int id, string SessionID) + public async Task>> GetChildrenOfDoctor(int id, string SessionId) { - Session s = await Handler.GetSession(SessionID); + Session s = await Handler.GetSession(SessionId); if (s == null) return Unauthorized(); try { diff --git a/CoviDok/Controllers/ImagesController.cs b/CoviDok/Controllers/ImagesController.cs index 7219849..15849ac 100644 --- a/CoviDok/Controllers/ImagesController.cs +++ b/CoviDok/Controllers/ImagesController.cs @@ -43,7 +43,7 @@ namespace CoviDok.Controllers public async Task> OnPostImage(ImagePost post) { GenericResponse response = new GenericResponse(); - Session s = await Handler.GetSession(post.SessionID); + Session s = await Handler.GetSession(post.SessionId); if (s == null) { response.Status = Status.Error; @@ -61,7 +61,7 @@ namespace CoviDok.Controllers public async Task OnGetImage(ImageGet imageGet) { GenericResponse response = new GenericResponse(); - Session s = await Handler.GetSession(imageGet.SessionID); + Session s = await Handler.GetSession(imageGet.SessionId); if (s == null) { response.Status = Status.Error; @@ -70,7 +70,7 @@ namespace CoviDok.Controllers } string res = null; ; - await MinioHandler.GetImage(BucketName, imageGet.ImageID, (stream) => { + await MinioHandler.GetImage(BucketName, imageGet.ImageId, (stream) => { StreamReader reader = new StreamReader(stream); res = reader.ReadToEnd(); }); diff --git a/CoviDok/Controllers/ParentController.cs b/CoviDok/Controllers/ParentController.cs index 659d38c..a465d97 100644 --- a/CoviDok/Controllers/ParentController.cs +++ b/CoviDok/Controllers/ParentController.cs @@ -22,9 +22,9 @@ namespace CoviDok.Controllers private readonly ParentManager parentManager = new ParentManager(); [HttpPost("{id}")] - public async Task> GetParent(int id, string SessionID) + public async Task> GetParent(int id, string SessionId) { - Session s = await sessionHandler.GetSession(SessionID); + Session s = await sessionHandler.GetSession(SessionId); if (s == null) return Unauthorized(); try { return await parentManager.GetParent(id); @@ -38,7 +38,7 @@ namespace CoviDok.Controllers [HttpPut("{id}")] public async Task PutParent(int id, PublicParent parent) { - Session s = await sessionHandler.GetSession(parent.SessionID); + Session s = await sessionHandler.GetSession(parent.SessionId); if (s == null) return Unauthorized(); try { await parentManager.UpdateParent(s, id, parent); @@ -58,9 +58,9 @@ namespace CoviDok.Controllers } } [HttpPost("{id}/children")] - public async Task>> GetChildrenOfParent(int id, string SessionID) + public async Task>> GetChildrenOfParent(int id, string SessionId) { - Session s = await sessionHandler.GetSession(SessionID); + Session s = await sessionHandler.GetSession(SessionId); if (s == null) return Unauthorized(); try { diff --git a/CoviDok/Data/Model/Assistant.cs b/CoviDok/Data/Model/Assistant.cs index a171d66..4896088 100644 --- a/CoviDok/Data/Model/Assistant.cs +++ b/CoviDok/Data/Model/Assistant.cs @@ -15,7 +15,7 @@ namespace CoviDok.Data.Model FirstName = assistant.FirstName; LastName = assistant.LastName; Email = assistant.Email; - PictureId = assistant.PictureID; + ImageId = assistant.ImageId; DoctorId = assistant.DoctorId; } public PublicAssistant ToPublic() @@ -25,8 +25,8 @@ namespace CoviDok.Data.Model FirstName = FirstName, LastName = LastName, Email = Email, - PictureID = PictureId, - ID = Id, + ImageId = ImageId, + Id = Id, DoctorId = DoctorId, Role = Api.Role.Ast }; diff --git a/CoviDok/Data/Model/Case.cs b/CoviDok/Data/Model/Case.cs index a7205d0..5bd06e1 100644 --- a/CoviDok/Data/Model/Case.cs +++ b/CoviDok/Data/Model/Case.cs @@ -8,9 +8,9 @@ namespace CoviDok.Data.Model public class Case { public int Id { get; set; } - public int DoctorID { get; set; } - public int ParentID { get; set; } - public int ChildID { get; set; } + public int DoctorId { get; set; } + public int ParentId { get; set; } + public int ChildId { get; set; } public CaseStatus CaseStatus { get; set; } diff --git a/CoviDok/Data/Model/Child.cs b/CoviDok/Data/Model/Child.cs index cff92ba..4710f69 100644 --- a/CoviDok/Data/Model/Child.cs +++ b/CoviDok/Data/Model/Child.cs @@ -24,8 +24,8 @@ namespace CoviDok.Data.Model ParentId = ParentId, SSN = SSN, BirthDate = BirthDate, - PictureId = PictureId, - ID = Id, + ImageId = ImageId, + Id = Id, Gender = Gender, Role = Api.Role.Chi }; @@ -38,7 +38,7 @@ namespace CoviDok.Data.Model ParentId = newVal.ParentId; SSN = newVal.SSN; BirthDate = newVal.BirthDate; - PictureId = newVal.PictureId; + ImageId = newVal.ImageId; Gender = newVal.Gender; } } diff --git a/CoviDok/Data/Model/Doctor.cs b/CoviDok/Data/Model/Doctor.cs index d6d7757..926919b 100644 --- a/CoviDok/Data/Model/Doctor.cs +++ b/CoviDok/Data/Model/Doctor.cs @@ -16,7 +16,7 @@ namespace CoviDok.Data.Model FirstName = doctor.FirstName; LastName = doctor.LastName; Email = doctor.Email; - PictureId = doctor.PictureID; + ImageId = doctor.ImageId; } public PublicDoctor ToPublic() { @@ -25,8 +25,8 @@ namespace CoviDok.Data.Model FirstName = FirstName, LastName = LastName, Email = Email, - PictureID = PictureId, - ID = Id, + ImageId = ImageId, + Id = Id, Role = Api.Role.Doc }; } diff --git a/CoviDok/Data/Model/Image.cs b/CoviDok/Data/Model/Image.cs index 57597bc..05b5690 100644 --- a/CoviDok/Data/Model/Image.cs +++ b/CoviDok/Data/Model/Image.cs @@ -8,7 +8,7 @@ namespace CoviDok.Data.Model public class Image { public int Id { get; set; } - public int UpdateID { get; set; } - public string ImageID { get; set; } + public int UpdateId { get; set; } + public string ImageId { get; set; } } } diff --git a/CoviDok/Data/Model/Parent.cs b/CoviDok/Data/Model/Parent.cs index 5a8c737..950fa3a 100644 --- a/CoviDok/Data/Model/Parent.cs +++ b/CoviDok/Data/Model/Parent.cs @@ -15,7 +15,7 @@ namespace CoviDok.Data.Model FirstName = parent.FirstName; LastName = parent.LastName; Email = parent.Email; - PictureId = parent.PictureID; + ImageId = parent.ImageId; } public PublicParent ToPublic() { @@ -23,8 +23,8 @@ namespace CoviDok.Data.Model FirstName = FirstName, LastName = LastName, Email = Email, - PictureID = PictureId, - ID = Id, + ImageId = ImageId, + Id = Id, Role = Api.Role.Par }; foreach (Child child in Children) diff --git a/CoviDok/Data/Model/Update.cs b/CoviDok/Data/Model/Update.cs index 6213085..c0822aa 100644 --- a/CoviDok/Data/Model/Update.cs +++ b/CoviDok/Data/Model/Update.cs @@ -9,8 +9,8 @@ namespace CoviDok.Data.Model public class Update { public int Id { get; set; } - public int CaseID { get; set; } - public int SenderID { get; set; } + public int CaseId { get; set; } + public int SenderId { get; set; } public Role SenderRole { get; set; } public string Content { get; set; } public DateTime CreatedDate { get; set; } diff --git a/CoviDok/Data/Model/User.cs b/CoviDok/Data/Model/User.cs index a6339ad..0eccee1 100644 --- a/CoviDok/Data/Model/User.cs +++ b/CoviDok/Data/Model/User.cs @@ -14,6 +14,6 @@ namespace CoviDok.Data.Model public DateTime BirthDate { get; set; } public DateTime RegistrationDate { get; set; } - public string PictureId { get; set; } + public string ImageId { get; set; } } } diff --git a/CoviDok/Data/MySQL/MySqlCaseHandler.cs b/CoviDok/Data/MySQL/MySqlCaseHandler.cs index ea15c94..9499502 100644 --- a/CoviDok/Data/MySQL/MySqlCaseHandler.cs +++ b/CoviDok/Data/MySQL/MySqlCaseHandler.cs @@ -24,7 +24,7 @@ namespace CoviDok.Data.MySQL public async Task SetCase(int id, CaseStatus status, Update message) { Case c = await context.Cases.FindAsync(id); - message.CaseID = c.Id; + message.CaseId = c.Id; context.Updates.Add(message); c.CaseStatus = status; c.Updates.Add(message); @@ -33,7 +33,7 @@ namespace CoviDok.Data.MySQL public List GetUpdatesForCase(int id) { - return (from u in context.Updates where u.CaseID == id select u).ToList(); + return (from u in context.Updates where u.CaseId == id select u).ToList(); } public Update GetUpadte(int id) @@ -41,14 +41,14 @@ namespace CoviDok.Data.MySQL 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 update; } - public bool IsAssistantOfDoctor(int id, int doctorID) + public bool IsAssistantOfDoctor(int id, int doctorId) { - return context.Assistants.Any( (a) => a.Id == id && a.DoctorId == doctorID); + return context.Assistants.Any( (a) => a.Id == id && a.DoctorId == doctorId); } public async Task> Filter(CaseFilter filter) @@ -57,17 +57,17 @@ namespace CoviDok.Data.MySQL await Task.Run(() => { var query = from c in context.Cases select c; - if (filter.ChildID != int.MinValue) + if (filter.ChildId != int.MinValue) { - query = query.Where(c => c.ChildID == filter.ChildID); + query = query.Where(c => c.ChildId == filter.ChildId); } - if (filter.DoctorID != int.MinValue) + if (filter.DoctorId != int.MinValue) { - query = query.Where(c => c.DoctorID == filter.DoctorID); + query = query.Where(c => c.DoctorId == filter.DoctorId); } - if (filter.ParentID != int.MinValue) + if (filter.ParentId != int.MinValue) { - query = query.Where(c => c.ParentID == filter.ParentID); + query = query.Where(c => c.ParentId == filter.ParentId); } if (filter.Assignee != int.MinValue) { @@ -94,12 +94,12 @@ namespace CoviDok.Data.MySQL string[] forbidden = { "Updates" }; PropertyCopier.Copy(Case, c, forbidden); context.Updates.Add(update); - foreach (string ImageID in update.Images) + foreach (string ImageId in update.Images) { Image image = new Image { - UpdateID = update.Id, - ImageID = ImageID + UpdateId = update.Id, + ImageId = ImageId }; context.Images.Add(image); } @@ -108,13 +108,13 @@ namespace CoviDok.Data.MySQL await context.SaveChangesAsync(); } - public bool IsAuthorized(int ID, Case c) + public bool IsAuthorized(int Id, Case c) { - if (ID == c.DoctorID || ID == c.ParentID) return true; + 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)); + return (context.Assistants.Any(a => a.Id == Id && a.DoctorId == c.DoctorId)); } } } diff --git a/CoviDok/Data/MySQL/MySqlChildHandler.cs b/CoviDok/Data/MySQL/MySqlChildHandler.cs index 4a20120..42846a7 100644 --- a/CoviDok/Data/MySQL/MySqlChildHandler.cs +++ b/CoviDok/Data/MySQL/MySqlChildHandler.cs @@ -23,9 +23,9 @@ namespace CoviDok.Data.MySQL return await context.Children.FindAsync(id); } - public List GetChildren(int parentID) + public List GetChildren(int parentId) { - return (from c in context.Children where c.ParentId == parentID select c).ToList(); + return (from c in context.Children where c.ParentId == parentId select c).ToList(); } public async Task UpdateChild(int id, Child newData) diff --git a/CoviDok/Data/MySQL/MySqlDoctorHandler.cs b/CoviDok/Data/MySQL/MySqlDoctorHandler.cs index 7fefe8e..edcef17 100644 --- a/CoviDok/Data/MySQL/MySqlDoctorHandler.cs +++ b/CoviDok/Data/MySQL/MySqlDoctorHandler.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace CoviDok.Data.MySQL { - public class MySqlDoctorHandler : IDoctorHandler + public class MySqlDoctorHandler : IdoctorHandler { private readonly MySqlContext context = new MySqlContext();