From ed4597e6b36a53f1ddd1db48c890b327e123e04b Mon Sep 17 00:00:00 2001
From: Giacomo Bertolazzi <20015159@studenti.uniupo.it>
Date: Fri, 4 Jan 2019 18:26:00 +0100
Subject: [PATCH] Refactoring api

---
 .../Controllers/AccountController.cs          |  21 +++-
 .../Controllers/Services/BaseController.cs    |   9 +-
 .../Controllers/Services/CrudController.cs    |  30 ++---
 .../Services/CrudTimeController.cs            | 108 ++++++++++--------
 SeniorAssistant/Views/Home/Data.cshtml        |  47 ++++++--
 SeniorAssistant/Views/Shared/Logout.cshtml    |  27 ++---
 SeniorAssistant/Views/Shared/Profile.cshtml   |   6 +-
 SeniorAssistant/Views/_ViewImports.cshtml     |   1 +
 SeniorAssistant/senior.db                     | Bin 655360 -> 667648 bytes
 9 files changed, 149 insertions(+), 100 deletions(-)

diff --git a/SeniorAssistant/Controllers/AccountController.cs b/SeniorAssistant/Controllers/AccountController.cs
index c7d8ef1..6a999d4 100644
--- a/SeniorAssistant/Controllers/AccountController.cs
+++ b/SeniorAssistant/Controllers/AccountController.cs
@@ -13,7 +13,7 @@ namespace IdentityDemo.Controllers
     [Route("[controller]/[action]")]
     public class AccountController : BaseController
     {
-        private readonly JsonResponse OkJson = new JsonResponse();
+        private static readonly string NoteModified = "Il tuo dottore ha modificato la nota per te";
 
         [HttpPost]
         public ActionResult _login(string username, string password)
@@ -35,9 +35,8 @@ namespace IdentityDemo.Controllers
                     HttpContext.Session.SetString(Username, username);
                     HttpContext.Session.SetString("email", user.Email);
                     HttpContext.Session.SetString("name", user.Name);
-                    //HttpContext.Session.SetString("lastname", user.LastName);
-
-
+                    HttpContext.Session.SetString("lastname", user.LastName);
+                    
                     var isDoc = (from d in Db.Doctors
                                  where d.Username.Equals(username)
                                  select d).ToArray().FirstOrDefault() != null;
@@ -168,5 +167,19 @@ namespace IdentityDemo.Controllers
                 return Json(new JsonResponse());
             });
         }
+
+        [HttpPut]
+        public ActionResult _addNote(string patient, string text)
+        {
+            return LoggedAccessDataOf(patient, () =>
+            {
+                var pat = Db.Patients.Where((p) => p.Username.Equals(patient)).FirstOrDefault();
+                pat.Notes = text;
+                Db.Update(pat);
+                _notification(patient, NoteModified);
+
+                return Json(OkJson);
+            });
+        }
     }
 }
\ No newline at end of file
diff --git a/SeniorAssistant/Controllers/Services/BaseController.cs b/SeniorAssistant/Controllers/Services/BaseController.cs
index 0c963ad..94dc2fb 100644
--- a/SeniorAssistant/Controllers/Services/BaseController.cs
+++ b/SeniorAssistant/Controllers/Services/BaseController.cs
@@ -12,6 +12,7 @@ namespace SeniorAssistant.Controllers
         protected static readonly string InvalidModel = "Modello non valido";
         protected static readonly string NoAuthorized = "Non sei autorizzato a vedere questi dati";
         protected static readonly string Username = "username";
+        protected readonly JsonResponse OkJson = new JsonResponse();
 
         IDataContextFactory<SeniorDataContext> dbFactory;
         SeniorDataContext db;
@@ -59,16 +60,16 @@ namespace SeniorAssistant.Controllers
             });
         }
 
-        protected ActionResult LoggedAccessDataOf(string username, Func<ActionResult> success)
+        protected ActionResult LoggedAccessDataOf(string username, Func<ActionResult> success, bool patients = true)
         {
             return LoggedAction(() =>
             {
                 var loggedUser = HttpContext.Session.GetString(Username);
                 var condition = username.Equals(loggedUser);
 
-                condition = condition || (from patient in Db.Patients
-                                          where patient.Doctor.Equals(loggedUser) && patient.Username.Equals(username)
-                                          select patient).ToArray().FirstOrDefault() != null;
+                condition = condition || (patients && (from patient in Db.Patients
+                                                       where patient.Doctor.Equals(loggedUser) && patient.Username.Equals(username)
+                                                       select patient).ToArray().FirstOrDefault() != null);
 
                 return condition ?
                 success.Invoke() :
diff --git a/SeniorAssistant/Controllers/Services/CrudController.cs b/SeniorAssistant/Controllers/Services/CrudController.cs
index 7bb68b8..4ba8e87 100644
--- a/SeniorAssistant/Controllers/Services/CrudController.cs
+++ b/SeniorAssistant/Controllers/Services/CrudController.cs
@@ -10,24 +10,24 @@ namespace SeniorAssistant.Controllers.Services
     public abstract class CrudController<TEntity> : BaseController
         where TEntity : class, IHasUsername
     {
-        [HttpGet]
-        public async Task<IEnumerable<TEntity>> Read() => await Db.GetTable<TEntity>().ToListAsync();
-
         [HttpGet("{username}")]
-        public async Task<TEntity> Read(string username) => await Db.GetTable<TEntity>().FirstOrDefaultAsync(c => c.Username.Equals(username));
-
-        [HttpPost]
-        public async Task Create([FromBody]TEntity item) => await Db.InsertAsync(item);
-
-        [HttpPut("{username}")]
-        public async Task Update(string username, [FromBody]TEntity item)
+        public async Task<IActionResult> Read(string username)
         {
-            item.Username = username;
-
-            await Db.UpdateAsync(item);
+            return LoggedAccessDataOf(username, () =>
+            {
+                return Json(Db.GetTable<TEntity>().Where((u) => u.Username.Equals(username)).ToArray());
+            });
         }
 
-        [HttpDelete("{username}")]
-        public async Task Delete(string username) => await Db.GetTable<TEntity>().Where(c => c.Username.Equals(username)).DeleteAsync();
+        [HttpPut("{username}")]
+        public async Task<IActionResult> Update(string username, [FromBody] TEntity entity)
+        {
+            return LoggedAccessDataOf(username, () =>
+            {
+                entity.Username = username;
+                Db.Update(entity);
+                return Json(OkJson);
+            }, false);
+        }
     }
 }
diff --git a/SeniorAssistant/Controllers/Services/CrudTimeController.cs b/SeniorAssistant/Controllers/Services/CrudTimeController.cs
index 9e3d1c3..1235bdf 100644
--- a/SeniorAssistant/Controllers/Services/CrudTimeController.cs
+++ b/SeniorAssistant/Controllers/Services/CrudTimeController.cs
@@ -2,74 +2,86 @@
 using Microsoft.AspNetCore.Mvc;
 using SeniorAssistant.Models;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace SeniorAssistant.Controllers.Services
 {
-    public class CrudTimeController<TEntity> : BaseController
+    public class CrudTimeController<TEntity> : CrudController<TEntity>
         where TEntity : class, IHasTime
     {
-        static readonly object Empty = new { };
-
-        [HttpGet]
-        public async Task<IEnumerable<TEntity>> Read() => await Db.GetTable<TEntity>().ToListAsync();
-
-        [HttpGet("{username}")]
-        public async Task<IEnumerable<TEntity>> Read(string username) => await Db.GetTable<TEntity>().Where(e => e.Username.Equals(username)).ToListAsync();
+        private static readonly string DateNotCorrect = "Il formato della data non e' corretto";
 
         [HttpGet("{username}/{date:regex((today|\\d{{4}}-\\d{{2}}-\\d{{2}}))}/{hour:range(0, 23)?}")]
-        public async Task<IEnumerable<TEntity>> Read(string username, string date, int hour = -1) => await Read(username, date, date, hour);
+        public async Task<IActionResult> Read(string username, string date, int hour = -1) => await Read(username, date, date, hour);
 
         [HttpGet("{username}/{from:regex((today|\\d{{4}}-\\d{{2}}-\\d{{2}}))}/{to:regex((today|\\d{{4}}-\\d{{2}}-\\d{{2}}))}/{hour:range(0, 23)?}")]
-        public async Task<IEnumerable<TEntity>> Read(string username, string from, string to, int hour = -1)
+        public async Task<IActionResult> Read(string username, string from, string to, int hour = -1)
         {
-            try
+            return LoggedAccessDataOf(username, () =>
             {
-                DateTime dateFrom = (from.Equals("today") ? DateTime.Now : DateTime.ParseExact(from, "yyyy-MM-dd", null));
-                DateTime dateTo = (to.Equals("today") ? DateTime.Now : DateTime.ParseExact(to, "yyyy-MM-dd", null));
+                try
+                {
+                    DateTime dateFrom = (from.Equals("today") ? DateTime.Now : DateTime.ParseExact(from, "yyyy-MM-dd", null));
+                    DateTime dateTo = (to.Equals("today") ? DateTime.Now : DateTime.ParseExact(to, "yyyy-MM-dd", null));
 
-                return await Db.GetTable<TEntity>().Where(e => e.Username.Equals(username) && dateFrom.Date<=e.Time.Date && dateTo.Date>=e.Time.Date && (hour < 0 || e.Time.Hour == hour)).ToListAsync();
-            }
-            catch
-            {
-                return new List<TEntity>();
-            }
+                    return Json((from entity in Db.GetTable<TEntity>()
+                                 where entity.Username.Equals(username)
+                                    && dateFrom.Date <= entity.Time.Date
+                                    && dateTo.Date >= entity.Time.Date
+                                    && (hour < 0 || entity.Time.Hour == hour)
+                                 select entity).ToArray());
+                }
+                catch
+                {
+                    return Json(new JsonResponse(false, DateNotCorrect));
+                }
+            });
         }
 
         [HttpGet("{username}/last/{hour:min(1)}")]
-        public async Task<IEnumerable<TEntity>> Read(string username, int hour)
+        public async Task<IActionResult> Read(string username, int hour)
         {
-            DateTime date = DateTime.Now.AddHours(-hour);
-            return await Db.GetTable<TEntity>().Where(e => e.Username.Equals(username) && date <= e.Time).ToListAsync();
+            return LoggedAccessDataOf(username, () =>
+            {
+                DateTime date = DateTime.Now.AddHours(-hour);
+                return Json((from entity in Db.GetTable<TEntity>()
+                             where entity.Username.Equals(username)
+                                && date <= entity.Time
+                             select entity).ToArray());
+            });
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Create([FromBody]TEntity item)
+        {
+            return Action(() =>
+            {
+                Db.Insert(item);
+                return Json(OkJson);
+            });
+        }
+
+        [HttpPut]
+        public async Task<IActionResult> Update([FromBody]TEntity item)
+        {
+            return LoggedAccessDataOf(item.Username, () =>
+            {
+                var e = Read(item.Username, item.Time);
+                if (e == null)
+                {
+                    Create(item);
+                }
+                else
+                {
+                    Db.UpdateAsync(item);
+                }
+
+                return Json(OkJson);
+            }, false);
         }
 
         [NonAction]
-        public async Task<TEntity> Read(string username, DateTime date) => await Db.GetTable<TEntity>().FirstOrDefaultAsync(e => e.Username.Equals(username) && date == e.Time);
-
-        [HttpPost]
-        public async Task Create([FromBody]TEntity item) => await Db.InsertAsync(item);
-        
-        [HttpPut]
-        public async Task<object> Update([FromBody]TEntity item)
-        {
-            var e = await Read(item.Username, item.Time);
-            if (e == null)
-            {
-                await Create(item);
-            }
-            else
-            {
-                await Db.UpdateAsync(item);
-            }
-
-            return Empty;
-        }
-
-        /*
-        [HttpDelete("{username}")]
-        public async Task Delete(string username) => await Db.GetTable<TEntity>().Where(c => c.Username.Equals(username)).DeleteAsync();
-        */
+        private TEntity Read(string username, DateTime date) => Db.GetTable<TEntity>().FirstOrDefault(e => e.Username.Equals(username) && date == e.Time);
     }
 }
diff --git a/SeniorAssistant/Views/Home/Data.cshtml b/SeniorAssistant/Views/Home/Data.cshtml
index 5eb10df..1322faa 100644
--- a/SeniorAssistant/Views/Home/Data.cshtml
+++ b/SeniorAssistant/Views/Home/Data.cshtml
@@ -8,13 +8,15 @@
     var username = session.GetString("username");
 
     bool auth = username.Equals(Model);
-    if (session.GetString("role").Equals("doctor"))
+    bool isDoc = session.GetString("role").Equals("doctor");
+    Patient patient = null;
+    if (isDoc)
     {
         var db = dbFactory.Create();
-        var isDocPatient = (from p in db.Patients
-                       where p.Username.Equals(Model) && p.Doctor.Equals(username)
-                       select p).ToArray().FirstOrDefault() != null;
-        auth = auth || isDocPatient;
+        patient = (from p in db.Patients
+                   where p.Username.Equals(Model) && p.Doctor.Equals(username)
+                   select p).ToArray().FirstOrDefault();
+        auth = auth || patient != null;
     }
 }
 
@@ -25,9 +27,38 @@
 else
 {
     // Aggiungere un qualcosa per scegliere le ore da vedere (Max 48?)
-    <input id="hours-data" type="text" placeholder="hours" value="24" />
-    <button id="refresh-hours" class="fc-button">Cambia ora</button>
-    <div id="chart-data"></div>
+    <div>
+        <input id="hours-data" type="text" placeholder="hours" value="24" />
+        <button id="refresh-hours" class="fc-button">Cambia ora</button>
+        <div id="chart-data"></div>
+    </div>
+    @if(isDoc && patient != null)
+    {
+        <div>
+            <p>NOTEEEEEEEEEEEE: l'alunno dorme durante la lezione</p>
+            <textarea id="note-area" placeholder="Scrivi una nota..">@patient.Notes</textarea>
+            <button id="send-note" class="btn">Salva</button>
+            <p id="note-error"></p>
+        </div>
+        <script>
+            $("#send-note").on("click", function () {
+                var text = $("#note-area").val().trim();
+                $.ajax({
+                    url: "/Account/_addNote",
+                    type: "PUT",
+                    data: {
+                        Patient: "@Model", Text: text
+                    },
+                    success: function (data) {
+                        $("#note-error").html(data.success?"Nota salvata":data.message);
+                    }
+                })
+            });
+        </script>
+    }
+
+
+
     <script>
         $("#hours-data").on("change keyup paste click", function () {
             var t = $(this);
diff --git a/SeniorAssistant/Views/Shared/Logout.cshtml b/SeniorAssistant/Views/Shared/Logout.cshtml
index a8c161e..f65e781 100644
--- a/SeniorAssistant/Views/Shared/Logout.cshtml
+++ b/SeniorAssistant/Views/Shared/Logout.cshtml
@@ -1,4 +1,10 @@
 @model string
+@inject IHttpContextAccessor HttpContextAccessor
+
+@{
+    var session = HttpContextAccessor.HttpContext.Session;
+}
+
 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
     <!-- The user image in the navbar-->
     <img src="~/AdminLTE-2.4.3/dist/img/user2-160x160.jpg" class="user-image" alt="User Image">
@@ -10,29 +16,14 @@
     <li class="user-header">
         <img src="~/AdminLTE-2.4.3/dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
         <p>
-            Alexander Pierce - Web Developer
-            <small>Member since Nov. 2012</small>
+            @session.GetString("name") @session.GetString("lastname") - @session.GetString("role")
+            <small>@session.GetString("email")</small>
         </p>
     </li>
-    <!-- Menu Body -->
-    <li class="user-body">
-        <div class="row">
-            <div class="col-xs-4 text-center">
-                <a href="#">Followers</a>
-            </div>
-            <div class="col-xs-4 text-center">
-                <a href="#">Sales</a>
-            </div>
-            <div class="col-xs-4 text-center">
-                <a href="#">Friends</a>
-            </div>
-        </div>
-        <!-- /.row -->
-    </li>
     <!-- Menu Footer-->
     <li class="user-footer">
         <div class="pull-left">
-            <a href="#" class="btn btn-default btn-flat">Profile</a>
+            <a href="/" class="btn btn-default btn-flat">Profile</a>
         </div>
         <div class="pull-right">
             <a href="#" id="logout-btn" class="btn btn-default btn-flat">Logout</a>
diff --git a/SeniorAssistant/Views/Shared/Profile.cshtml b/SeniorAssistant/Views/Shared/Profile.cshtml
index 57e8bb4..2e277a9 100644
--- a/SeniorAssistant/Views/Shared/Profile.cshtml
+++ b/SeniorAssistant/Views/Shared/Profile.cshtml
@@ -27,13 +27,13 @@
                           where d.Username.Equals(patientData.Doctor)
                           select new { u.Username, u.Name, u.LastName, d.Location }).ToArray().First();
 
-            <p class="text-bold">@doctor.Name @doctor.LastName</p>
-            <p class="text-fuchsia">@doctor.Location</p>
+            <p class="text-bold">Dottore: @doctor.Name @doctor.LastName</p>
+            <p class="text-fuchsia">Dove mi puoi trovare? @doctor.Location</p>
             <textarea class="progress-text" placeholder="Nessuna nuova nota" readonly>@patientData.Notes</textarea>
 
             <div id="send-doc-message">
                 <p>Invia un messaggio al tuo dottore</p>
-                <textarea id="doc-message" class="progress-text" placeholder="scrivi qui">@patientData.Notes</textarea>
+                <textarea id="doc-message" class="progress-text" placeholder="scrivi qui"></textarea>
                 <button id="btn-send-message">Invia</button>
                 <p id="message-error" class="text-red"></p>
 
diff --git a/SeniorAssistant/Views/_ViewImports.cshtml b/SeniorAssistant/Views/_ViewImports.cshtml
index f4d06f3..d963aaa 100644
--- a/SeniorAssistant/Views/_ViewImports.cshtml
+++ b/SeniorAssistant/Views/_ViewImports.cshtml
@@ -1,4 +1,5 @@
 @using SeniorAssistant.Models;
+@using SeniorAssistant.Models.Users;
 @using SeniorAssistant.Data;
 @using Microsoft.AspNetCore.Mvc;
 @using Microsoft.AspNetCore.Http;
\ No newline at end of file
diff --git a/SeniorAssistant/senior.db b/SeniorAssistant/senior.db
index 084582b44c093e593efca440163e2b6405ea08a6..0785b6ac238242370d9e7ba3f501d99a5196ea16 100644
GIT binary patch
delta 18095
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
O1=C@e^1Y{Y_&)%Ss|uz7

delta 4044
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