From bfd62236e10d22445798dd5d7c1ce893a7c9e366 Mon Sep 17 00:00:00 2001 From: Jeremy Mill Date: Thu, 12 Nov 2015 15:35:10 -0500 Subject: [PATCH] added new newtonsoft package, finished GetCustomer api --- API_REF.xlsx | Bin 9406 -> 9468 bytes .../Controllers/GetCustomerController.cs | 7 +++++-- .../TeamDBAwesome/Models/Customer.cs | 3 ++- .../TeamDBAwesome/SqlService/MySqlService.cs | 13 ++++++++++++- .../TeamDBAwesome/TeamDBAwesome.csproj | 7 ++++--- TeamDBAwesome/TeamDBAwesome/Web.config | 2 +- TeamDBAwesome/TeamDBAwesome/packages.config | 2 +- 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/API_REF.xlsx b/API_REF.xlsx index fbc603e4ffdd088ead346f2c210e03facdd85dd8..631f7a5e0a4a8dbbda737e3520ee8df1ec5199cc 100644 GIT binary patch delta 2492 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 LA_jsX00000P~CT9 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