diff --git a/API_REF.xlsx b/API_REF.xlsx index dadd420..07c80e6 100644 Binary files a/API_REF.xlsx and b/API_REF.xlsx differ diff --git a/TeamDBAwesome/TeamDBAwesome/Controllers/TestController.cs b/TeamDBAwesome/TeamDBAwesome/Controllers/TestController.cs index 1a26bf2..d26d556 100644 --- a/TeamDBAwesome/TeamDBAwesome/Controllers/TestController.cs +++ b/TeamDBAwesome/TeamDBAwesome/Controllers/TestController.cs @@ -14,7 +14,7 @@ public class TestController : ApiController // GET: api/Test public HttpResponseMessage Get() { - //make a test customer + /*//make a test customer Customer test = new Customer(); test.Address = "test"; test.City = "test"; @@ -37,13 +37,26 @@ public HttpResponseMessage Get() //int ID = sqlS.AddNewUser(test); int ID = 0; - Customer customer = sqlS.GetCustomer(3); + Customer customer = sqlS.GetCustomer(3);*/ + Search search = new Search + { + Media = "test", + Album = "test", + Artist = "test", + Track = "test", + Composer = "test", + Genre = "test" + }; + MySqlService service = new MySqlService(); + + service.Search(search); //return an OK with the int of the new user HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.OK); - response.Content = new StringContent(ID.ToString()); + + return response; diff --git a/TeamDBAwesome/TeamDBAwesome/Models/SearchResult.cs b/TeamDBAwesome/TeamDBAwesome/Models/SearchResult.cs index d06cbb8..7d91cd0 100644 --- a/TeamDBAwesome/TeamDBAwesome/Models/SearchResult.cs +++ b/TeamDBAwesome/TeamDBAwesome/Models/SearchResult.cs @@ -7,11 +7,12 @@ namespace TeamDBAwesome.Models { public class SearchResult { - List Media { get; set; } - List Album { get; set; } - List Artist { get; set; } - List Track { get; set; } - List Composer { get; set; } - List Genre { get; set; } + public List Media { get; set; } + public List Album { get; set; } + public List Artist { get; set; } + public List Track { get; set; } + //pretty sure I don't need this + //public List Composer { get; set; } + public List Genre { get; set; } } } \ No newline at end of file diff --git a/TeamDBAwesome/TeamDBAwesome/SqlService/MySqlService.cs b/TeamDBAwesome/TeamDBAwesome/SqlService/MySqlService.cs index b887a8e..cecf093 100644 --- a/TeamDBAwesome/TeamDBAwesome/SqlService/MySqlService.cs +++ b/TeamDBAwesome/TeamDBAwesome/SqlService/MySqlService.cs @@ -192,6 +192,30 @@ public SearchResult Search(Search search) string composerQuery = "select * from chinook.track where composer like \'%" + search.Composer + "%\' "; string genreQuery = "select * from chinook.genre where name like \'%" + search.Genre + "%\' "; + MySqlCommand cmd = new MySqlCommand(trackQuery, SqlConn); + MySqlDataReader reader = cmd.ExecuteReader(); + + SearchResult searchresult = new SearchResult(); + + while(reader.Read()) + { + if(search.Track != "") + { + searchresult.Track.Add(new Track + { + AlbumId = int.Parse(GetDBString("AlbumID", reader)), + TrackId = int.Parse(GetDBString("TrackId", reader)), + Name = GetDBString("Name", reader), + MediaTypeId = int.Parse(GetDBString("MediaTypeId", reader)), + GenreId = int.Parse(GetDBString("GenreId", reader)), + Composer = GetDBString("Composer", reader), + Milliseconds = int.Parse(GetDBString("Milliseconds", reader)), + Bytes = int.Parse(GetDBString("Bytes", reader)), + UnitPrice = float.Parse(GetDBString("UnitPrice", reader)) + }); + } + } + } else