Adjust code according to comment

Azure · Feb 3, 2017 · cefda08 · cefda08
1 parent b84d4bd
commit cefda08
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -208,3 +208,4 @@ VendingMachineSample/packages/*
 /RemoteMonitoring.VC.VC.opendb
 /Simulator/Simulator.WebJob/DMSimulator.exe
 /pingme.txt
+*.powerbirc
diff --git a/DeviceAdministration/Web/Controllers/JobController.cs b/DeviceAdministration/Web/Controllers/JobController.cs
@@ -13,6 +13,7 @@
 using Microsoft.Azure.Devices.Applications.RemoteMonitoring.DeviceAdmin.Web.Security;
 using Microsoft.Azure.Devices.Shared;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Azure.Devices.Applications.RemoteMonitoring.DeviceAdmin.Web.Controllers
 {
@@ -116,9 +117,7 @@ public async Task<ActionResult> CloneJob(string jobId)
                             {
                                 PropertyName = p.Key,
                                 PropertyValue = p.Value.Value.ToString(),
-                                DataType = valuetype.HasFlag(Newtonsoft.Json.Linq.JTokenType.Float & Newtonsoft.Json.Linq.JTokenType.Integer) ? TwinDataType.Number
-                                          : valuetype.HasFlag(Newtonsoft.Json.Linq.JTokenType.Boolean) ? TwinDataType.Boolean 
-                                          : TwinDataType.String
+                                DataType = convertToTwinDataType(valuetype)
                             };
                         }).ToList(),
                         Tags = twin.Tags.AsEnumerableFlatten().Select(t =>
@@ -128,9 +127,7 @@ public async Task<ActionResult> CloneJob(string jobId)
                             {
                                 TagName = t.Key,
                                 TagValue = t.Value.Value.ToString(),
-                                DataType = valuetype.HasFlag(Newtonsoft.Json.Linq.JTokenType.Float & Newtonsoft.Json.Linq.JTokenType.Integer) ? TwinDataType.Number
-                                          : valuetype.HasFlag(Newtonsoft.Json.Linq.JTokenType.Boolean) ? TwinDataType.Boolean
-                                          : TwinDataType.String
+                                DataType = convertToTwinDataType(valuetype)
                             };
                         }).ToList(),
                     });
@@ -193,7 +190,7 @@ public async Task<ActionResult> ScheduleTwinUpdate(ScheduleTwinUpdateModel model
                 }
                 else
                 {
-                    TwinExtension.Set(twin, key, getDyanmicValue(tagModel.DataType, tagModel.TagValue));                  
+                    TwinExtension.Set(twin, key, getDyanmicValue(tagModel.DataType, tagModel.TagValue));
                 }
                 await _nameCacheLogic.AddNameAsync(tagModel.TagName);
             }
@@ -207,7 +204,7 @@ public async Task<ActionResult> ScheduleTwinUpdate(ScheduleTwinUpdateModel model
                 }
                 else
                 {
-                    TwinExtension.Set(twin, key, getDyanmicValue(propertyModel.DataType, propertyModel.PropertyValue));                                     
+                    TwinExtension.Set(twin, key, getDyanmicValue(propertyModel.DataType, propertyModel.PropertyValue));
                 }
                 await _nameCacheLogic.AddNameAsync(propertyModel.PropertyName);
             }
@@ -276,7 +273,7 @@ public async Task<ActionResult> ScheduleDeviceMethod(ScheduleDeviceMethodModel m
         {
             string methodName = model.MethodName.Split('(').First();
 
-            var parameters = model.Parameters?.ToDictionary(p => p.ParameterName, p => getDyanmicValue(p.Type,p.ParameterValue)) ?? new Dictionary<string, dynamic>();
+            var parameters = model.Parameters?.ToDictionary(p => p.ParameterName, p => getDyanmicValue(p.Type, p.ParameterValue)) ?? new Dictionary<string, dynamic>();
             string payload = JsonConvert.SerializeObject(parameters);
 
             var deviceListFilter = await GetFilterById(model.FilterId);
@@ -295,14 +292,14 @@ public async Task<ActionResult> ScheduleDeviceMethod(ScheduleDeviceMethodModel m
 
             return RedirectToAction("Index", "Job", new { jobId = jobId });
         }
-        
-        private dynamic getDyanmicValue (TwinDataType type, dynamic value)
+
+        private dynamic getDyanmicValue(TwinDataType type, dynamic value)
         {
             switch (type)
             {
                 case Infrastructure.Models.TwinDataType.String:
                     string valueString = value.ToString();
-                    return valueString as dynamic;                    
+                    return valueString as dynamic;
                 case Infrastructure.Models.TwinDataType.Number:
                     int valueInt;
                     float valuefloat;
@@ -317,7 +314,7 @@ private dynamic getDyanmicValue (TwinDataType type, dynamic value)
                     else
                     {
                         return value as string;
-                    }                    
+                    }
                 case Infrastructure.Models.TwinDataType.Boolean:
                     bool valueBool;
                     if (bool.TryParse(value.ToString(), out valueBool))
@@ -332,6 +329,13 @@ private dynamic getDyanmicValue (TwinDataType type, dynamic value)
             }
         }
 
+        private TwinDataType convertToTwinDataType(JTokenType valuetype)
+        {
+            return valuetype.HasFlag(Newtonsoft.Json.Linq.JTokenType.Float & Newtonsoft.Json.Linq.JTokenType.Integer) ? TwinDataType.Number
+                    : valuetype.HasFlag(Newtonsoft.Json.Linq.JTokenType.Boolean) ? TwinDataType.Boolean
+                    : TwinDataType.String;
+        }
+
         private async Task AddMoreDetailsToJobAsync(DeviceJobModel job)
         {
             Task<JobRepositoryModel> queryJobTask = _jobRepository.QueryByJobIDAsync(job.JobId);