Merge

merged commit form master that fixed most things

SeniorAssistant/Models/Data/Heartbeat.cs

@@ -1,7 +1,7 @@
 using LinqToDB.Mapping;
 using System;
 
-namespace SeniorAssistant.Models
+namespace SeniorAssistant.Models.Data
 {
     public class Heartbeat : IHasTime
     {
@@ -14,10 +14,5 @@ namespace SeniorAssistant.Models
         public DateTime Time { get; set; }
 
         public double Value { get; set; }
-
-        /*
-        [Association(ThisKey = nameof(Username), OtherKey = nameof(User.Username), CanBeNull = false)]
-        public User UserObj { get; set; }
-        */
     }
 }

SeniorAssistant/Models/Data/Sleep.cs

@@ -1,7 +1,7 @@
 using LinqToDB.Mapping;
 using System;
 
-namespace SeniorAssistant.Models
+namespace SeniorAssistant.Models.Data
 {
     public class Sleep : IHasTime
     {

SeniorAssistant/Models/Data/Step.cs

@@ -1,7 +1,7 @@
 using LinqToDB.Mapping;
 using System;
 
-namespace SeniorAssistant.Models
+namespace SeniorAssistant.Models.Data
 {
     public class Step : IHasTime
     {

SeniorAssistant/Models/Interfaces/IHasMessage.cs

@@ -0,0 +1,14 @@
+using LinqToDB.Mapping;
+using System;
+
+namespace SeniorAssistant.Models
+{
+    public interface IHasMessage : IHasTime
+    {
+        string Receiver { get; set; }
+
+        string Body { get; set; }
+
+        DateTime Seen { get; set; }
+    }
+}

SeniorAssistant/Models/Message.cs

@@ -3,7 +3,7 @@ using System;
 
 namespace SeniorAssistant.Models
 {
-    public class Message : IHasTime
+    public class Message : IHasMessage
     {
         [Column(IsPrimaryKey = true, CanBeNull = false, IsIdentity = true)]
         public int Id { get; set; }
@@ -13,14 +13,12 @@ namespace SeniorAssistant.Models
         
         [NotNull]
         public string Username { get; set; }
-
+        
         [NotNull]
-        public string Reciver { get; set; }
+        public string Receiver { get; set; }
 
-        [NotNull]
         public string Body { get; set; }
 
-        public bool Seen { get; set; }
-        
+        public DateTime Seen { get; set; }
     }
 }

SeniorAssistant/Models/Notification.cs

@@ -3,7 +3,7 @@ using System;
 
 namespace SeniorAssistant.Models
 {
-    public class Notification : IHasTime
+    public class Notification : IHasMessage
     {
         [Column(IsPrimaryKey = true, CanBeNull = false, IsIdentity = true)]
         public int Id { get; set; }
@@ -13,9 +13,14 @@ namespace SeniorAssistant.Models
 
         [NotNull]
         public DateTime Time { get; set; }
-        
-        public bool Seen { get; set; }
-        
-        public string Message { get; set; }
+
+        [NotNull]
+        public string Receiver { get; set; }
+
+        public string Body { get; set; }
+
+        public string Url { get; set; }
+
+        public DateTime Seen { get; set; }
     }
 }

SeniorAssistant/Models/Users/Doctor.cs

@@ -7,11 +7,10 @@ namespace SeniorAssistant.Models.Users
         [Column(IsPrimaryKey = true, CanBeNull = false)]
         public string Username { get; set; }
 
-        [Association(ThisKey = "Username", OtherKey = nameof(User.Username), CanBeNull = false)]
-        public User UserData { get; set; }
-
         public string Location { get; set; }
 
         public string Schedule { get; set; }
+
+        public string PhoneNumber { get; set; }
     }
 }

SeniorAssistant/Models/Users/Patient.cs

@@ -7,12 +7,13 @@ namespace SeniorAssistant.Models.Users
         [Column(IsPrimaryKey = true, CanBeNull = false)]
         public string Username { get; set; }
 
-        [Association(ThisKey = "Username", OtherKey = nameof(User.Username), CanBeNull = false)]
-        public User UserData { get; set; }
-
         [NotNull]
         public string Doctor { get; set; }
 
         public string Notes { get; set; }
+
+        public int MaxHeart { get; set; }
+
+        public int MinHeart { get; set; }
     }
 }