From 16839b9bf80adff93ae9b5e018c407b20fd67859 Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng94@gmail.com>
Date: Wed, 22 Dec 2021 20:18:27 -0500
Subject: [PATCH] Saving changes

---
 Controllers/v1/RegisterController.cs    | 12 ++++++-
 Database/Repositories/UserRepository.cs |  2 +-
 Models/User.cs                          | 46 ++++++++++++++-----------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/Controllers/v1/RegisterController.cs b/Controllers/v1/RegisterController.cs
index 7fad923..9df1cce 100644
--- a/Controllers/v1/RegisterController.cs
+++ b/Controllers/v1/RegisterController.cs
@@ -44,7 +44,17 @@ namespace Icarus.Controllers.V1
             UserRepository context = HttpContext.RequestServices
                 .GetService(typeof(UserRepository)) as UserRepository;
 
-            context.SaveUser(user);
+            try
+            {
+                context.SaveUser(user);
+            }
+            catch (Exception ex)
+            {
+                var msg = ex.Message;
+                var stackTrace = ex.StackTrace;
+
+                Console.WriteLine($"An error occurred: {msg}");
+            }
 
             var registerResult = new RegisterResult
             {
diff --git a/Database/Repositories/UserRepository.cs b/Database/Repositories/UserRepository.cs
index 52e778b..f42bb8b 100644
--- a/Database/Repositories/UserRepository.cs
+++ b/Database/Repositories/UserRepository.cs
@@ -37,7 +37,7 @@ namespace Icarus.Database.Repositories
                 {
                     conn.Open();
                     string query = "INSERT INTO User(Username, Password, Nickname, Email" +
-                        ", PhoneNumber, Firstname, Lastname, EmailVerified) " +
+                        ", Phone, Firstname, Lastname, EmailVerified) " +
                         "VALUES(@Username, @Password, @Nickname, @Email, @PhoneNumber," +
                         " @Firstname, @Lastname, @EmailVerified)";
 
diff --git a/Models/User.cs b/Models/User.cs
index 9c289d0..a38951c 100644
--- a/Models/User.cs
+++ b/Models/User.cs
@@ -1,32 +1,38 @@
 using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
 
 namespace Icarus.Models
 {
+	[Table("User")]
     public class User
     {
         [JsonProperty("id")]
-	public int Id { get; set; }
-	[JsonProperty("username")]
-	public string Username { get; set; }
-	[JsonProperty("nickname")]
-	public string Nickname { get; set; }
-	[JsonProperty("password")]
-	public string Password { get; set; }
-	[JsonProperty("email")]
-	public string Email { get; set; }
-	[JsonProperty("phone_number")]
-	public string PhoneNumber { get; set; }
-	[JsonProperty("first_name")]
-	public string Firstname { get; set; }
-	[JsonProperty("last_name")]
-	public string Lastname { get; set; }
-	[JsonProperty("email_verified")]
-	public bool EmailVerified { get; set; }
+		[Column("UserId")]
+		[Key]
+		public int Id { get; set; }
+		[JsonProperty("username")]
+		public string Username { get; set; }
+		[JsonProperty("nickname")]
+		public string Nickname { get; set; }
+		[JsonProperty("password")]
+		public string Password { get; set; }
+		[JsonProperty("email")]
+		public string Email { get; set; }
+		[JsonProperty("phone")]
+		[Column("Phone")]
+		public string PhoneNumber { get; set; }
+		[JsonProperty("first_name")]
+		public string Firstname { get; set; }
+		[JsonProperty("last_name")]
+		public string Lastname { get; set; }
+		[JsonProperty("email_verified")]
+		public bool EmailVerified { get; set; }
         [JsonProperty("date_created")]
-	public DateTime DateCreated { get; set; }
-	[JsonProperty("last_login")]
-	public DateTime? LastLogin { get; set; }
+		public DateTime DateCreated { get; set; }
+		[JsonProperty("last_login")]
+		public DateTime? LastLogin { get; set; }
     }
 }