Issue #72 device command failed (#104)

* fix #88 (#92) Co-authored-by: ben salim <[email protected]> * fix #76 check the DevEui at device creation * fix #72 * fix #72
CGI-FR · Jan 26, 2022 · 2e60553 · 2e60553
1 parent bf1f5de
commit 2e60553
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 14 deletions.
diff --git a/src/AzureIoTHub.Portal.Server.Tests/Helpers/HelpersTest.cs b/src/AzureIoTHub.Portal.Server.Tests/Helpers/HelpersTest.cs
@@ -54,7 +54,7 @@ public void RetrieveProperyValue_RealTwin_ReturnsExpectedValue()
             twin.Properties.Desired[PROPERTY_KEY] = PROPERTY_VALUE;
 
             // Act
-            var result = DeviceHelper.RetrievePropertyValue(twin, PROPERTY_KEY);
+            var result = DeviceHelper.RetrieveDesiredPropertyValue(twin, PROPERTY_KEY);
 
             // Assert
             result.Contains($"{PROPERTY_VALUE}");
@@ -68,7 +68,7 @@ public void RetrievePropertyValue_EmptyTwin_ReturnsNull()
             const string PROPERTY_KEY = "tag_key";
 
             // Act
-            var result = DeviceHelper.RetrievePropertyValue(twin, PROPERTY_KEY);
+            var result = DeviceHelper.RetrieveDesiredPropertyValue(twin, PROPERTY_KEY);
 
             // Assert
             Assert.IsNull(result);

diff --git a/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor b/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
@@ -147,7 +147,7 @@
                                         @foreach (var command in Device.Commands)
                                         {
                                             <MudItem xs="12" Class="custom-form command_button" Style="padding:3px;">
-                                                <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="@(async () => await ExecuteMethod(command))"> @command.CommandId</MudButton>
+                                                <MudButton Variant="Variant.Filled" Color="Color.Primary" Disabled="@(!Device.AlreadyLoggedInOnce)" OnClick="@(async () => await ExecuteMethod(command))"> @command.CommandId</MudButton>
                                             </MudItem>
                                         }
                                     </MudItem>
@@ -238,12 +238,12 @@
 
         if (result.IsSuccessStatusCode)
         {
-            Snackbar.Add($"{method.Frame} has been successfully execute!",
+            Snackbar.Add($"{method.CommandId} has been successfully execute!",
                 Severity.Success);
         }
         else
         {
-            Snackbar.Add(await result.Content.ReadAsStringAsync(), Severity.Error, (option)=> { option.VisibleStateDuration = 30000; });
+            Snackbar.Add(await result.Content.ReadAsStringAsync(), Severity.Error, (option)=> { option.VisibleStateDuration = 1000; });
         }
     }
 }

diff --git a/src/AzureIoTHub.Portal/Server/Controllers/DevicesController.cs b/src/AzureIoTHub.Portal/Server/Controllers/DevicesController.cs
@@ -83,7 +83,7 @@ public async Task<IActionResult> CreateDeviceAsync(DeviceDetails device)
         {
             try
             {
-                if (!Eui.TryParse(device.DeviceID, out ulong deviceIdConvert))
+                if (!Eui.TryParse(device.DeviceID, out ulong deviceIdConvert) && device.DeviceType == "LoRa Device")
                 {
                     throw new InvalidOperationException("the device id is in the wrong format.");
                 }
@@ -187,15 +187,25 @@ public async Task<IActionResult> ExecuteCommand(string deviceId, string commandI
 
                 var result = await this.loraDeviceMethodManager.ExecuteLoRaDeviceMessage(deviceId, deviceModelCommand);
 
+                if (result.StatusCode == System.Net.HttpStatusCode.InternalServerError)
+                {
+                    this.logger.LogError($"{deviceId} - Execute command on device failed \n {result}");
+                    throw new FormatException("Incorrect port or invalid DevEui Format.");
+                }
+
                 this.logger.LogInformation($"{deviceId} - Execute command: {result}");
 
                 return this.Ok(await result.Content.ReadFromJsonAsync<dynamic>());
             }
-            catch (Exception e)
+            catch (FormatException e)
             {
-                this.logger.LogError($"{deviceId} - Execute command on device failed", e);
+                this.logger.LogError($"{deviceId} - Execute command on device failed \n {e.Message}");
 
-                return this.BadRequest();
+                return this.BadRequest("Something went wrong when executing the command.");
+            }
+            catch (Exception e)
+            {
+                return this.BadRequest(e.Message);
             }
         }
     }

diff --git a/src/AzureIoTHub.Portal/Server/Helpers/DeviceHelper.cs b/src/AzureIoTHub.Portal/Server/Helpers/DeviceHelper.cs
@@ -66,14 +66,22 @@ public static void SetTagValue(Twin item, string tagName, string value)
         /// <param name="item">Device twin.</param>
         /// <param name="propertyName">Property to retrieve.</param>
         /// <returns>Corresponding property value, or null if it doesn't exist.</returns>
-        public static string RetrievePropertyValue(Twin item, string propertyName)
+        public static string RetrieveDesiredPropertyValue(Twin item, string propertyName)
         {
             if (item.Properties.Desired.Contains(propertyName))
                 return item.Properties.Desired[propertyName];
             else
                 return null;
         }
 
+        public static string RetrieveReportedPropertyValue(Twin twin, string propertyName)
+        {
+            if (twin.Properties.Reported.Contains(propertyName))
+                return twin.Properties.Reported[propertyName];
+            else
+                return null;
+        }
+
         /// <summary>
         /// this function retreive and return the number of connected
         /// devices.

diff --git a/src/AzureIoTHub.Portal/Server/Mappers/DeviceTwinMapper.cs b/src/AzureIoTHub.Portal/Server/Mappers/DeviceTwinMapper.cs
@@ -33,16 +33,16 @@ public DeviceDetails CreateDeviceDetails(Twin twin)
             {
                 DeviceID = twin.DeviceId,
                 ModelId = modelId,
-                // ModelName = modelName,
+                AlreadyLoggedInOnce = Helpers.DeviceHelper.RetrieveReportedPropertyValue(twin, "DevAddr") != null,
                 ImageUrl = this.deviceModelImageManager.ComputeImageUri(modelId),
                 IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 StatusUpdatedTime = twin.StatusUpdatedTime.GetValueOrDefault(DateTime.MinValue),
-                AppEUI = Helpers.DeviceHelper.RetrievePropertyValue(twin, nameof(DeviceDetails.AppEUI)),
-                AppKey = Helpers.DeviceHelper.RetrievePropertyValue(twin, nameof(DeviceDetails.AppKey)),
+                AppEUI = Helpers.DeviceHelper.RetrieveDesiredPropertyValue(twin, nameof(DeviceDetails.AppEUI)),
+                AppKey = Helpers.DeviceHelper.RetrieveDesiredPropertyValue(twin, nameof(DeviceDetails.AppKey)),
                 LocationCode = Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.LocationCode)),
                 AssetID = Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.AssetID)),
-                SensorDecoder = Helpers.DeviceHelper.RetrievePropertyValue(twin, nameof(DeviceDetails.SensorDecoder)),
+                SensorDecoder = Helpers.DeviceHelper.RetrieveDesiredPropertyValue(twin, nameof(DeviceDetails.SensorDecoder)),
                 DeviceType = Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.DeviceType)),
                 Commands = this.deviceModelCommandsManager.RetrieveCommands(modelId)
             };

diff --git a/src/AzureIoTHub.Portal/Shared/Models/Device/DeviceDetails.cs b/src/AzureIoTHub.Portal/Shared/Models/Device/DeviceDetails.cs
@@ -38,6 +38,8 @@ public class DeviceDetails
 
         public string SensorDecoder { get; set; }
 
+        public bool AlreadyLoggedInOnce { get; set; }
+
         public List<Command> Commands { get; set; } = new List<Command>();
     }
 }