From 69dbba322f6ef275134b7b214510e47b9fcdd0b0 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 17 Nov 2020 15:11:40 +0200
Subject: IMplemented NSwag for DataStore WebAPI controller. Implemented data
 store tool dsUtil.

---
 .../Tango.Web/Controllers/TangoController.cs              | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs')

diff --git a/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs b/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
index b3df0373e..0f69bf570 100644
--- a/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
+++ b/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
@@ -60,6 +60,7 @@ namespace Tango.Web.Controllers
                 LogManager.Log(ex, $"An error occurred while processing the request message on {controllerName + "/" + actionName}.");
 
                 HttpStatusCode code = HttpStatusCode.InternalServerError;
+                HttpResponseException httpException = null;
 
                 if (ex is ArgumentException || ex is InvalidDataException)
                 {
@@ -69,8 +70,18 @@ namespace Tango.Web.Controllers
                 {
                     code = HttpStatusCode.Unauthorized;
                 }
-
-                var httpException = new HttpResponseException(Request.CreateErrorResponse(code, ex.FlattenMessage(), ex));
+                else if (ex is KeyNotFoundException)
+                {
+                    code = HttpStatusCode.NotFound;
+                }
+                else if (ex is HttpResponseException httpResponseException)
+                {
+                    httpException = httpResponseException;
+                }
+                else
+                {
+                    httpException = new HttpResponseException(Request.CreateErrorResponse(code, ex.FlattenMessage(), ex));
+                }
 
 #if DEBUG
                 throw httpException;
-- 
cgit v1.3.1


From db1876bf3310a672176588329033ab4efc955175 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 18 Nov 2020 03:33:34 +0200
Subject: Fixed exception issue in TangoController. Removed big first
 diagnostics response and hardware configuration request.

---
 .../Visual_Studio/Tango.Integration/Operation/MachineOperator.cs | 9 +++++++--
 Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs  | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs')

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 2bec38f82..93320c646 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -654,7 +654,9 @@ namespace Tango.Integration.Operation
                 bool responseLogged = false;
                 _diagnosticsSent = true;
 
-                SendContinuousRequest<StartDiagnosticsRequest, StartDiagnosticsResponse>(request, new TransportContinuousRequestConfig() { ShouldLog = true }).ObserveOn(new NewThreadScheduler()).Subscribe(
+                LogManager.Log($"Sending '{nameof(StartDiagnosticsRequest)}'...");
+
+                SendContinuousRequest<StartDiagnosticsRequest, StartDiagnosticsResponse>(request, new TransportContinuousRequestConfig() { ShouldLog = false }).ObserveOn(new NewThreadScheduler()).Subscribe(
                     (response) =>
                     {
                         if (!responseLogged)
@@ -3236,8 +3238,11 @@ namespace Tango.Integration.Operation
 
             try
             {
+                LogManager.Log($"Sending '{nameof(UploadHardwareConfigurationRequest)}'...");
+                LogManager.Log($"{nameof(UploadHardwareConfigurationRequest)} request:\n{request.HardwareConfiguration.ToJsonString()}", LogCategory.Debug);
+
                 CurrentHardwareConfiguration = hardwareConfiguration;
-                response = await SendRequest<UploadHardwareConfigurationRequest, UploadHardwareConfigurationResponse>(request, new TransportRequestConfig() { ShouldLog = true });
+                response = await SendRequest<UploadHardwareConfigurationRequest, UploadHardwareConfigurationResponse>(request, new TransportRequestConfig() { ShouldLog = false });
             }
             catch (Exception ex)
             {
diff --git a/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs b/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
index 0f69bf570..deaa7cf48 100644
--- a/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
+++ b/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
@@ -60,7 +60,6 @@ namespace Tango.Web.Controllers
                 LogManager.Log(ex, $"An error occurred while processing the request message on {controllerName + "/" + actionName}.");
 
                 HttpStatusCode code = HttpStatusCode.InternalServerError;
-                HttpResponseException httpException = null;
 
                 if (ex is ArgumentException || ex is InvalidDataException)
                 {
@@ -74,7 +73,10 @@ namespace Tango.Web.Controllers
                 {
                     code = HttpStatusCode.NotFound;
                 }
-                else if (ex is HttpResponseException httpResponseException)
+
+                HttpResponseException httpException = null;
+
+                if (ex is HttpResponseException httpResponseException)
                 {
                     httpException = httpResponseException;
                 }
-- 
cgit v1.3.1