Implements less permissive iodd search (#18)

* Implements less permissive iodd search
Adds test

* Fixes test

---------

Co-authored-by: Dominik Deschner <domdeger@gmail.com>

Author: domdeger

src/IODD.Provider/DeviceDefinitionProvider.cs

@@ -1,7 +1,5 @@
-
 using System.IO.Compression;
 using System.Xml.Linq;
-
 using IOLinkNET.IODD.Structure;
 
 namespace IOLinkNET.IODD.Provider;
@@ -10,25 +8,42 @@ public class DeviceDefinitionProvider : IDeviceDefinitionProvider
 {
     private readonly IIODDProvider _ioddProvider;
     private readonly IODDParser _ioddParser = new IODDParser();
+
     public DeviceDefinitionProvider(IIODDProvider ioddProvider)
     {
         _ioddProvider = ioddProvider;
     }
 
-    public async Task<IODevice> GetDeviceDefinitionAsync(ushort vendorId, uint deviceId, string productId, CancellationToken cancellationToken = default)
+    public async Task<IODevice> GetDeviceDefinitionAsync(
+        ushort vendorId,
+        uint deviceId,
+        string productId,
+        CancellationToken cancellationToken = default
+    )
     {
-        var ioddPackage = await _ioddProvider.GetIODDPackageAsync(vendorId, deviceId, productId, cancellationToken);
+        var ioddPackage = await _ioddProvider.GetIODDPackageAsync(
+            vendorId,
+            deviceId,
+            productId,
+            cancellationToken
+        );
 
         using var zipArchive = new ZipArchive(ioddPackage, ZipArchiveMode.Read);
         var ioddXml = await FindMainIoddEntryAsync(zipArchive, cancellationToken);
 
-
-        return _ioddParser.Parse(ioddXml.Root ?? throw new InvalidOperationException("No root element found"));
+        return _ioddParser.Parse(
+            ioddXml.Root ?? throw new InvalidOperationException("No root element found")
+        );
     }
 
-    private async Task<XDocument> FindMainIoddEntryAsync(ZipArchive zipArchive, CancellationToken cancellationToken)
+    private async Task<XDocument> FindMainIoddEntryAsync(
+        ZipArchive zipArchive,
+        CancellationToken cancellationToken
+    )
     {
-        var xmlFiles = zipArchive.Entries.Where(e => e.Name.EndsWith(".xml", StringComparison.OrdinalIgnoreCase));
+        var xmlFiles = zipArchive.Entries.Where(e =>
+            e.Name.EndsWith(".xml", StringComparison.OrdinalIgnoreCase)
+        );
 
         foreach (var xmlFile in xmlFiles)
         {
@@ -42,4 +57,4 @@ private async Task<XDocument> FindMainIoddEntryAsync(ZipArchive zipArchive, Canc
 
         throw new InvalidOperationException("No matching IODD file found");
     }
-}
+}

src/IODD.Provider/IODDFinderPublicClient.cs

@@ -1,6 +1,5 @@
 using System.Net.Http;
 using System.Net.Http.Json;
-
 using IOLinkNET.IODD.Provider.Data;
 
 namespace IOLinkNET.IODD.Provider;
@@ -22,34 +21,48 @@ public IODDFinderPublicClient(Uri baseUrl, bool shouldValidateSSLCertificate = t
                 ServerCertificateCustomValidationCallback = (request, cert, chain, errors) =>
                 {
                     return true;
-                }
+                },
             };
             _httpClient = new(handler) { BaseAddress = baseUrl };
         }
     }
 
-    public IODDFinderPublicClient() : this(new Uri("https://ioddfinder.io-link.com/"))
-    {
-    }
+    public IODDFinderPublicClient()
+        : this(new Uri("https://ioddfinder.io-link.com/")) { }
 
-    public async Task<Stream> GetIODDPackageAsync(ushort vendorId, uint deviceId, string productId, CancellationToken cancellationToken = default)
+    public async Task<Stream> GetIODDPackageAsync(
+        ushort vendorId,
+        uint deviceId,
+        string productId,
+        CancellationToken cancellationToken = default
+    )
     {
-        var entries = await _httpClient.GetFromJsonAsync<IODDFinderSearchResponse>($"api/drivers?status=APPROVED&status=UPLOADED&vendorId={vendorId}&deviceId={deviceId}&productId={productId}");
+        var entries = await _httpClient.GetFromJsonAsync<IODDFinderSearchResponse>(
+            $"api/drivers?status=APPROVED&status=UPLOADED&vendorId={vendorId}&deviceId={deviceId}&productId={productId}"
+        );
         if (entries is null)
         {
             throw new InvalidOperationException("Could not deserialize response");
         }
 
         if (entries.Content.Count() < 1)
         {
-            throw new InvalidOperationException("No entries found");
-        }
+            entries = await _httpClient.GetFromJsonAsync<IODDFinderSearchResponse>(
+                $"api/drivers?status=APPROVED&status=UPLOADED&vendorId={vendorId}&deviceId={deviceId}"
+            );
 
+            if (entries?.Content.Count() < 1)
+            {
+                throw new InvalidOperationException("No entries found");
+            }
+        }
 
         var entry = entries.Content.OrderByDescending(x => x.IoLinkRev).First();
 
-        var zipStream = await _httpClient.GetStreamAsync($"api/vendors/{vendorId}/iodds/{entry.IoddId}/files/zip/rated");
+        var zipStream = await _httpClient.GetStreamAsync(
+            $"api/vendors/{vendorId}/iodds/{entry.IoddId}/files/zip/rated"
+        );
 
         return zipStream;
     }
-}
+}

src/Tests/IODD.Provider.Tests/DeviceDefinitionProviderTests.cs

@@ -5,6 +5,7 @@ namespace IODD.Provider.Tests;
 public class DeviceDefinitionProviderTests
 {
     private readonly Uri _baseUrl = new("https://ioddfinder.io-link.com/");
+
     [Fact]
     public async Task DoesLoadDeviceDefinitionAsync()
     {
@@ -14,4 +15,15 @@ public async Task DoesLoadDeviceDefinitionAsync()
 
         definition.ProfileBody.DeviceIdentity.VendorId.Should().Be(888);
     }
-}
+
+    [Fact]
+    public async Task DoesLoadDeviceDefinitionForIfmDeviceAsync()
+    {
+        var client = new IODDFinderPublicClient(_baseUrl);
+        var provider = new DeviceDefinitionProvider(client);
+        var definition = await provider.GetDeviceDefinitionAsync(310, 1367, "VVB001 Status B");
+
+        definition.ProfileBody.DeviceIdentity.VendorId.Should().Be(310);
+        definition.ProfileBody.DeviceIdentity.DeviceId.Should().Be(1367);
+    }
+}