From 877d50d3a88fc3d3d9e7b2114a26bf16e99573c7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 7 Mar 2019 14:20:03 +0100
Subject: [PATCH] Ancora refactoring

---
 MConnectSDK/MConnectClient.cs |  20 +++---
 MConnectSDK/Utils.cs          | 115 +++++++++++++++++-----------------
 TestClient/MainForm.cs        |   8 +--
 3 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/MConnectSDK/MConnectClient.cs b/MConnectSDK/MConnectClient.cs
index 9c837eb..b4e4143 100644
--- a/MConnectSDK/MConnectClient.cs
+++ b/MConnectSDK/MConnectClient.cs
@@ -333,28 +333,28 @@ namespace MConnectSDK
       {
         // init in stato ND...
         isHmiEnrolled = false,
-        cloudConnection = false,
-        localConnection = false,
-        source = Result.Source.offline,
-        callSuccess = false
+        cloudStatus = false,
+        localStatus = false,
+        source = Source.offline,
+        callResult = false
       };
       // verifico REDIS in primis 
-      answ.localConnection = checkRedisAlive();
-      if (answ.localConnection)
+      answ.localStatus = checkRedisAlive();
+      if (answ.localStatus)
       {
         // cerco i TOKEN in REDIS...
         answ.isAuth = !string.IsNullOrEmpty(refresh_token);
         answ.isHmiEnrolled = enrollDate < DateTime.Now;
-        answ.source = Result.Source.local;
+        answ.source = Source.local;
       }
 
       // verifico chiamata server...
       if (_currParam.testMode)
       {
         // Fingo che tutto vada bene e di conseguenza setto risposta...
-        answ.cloudConnection = true;
-        answ.source = Result.Source.cloud;
-        answ.callSuccess = true;
+        answ.cloudStatus = true;
+        answ.source = Source.cloud;
+        answ.callResult = true;
         // attesa random...
         Random r = new Random();
         Thread.Sleep(100 + r.Next(0, 100));
diff --git a/MConnectSDK/Utils.cs b/MConnectSDK/Utils.cs
index 9d511cb..3c8e18d 100644
--- a/MConnectSDK/Utils.cs
+++ b/MConnectSDK/Utils.cs
@@ -154,57 +154,6 @@
   /// </summary>
   public class Result
   {
-    /// <summary>
-    /// Enum delle sorgenti di comunicazione
-    /// </summary>
-    public enum Source
-    {
-      /// <summary>
-      /// Piattaforma Cloud MaestroConnect
-      /// </summary>
-      cloud = 0,
-      /// <summary>
-      /// Storage cache locale
-      /// </summary>
-      local,
-      /// <summary>
-      /// Offline
-      /// </summary>
-      offline
-    }
-
-    /// <summary>
-    /// Enum per status
-    /// </summary>
-    public enum Status
-    {
-      KO = 0,
-      OK = 1
-    }
-
-    /// <summary>
-    /// Classe errore chiamata
-    /// </summary>
-    public class Error
-    {
-      /// <summary>
-      /// Enum per causali errori
-      /// </summary>
-      public enum Reason
-      {
-        NotFound = 0,
-        PwdMismatch
-      }
-      /// <summary>
-      /// Classe causale errore
-      /// </summary>
-      public Reason reason;
-      /// <summary>
-      /// Messaggio di dettaglio errore
-      /// </summary>
-      public string message;
-    }
-
     /// <summary>
     /// indica se l'applicazione abbia token di auth validi
     /// </summary>                                                                         
@@ -216,11 +165,11 @@
     /// <summary>
     /// Indica lo stato di disponibilità del CLOUD (= connesso)
     /// </summary>
-    public bool cloudConnection = false;
+    public bool cloudStatus = false;
     /// <summary>
     /// Indica la disponibilità dello storage LOCALE (= connesso)
     /// </summary>
-    public bool localConnection = false;
+    public bool localStatus = false;
     /// <summary>
     /// Sorgente da cui deriva l'esito dell'operazione
     /// </summary>
@@ -228,15 +177,65 @@
     /// <summary>
     /// Indica se la chiamata sia andata a buon fine (success) oppure ci siano stati errori/problemi
     /// </summary>
-    public bool callSuccess = false;
-    /// <summary>
-    /// Payload associato alla chiamata
-    /// </summary>
-    public PayLoad payLoad;
+    public bool callResult = false;
     /// <summary>
     /// Property class associata ad eventuale errore riscontrato
     /// </summary>
     public Error error;
+    /// <summary>
+    /// Payload associato alla chiamata
+    /// </summary>
+    public PayLoad payLoad;
+  }
+  /// <summary>
+  /// Enum delle sorgenti di comunicazione
+  /// </summary>
+  public enum Source
+  {
+    /// <summary>
+    /// Piattaforma Cloud MaestroConnect
+    /// </summary>
+    cloud = 0,
+    /// <summary>
+    /// Storage cache locale
+    /// </summary>
+    local,
+    /// <summary>
+    /// Offline
+    /// </summary>
+    offline
+  }
+
+  /// <summary>
+  /// Enum per status
+  /// </summary>
+  public enum Status
+  {
+    KO = 0,
+    OK = 1
+  }
+
+  /// <summary>
+  /// Classe errore chiamata
+  /// </summary>
+  public class Error
+  {
+    /// <summary>
+    /// Enum per causali errori
+    /// </summary>
+    public enum Reason
+    {
+      NotFound = 0,
+      PwdMismatch
+    }
+    /// <summary>
+    /// Classe causale errore
+    /// </summary>
+    public Reason reason;
+    /// <summary>
+    /// Messaggio di dettaglio errore
+    /// </summary>
+    public string message;
   }
 
   /// <summary>
diff --git a/TestClient/MainForm.cs b/TestClient/MainForm.cs
index 7248944..44bea08 100644
--- a/TestClient/MainForm.cs
+++ b/TestClient/MainForm.cs
@@ -119,9 +119,9 @@ namespace TestClient
       sb.AppendLine("-------------------------");
       sb.AppendLine("isAuth: " + reqStatus.isAuth);
       sb.AppendLine("isHmiEnrolled: " + reqStatus.isHmiEnrolled);
-      sb.AppendLine("cloudConnection: " + reqStatus.cloudConnection);
-      sb.AppendLine("localConnection: " + reqStatus.localConnection);
-      sb.AppendLine("callSuccess: " + reqStatus.callSuccess);
+      sb.AppendLine("cloudConnection: " + reqStatus.cloudStatus);
+      sb.AppendLine("localConnection: " + reqStatus.localStatus);
+      sb.AppendLine("callSuccess: " + reqStatus.callResult);
       sb.AppendLine("-------------------------");
       lblReqStatus.Text = sb.ToString();
       sb.AppendLine("");
@@ -141,7 +141,7 @@ namespace TestClient
     {
       // aggiorno console...
       lblConsole.Text = authData.outMessage;
-      // verifico se sia AUTH (altrimenti NON mostro codice e QR...)
+      // verifico se sia AUTH (altrimenti NON mostro codice e QR...)  
       if (authData.hasAuth || reqStatus.isAuth)
       {
         var currColor = Color.Orange;