Fix #1635 - discard device sync if its modelid is not provided

CGI-FR · Dec 5, 2022 · 7df6d3b · 7df6d3b
1 parent b210968
commit 7df6d3b
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/src/AzureIoTHub.Portal.Server/Jobs/SyncDevicesJob.cs b/src/AzureIoTHub.Portal.Server/Jobs/SyncDevicesJob.cs
@@ -71,6 +71,12 @@ private async Task SyncDevices()
 
             foreach (var twin in deviceTwins)
             {
+                if (!twin.Tags.Contains(ModelId))
+                {
+                    this.logger.LogInformation($"Cannot import device '{twin.DeviceId}' since it doesn't have a model identifier.");
+                    continue;
+                }
+
                 var deviceModel = await this.deviceModelRepository.GetByIdAsync(twin.Tags[ModelId]?.ToString() ?? string.Empty);
 
                 if (deviceModel == null)

diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Server/Jobs/SyncDevicesJobTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Server/Jobs/SyncDevicesJobTests.cs
@@ -426,5 +426,45 @@ public async Task Execute_ExistingLorawanDeviceWithGreeterVersion_LorawanDeviceU
             // Assert
             MockRepository.VerifyAll();
         }
+
+        [Test]
+        public async Task Execute_MissingModelId_ShouldNotFail()
+        {
+            // Arrange
+            var mockJobExecutionContext = MockRepository.Create<IJobExecutionContext>();
+
+            var expectedDeviceModel = Fixture.Create<DeviceModel>();
+            expectedDeviceModel.SupportLoRaFeatures = true;
+
+            var expectedTwinDevice = new Twin
+            {
+                DeviceId = Fixture.Create<string>(),
+            };
+
+            _ = this.mockDeviceService
+                .Setup(x => x.GetAllDevice(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<bool?>(),
+                    It.IsAny<bool?>(),
+                    It.IsAny<Dictionary<string, string>>(),
+                    It.Is<int>(x => x == 100)))
+                .ReturnsAsync(new PaginationResult<Twin>
+                {
+                    Items = new List<Twin>
+                    {
+                        expectedTwinDevice
+                    },
+                    TotalItems = 1
+                });
+
+            // Act
+            await this.syncDevicesJob.Execute(mockJobExecutionContext.Object);
+
+            // Assert
+            MockRepository.VerifyAll();
+        }
     }
 }