Finished login system.

3 files changed, 34 insertions, 14 deletions

diff --git a/ApartmentManager/HousingWebApi/Models/Resident.cs b/ApartmentManager/HousingWebApi/Models/Resident.cs
index 00fc439..a34cf80 100644
--- a/ApartmentManager/HousingWebApi/Models/Resident.cs
+++ b/ApartmentManager/HousingWebApi/Models/Resident.cs
@@ -9,13 +9,8 @@ namespace HousingWebApi
     public partial class Resident
     {
         [Key]
-        [Column(Order = 0)]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
         public int ResidentNr { get; set; }
 
-        [Key]
-        [Column(Order = 1)]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
         public int ApartmentNr { get; set; }
 
         [Required]
diff --git a/ApartmentManager/HousingWebApi/Models/ResidentList.cs b/ApartmentManager/HousingWebApi/Models/ResidentList.cs
new file mode 100644
index 0000000..1fd4b30
--- /dev/null
+++ b/ApartmentManager/HousingWebApi/Models/ResidentList.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace HousingWebApi
+{
+    public class ResidentList
+    {
+        public int ResidentNr { get; set; }
+        public int ApartmentNr { get; set; }
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public DateTime? BirthDate { get; set; }
+        public int? Phone { get; set; }
+        public string Email { get; set; }
+        public byte[] Picture { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/ApartmentManager/HousingWebApi/Models/User.cs b/ApartmentManager/HousingWebApi/Models/User.cs
index bce5318..e260ede 100644
--- a/ApartmentManager/HousingWebApi/Models/User.cs
+++ b/ApartmentManager/HousingWebApi/Models/User.cs
@@ -8,6 +8,10 @@ namespace HousingWebApi
 
     public partial class User
     {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.None)]
+        public int ApartmentNr { get; set; }
+
         [Required]
         [StringLength(15)]
         public string Username { get; set; }
@@ -17,11 +21,15 @@ namespace HousingWebApi
         public string Password { get; set; }
 
         [Required]
-        [StringLength(15)]
+        [StringLength(1)]
+        public string Type { get; set; }
+
+        [Required]
+        [StringLength(20)]
         public string FirstName { get; set; }
 
         [Required]
-        [StringLength(15)]
+        [StringLength(20)]
         public string LastName { get; set; }
 
         [Column(TypeName = "date")]
@@ -30,16 +38,12 @@ namespace HousingWebApi
         [StringLength(12)]
         public string Phone { get; set; }
 
-        [StringLength(26)]
+        [StringLength(30)]
         public string Email { get; set; }
 
         [Column(TypeName = "image")]
         public byte[] Picture { get; set; }
 
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        public int ApartmentNr { get; set; }
-
         [StringLength(20)]
         public string SecondName { get; set; }
 
@@ -49,9 +53,10 @@ namespace HousingWebApi
         [Column(TypeName = "date")]
         public DateTime? SecondBirthDate { get; set; }
 
-        public int? SecondPhone { get; set; }
+        [StringLength(12)]
+        public string SecondPhone { get; set; }
 
-        [StringLength(25)]
+        [StringLength(30)]
         public string SecondEmail { get; set; }
 
         public virtual Apartment Apartment { get; set; }