From d2f735b2efd3b922066354a6894cba82b11f7f9e Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@wyattjmiller.com>
Date: Thu, 30 Jun 2022 17:44:06 -0400
Subject: [PATCH] implemented interface, cleaned up ApiDataService

---
 DeskHubSharpRevised/DAL/ApiDataService.cs     | 48 +++++--------------
 DeskHubSharpRevised/DAL/JsonDataService.cs    | 17 ++++++-
 .../ViewModels/SearchWindowViewModel.cs       |  6 +++
 3 files changed, 33 insertions(+), 38 deletions(-)
 create mode 100644 DeskHubSharpRevised/ViewModels/SearchWindowViewModel.cs

diff --git a/DeskHubSharpRevised/DAL/ApiDataService.cs b/DeskHubSharpRevised/DAL/ApiDataService.cs
index f615beb..1eb284f 100644
--- a/DeskHubSharpRevised/DAL/ApiDataService.cs
+++ b/DeskHubSharpRevised/DAL/ApiDataService.cs
@@ -8,7 +8,7 @@ using RestSharp;
 
 namespace DeskHubSharpRevised.DAL;
 
-public class ApiDataService
+public class ApiDataService : IDataService
 {
     private string _apiEndpoint;
         private string _query;
@@ -33,23 +33,13 @@ public class ApiDataService
         {
             try
             {
-                var client = new RestClient(_apiEndpoint);
+                RestClient client = new RestClient(_apiEndpoint);
                 RestRequest requestRepo = new RestRequest($"users/{_query}/repos", Method.Get);
 
-                var response = client.Execute(requestRepo);
-                var x = response.Content;
-                var deserialized = JsonConvert.DeserializeObject<ObservableCollection<RepoDetail>>(x);
-
-                if (deserialized.Count == 0)
-                {
-                    throw new Exception();
-                }
-                else
-                {
-                    RequestList.repoDetail = deserialized;
-                }
+                string? response = client.Execute(requestRepo).Content;
+                RequestList.repoDetail = JsonConvert.DeserializeObject<ObservableCollection<RepoDetail>>(response);
             }
-            catch (Exception)
+            catch (NullReferenceException)
             {
                 ErrorWindow err = new ErrorWindow();
                 err.txtblk_error.Text = "We couldn't gather repository data. Please try again";
@@ -64,23 +54,11 @@ public class ApiDataService
         {
             try
             {
-                var client = new RestClient(_apiEndpoint);
-
+                RestClient client = new RestClient(_apiEndpoint);
                 RestRequest requestUser = new RestRequest($"users/{_query}", Method.Get);
 
-                var response = client.Execute(requestUser);
-                string x = response.Content;
-                var deserailized = JsonConvert.DeserializeObject<User>(x);
-
-                if (deserailized == null)
-                {
-                    throw new Exception();
-                }
-                else
-                {
-                    RequestList.userDetail = deserailized;
-                }
-
+                string? response = client.Execute(requestUser).Content;
+                RequestList.userDetail  = JsonConvert.DeserializeObject<User>(response);
             }
             catch (NullReferenceException)
             {
@@ -97,15 +75,11 @@ public class ApiDataService
         {
             try
             {
-                var client = new RestClient(_apiEndpoint);
-
+                RestClient client = new RestClient(_apiEndpoint);
                 RestRequest requestUser = new RestRequest($"/repos/{RequestList.userDetail.login}/{_query}/branches", Method.Get);
 
-                var response = client.Execute(requestUser);
-                string x = response.Content;
-                var deserailized = JsonConvert.DeserializeObject<ObservableCollection<Branch>>(x);
-
-                RequestList.branchDetail = deserailized;
+                string? response = client.Execute(requestUser).Content;
+                RequestList.branchDetail = JsonConvert.DeserializeObject<ObservableCollection<Branch>>(response);
             }
             catch (NullReferenceException)
             {
diff --git a/DeskHubSharpRevised/DAL/JsonDataService.cs b/DeskHubSharpRevised/DAL/JsonDataService.cs
index 4e9024f..b9bb616 100644
--- a/DeskHubSharpRevised/DAL/JsonDataService.cs
+++ b/DeskHubSharpRevised/DAL/JsonDataService.cs
@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 
 namespace DeskHubSharpRevised.DAL;
 
-public class JsonDataService
+public class JsonDataService : IDataService
 {
     private string _dataConfig;
 
@@ -67,4 +67,19 @@ public class JsonDataService
     {
         _dataConfig = dataFile;
     }
+
+    public void SearchRequest()
+    {
+        throw new NotImplementedException();
+    }
+
+    public void UserRequest()
+    {
+        throw new NotImplementedException();
+    }
+
+    public void BranchRequest()
+    {
+        throw new NotImplementedException();
+    }
 }
\ No newline at end of file
diff --git a/DeskHubSharpRevised/ViewModels/SearchWindowViewModel.cs b/DeskHubSharpRevised/ViewModels/SearchWindowViewModel.cs
new file mode 100644
index 0000000..7da889c
--- /dev/null
+++ b/DeskHubSharpRevised/ViewModels/SearchWindowViewModel.cs
@@ -0,0 +1,6 @@
+namespace DeskHubSharpRevised;
+
+public class SearchWindowViewModel
+{
+    
+}
\ No newline at end of file