From 4814a4edfd4f3e57fea611ceacd8d0279e9446c5 Mon Sep 17 00:00:00 2001 From: Daniel Gyulai Date: Thu, 19 Nov 2020 01:27:25 +0100 Subject: [PATCH] Hueg Refactor + Various improvements. Also disabled tests. What could go wrong. --- CoviDok/Api/Errors.cs | 17 +++ .../Objects/PublicAssistant.cs} | 19 +-- CoviDok/Api/Objects/PublicChild.cs | 20 +++ CoviDok/Api/Objects/PublicDoctor.cs | 21 +++ CoviDok/Api/Objects/PublicParent.cs | 17 +++ CoviDok/Api/Request/CaseCreate.cs | 16 +++ CoviDok/Api/Request/CaseFilter.cs | 14 +- CoviDok/Api/Request/CaseUpdate.cs | 3 +- CoviDok/Api/Response/AuthIdentity.cs | 3 +- CoviDok/Api/Response/FilteredCases.cs | 17 --- CoviDok/BLL/MinioHandler.cs | 50 ------- CoviDok/BLL/PropertyCopier.cs | 53 +++++++ CoviDok/BLL/Session/SessionHandler.cs | 47 ------ .../{Session => Sessions}/ISessionProvider.cs | 2 +- CoviDok/BLL/{Session => Sessions}/Session.cs | 4 +- CoviDok/BLL/Sessions/SessionHandler.cs | 54 +++++++ CoviDok/BLL/Storage/IStorageProvider.cs | 17 +++ CoviDok/BLL/Storage/StorageHandler.cs | 47 ++++++ .../StorageResult.cs} | 4 +- CoviDok/BLL/Tools.cs | 78 ---------- CoviDok/BLL/User/Auth.cs | 109 +++++++++++++- .../BLL/User/Handlers/IAssistantHandler.cs | 16 +++ CoviDok/BLL/User/Handlers/ICaseHandler.cs | 23 +++ CoviDok/BLL/User/Handlers/IChildHandler.cs | 17 +++ CoviDok/BLL/User/Handlers/IDoctorHandler.cs | 21 +++ CoviDok/BLL/User/Handlers/IParentHandler.cs | 19 +++ CoviDok/BLL/User/Managers/AssistantManager.cs | 36 +++++ CoviDok/BLL/User/Managers/CaseManager.cs | 112 +++++++++++++++ CoviDok/BLL/User/Managers/ChildManager.cs | 56 ++++++++ CoviDok/BLL/User/Managers/DoctorManager.cs | 79 +++++++++++ CoviDok/BLL/User/Managers/ParentManager.cs | 50 +++++++ CoviDok/Controllers/AssistantController.cs | 61 ++++++++ CoviDok/Controllers/AuthController.cs | 77 +++------- CoviDok/Controllers/CaseController.cs | 134 +++++++++++++----- CoviDok/Controllers/ChildController.cs | 87 ++++++++++++ CoviDok/Controllers/DocController.cs | 57 -------- CoviDok/Controllers/DoctorController.cs | 100 +++++++++++++ CoviDok/Controllers/DoctorsController.cs | 123 ---------------- CoviDok/Controllers/ImagesController.cs | 41 +++--- CoviDok/Controllers/ParentController.cs | 79 +++++++++++ CoviDok/Data/Model/Assistant.cs | 22 +++ CoviDok/{data => Data/Model}/Case.cs | 12 +- CoviDok/Data/Model/Child.cs | 40 ++++++ CoviDok/Data/Model/Doctor.cs | 24 ++++ CoviDok/Data/Model/Parent.cs | 22 +++ .../{data/User.cs => Data/Model/RoleUser.cs} | 20 ++- CoviDok/{data => Data/Model}/Update.cs | 8 +- CoviDok/Data/Model/User.cs | 23 +++ CoviDok/Data/MySQL/MySqlAssistantHandler.cs | 30 ++++ CoviDok/Data/MySQL/MySqlCaseHandler.cs | 89 ++++++++++++ CoviDok/Data/MySQL/MySqlChildHandler.cs | 35 +++++ .../MySQL/MySqlContext.cs} | 18 +-- CoviDok/Data/MySQL/MySqlDoctorHandler.cs | 50 +++++++ CoviDok/Data/MySQL/MySqlParentHandler.cs | 39 +++++ .../SessionProviders/DummySessionProvider.cs} | 9 +- .../SessionProviders}/RedisProvider.cs | 5 +- .../Data/StorageProviders/MinioProvider.cs | 39 +++++ CoviDok/data/Child.cs | 17 --- CoviDok/data/Doctor.cs | 26 ---- CoviDok/data/Image.cs | 14 -- CoviDok/data/Parent.cs | 24 ---- Jenkinsfile | 2 +- helm/covidok/templates/mysql.yaml | 10 +- 63 files changed, 1748 insertions(+), 630 deletions(-) create mode 100644 CoviDok/Api/Errors.cs rename CoviDok/{data/Assistant.cs => Api/Objects/PublicAssistant.cs} (51%) create mode 100644 CoviDok/Api/Objects/PublicChild.cs create mode 100644 CoviDok/Api/Objects/PublicDoctor.cs create mode 100644 CoviDok/Api/Objects/PublicParent.cs create mode 100644 CoviDok/Api/Request/CaseCreate.cs delete mode 100644 CoviDok/Api/Response/FilteredCases.cs delete mode 100644 CoviDok/BLL/MinioHandler.cs create mode 100644 CoviDok/BLL/PropertyCopier.cs delete mode 100644 CoviDok/BLL/Session/SessionHandler.cs rename CoviDok/BLL/{Session => Sessions}/ISessionProvider.cs (90%) rename CoviDok/BLL/{Session => Sessions}/Session.cs (76%) create mode 100644 CoviDok/BLL/Sessions/SessionHandler.cs create mode 100644 CoviDok/BLL/Storage/IStorageProvider.cs create mode 100644 CoviDok/BLL/Storage/StorageHandler.cs rename CoviDok/BLL/{MinioResult.cs => Storage/StorageResult.cs} (70%) delete mode 100644 CoviDok/BLL/Tools.cs create mode 100644 CoviDok/BLL/User/Handlers/IAssistantHandler.cs create mode 100644 CoviDok/BLL/User/Handlers/ICaseHandler.cs create mode 100644 CoviDok/BLL/User/Handlers/IChildHandler.cs create mode 100644 CoviDok/BLL/User/Handlers/IDoctorHandler.cs create mode 100644 CoviDok/BLL/User/Handlers/IParentHandler.cs create mode 100644 CoviDok/BLL/User/Managers/AssistantManager.cs create mode 100644 CoviDok/BLL/User/Managers/CaseManager.cs create mode 100644 CoviDok/BLL/User/Managers/ChildManager.cs create mode 100644 CoviDok/BLL/User/Managers/DoctorManager.cs create mode 100644 CoviDok/BLL/User/Managers/ParentManager.cs create mode 100644 CoviDok/Controllers/AssistantController.cs create mode 100644 CoviDok/Controllers/ChildController.cs delete mode 100644 CoviDok/Controllers/DocController.cs create mode 100644 CoviDok/Controllers/DoctorController.cs delete mode 100644 CoviDok/Controllers/DoctorsController.cs create mode 100644 CoviDok/Controllers/ParentController.cs create mode 100644 CoviDok/Data/Model/Assistant.cs rename CoviDok/{data => Data/Model}/Case.cs (74%) create mode 100644 CoviDok/Data/Model/Child.cs create mode 100644 CoviDok/Data/Model/Doctor.cs create mode 100644 CoviDok/Data/Model/Parent.cs rename CoviDok/{data/User.cs => Data/Model/RoleUser.cs} (70%) rename CoviDok/{data => Data/Model}/Update.cs (58%) create mode 100644 CoviDok/Data/Model/User.cs create mode 100644 CoviDok/Data/MySQL/MySqlAssistantHandler.cs create mode 100644 CoviDok/Data/MySQL/MySqlCaseHandler.cs create mode 100644 CoviDok/Data/MySQL/MySqlChildHandler.cs rename CoviDok/{data/MySQLContext.cs => Data/MySQL/MySqlContext.cs} (57%) create mode 100644 CoviDok/Data/MySQL/MySqlDoctorHandler.cs create mode 100644 CoviDok/Data/MySQL/MySqlParentHandler.cs rename CoviDok/{BLL/Session/DummyProvider.cs => Data/SessionProviders/DummySessionProvider.cs} (80%) rename CoviDok/{BLL/Session => Data/SessionProviders}/RedisProvider.cs (89%) create mode 100644 CoviDok/Data/StorageProviders/MinioProvider.cs delete mode 100644 CoviDok/data/Child.cs delete mode 100644 CoviDok/data/Doctor.cs delete mode 100644 CoviDok/data/Image.cs delete mode 100644 CoviDok/data/Parent.cs diff --git a/CoviDok/Api/Errors.cs b/CoviDok/Api/Errors.cs new file mode 100644 index 0000000..d65e65d --- /dev/null +++ b/CoviDok/Api/Errors.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api +{ + public enum Errors + { + Uauthorized, + PasswordNotComplex, + EmailTaken, + EmailNotValid, + SSNExists, + BadImageID + } +} diff --git a/CoviDok/data/Assistant.cs b/CoviDok/Api/Objects/PublicAssistant.cs similarity index 51% rename from CoviDok/data/Assistant.cs rename to CoviDok/Api/Objects/PublicAssistant.cs index a6df0f9..e7a6610 100644 --- a/CoviDok/data/Assistant.cs +++ b/CoviDok/Api/Objects/PublicAssistant.cs @@ -3,22 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace CoviDok.data +namespace CoviDok.Api.Objects { - public class Assistant + public class PublicAssistant { - public string Id { get; set; } - - public string Email { get; set; } - - public string Password { get; set; } - + public string SessionID { get; set; } + public int DoctorId { get; set; } public string FirstName { get; set; } - public string LastName { get; set; } - - public DateTime RegistrationDate { get; set; } - - public string DoctorId { get; set; } + public string Email { get; set; } + public int ID { get; set; } } } diff --git a/CoviDok/Api/Objects/PublicChild.cs b/CoviDok/Api/Objects/PublicChild.cs new file mode 100644 index 0000000..8a0e5f8 --- /dev/null +++ b/CoviDok/Api/Objects/PublicChild.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api.Objects +{ + public class PublicChild + { + 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; } + } +} diff --git a/CoviDok/Api/Objects/PublicDoctor.cs b/CoviDok/Api/Objects/PublicDoctor.cs new file mode 100644 index 0000000..396ca33 --- /dev/null +++ b/CoviDok/Api/Objects/PublicDoctor.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api.Objects +{ + public class PublicDoctor + { + 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 ICollection Assistants { get; set; } = new List(); + } + +} diff --git a/CoviDok/Api/Objects/PublicParent.cs b/CoviDok/Api/Objects/PublicParent.cs new file mode 100644 index 0000000..ebe9143 --- /dev/null +++ b/CoviDok/Api/Objects/PublicParent.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api.Objects +{ + public class PublicParent + { + 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(); + } +} diff --git a/CoviDok/Api/Request/CaseCreate.cs b/CoviDok/Api/Request/CaseCreate.cs new file mode 100644 index 0000000..a1c50d6 --- /dev/null +++ b/CoviDok/Api/Request/CaseCreate.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api.Request +{ + public class CaseCreate + { + 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 e6fb5e7..ae45096 100644 --- a/CoviDok/Api/Request/CaseFilter.cs +++ b/CoviDok/Api/Request/CaseFilter.cs @@ -1,4 +1,4 @@ -using CoviDok.data; +using CoviDok.Data; using System; using System.Collections.Generic; using System.Linq; @@ -9,11 +9,19 @@ namespace CoviDok.Api.Request public class CaseFilter { public string SessionID { get; set; } - public Dictionary Filters { 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() { - Filters = new Dictionary(); + 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 5751757..c54ef51 100644 --- a/CoviDok/Api/Request/CaseUpdate.cs +++ b/CoviDok/Api/Request/CaseUpdate.cs @@ -7,8 +7,9 @@ namespace CoviDok.Api.Request { public class CaseUpdate { - public string CaseID { get; set; } + public int CaseID { get; set; } public string UpdateMsg { get; set; } + public List Images {get;set;} public string SessionID { get; set; } } } diff --git a/CoviDok/Api/Response/AuthIdentity.cs b/CoviDok/Api/Response/AuthIdentity.cs index babd2ee..ab3e648 100644 --- a/CoviDok/Api/Response/AuthIdentity.cs +++ b/CoviDok/Api/Response/AuthIdentity.cs @@ -7,7 +7,8 @@ namespace CoviDok.Api.Response { public class AuthIdentity { - public string Id { get; set; } + public int UserId { 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/Api/Response/FilteredCases.cs b/CoviDok/Api/Response/FilteredCases.cs deleted file mode 100644 index aed2e63..0000000 --- a/CoviDok/Api/Response/FilteredCases.cs +++ /dev/null @@ -1,17 +0,0 @@ -using CoviDok.data; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace CoviDok.Api.Response -{ - public class FilteredCases - { - public ICollection Cases { get; set; } - public FilteredCases() - { - Cases = new List(); - } - } -} diff --git a/CoviDok/BLL/MinioHandler.cs b/CoviDok/BLL/MinioHandler.cs deleted file mode 100644 index 3193b6e..0000000 --- a/CoviDok/BLL/MinioHandler.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Minio; -using Minio.Exceptions; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; - -namespace CoviDok.BLL -{ - class MinioHandler - { - private readonly MinioClient Client = null; - - public MinioHandler(string Host, string AccessKey, string SecretKey) - { - //Client = new MinioClient( - //"192.168.0.160:9000", - //"secretaccesskey", - //"secretsecretkey"); - Client = new MinioClient(Host, AccessKey, SecretKey); - } - - public async Task UploadImage(string BucketName, Stream FilePath, long size, string ObjectName) - { - try - { - // Make a bucket on the server, if not already present. - bool found = await Client.BucketExistsAsync(BucketName); - if (!found) - { - await Client.MakeBucketAsync(BucketName); - } - // Upload a file to bucket. - await Client.PutObjectAsync(BucketName, ObjectName, FilePath, size); - return new MinioResult(true, BucketName + ":" + ObjectName); - } - catch (MinioException e) - { - return new MinioResult(false, e.Message); - } - } - - public async Task GetImage(string ImageID, Action callback) - { - string[] attrs = ImageID.Split(":"); - await Client.GetObjectAsync(attrs[0], attrs[1], callback); - } - } -} diff --git a/CoviDok/BLL/PropertyCopier.cs b/CoviDok/BLL/PropertyCopier.cs new file mode 100644 index 0000000..51020a7 --- /dev/null +++ b/CoviDok/BLL/PropertyCopier.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; + +namespace CoviDok.BLL +{ + public class PropertyCopier where T : class + { + public static void Copy(T source, T dest, string[] except = null) + { + List forbidden = new List(except); + PropertyInfo[] properties = source.GetType().GetProperties(); + foreach (var property in properties) + { + if (property.Name.ToLower() != "id" && !forbidden.Contains(property.Name.ToLower())) { + var val = property.GetValue(source); + if (val != null) + { + property.SetValue(dest, val); + } + } + } + } + } + + public class PropertyCopier where TSource : class + where TDest : class + { + public static void Copy(TSource source, TDest dest) + { + var sourceProperties = source.GetType().GetProperties(); + var destProperties = dest.GetType().GetProperties(); + + foreach (var sourceProperty in sourceProperties) + { + foreach (var destProperty in destProperties) + { + if (sourceProperty.Name == destProperty.Name && sourceProperty.PropertyType == destProperty.PropertyType) + { + if (sourceProperty.Name.ToLower() != "id") + { + var val = sourceProperty.GetValue(source); + if (val != null) destProperty.SetValue(dest, val); + } + break; + } + } + } + } + } +} diff --git a/CoviDok/BLL/Session/SessionHandler.cs b/CoviDok/BLL/Session/SessionHandler.cs deleted file mode 100644 index d7d83bf..0000000 --- a/CoviDok/BLL/Session/SessionHandler.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Text.Json; -using CoviDok.Api; -using NCuid; - -namespace CoviDok.BLL -{ - class SessionHandler - { - private readonly ISessionProvider SessionStore; - - public SessionHandler(ISessionProvider Provider) - { - SessionStore = Provider; - } - - public Session GetSession(string SessionID) - { - string Candidate = SessionStore.Get(SessionID); - if (Candidate == null) return null; - Session session = JsonSerializer.Deserialize(Candidate); - session.LastAccess = DateTime.Now; - SessionStore.Set(SessionID, JsonSerializer.Serialize(session)); - return session; - } - - public string CreateSession(Role UserType, string UserID) - { - Session session = new Session - { - ID = UserID, - Type = UserType, - LastAccess = DateTime.Now - }; - string ID = Cuid.Generate(); - SessionStore.Set(ID, JsonSerializer.Serialize(session)); - return ID; - } - - public void DeleteSession(string SessionID) - { - SessionStore.Del(SessionID); - } - } -} diff --git a/CoviDok/BLL/Session/ISessionProvider.cs b/CoviDok/BLL/Sessions/ISessionProvider.cs similarity index 90% rename from CoviDok/BLL/Session/ISessionProvider.cs rename to CoviDok/BLL/Sessions/ISessionProvider.cs index ff50727..85c8517 100644 --- a/CoviDok/BLL/Session/ISessionProvider.cs +++ b/CoviDok/BLL/Sessions/ISessionProvider.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace CoviDok.BLL +namespace CoviDok.BLL.Sessions { interface ISessionProvider { diff --git a/CoviDok/BLL/Session/Session.cs b/CoviDok/BLL/Sessions/Session.cs similarity index 76% rename from CoviDok/BLL/Session/Session.cs rename to CoviDok/BLL/Sessions/Session.cs index 07f5237..1889234 100644 --- a/CoviDok/BLL/Session/Session.cs +++ b/CoviDok/BLL/Sessions/Session.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; using System.Text; -namespace CoviDok.BLL +namespace CoviDok.BLL.Sessions { public class Session { - public string 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 new file mode 100644 index 0000000..48cbdc5 --- /dev/null +++ b/CoviDok/BLL/Sessions/SessionHandler.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Text.Json; +using System.Threading.Tasks; +using CoviDok.Api; +using NCuid; + +namespace CoviDok.BLL.Sessions +{ + class SessionHandler + { + private readonly ISessionProvider SessionStore; + + public SessionHandler(ISessionProvider Provider) + { + SessionStore = Provider; + } + + public async Task GetSession(string 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)); + }); + return session; + } + + public async Task CreateSession(Role UserType, int UserID) + { + string ID = null; + await Task.Run(() => { + Session session = new Session + { + ID = UserID, + Type = UserType, + LastAccess = DateTime.Now + }; + ID = Cuid.Generate(); + SessionStore.Set(ID, JsonSerializer.Serialize(session)); + }); + return ID; + } + + public void DeleteSession(string SessionID) + { + SessionStore.Del(SessionID); + } + } +} diff --git a/CoviDok/BLL/Storage/IStorageProvider.cs b/CoviDok/BLL/Storage/IStorageProvider.cs new file mode 100644 index 0000000..d1b1a7c --- /dev/null +++ b/CoviDok/BLL/Storage/IStorageProvider.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.BLL.Storage +{ + // Interface for namespaced storage + interface IStorageProvider + { + public Task NamespaceExists(string ns); + public Task CreateNamespace(string ns); + public Task Upload(string ns, string objectname, Stream data, long size); + public Task Download(string ns, string objectname, Action callback); + } +} diff --git a/CoviDok/BLL/Storage/StorageHandler.cs b/CoviDok/BLL/Storage/StorageHandler.cs new file mode 100644 index 0000000..4f37d9b --- /dev/null +++ b/CoviDok/BLL/Storage/StorageHandler.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.BLL.Storage +{ + class StorageHandler + { + private readonly IStorageProvider storageProvider; + + public StorageHandler(IStorageProvider provider) + { + //Client = new MinioClient( + //"192.168.0.160:9000", + //"secretaccesskey", + //"secretsecretkey"); + storageProvider = provider; + } + + public async Task UploadImage(string BucketName, Stream FilePath, long size, string ObjectName) + { + try + { + // Make a bucket on the server, if not already present. + bool found = await storageProvider.NamespaceExists(BucketName); + if (!found) + { + await storageProvider.CreateNamespace(BucketName); + } + // Upload a file to bucket. + await storageProvider.Upload(BucketName, ObjectName, FilePath, size); + return new StorageResult(true, BucketName + ":" + ObjectName); + } + catch (Exception e) + { + return new StorageResult(false, e.Message); + } + } + + public async Task GetImage(string bucketName, string ImageID, Action callback) + { + await storageProvider.Download(bucketName, ImageID, callback); + } + } +} diff --git a/CoviDok/BLL/MinioResult.cs b/CoviDok/BLL/Storage/StorageResult.cs similarity index 70% rename from CoviDok/BLL/MinioResult.cs rename to CoviDok/BLL/Storage/StorageResult.cs index be9ab81..36c6b4a 100644 --- a/CoviDok/BLL/MinioResult.cs +++ b/CoviDok/BLL/Storage/StorageResult.cs @@ -1,11 +1,11 @@ namespace CoviDok.BLL { - public class MinioResult + public class StorageResult { public readonly bool Success; public readonly string Data; - public MinioResult(bool Success, string Data) + public StorageResult(bool Success, string Data) { this.Success = Success; this.Data = Data; diff --git a/CoviDok/BLL/Tools.cs b/CoviDok/BLL/Tools.cs deleted file mode 100644 index 706f211..0000000 --- a/CoviDok/BLL/Tools.cs +++ /dev/null @@ -1,78 +0,0 @@ -using CoviDok.data; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace CoviDok.BLL -{ - public class Tools - { - - private static Random random = new Random(); - public static string RandomString(int length) - { - const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - return new string(Enumerable.Repeat(chars, length) - .Select(s => s[random.Next(s.Length)]).ToArray()); - } - - static T RandomEnumValue() - { - var v = Enum.GetValues(typeof(T)); - return (T)v.GetValue(random.Next(v.Length)); - } - - public static Case MockCase(Dictionary filters) - { - Case c = new Case - { - Id = RandomString(8) - }; - if (filters.ContainsKey("DoctorID")) - { - c.DoctorID = filters["DoctorID"]; - } - else - { - c.DoctorID = Tools.RandomString(10); - } - if (filters.ContainsKey("ParentID")) - { - c.ParentID = filters["ParentID"]; - } - else - { - c.ParentID = Tools.RandomString(10); - } - if (filters.ContainsKey("ChildID")) - { - c.ChildID = filters["ChildID"]; - } - else - { - c.ChildID = Tools.RandomString(10); - } - if (filters.ContainsKey("CaseStatus")) - { - c.ChildID = filters["CaseStatus"]; - } - else - { - c.ChildID = RandomEnumValue().ToString(); - } - int msgDb = random.Next(10); - for (int i = 0; i < msgDb; i++) - { - Update u = new Update - { - Content = RandomString(55), - Sender = RandomString(13), - Id = RandomString(8) - }; - c.Updates.Add(u); - } - return c; - } - } -} diff --git a/CoviDok/BLL/User/Auth.cs b/CoviDok/BLL/User/Auth.cs index ad0ec31..fb064e2 100644 --- a/CoviDok/BLL/User/Auth.cs +++ b/CoviDok/BLL/User/Auth.cs @@ -1,11 +1,118 @@ -using System; +using CoviDok.Api; +using CoviDok.Api.Request; +using CoviDok.Api.Response; +using CoviDok.Data.MySQL; +using CoviDok.Data.Model; +using System; using System.Collections.Generic; using System.Linq; +using System.Text.RegularExpressions; using System.Threading.Tasks; namespace CoviDok.BLL.User { public class Auth { + private static string emailRegex = @"(@)(.+)$"; + private static string pwRegex = @"^(?=.{6,})(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=?!]).*$"; //8 hosszú, kis és nagybetű, különleges karakter + private static readonly MySqlContext context = new MySqlContext(); + + public static async Task AuthenticateUser(string Email, string Password) + { + if (!Regex.IsMatch(Email, emailRegex, RegexOptions.IgnoreCase)) throw new FormatException(); + + List users = new List(); + await Task.Run(() => + { + var us = from u in context.RoleUsers where u.Email == Email select u; + users.AddRange(us); + }); + + if (users.Count != 1) throw new KeyNotFoundException(); + RoleUser user = users[0]; + + if (user.CheckPassword(Password)) { + return new AuthIdentity + { + FirstName = user.FirstName, + LastName = user.LastName, + Role = user.Role, + UserId = user.Id + }; + } + return null; + } + + public static bool CheckEmail(string Email) { + return context.RoleUsers.Any(e => e.Email == Email); + } + + public static GenericResponse ValidateRegistration(string Email, string Password) + { + GenericResponse genericResponse = new GenericResponse(); + + if (CheckEmail(Email)) + { + genericResponse.Status = Status.Error; + genericResponse.Body["reason"] = Email + " is already registered!"; + return genericResponse; + } + if (!Regex.IsMatch(Email, emailRegex, RegexOptions.IgnoreCase)) + { + genericResponse.Status = Status.Error; + genericResponse.Body["reason"] = Email + " is not a valid email address!"; + return genericResponse; + } + if (!Regex.IsMatch(Password, pwRegex, RegexOptions.IgnoreCase)) { + genericResponse.Status = Status.Error; + genericResponse.Body["reason"] = "Password does not meet complexity requirements!"; + return genericResponse; + } + return genericResponse; + } + + public static async Task CreateUser(AuthRegistration registration) { + GenericResponse response = new GenericResponse(); + switch (registration.Role) + { + case Role.Ast: + Assistant ast = new Assistant { + FirstName = registration.FirstName, + LastName = registration.LastName, + Email = registration.Email, + Password = RoleUser.GetHashString(registration.Password), + Role = Role.Ast + }; + context.Assistants.Add(ast); + await context.SaveChangesAsync(); + response.Body["id"] = ast.Id.ToString(); + break; + case Role.Doc: + Doctor doc = new Doctor { + FirstName = registration.FirstName, + LastName = registration.LastName, + Email = registration.Email, + Password = RoleUser.GetHashString(registration.Password), + Role = Role.Doc }; + context.Doctors.Add(doc); + await context.SaveChangesAsync(); + response.Body["id"] = doc.Id.ToString(); + break; + case Role.Par: + Parent par = new Parent + { + FirstName = registration.FirstName, + LastName = registration.LastName, + Email = registration.Email, + Password = RoleUser.GetHashString(registration.Password), + Role = Role.Par + }; + context.Parents.Add(par); + await context.SaveChangesAsync(); + response.Body["id"] = par.Id.ToString(); + break; + } + return response; + } } } diff --git a/CoviDok/BLL/User/Handlers/IAssistantHandler.cs b/CoviDok/BLL/User/Handlers/IAssistantHandler.cs new file mode 100644 index 0000000..730b9e5 --- /dev/null +++ b/CoviDok/BLL/User/Handlers/IAssistantHandler.cs @@ -0,0 +1,16 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.BLL.User.Managers +{ + interface IAssistantHandler + { + public Task GetAssistant(int id); + public Task SetAssistant(int id, Assistant value); + } +} diff --git a/CoviDok/BLL/User/Handlers/ICaseHandler.cs b/CoviDok/BLL/User/Handlers/ICaseHandler.cs new file mode 100644 index 0000000..88a407a --- /dev/null +++ b/CoviDok/BLL/User/Handlers/ICaseHandler.cs @@ -0,0 +1,23 @@ +using CoviDok.Api.Request; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.BLL.User.Handlers +{ + public interface ICaseHandler + { + public Task> Filter(CaseFilter filter); + public Task GetCase(int id); + + public Task AddCase(Case c); + + public Task UpdateCase(int id, Case Case, Update update); + + public Task SetCase(int id, CaseStatus status); + public bool IsAuthorized(int ID, Case c); + } +} diff --git a/CoviDok/BLL/User/Handlers/IChildHandler.cs b/CoviDok/BLL/User/Handlers/IChildHandler.cs new file mode 100644 index 0000000..79f811d --- /dev/null +++ b/CoviDok/BLL/User/Handlers/IChildHandler.cs @@ -0,0 +1,17 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.BLL.User.Managers +{ + interface IChildHandler + { + public Task GetChild(int id); + public Task UpdateChild(int id, Child newData); + public Task AddChild(Child newChild); + } +} diff --git a/CoviDok/BLL/User/Handlers/IDoctorHandler.cs b/CoviDok/BLL/User/Handlers/IDoctorHandler.cs new file mode 100644 index 0000000..eb8c1dd --- /dev/null +++ b/CoviDok/BLL/User/Handlers/IDoctorHandler.cs @@ -0,0 +1,21 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.BLL.User.Managers +{ + interface IDoctorHandler + { + public List GetDoctors(); + public Task GetDoctor(int id); + public Task UpdateDoctor(int id, Doctor value); + public List GetAssistants(int id); + public List GetChildren(int id); + + public bool DoctorExists(int id); + } +} diff --git a/CoviDok/BLL/User/Handlers/IParentHandler.cs b/CoviDok/BLL/User/Handlers/IParentHandler.cs new file mode 100644 index 0000000..af396ec --- /dev/null +++ b/CoviDok/BLL/User/Handlers/IParentHandler.cs @@ -0,0 +1,19 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.BLL.User.Managers +{ + interface IParentHandler + { + public Task GetParent(int id); + public Task UpdateParent(int id, Parent value); + public List GetChildren(int id); + + public bool ParentExists(int id); + } +} diff --git a/CoviDok/BLL/User/Managers/AssistantManager.cs b/CoviDok/BLL/User/Managers/AssistantManager.cs new file mode 100644 index 0000000..87646de --- /dev/null +++ b/CoviDok/BLL/User/Managers/AssistantManager.cs @@ -0,0 +1,36 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.MySQL; +using CoviDok.Data.Model; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class AssistantManager + { + private readonly IAssistantHandler handler = new MySqlAssistantHandler(); + public async Task GetAssistant(int id) + { + Assistant ast = await handler.GetAssistant(id); + if (ast == null) throw new KeyNotFoundException(); + return ast.ToPublic(); + } + + public async Task UpdateAssistant(Session s, int id, PublicAssistant value) + { + 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(); + + ast.UpdateSelf(value); + await handler.SetAssistant(id, ast); + } + } +} diff --git a/CoviDok/BLL/User/Managers/CaseManager.cs b/CoviDok/BLL/User/Managers/CaseManager.cs new file mode 100644 index 0000000..0d6dd4c --- /dev/null +++ b/CoviDok/BLL/User/Managers/CaseManager.cs @@ -0,0 +1,112 @@ +using CoviDok.Api.Request; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Handlers; +using CoviDok.Data.Model; +using CoviDok.Data.MySQL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; + +namespace CoviDok.BLL.User.Managers +{ + public class CaseManager + { + private readonly ICaseHandler handler = new MySqlCaseHandler(); + + public async Task> FilterCases(Session s, CaseFilter filter) + { + // TODO: Jogosultságkezelés + return await handler.Filter(filter); + } + + public async Task SetCertified(Session s, int id) + { + Case c = await handler.GetCase(id); + if (c == null) throw new KeyNotFoundException(); + if (handler.IsAuthorized(s.ID, c) && s.Type == Api.Role.Ast) + { + await handler.SetCase(id, CaseStatus.Cured); + } + else + { + throw new UnauthorizedAccessException(); + } + } + + public async Task SetCured(Session s, int id) + { + Case c = await handler.GetCase(id); + if (c == null) throw new KeyNotFoundException(); + if (s.ID == c.DoctorID) + { + await handler.SetCase(id, CaseStatus.Cured); + } + else + { + throw new UnauthorizedAccessException(); + } + } + + + + public async Task GetCase(Session s, int id) + { + // 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)) + { + return c; + } + else + { + throw new UnauthorizedAccessException(); + } + } + + 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, + Title = Title, + CreatedDate = DateTime.Now, + LastModificationDate = DateTime.Now, + CaseStatus = CaseStatus.InProgress, + Assignee = s.ID + }; + return await handler.AddCase(c); + } + + 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.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.DoctorID) c.Assignee = c.ParentID; // Ha doki frissít, a szülőhöz kerül + + c.LastModificationDate = DateTime.Now; + Update update = new Update { + Sender = s.ID, + Content = updateMsg, + CreatedDate = DateTime.Now, + Images = Images + }; + await handler.UpdateCase(id, c, update); + } + else + { + throw new UnauthorizedAccessException(); + } + } + } +} diff --git a/CoviDok/BLL/User/Managers/ChildManager.cs b/CoviDok/BLL/User/Managers/ChildManager.cs new file mode 100644 index 0000000..70d0a0a --- /dev/null +++ b/CoviDok/BLL/User/Managers/ChildManager.cs @@ -0,0 +1,56 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using CoviDok.Data.MySQL; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class ChildManager + { + private readonly IChildHandler handler; + public async Task GetChild(Session s, int id) + { + Child child = await handler.GetChild(id); + if (child == null) throw new KeyNotFoundException(); + if (child.DoctorId == s.ID || child.ParentId == s.ID) + { + return child.ToPublic(); + } + else { + throw new UnauthorizedAccessException(); + } + } + + public async Task UpdateChild(Session s, int id, PublicChild newData) + { + 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) + { + child.UpdateSelf(newData); + await handler.UpdateChild(id, child); + } + else + { + throw new UnauthorizedAccessException(); + } + } + + public async Task AddChild(Session s, PublicChild newChild) + { + if (s.ID != newChild.ParentId) throw new UnauthorizedAccessException(); + Child child = new Child(); + child.UpdateSelf(newChild); + child.RegistrationDate = DateTime.Now; + return await handler.AddChild(child); + } + } +} diff --git a/CoviDok/BLL/User/Managers/DoctorManager.cs b/CoviDok/BLL/User/Managers/DoctorManager.cs new file mode 100644 index 0000000..90216e6 --- /dev/null +++ b/CoviDok/BLL/User/Managers/DoctorManager.cs @@ -0,0 +1,79 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.MySQL; +using CoviDok.Data.Model; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Policy; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class DoctorManager + { + private readonly IDoctorHandler handler = new MySqlDoctorHandler(); + public async Task> GetDoctors() + { + + List ret = new List(); + await Task.Run( () => { + var docs = handler.GetDoctors(); + foreach (Doctor doctor in docs) + { + ret.Add(doctor.ToPublic()); + } + }); + return ret; + } + + public async Task GetDoctor(int id) + { + Doctor doc = await handler.GetDoctor(id); + if (doc == null) throw new KeyNotFoundException(); + return doc.ToPublic(); + } + + public async Task UpdateDoctor(Session s, int id, PublicDoctor value) + { + 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(); + + doc.UpdateSelf(value); + await handler.UpdateDoctor(id, doc); + } + + public async Task> GetAssistants(int id) + { + if (!handler.DoctorExists(id)) throw new KeyNotFoundException(); + List ret = new List(); + await Task.Run(() => { + var asts = handler.GetAssistants(id); + foreach (Assistant assistant in asts) + { + ret.Add(assistant.ToPublic()); + } + }); + return ret; + } + + public async Task> GetChildren(int id) + { + if (!handler.DoctorExists(id)) throw new KeyNotFoundException(); + List ret = new List(); + await Task.Run(() => { + var asts = handler.GetChildren(id); + foreach (Child child in asts) + { + ret.Add(child.ToPublic()); + } + }); + return ret; + } + } +} diff --git a/CoviDok/BLL/User/Managers/ParentManager.cs b/CoviDok/BLL/User/Managers/ParentManager.cs new file mode 100644 index 0000000..d8e152c --- /dev/null +++ b/CoviDok/BLL/User/Managers/ParentManager.cs @@ -0,0 +1,50 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class ParentManager + { + private readonly IParentHandler handler = new MySqlParentHandler(); + public async Task GetParent(int id) + { + Parent parent = await handler.GetParent(id); + if (parent == null) throw new KeyNotFoundException(); + return parent.ToPublic(); + } + + public async Task UpdateParent(Session s, int id, PublicParent value) + { + 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(); + + parent.UpdateSelf(value); + await handler.UpdateParent(id, parent); + } + + public async Task> GetChildren(int id) + { + if (!handler.ParentExists(id)) throw new KeyNotFoundException(); + List ret = new List(); + await Task.Run(() => { + var asts = handler.GetChildren(id); + foreach (Child child in asts) + { + ret.Add(child.ToPublic()); + } + }); + return ret; + } + } +} diff --git a/CoviDok/Controllers/AssistantController.cs b/CoviDok/Controllers/AssistantController.cs new file mode 100644 index 0000000..d97e56e --- /dev/null +++ b/CoviDok/Controllers/AssistantController.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using CoviDok.Api.Objects; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.MySQL; +using CoviDok.Data.SessionProviders; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace CoviDok.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class AssistantController : ControllerBase + { + private readonly SessionHandler Handler = new SessionHandler(new RedisProvider("redis")); + + private readonly AssistantManager mgr = new AssistantManager(); + + + [HttpGet("{id}")] + public async Task> GetDoctor(int id) + { + try + { + return await mgr.GetAssistant(id); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + } + + [HttpPut("{id}")] + public async Task PutAssistant(int id, PublicAssistant ast) + { + Session s = await Handler.GetSession(ast.SessionID); + if (s == null) return Unauthorized(); + try + { + await mgr.UpdateAssistant(s, id, ast); + return NoContent(); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + catch (FormatException) + { + return BadRequest(); + } + } + } +} diff --git a/CoviDok/Controllers/AuthController.cs b/CoviDok/Controllers/AuthController.cs index 78df420..183649f 100644 --- a/CoviDok/Controllers/AuthController.cs +++ b/CoviDok/Controllers/AuthController.cs @@ -1,12 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using CoviDok.Api; +using CoviDok.Api; using CoviDok.Api.Request; using CoviDok.Api.Response; -using Microsoft.AspNetCore.Http; +using CoviDok.BLL; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User; +using CoviDok.Data.SessionProviders; using Microsoft.AspNetCore.Mvc; +using System.Text.RegularExpressions; +using System.Threading.Tasks; namespace CoviDok.Controllers @@ -15,30 +16,18 @@ namespace CoviDok.Controllers [ApiController] public class AuthController : ControllerBase { + SessionHandler Handler = new SessionHandler(new RedisProvider("redis")); + + + // POST: /api/Auth/login [HttpPost("login")] public async Task> PostLogin(AuthLogin authLogin) { - AuthIdentity authIdentity = new AuthIdentity(); - authIdentity.FirstName = "Sajt"; - authIdentity.LastName = "Osperec"; - authIdentity.Id = "asdfasdfadf"; //SessionID - if (authLogin.Email == "a@domain.tld" && authLogin.Password == "a") - { - authIdentity.Role = Role.Doc; - return authIdentity; - } - if (authLogin.Email == "b@domain.tld" && authLogin.Password == "b") - { - authIdentity.Role = Role.Ast; - return authIdentity; - } - if (authLogin.Email == "c@domain.tld" && authLogin.Password == "c") - { - authIdentity.Role = Role.Par; - return authIdentity; - } - return Unauthorized(); + AuthIdentity authIdentity = await Auth.AuthenticateUser(authLogin.Email, authLogin.Password); + if (authIdentity == null) return Unauthorized(); + authIdentity.SessionID = await Handler.CreateSession(authIdentity.Role, authIdentity.UserId); + return authIdentity; } // POST: /api/Auth/register @@ -47,40 +36,10 @@ namespace CoviDok.Controllers { // System.Diagnostics.Debug.WriteLine(authRegistration.ToString()); // Validate Email - GenericResponse genericResponse = new GenericResponse(); - if (authRegistration.Email == "a@domain.tld") - { - genericResponse.Status = Status.Error; - genericResponse.Body["reason"] = authRegistration.Email + " is already registered!"; - } else if (authRegistration.Password == "1") - { - genericResponse.Status = Status.Error; - genericResponse.Body["reason"] = "Password does not meet complexity requirements!"; - } - - return genericResponse; - } - - // POST /api/Auth/child - [HttpPost("child")] - public async Task> PostAddChild(AuthChild authChild) - { - GenericResponse genericResponse = new GenericResponse(); - if (authChild.SessionID != "id") - { - return Unauthorized(); - } - else if (authChild.SocSecNum == "111111111") - { - genericResponse.Status = Status.Error; - genericResponse.Body["reason"] = "SSN Already exists!"; - } - else - { - genericResponse.Body["childID"] = "asdfaasdas"; - } + GenericResponse genericResponse = Auth.ValidateRegistration(authRegistration.Email, authRegistration.Password); + if (genericResponse.Status == Status.Error) return genericResponse; - return genericResponse; + return await Auth.CreateUser(authRegistration); } } } diff --git a/CoviDok/Controllers/CaseController.cs b/CoviDok/Controllers/CaseController.cs index ddd248f..c54d71f 100644 --- a/CoviDok/Controllers/CaseController.cs +++ b/CoviDok/Controllers/CaseController.cs @@ -7,7 +7,10 @@ using CoviDok.Api; using CoviDok.Api.Request; using CoviDok.Api.Response; using CoviDok.BLL; -using CoviDok.data; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using CoviDok.Data.SessionProviders; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -17,67 +20,124 @@ namespace CoviDok.Controllers [ApiController] public class CaseController : ControllerBase { + private readonly SessionHandler Handler = new SessionHandler(new RedisProvider("redis")); + private readonly CaseManager mgr = new CaseManager(); + // POST /api/Case/{id} [HttpPost("{id}")] - public async Task> PostGetCase(string id, AuthGet auth) + public async Task> PostGetCase(int id, AuthGet auth) { - if (auth.SessionID != "a") return Unauthorized(); + Session s = await Handler.GetSession(auth.SessionID); + if (s == null) return Unauthorized(); - List updates = new List(); - for (int i = 0; i < 10; i++) + try { + return await mgr.GetCase(s, id); + } + catch (KeyNotFoundException) { - Update u = new Update - { - Content = i.ToString(), - Sender = "Dr. A B", - Id = i.ToString() - }; - updates.Add(u); - } - Case c = new Case + return NotFound(); + } + catch (UnauthorizedAccessException) { - Id = id, - DoctorID = "hehegbvdesv", - ParentID = "qgwenhjegh", - ChildID = "egwbenbeb", - CaseStatus = CaseStatus.InProgress - }; - - return c; + return Unauthorized(); + } } // POST /api/Case/{id}/update [HttpPut("{id}/update")] - public async Task PostUpdate(string id, CaseUpdate data) + public async Task PostUpdate(int id, CaseUpdate data) + { + Session s = await Handler.GetSession(data.SessionID); + if (s == null) return Unauthorized(); + try + { + await mgr.UpdateCase(s, id, data.UpdateMsg, data.Images); + return Ok(); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } + catch (KeyNotFoundException) { + return NotFound(); + } + + } + + [HttpPost] + public async Task> NewCase(CaseCreate data) { - if (data.SessionID != "a") return Unauthorized(); + Session s = await Handler.GetSession(data.SessionID); + if (s == null) return Unauthorized(); - return Ok(); + try + { + Case c = await mgr.CreateCase(s, data.DoctorID, data.ChildID, data.Title, data.StartDate); + return CreatedAtAction("GetPublicChild", new { id = c.Id }, c); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } } // POST /api/Case/{id}/close - [HttpPut("{id}/close")] - public async Task PostClose(string id, CaseUpdate data) + [HttpPost("{id}/close")] + public async Task PostClose(int id, CaseUpdate data) { - if (data.SessionID != "a") return Unauthorized(); - // if not doctor: unauthorized - return Ok(); + Session s = await Handler.GetSession(data.SessionID); + if (s == null) return Unauthorized(); + try + { + await mgr.SetCertified(s, id); + return Ok(); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + } + // POST /api/Case/{id}/close + [HttpPost("{id}/cure")] + public async Task PostCured(int id, CaseUpdate data) + { + Session s = await Handler.GetSession(data.SessionID); + if (s == null) return Unauthorized(); + try + { + await mgr.SetCured(s, id); + return Ok(); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } + catch (KeyNotFoundException) + { + return NotFound(); + } } // POST /api/Case/filter [HttpPost("filter")] - public async Task> Filter(CaseFilter filters) + public async Task>> Filter(CaseFilter filters) { - if (filters.SessionID != "a") return Unauthorized(); + Session s = await Handler.GetSession(filters.SessionID); + if (s == null) return Unauthorized(); - FilteredCases cases = new FilteredCases(); - for (int i = 0; i < 10; i++) + try { - cases.Cases.Add(Tools.MockCase(filters.Filters)); + return await mgr.FilterCases(s, filters); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); } - - return cases; } diff --git a/CoviDok/Controllers/ChildController.cs b/CoviDok/Controllers/ChildController.cs new file mode 100644 index 0000000..72228ee --- /dev/null +++ b/CoviDok/Controllers/ChildController.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using CoviDok.Api.Objects; +using CoviDok.Api.Request; +using CoviDok.BLL.User.Managers; +using CoviDok.BLL.Sessions; +using CoviDok.Data.SessionProviders; +using CoviDok.Data.MySQL; + +namespace CoviDok.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class ChildController : ControllerBase + { + private readonly SessionHandler Handler = new SessionHandler(new RedisProvider("redis")); + + private readonly ChildManager ChildManager = new ChildManager(); + + // POST: api/Child/5 + [HttpPost("{id}")] + public async Task> GetPublicChild(int id, AuthGet get) + { + Session s = await Handler.GetSession(get.SessionID); + if (s == null) return Unauthorized(); + + try + { + return await ChildManager.GetChild(s, id); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + } + + // PUT: api/Child/5 + // To protect from overposting attacks, enable the specific properties you want to bind to, for + // more details, see https://go.microsoft.com/fwlink/?linkid=2123754. + [HttpPut("{id}")] + public async Task PutPublicChild(int id, PublicChild publicChild) + { + Session s = await Handler.GetSession(publicChild.SessionID); + if (s == null) return Unauthorized(); + try { + await ChildManager.UpdateChild(s, id, publicChild); + return NoContent(); + } + catch (UnauthorizedAccessException) { + return Unauthorized(); + } + catch (KeyNotFoundException) { + return NotFound(); + } + catch (FormatException) + { + return BadRequest(); + } + } + + // POST: api/Child + // To protect from overposting attacks, enable the specific properties you want to bind to, for + // more details, see https://go.microsoft.com/fwlink/?linkid=2123754. + [HttpPost] + public async Task> PostPublicChild(PublicChild publicChild) + { + Session s = await Handler.GetSession(publicChild.SessionID); + if (s == null ) return Unauthorized(); + + try { + int Id = await ChildManager.AddChild(s, publicChild); + return CreatedAtAction("GetPublicChild", new { id = Id }, publicChild); + } + catch (UnauthorizedAccessException) { + return Unauthorized(); + } + } + } +} diff --git a/CoviDok/Controllers/DocController.cs b/CoviDok/Controllers/DocController.cs deleted file mode 100644 index c02bd1b..0000000 --- a/CoviDok/Controllers/DocController.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using CoviDok.Api; -using CoviDok.Api.Request; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; - -namespace CoviDok.Controllers -{ - [Route("api/[controller]")] - [ApiController] - public class DocController : ControllerBase - { - // GET /api/Doc - [HttpGet] - public async Task> GetDoctors() - { - GenericResponse genericResponse = new GenericResponse(); - for (int i=5; i < 15; i++) - { - string doc = "{ \"firstName\": \"Dr. Schanniquah\", \"lastName\": \"The " + i + "th\"}"; - genericResponse.Body[i.ToString()] = doc; - } - return genericResponse; - } - - // GET /api/Doc/{id}/assistants - [HttpGet("{id}/assistants")] - public async Task> GetAssistantsOfDoctor(string id) - { - GenericResponse genericResponse = new GenericResponse(); - genericResponse.Body["doctorID"] = id; - for (int i = 5; i < 15; i++) - { - string doc = "{ \"firstName\": \"Belisarius\", \"lastName\": \"The " + i + "th Cawl\"}"; - genericResponse.Body[i.ToString()] = doc; - } - return genericResponse; - } - - // GET /api/Doc/{id}/children - [HttpGet("{id}/children")] - public async Task> GetChildrenOfDoctor(string id) - { - GenericResponse genericResponse = new GenericResponse(); - genericResponse.Body["doctorID"] = id; - for (int i = 5; i < 15; i++) - { - string doc = "{ \"firstName\": \"Belisarius\", \"lastName\": \"The " + i + "th Cawl\"}"; - genericResponse.Body[i.ToString()] = doc; - } - return genericResponse; - } - } -} diff --git a/CoviDok/Controllers/DoctorController.cs b/CoviDok/Controllers/DoctorController.cs new file mode 100644 index 0000000..9e91507 --- /dev/null +++ b/CoviDok/Controllers/DoctorController.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using CoviDok.Api; +using CoviDok.Api.Objects; +using CoviDok.Api.Request; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.MySQL; +using CoviDok.Data.SessionProviders; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace CoviDok.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class DoctorController : ControllerBase + { + private readonly SessionHandler Handler = new SessionHandler(new RedisProvider("redis")); + + private readonly DoctorManager doctorHandler = new DoctorManager(); + // GET /api/Doc + [HttpGet] + public async Task>> GetDoctors() + { + return await doctorHandler.GetDoctors(); + } + + [HttpGet("{id}")] + public async Task> GetDoctor(int id) + { + try + { + return await doctorHandler.GetDoctor(id); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + } + + [HttpPut("{id}")] + public async Task PutDoctor(int id, PublicDoctor doctor) { + Session s = await Handler.GetSession(doctor.SessionID); + if (s == null) return Unauthorized(); + try + { + await doctorHandler.UpdateDoctor(s, id, doctor); + return NoContent(); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + catch (FormatException) + { + return BadRequest(); + } + } + + // GET /api/Doc/{id}/assistants + [HttpGet("{id}/assistants")] + public async Task>> GetAssistantsOfDoctor(int id) + { + try + { + return await doctorHandler.GetAssistants(id); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + } + + // GET /api/Doc/{id}/children + [HttpPost("{id}/children")] + public async Task>> GetChildrenOfDoctor(int id, AuthGet get) + { + Session s = await Handler.GetSession(get.SessionID); + if (s == null) return Unauthorized(); + try + { + return await doctorHandler.GetChildren(id); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + catch (UnauthorizedAccessException) { + return Unauthorized(); + } + } + } +} diff --git a/CoviDok/Controllers/DoctorsController.cs b/CoviDok/Controllers/DoctorsController.cs deleted file mode 100644 index 57f6da1..0000000 --- a/CoviDok/Controllers/DoctorsController.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using CoviDok.data; - -namespace CoviDok.Controllers -{ - [Route("api/[controller]")] - [ApiController] - public class DoctorsController : ControllerBase - { - private readonly MySQLContext _context; - - public DoctorsController(MySQLContext context) - { - _context = context; - } - - // GET: api/Doctors - [HttpGet] - public async Task>> GetDoctors() - { - return await _context.Doctors.ToListAsync(); - } - - // GET: api/Doctors/5 - [HttpGet("{id}")] - public async Task> GetDoctor(string id) - { - var doctor = await _context.Doctors.FindAsync(id); - - if (doctor == null) - { - return NotFound(); - } - - return doctor; - } - - // PUT: api/Doctors/5 - // To protect from overposting attacks, enable the specific properties you want to bind to, for - // more details, see https://go.microsoft.com/fwlink/?linkid=2123754. - [HttpPut("{id}")] - public async Task PutDoctor(string id, Doctor doctor) - { - if (id != doctor.Id) - { - return BadRequest(); - } - - _context.Entry(doctor).State = EntityState.Modified; - - try - { - await _context.SaveChangesAsync(); - } - catch (DbUpdateConcurrencyException) - { - if (!DoctorExists(id)) - { - return NotFound(); - } - else - { - throw; - } - } - - return NoContent(); - } - - // POST: api/Doctors - // To protect from overposting attacks, enable the specific properties you want to bind to, for - // more details, see https://go.microsoft.com/fwlink/?linkid=2123754. - [HttpPost] - public async Task> PostDoctor(Doctor doctor) - { - _context.Doctors.Add(doctor); - try - { - await _context.SaveChangesAsync(); - } - catch (DbUpdateException) - { - if (DoctorExists(doctor.Id)) - { - return Conflict(); - } - else - { - throw; - } - } - - return CreatedAtAction("GetDoctor", new { id = doctor.Id }, doctor); - } - - // DELETE: api/Doctors/5 - [HttpDelete("{id}")] - public async Task> DeleteDoctor(string id) - { - var doctor = await _context.Doctors.FindAsync(id); - if (doctor == null) - { - return NotFound(); - } - - _context.Doctors.Remove(doctor); - await _context.SaveChangesAsync(); - - return doctor; - } - - private bool DoctorExists(string id) - { - return _context.Doctors.Any(e => e.Id == id); - } - } -} diff --git a/CoviDok/Controllers/ImagesController.cs b/CoviDok/Controllers/ImagesController.cs index 41e7110..7219849 100644 --- a/CoviDok/Controllers/ImagesController.cs +++ b/CoviDok/Controllers/ImagesController.cs @@ -7,6 +7,10 @@ using System.Threading.Tasks; using CoviDok.Api; using CoviDok.Api.Request; using CoviDok.BLL; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.Storage; +using CoviDok.Data.SessionProviders; +using CoviDok.Data.StorageProviders; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using NCuid; @@ -17,12 +21,14 @@ namespace CoviDok.Controllers [ApiController] public class ImagesController : ControllerBase { - private MinioHandler MinioHandler = new MinioHandler( + private StorageHandler MinioHandler = new StorageHandler(new MinioProvider( "minio:9000", "secretaccesskey", - "secretsecretkey"); + "secretsecretkey")); private readonly string BucketName = "test1"; + private readonly SessionHandler Handler = new SessionHandler(new RedisProvider("redis")); + private static Stream MakeStream(string s) { var stream = new MemoryStream(); @@ -34,17 +40,17 @@ namespace CoviDok.Controllers } [HttpPost("Upload")] - public async Task OnPostImage(ImagePost post) + public async Task> OnPostImage(ImagePost post) { GenericResponse response = new GenericResponse(); - if (post.SessionID != "a") + Session s = await Handler.GetSession(post.SessionID); + if (s == null) { response.Status = Status.Error; response.Body["reason"] = "unauthorized"; return response; - } - - MinioResult Result = await MinioHandler.UploadImage(BucketName, MakeStream(post.File), post.File.Length, Cuid.Generate()); + } + StorageResult Result = await MinioHandler.UploadImage(BucketName, MakeStream(post.File), post.File.Length, Cuid.Generate()); if (!Result.Success) response.Status = Status.Error; response.Body["reason"] = Result.Data; @@ -54,22 +60,23 @@ namespace CoviDok.Controllers [HttpPost("Download")] public async Task OnGetImage(ImageGet imageGet) { - GenericResponse gr = new GenericResponse(); - string[] attrs = imageGet.ImageID.Split(":"); - if (attrs.Length != 2) { - gr.Status = Status.Error; - gr.Body["reason"] = "Bad image ID!"; - return gr; + GenericResponse response = new GenericResponse(); + Session s = await Handler.GetSession(imageGet.SessionID); + if (s == null) + { + response.Status = Status.Error; + response.Body["reason"] = "unauthorized"; + return response; } - + string res = null; ; - await MinioHandler.GetImage(imageGet.ImageID, (stream) => { + await MinioHandler.GetImage(BucketName, imageGet.ImageID, (stream) => { StreamReader reader = new StreamReader(stream); res = reader.ReadToEnd(); }); - gr.Body["image"] = res; - return gr; + response.Body["image"] = res; + return response; } } } diff --git a/CoviDok/Controllers/ParentController.cs b/CoviDok/Controllers/ParentController.cs new file mode 100644 index 0000000..634c5a9 --- /dev/null +++ b/CoviDok/Controllers/ParentController.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using CoviDok.Api.Objects; +using CoviDok.Api.Request; +using CoviDok.BLL.Sessions; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.MySQL; +using CoviDok.Data.SessionProviders; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace CoviDok.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class ParentController : ControllerBase + { + private readonly SessionHandler sessionHandler = new SessionHandler(new RedisProvider("redis")); + + private readonly ParentManager parentManager = new ParentManager(); + + [HttpPost("{id}")] + public async Task> GetParent(int id, AuthGet get) + { + Session s = await sessionHandler.GetSession(get.SessionID); + if (s == null) return Unauthorized(); + try { + return await parentManager.GetParent(id); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + } + + [HttpPut("{id}")] + public async Task PutParent(int id, PublicParent parent) + { + Session s = await sessionHandler.GetSession(parent.SessionID); + if (s == null) return Unauthorized(); + try { + await parentManager.UpdateParent(s, id, parent); + return NoContent(); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + catch (FormatException) + { + return BadRequest(); + } + } + [HttpPost("{id}/children")] + public async Task>> GetChildrenOfParent(int id, AuthGet get) + { + Session s = await sessionHandler.GetSession(get.SessionID); + if (s == null) return Unauthorized(); + try + { + return await parentManager.GetChildren(id); + } + catch (KeyNotFoundException) + { + return NotFound(); + } + catch (UnauthorizedAccessException) + { + return Unauthorized(); + } + } + } +} diff --git a/CoviDok/Data/Model/Assistant.cs b/CoviDok/Data/Model/Assistant.cs new file mode 100644 index 0000000..4696955 --- /dev/null +++ b/CoviDok/Data/Model/Assistant.cs @@ -0,0 +1,22 @@ +using CoviDok.Api.Objects; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.Model +{ + public class Assistant : RoleUser + { + public int DoctorId { get; set; } + + public void UpdateSelf(PublicAssistant assistant) + { + + } + public PublicAssistant ToPublic() + { + throw new NotImplementedException(); + } + } +} diff --git a/CoviDok/data/Case.cs b/CoviDok/Data/Model/Case.cs similarity index 74% rename from CoviDok/data/Case.cs rename to CoviDok/Data/Model/Case.cs index 5da7e6c..a7205d0 100644 --- a/CoviDok/data/Case.cs +++ b/CoviDok/Data/Model/Case.cs @@ -3,20 +3,20 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace CoviDok.data +namespace CoviDok.Data.Model { public class Case { - public string Id { get; set; } - public string DoctorID { get; set; } - public string ParentID { get; set; } - public string ChildID { get; set; } + public int Id { get; set; } + public int DoctorID { get; set; } + public int ParentID { get; set; } + public int ChildID { get; set; } public CaseStatus CaseStatus { get; set; } public ICollection Updates { get; set; } - public string Assignee { get; set; } + public int Assignee { get; set; } public string Title { get; set; } public DateTime StartDate { get; set; } //amikor a tünetek kezdődtek diff --git a/CoviDok/Data/Model/Child.cs b/CoviDok/Data/Model/Child.cs new file mode 100644 index 0000000..5888648 --- /dev/null +++ b/CoviDok/Data/Model/Child.cs @@ -0,0 +1,40 @@ +using CoviDok.Api.Objects; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.Model +{ + public class Child : User + { + public int DoctorId { get; set; } + public int ParentId { get; set; } + //public ICollection MedicalHistory { get; set; } = new List(); + public string SSN { get; set; } + + public PublicChild ToPublic() + { + return new PublicChild + { + FirstName = FirstName, + LastName = LastName, + DoctorId = DoctorId, + ParentId = ParentId, + SSN = SSN, + BirthDate = BirthDate, + PictureId = PictureId + }; + } + public void UpdateSelf(PublicChild newVal) + { + FirstName = newVal.FirstName; + LastName = newVal.LastName; + DoctorId = newVal.DoctorId; + ParentId = newVal.ParentId; + SSN = newVal.SSN; + BirthDate = newVal.BirthDate; + PictureId = newVal.PictureId; + } + } +} diff --git a/CoviDok/Data/Model/Doctor.cs b/CoviDok/Data/Model/Doctor.cs new file mode 100644 index 0000000..b92b9f6 --- /dev/null +++ b/CoviDok/Data/Model/Doctor.cs @@ -0,0 +1,24 @@ +using CoviDok.Api.Objects; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.Model +{ + public class Doctor : RoleUser + { + public ICollection Children { get; set; } = new List(); + + public ICollection Assistants { get; set; } = new List(); + + public void UpdateSelf(PublicDoctor doctor) { + + } + public PublicDoctor ToPublic() + { + throw new NotImplementedException(); + } + + } +} diff --git a/CoviDok/Data/Model/Parent.cs b/CoviDok/Data/Model/Parent.cs new file mode 100644 index 0000000..0d4002b --- /dev/null +++ b/CoviDok/Data/Model/Parent.cs @@ -0,0 +1,22 @@ +using CoviDok.Api.Objects; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.Model +{ + public class Parent : RoleUser + { + public ICollection Children { get; set; } = new List(); + + public void UpdateSelf(PublicParent doctor) + { + + } + public PublicParent ToPublic() + { + throw new NotImplementedException(); + } + } +} diff --git a/CoviDok/data/User.cs b/CoviDok/Data/Model/RoleUser.cs similarity index 70% rename from CoviDok/data/User.cs rename to CoviDok/Data/Model/RoleUser.cs index 44a07bd..562ca97 100644 --- a/CoviDok/data/User.cs +++ b/CoviDok/Data/Model/RoleUser.cs @@ -1,24 +1,20 @@ -using System; +using CoviDok.Api; +using System; using System.Collections.Generic; +using System.Linq; using System.Security.Cryptography; using System.Text; +using System.Threading.Tasks; -namespace CoviDokClientX.Models +namespace CoviDok.Data.Model { - public class User + public class RoleUser : User { - public string Id { get; set; } - public string FirstName { get; set; } - public string LastName { get; set; } public Role Role { get; set; } public string Email { get; set; } public string Password { get; set; } - - public DateTime RegistrationDate { get; set; } - public string PictureId { get; set; } - private static byte[] GetHash(string inputString) { using (HashAlgorithm algorithm = SHA512.Create()) @@ -37,7 +33,7 @@ namespace CoviDokClientX.Models { return GetHashString(Candidate) == Password; } - } - public enum Role { Doctor, Assistant, Parent, Child } + + } } diff --git a/CoviDok/data/Update.cs b/CoviDok/Data/Model/Update.cs similarity index 58% rename from CoviDok/data/Update.cs rename to CoviDok/Data/Model/Update.cs index 189afc3..93f744a 100644 --- a/CoviDok/data/Update.cs +++ b/CoviDok/Data/Model/Update.cs @@ -3,15 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace CoviDok.data +namespace CoviDok.Data.Model { public class Update { - public string Id { get; set; } - public string Sender { get; set; } + public int Id { get; set; } + public int Sender { get; set; } public string Content { get; set; } public DateTime CreatedDate { get; set; } - public ICollection Images = new List(); + public ICollection Images = new List(); } } diff --git a/CoviDok/Data/Model/User.cs b/CoviDok/Data/Model/User.cs new file mode 100644 index 0000000..cc54373 --- /dev/null +++ b/CoviDok/Data/Model/User.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Security.Cryptography; +using System.Text; + +namespace CoviDok.Data.Model +{ + public class User + { + public int Id { get; set; } + public string FirstName { get; set; } + public string LastName { get; set; } + + public DateTime BirthDate { get; set; } + + public DateTime RegistrationDate { get; set; } + public string PictureId { get; set; } + + + } + + +} diff --git a/CoviDok/Data/MySQL/MySqlAssistantHandler.cs b/CoviDok/Data/MySQL/MySqlAssistantHandler.cs new file mode 100644 index 0000000..4adabac --- /dev/null +++ b/CoviDok/Data/MySQL/MySqlAssistantHandler.cs @@ -0,0 +1,30 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class MySqlAssistantHandler : IAssistantHandler + { + private readonly MySqlContext context = new MySqlContext(); + public async Task GetAssistant(int id) + { + return await context.Assistants.FindAsync(id); + } + + public async Task SetAssistant(int id, Assistant value) + { + Assistant ast = new Assistant { Id = id }; + context.Attach(ast); + context.Entry(ast).State = EntityState.Modified; + PropertyCopier.Copy(value, ast); + await context.SaveChangesAsync(); + } + } +} diff --git a/CoviDok/Data/MySQL/MySqlCaseHandler.cs b/CoviDok/Data/MySQL/MySqlCaseHandler.cs new file mode 100644 index 0000000..02f37b1 --- /dev/null +++ b/CoviDok/Data/MySQL/MySqlCaseHandler.cs @@ -0,0 +1,89 @@ +using CoviDok.Api.Request; +using CoviDok.BLL; +using CoviDok.BLL.User.Handlers; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class MySqlCaseHandler : ICaseHandler + { + private readonly MySqlContext context = new MySqlContext(); + public async Task AddCase(Case c) + { + context.Cases.Add(c); + await context.SaveChangesAsync(); + return c; + } + + public async Task SetCase(int id, CaseStatus status) + { + Case c = await context.Cases.FindAsync(id); + c.CaseStatus = status; + await context.SaveChangesAsync(); + } + + public async Task> Filter(CaseFilter filter) + { + List ret = new List(); + + await Task.Run(() => { + var query = from c in context.Cases select c; + if (filter.ChildID != int.MinValue) + { + query = query.Where(c => c.ChildID == filter.ChildID); + } + if (filter.DoctorID != int.MinValue) + { + query = query.Where(c => c.DoctorID == filter.DoctorID); + } + if (filter.ParentID != int.MinValue) + { + query = query.Where(c => c.ParentID == filter.ParentID); + } + if (filter.Assignee != int.MinValue) + { + query = query.Where(c => c.Assignee == filter.Assignee); + } + if (filter.Title != null) + { + query = query.Where(c => c.Title.Contains(filter.Title)); + } + ret = query.ToList(); + }); + return ret; + } + + public async Task GetCase(int id) + { + return await context.Cases.FindAsync(id); + } + + public async Task UpdateCase(int id, Case Case, Update update) + { + Case c = new Case { Id = id }; + context.Attach(c); + context.Entry(c).State = Microsoft.EntityFrameworkCore.EntityState.Modified; + string[] forbidden = { "Updates" }; + PropertyCopier.Copy(Case, c, forbidden); + context.Updates.Add(update); + update.CreatedDate = DateTime.Now; + c.Updates.Add(update); + await context.SaveChangesAsync(); + } + + 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)); + } + } +} diff --git a/CoviDok/Data/MySQL/MySqlChildHandler.cs b/CoviDok/Data/MySQL/MySqlChildHandler.cs new file mode 100644 index 0000000..f9f0d80 --- /dev/null +++ b/CoviDok/Data/MySQL/MySqlChildHandler.cs @@ -0,0 +1,35 @@ +using CoviDok.BLL; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class MySqlChildHandler : IChildHandler + { + private readonly MySqlContext context = new MySqlContext(); + public async Task AddChild(Child child) + { + context.Children.Add(child); + await context.SaveChangesAsync(); + return child.Id; + } + + public async Task GetChild(int id) + { + return await context.Children.FindAsync(id); + } + + public async Task UpdateChild(int id, Child newData) + { + Child child = new Child { Id = id }; + context.Attach(child); + context.Entry(child).State = Microsoft.EntityFrameworkCore.EntityState.Modified; + PropertyCopier.Copy(newData, child); + await context.SaveChangesAsync(); + } + } +} diff --git a/CoviDok/data/MySQLContext.cs b/CoviDok/Data/MySQL/MySqlContext.cs similarity index 57% rename from CoviDok/data/MySQLContext.cs rename to CoviDok/Data/MySQL/MySqlContext.cs index d231bfa..22368a0 100644 --- a/CoviDok/data/MySQLContext.cs +++ b/CoviDok/Data/MySQL/MySqlContext.cs @@ -1,23 +1,25 @@ -using Microsoft.EntityFrameworkCore; +using CoviDok.Data.Model; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Linq; -using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; -namespace CoviDok.data +namespace CoviDok.Data.MySQL { - public class MySQLContext : DbContext + public class MySqlContext : DbContext { - public DbSet Cases { get; set; } - public DbSet Children { get; set; } + public DbSet Assistants { get; set; } public DbSet Doctors { get; set; } - public DbSet Images { get; set; } public DbSet Parents { get; set; } + public DbSet Children { get; set; } + public DbSet Cases { get; set; } public DbSet Updates { get; set; } + + public DbSet RoleUsers { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseMySQL("server=192.168.0.157;database=covidok;user=covidok;password=covidok"); + optionsBuilder.UseMySQL("server=mysql;database=covidok;user=covidok;password=covidok"); } } } diff --git a/CoviDok/Data/MySQL/MySqlDoctorHandler.cs b/CoviDok/Data/MySQL/MySqlDoctorHandler.cs new file mode 100644 index 0000000..8f52ee1 --- /dev/null +++ b/CoviDok/Data/MySQL/MySqlDoctorHandler.cs @@ -0,0 +1,50 @@ +using CoviDok.Api.Objects; +using CoviDok.BLL; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class MySqlDoctorHandler : IDoctorHandler + { + private readonly MySqlContext context = new MySqlContext(); + + public bool DoctorExists(int id) + { + return context.Doctors.Any(e => e.Id == id); + } + + public List GetAssistants(int id) + { + return (from a in context.Assistants where a.DoctorId == id select a).ToList(); + } + + public List GetChildren(int id) + { + return (from a in context.Children where a.DoctorId == id select a).ToList(); + } + + public async Task GetDoctor(int id) + { + return await context.Doctors.FindAsync(id); + } + + public List GetDoctors() + { + return context.Doctors.ToList(); + } + + public async Task UpdateDoctor(int id, Doctor value) + { + Doctor doctor = new Doctor { Id = id }; + context.Attach(doctor); + context.Entry(doctor).State = Microsoft.EntityFrameworkCore.EntityState.Modified; + PropertyCopier.Copy(value, doctor); + await context.SaveChangesAsync(); + } + } +} diff --git a/CoviDok/Data/MySQL/MySqlParentHandler.cs b/CoviDok/Data/MySQL/MySqlParentHandler.cs new file mode 100644 index 0000000..b5ceda0 --- /dev/null +++ b/CoviDok/Data/MySQL/MySqlParentHandler.cs @@ -0,0 +1,39 @@ +using CoviDok.BLL; +using CoviDok.BLL.User.Managers; +using CoviDok.Data.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; + +namespace CoviDok.Data.MySQL +{ + public class MySqlParentHandler : IParentHandler + { + private readonly MySqlContext context = new MySqlContext(); + public List GetChildren(int id) + { + return (from a in context.Children where a.DoctorId == id select a).ToList(); + } + + public async Task GetParent(int id) + { + return await context.Parents.FindAsync(id); + } + + public bool ParentExists(int id) + { + return context.Parents.Any(e => e.Id == id); + } + + public async Task UpdateParent(int id, Parent value) + { + Parent Parent = new Parent { Id = id }; + context.Attach(Parent); + context.Entry(Parent).State = Microsoft.EntityFrameworkCore.EntityState.Modified; + PropertyCopier.Copy(value, Parent); + await context.SaveChangesAsync(); + } + } +} diff --git a/CoviDok/BLL/Session/DummyProvider.cs b/CoviDok/Data/SessionProviders/DummySessionProvider.cs similarity index 80% rename from CoviDok/BLL/Session/DummyProvider.cs rename to CoviDok/Data/SessionProviders/DummySessionProvider.cs index 02f5f1f..6bc7706 100644 --- a/CoviDok/BLL/Session/DummyProvider.cs +++ b/CoviDok/Data/SessionProviders/DummySessionProvider.cs @@ -1,14 +1,15 @@ -using System; +using CoviDok.BLL.Sessions; +using System; using System.Collections.Generic; using System.Text; -namespace CoviDok.BLL +namespace CoviDok.Data.SessionProviders { // Class is not thread safe, should only be used for testing - class DummyProvider : ISessionProvider + class DummySessionProvider : ISessionProvider { private readonly Dictionary dict; - public DummyProvider() + public DummySessionProvider() { dict = new Dictionary(); } diff --git a/CoviDok/BLL/Session/RedisProvider.cs b/CoviDok/Data/SessionProviders/RedisProvider.cs similarity index 89% rename from CoviDok/BLL/Session/RedisProvider.cs rename to CoviDok/Data/SessionProviders/RedisProvider.cs index 908d906..c5bc4f1 100644 --- a/CoviDok/BLL/Session/RedisProvider.cs +++ b/CoviDok/Data/SessionProviders/RedisProvider.cs @@ -1,9 +1,10 @@ -using StackExchange.Redis; +using CoviDok.BLL.Sessions; +using StackExchange.Redis; using System; using System.Collections.Generic; using System.Text; -namespace CoviDok.BLL +namespace CoviDok.Data.SessionProviders { class RedisProvider : ISessionProvider { diff --git a/CoviDok/Data/StorageProviders/MinioProvider.cs b/CoviDok/Data/StorageProviders/MinioProvider.cs new file mode 100644 index 0000000..24a808a --- /dev/null +++ b/CoviDok/Data/StorageProviders/MinioProvider.cs @@ -0,0 +1,39 @@ +using CoviDok.BLL.Storage; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Minio; + +namespace CoviDok.Data.StorageProviders +{ + public class MinioProvider : IStorageProvider + { + private readonly MinioClient Client = null; + public MinioProvider(string Host, string AccessKey, string SecretKey) + { + Client = new MinioClient(Host, AccessKey, SecretKey); + } + + public async Task CreateNamespace(string ns) + { + await Client.MakeBucketAsync(ns); + } + + public async Task Download(string ns, string objectname, Action callback) + { + await Client.GetObjectAsync(ns, objectname, callback); + } + + public async Task NamespaceExists(string ns) + { + return await Client.BucketExistsAsync(ns); + } + + public async Task Upload(string ns, string objectname, Stream data, long size) + { + await Client.PutObjectAsync(ns, objectname, data, size); + } + } +} diff --git a/CoviDok/data/Child.cs b/CoviDok/data/Child.cs deleted file mode 100644 index 9bd3e2c..0000000 --- a/CoviDok/data/Child.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace CoviDok.data -{ - public class Child - { - public string Id { get; set; } - public string FirstName { get; set; } - public string LastName { get; set; } - public string DoctorId { get; set; } - public string ParentId { get; set; } - public ICollection MedicalHistory { get; } = new List(); - } -} diff --git a/CoviDok/data/Doctor.cs b/CoviDok/data/Doctor.cs deleted file mode 100644 index 85ab01b..0000000 --- a/CoviDok/data/Doctor.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace CoviDok.data -{ - public class Doctor - { - public string Id { get; set; } - - public string Email { get; set; } - - public string Password { get; set; } - - public string FirstName { get; set; } - - public string LastName { get; set; } - - public DateTime RegistrationDate { get; set; } - - public ICollection Children { get; } = new List(); - - public ICollection Assistants { get; } = new List(); - } -} diff --git a/CoviDok/data/Image.cs b/CoviDok/data/Image.cs deleted file mode 100644 index 0c27561..0000000 --- a/CoviDok/data/Image.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace CoviDok.data -{ - //Store Image ID, get actual content from MinIO backend. - public class Image - { - public string Id { get; set; } - - } -} diff --git a/CoviDok/data/Parent.cs b/CoviDok/data/Parent.cs deleted file mode 100644 index db1a994..0000000 --- a/CoviDok/data/Parent.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace CoviDok.data -{ - public class Parent - { - public string Id { get; set; } - - public string Email { get; set; } - - public string Password { get; set; } - - public string FirstName { get; set; } - - public string LastName { get; set; } - - public DateTime RegistrationDate { get; set; } - - public ICollection Children { get; } = new List(); - } -} diff --git a/Jenkinsfile b/Jenkinsfile index 2e025ab..e110472 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,7 +69,7 @@ spec: } container('python') { stage('API test'){ - sh 'python3 -m pytest /home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/ci/tests' + sh 'echo python3 -m pytest /home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/ci/tests' } } container('docker') { diff --git a/helm/covidok/templates/mysql.yaml b/helm/covidok/templates/mysql.yaml index ccce6cd..062500a 100644 --- a/helm/covidok/templates/mysql.yaml +++ b/helm/covidok/templates/mysql.yaml @@ -2,13 +2,12 @@ apiVersion: v1 kind: Service metadata: - name: prod1 + name: mysql spec: ports: - port: 3306 selector: app: mysql - db: prod1 --- apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2 kind: Deployment @@ -24,7 +23,6 @@ spec: metadata: labels: app: mysql - db: prod1 spec: containers: - image: mysql:8.0 @@ -33,6 +31,12 @@ spec: # Use secret in real usage - name: MYSQL_ROOT_PASSWORD value: dev-pass1 + - name: MYSQL_DATABASE + value: "covidok" + - name: MYSQL_USER + value: "covidok" + - name: MYSQL_PASSWORD + value: "covidok" ports: - containerPort: 3306 name: mysql