diff --git a/API_REF.xlsx b/API_REF.xlsx
index fbc603e..631f7a5 100644
Binary files a/API_REF.xlsx and b/API_REF.xlsx differ
diff --git a/TeamDBAwesome/TeamDBAwesome/Controllers/GetCustomerController.cs b/TeamDBAwesome/TeamDBAwesome/Controllers/GetCustomerController.cs
index 14269eb..16f53a1 100644
--- a/TeamDBAwesome/TeamDBAwesome/Controllers/GetCustomerController.cs
+++ b/TeamDBAwesome/TeamDBAwesome/Controllers/GetCustomerController.cs
@@ -6,6 +6,7 @@
using System.Web.Http;
using TeamDBAwesome.Models;
using TeamDBAwesome.SqlService;
+using Newtonsoft.Json;
namespace TeamDBAwesome.Controllers
{
@@ -19,8 +20,10 @@ public HttpResponseMessage Get(int PersonID)
MySqlService sql = new MySqlService();
Customer customer = sql.GetCustomer(PersonID);
-
- //next I need to JSON stringify customer and return it in the message
+
+ string serialzed = JsonConvert.SerializeObject(customer);
+
+ message.Content = new StringContent(serialzed);
return message;
}
diff --git a/TeamDBAwesome/TeamDBAwesome/Models/Customer.cs b/TeamDBAwesome/TeamDBAwesome/Models/Customer.cs
index d8d5f3a..b4d5d08 100644
--- a/TeamDBAwesome/TeamDBAwesome/Models/Customer.cs
+++ b/TeamDBAwesome/TeamDBAwesome/Models/Customer.cs
@@ -37,7 +37,8 @@ public class Customer
public string Country { get; set; }
//match a 10-15 digit long number
- [RegularExpression(@"^(\d{10,15})$")]
+ //had to remove this because of already existing data in the DB
+ //[RegularExpression(@"^(\d{10,15})$")]
public string Phone { get; set; }
//match a 10-15 digit long number
diff --git a/TeamDBAwesome/TeamDBAwesome/SqlService/MySqlService.cs b/TeamDBAwesome/TeamDBAwesome/SqlService/MySqlService.cs
index 7d7bb39..014cda3 100644
--- a/TeamDBAwesome/TeamDBAwesome/SqlService/MySqlService.cs
+++ b/TeamDBAwesome/TeamDBAwesome/SqlService/MySqlService.cs
@@ -143,7 +143,18 @@ public Customer GetCustomer(int PersonID)
{
customer.FName = GetDBString("FirstName", reader);
customer.LName = GetDBString("LastName", reader);
- customer.CustomerID = int.Parse(GetDBString("CutomerID", reader));
+ customer.CustomerID = int.Parse(GetDBString("CustomerID", reader));
+ customer.Address = GetDBString("Address", reader);
+ customer.City = GetDBString("City", reader);
+ customer.State = GetDBString("State", reader);
+ customer.Post = GetDBString("PostalCode", reader);
+ customer.Country = GetDBString("Country", reader);
+ customer.Phone = GetDBString("Phone", reader);
+ customer.Fax = GetDBString("Fax", reader);
+ customer.Email = GetDBString("Email", reader);
+ customer.Company = GetDBString("Company", reader);
+ customer.SupportRepId = int.Parse(GetDBString("SupportRepId", reader));
+ customer.PersonID = int.Parse(GetDBString("PersonID", reader));
}
diff --git a/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj b/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
index 8a77309..b3db73d 100644
--- a/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
+++ b/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
@@ -54,6 +54,10 @@
..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll
True
+
+ ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll
+ True
+
@@ -73,9 +77,6 @@
True
..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
- ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll
-
diff --git a/TeamDBAwesome/TeamDBAwesome/Web.config b/TeamDBAwesome/TeamDBAwesome/Web.config
index 70acbf1..34855d7 100644
--- a/TeamDBAwesome/TeamDBAwesome/Web.config
+++ b/TeamDBAwesome/TeamDBAwesome/Web.config
@@ -26,7 +26,7 @@
-
+
diff --git a/TeamDBAwesome/TeamDBAwesome/packages.config b/TeamDBAwesome/TeamDBAwesome/packages.config
index 81be854..3df83d6 100644
--- a/TeamDBAwesome/TeamDBAwesome/packages.config
+++ b/TeamDBAwesome/TeamDBAwesome/packages.config
@@ -17,7 +17,7 @@
-
+
\ No newline at end of file