Skip to content

Commit 3bc6b53

Browse files
committed
Fix couple of exceptions
1 parent 59b4fe7 commit 3bc6b53

File tree

6 files changed

+31
-7
lines changed

6 files changed

+31
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ SSLLWrapper/obj/Debug/
33
SSLLWrapper/bin/Debug/
44
SSLLWrapper.ConsoleAppTester/obj/Debug/
55
SSLLWrapper.Tests/obj/Debug/
6+
SSLLWrapper.ConsoleAppTester/bin/Debug/

SSLLWrapper/Api.cs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,23 @@ public class Api : IApi
88
{
99
public HttpWebResponse MakeGetRequest(RequestModel requestModel)
1010
{
11-
var url = requestModel.ApiBaseUrl + "/" + requestModel.Action; // ** TO DO - Add query string
11+
var url = requestModel.ApiBaseUrl + "/" + requestModel.Action;
12+
13+
// ** TO DO - Refactor this
14+
if (requestModel.Parameters.Count >= 1)
15+
{
16+
url = url + "?";
17+
var iteration = 0;
18+
19+
foreach(var parameter in requestModel.Parameters)
20+
{
21+
iteration++;
22+
url = url + parameter.Key + "=" + parameter.Value;
23+
24+
if (iteration != requestModel.Parameters.Count)
25+
url = url + "&";
26+
}
27+
}
1228

1329
var request = (HttpWebRequest)WebRequest.Create(url);
1430
request.Method = "GET";

SSLLWrapper/ApiService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public ApiService(string apiUrl)
4949
_webResponseHelper = new HttpWebResponseHelper();
5050
_requestModelHelper = new RequestModelHelper();
5151
_urlHelper = new UrlHelper();
52+
JsonSerializerSettings = new JsonSerializerSettings();
5253

5354
ApiUrl = apiUrl;
5455

SSLLWrapper/Helpers/RequestModelHelper.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public RequestModel AnalyzeProperties(string apiBaseUrl, string action, string h
1616
{
1717
var requestModel = new RequestModel() { ApiBaseUrl = apiBaseUrl, Action = action};
1818

19-
requestModel.Paramaters.Add("host", host);
20-
requestModel.Paramaters.Add("publish", publish);
21-
requestModel.Paramaters.Add("clearCache", clearCache);
22-
requestModel.Paramaters.Add("fromCache", fromCache);
23-
requestModel.Paramaters.Add("all", all);
19+
requestModel.Parameters.Add("host", host);
20+
requestModel.Parameters.Add("publish", publish);
21+
requestModel.Parameters.Add("clearCache", clearCache);
22+
//requestModel.Parameters.Add("fromCache", fromCache); // Temp commenting out
23+
requestModel.Parameters.Add("all", all);
2424

2525
return requestModel;
2626
}

SSLLWrapper/Models/RequestModel.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ public class RequestModel
1010
{
1111
public string ApiBaseUrl;
1212
public string Action;
13-
public Dictionary<string, string> Paramaters;
13+
public Dictionary<string, string> Parameters;
1414
public string RequestType;
15+
16+
public RequestModel()
17+
{
18+
Parameters = new Dictionary<string, string>();
19+
}
1520
}
1621
}

SSLLWrapper/Models/Response/BaseModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class BaseModel
1212
public BaseModel()
1313
{
1414
Headers = new Header();
15+
Errors = new List<Error>();
1516
this.HasErrorOccurred = false;
1617
}
1718
}

0 commit comments

Comments
 (0)