Complete Info method and increase error detection for HasErrorOccurred

Author: AshleyPoole

SSLLWrapper/ApiService.cs

@@ -62,15 +62,20 @@ public ApiService(string apiUrl)
 		public InfoModel Info()
 		{
 			var infoModel = new InfoModel();
+
+			// Building request model
 		    var requestModel = _requestModelHelper.InfoProperties(ApiUrl, "info");
 
 			try
 			{
+				// Making Api request and gathering response
 				var webResponse = _api.MakeGetRequest(requestModel);
 				var webResult = _webResponseHelper.GetResponsePayload(webResponse);
 
-				// ** TO DO - Check for error before converting to model. Expand model to include error properties?
+				// Trying to bind result to model
 				infoModel = JsonConvert.DeserializeObject<InfoModel>(webResult, JsonSerializerSettings);
+				infoModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
+				infoModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
 
 				if (infoModel.engineVersion != null)
 				{
@@ -83,6 +88,9 @@ public InfoModel Info()
 				infoModel.Errors.Add(new Error { message = ex.ToString() });
 			}
 
+			// Checking if errors have occoured either from ethier api or wrapper
+			if (infoModel.Errors.Count != 0 && !infoModel.HasErrorOccurred) { infoModel.HasErrorOccurred = true;}
+
 			return infoModel;
 		}
 
@@ -125,6 +133,9 @@ public AnalyzeModel Analyze(string host, Publish publish, ClearCache clearCache,
 				analyzeModel.Errors.Add(new Error {message = ex.ToString()});
 			}
 
+			// Checking if errors have occoured either from ethier api or wrapper
+			if (analyzeModel.Errors.Count != 0 && !analyzeModel.HasErrorOccurred) { analyzeModel.HasErrorOccurred = true; }
+
 			return analyzeModel;
 		}