From 3031846f84990ae7653f22a573399d4b0301f2a7 Mon Sep 17 00:00:00 2001 From: Daniel Gyulai Date: Sat, 31 Oct 2020 23:34:56 +0100 Subject: [PATCH] Expanded API with Case and Doc endpoints --- CoviDok/API.md | 4 +- CoviDok/Api/Request/CaseFilter.cs | 14 +++++ CoviDok/Api/Request/CaseUpdate.cs | 14 +++++ CoviDok/Api/Response/FilteredCases.cs | 13 +++++ CoviDok/BLL/Tools.cs | 78 +++++++++++++++++++++++++ CoviDok/Controllers/CaseController.cs | 84 +++++++++++++++++++++++++++ CoviDok/Controllers/DocController.cs | 66 +++++++++++++++++++++ CoviDok/data/MySQLContext.cs | 2 +- 8 files changed, 272 insertions(+), 3 deletions(-) create mode 100644 CoviDok/Api/Request/CaseFilter.cs create mode 100644 CoviDok/Api/Request/CaseUpdate.cs create mode 100644 CoviDok/Api/Response/FilteredCases.cs create mode 100644 CoviDok/BLL/Tools.cs create mode 100644 CoviDok/Controllers/CaseController.cs create mode 100644 CoviDok/Controllers/DocController.cs diff --git a/CoviDok/API.md b/CoviDok/API.md index 27e03ab..e34cc12 100644 --- a/CoviDok/API.md +++ b/CoviDok/API.md @@ -15,7 +15,7 @@ Error codes coming soon. ## Auth -### GET /api/Auth +### POST /api/Auth/login Login authentication. Requires account login info, returns a session ID and the ientity of the logged in entity. @@ -24,7 +24,7 @@ Login authentication. Requires account login info, returns a session ID and the |Request|{
"email" : string,
"password": string
}| |Response|{
"id" : SessionID,
"firstName": x.Firstname,
"lastName": x.Lastname,
"role": "Doc/Ast/Par"
}| -### POST /api/Auth +### POST /api/Auth/register Registration call. Returns with the type and ID of the created entity. diff --git a/CoviDok/Api/Request/CaseFilter.cs b/CoviDok/Api/Request/CaseFilter.cs new file mode 100644 index 0000000..d29c449 --- /dev/null +++ b/CoviDok/Api/Request/CaseFilter.cs @@ -0,0 +1,14 @@ +using CoviDok.data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api.Request +{ + public class CaseFilter + { + public string SessionID { get; set; } + public Dictionary Filters = new Dictionary(); + } +} diff --git a/CoviDok/Api/Request/CaseUpdate.cs b/CoviDok/Api/Request/CaseUpdate.cs new file mode 100644 index 0000000..5751757 --- /dev/null +++ b/CoviDok/Api/Request/CaseUpdate.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api.Request +{ + public class CaseUpdate + { + public string CaseID { get; set; } + public string UpdateMsg { get; set; } + public string SessionID { get; set; } + } +} diff --git a/CoviDok/Api/Response/FilteredCases.cs b/CoviDok/Api/Response/FilteredCases.cs new file mode 100644 index 0000000..32c3e82 --- /dev/null +++ b/CoviDok/Api/Response/FilteredCases.cs @@ -0,0 +1,13 @@ +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 = new List(); + } +} diff --git a/CoviDok/BLL/Tools.cs b/CoviDok/BLL/Tools.cs new file mode 100644 index 0000000..0c085d8 --- /dev/null +++ b/CoviDok/BLL/Tools.cs @@ -0,0 +1,78 @@ +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/Controllers/CaseController.cs b/CoviDok/Controllers/CaseController.cs new file mode 100644 index 0000000..11530a7 --- /dev/null +++ b/CoviDok/Controllers/CaseController.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using CoviDok.Api; +using CoviDok.Api.Request; +using CoviDok.Api.Response; +using CoviDok.BLL; +using CoviDok.data; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace CoviDok.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class CaseController : ControllerBase + { + // POST /api/Case/{id} + [HttpGet("{id}")] + public async Task> GetCase(string id, AuthGet auth) + { + if (auth.SessionID != "a") return Unauthorized(); + + List updates = new List(); + for (int i = 0; i < 10; i++) + { + Update u = new Update + { + Content = i.ToString(), + Sender = "Dr. A B", + Id = i.ToString() + }; + updates.Add(u); + } + Case c = new Case + { + Id = "asasadf", + DoctorID = "hehegbvdesv", + ParentID = "qgwenhjegh", + ChildID = "egwbenbeb", + CaseStatus = CaseStatus.InProgress + }; + + return c; + } + + // POST /api/Case/{id}/update + + [HttpPut("{id}/update")] + public async Task PostUpdate(string id, CaseUpdate data) + { + if (data.SessionID != "a") return Unauthorized(); + + return Ok(); + } + + // POST /api/Case/{id}/close + [HttpPost("{i}/close")] + public async Task PostClose(string id, CaseUpdate data) + { + if (data.SessionID != "a") return Unauthorized(); + // if not doctor: unauthorized + return Ok(); + } + + // POST /api/Case/filter + public async Task> Filter(CaseFilter filters) + { + if (filters.SessionID != "a") return Unauthorized(); + + FilteredCases cases = new FilteredCases(); + for (int i = 0; i < 10; i++) + { + cases.Cases.Add(Tools.MockCase(filters.Filters)); + } + + return cases; + + } + + } +} diff --git a/CoviDok/Controllers/DocController.cs b/CoviDok/Controllers/DocController.cs new file mode 100644 index 0000000..23c6a54 --- /dev/null +++ b/CoviDok/Controllers/DocController.cs @@ -0,0 +1,66 @@ +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 + { + Status = Status.Success + }; + 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 + { + Status = Status.Success + }; + 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 + { + Status = Status.Success + }; + 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/data/MySQLContext.cs b/CoviDok/data/MySQLContext.cs index 33acf82..d231bfa 100644 --- a/CoviDok/data/MySQLContext.cs +++ b/CoviDok/data/MySQLContext.cs @@ -17,7 +17,7 @@ namespace CoviDok.data public DbSet Updates { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseMySQL("server=localhost;database=library;user=user;password=password"); + optionsBuilder.UseMySQL("server=192.168.0.157;database=covidok;user=covidok;password=covidok"); } } }