feat(api): Updated ProductId handlers

Author: rlabbeptc

Kepware.Api.Test/ApiClient/GetProductInfo.cs

@@ -36,12 +36,14 @@ public async Task GetProductInfoAsync_ShouldReturnProductInfo_WhenApiRespondsSuc
 
         #region GetProductInfoAsync - SupportsJsonProjectLoadService
 
-        //TODO: Add more test cases for TKS versions as well. Different product name
         [Theory]
         [InlineData("KEPServerEX", "12", 6, 17, true)]  // Supports JSON Project Load Service (6.17+)
         [InlineData("KEPServerEX", "12", 6, 16, false)] // Does not support it (6.16)
-        [InlineData("ThingWorxKepwareEdge", "13", 1, 10, true)] // Supports it (1.10+)
+        [InlineData("ThingworxKepwareServer", "12", 6, 17, true)]  // Supports JSON Project Load Service (6.17+)
+        [InlineData("ThingworxKepwareServer", "12", 6, 16, false)] // Does not support it (6.16)
+        [InlineData("ThingWorxKepwareEdge", "13", 1, 10, true)] // Supports JSON Project Load Service (1.10+)
         [InlineData("ThingWorxKepwareEdge", "13", 1, 9, false)] // Does not support it (1.9)
+        [InlineData("Kepware Edge", "13", 1, 0, true)] // Supports JSON Project Load Service
         [InlineData("UnknownProduct", "99", 10, 0, false)] // Unknown product, should be false
         public async Task GetProductInfoAsync_ShouldReturnCorrect_SupportsJsonProjectLoadService(
             string productName, string productId, int majorVersion, int minorVersion, bool expectedResult)
@@ -62,8 +64,10 @@ public async Task GetProductInfoAsync_ShouldReturnCorrect_SupportsJsonProjectLoa
         #region GetProductInfoAsync - ProductType
 
         [Theory]
-        [InlineData("KEPServerEX", "12", ProductType.KEPServerEX)]
-        [InlineData("ThingWorxKepwareEdge", "13", ProductType.ThingWorxKepwareEdge)]
+        [InlineData("KEPServerEX", "12", ProductType.KepwareServer)]
+        [InlineData("ThingworxKepwareServer", "12", ProductType.KepwareServer)]
+        [InlineData("ThingWorxKepwareEdge", "13", ProductType.KepwareEdge)]
+        [InlineData("Kepware Edge", "13", ProductType.KepwareEdge)]
         [InlineData("UnknownProduct", "99", ProductType.Unknown)]
         [InlineData("InvalidProduct", "abc", ProductType.Unknown)] // Invalid ID, should be Unknown
         public async Task GetProductInfoAsync_ShouldReturnCorrect_ProductType(

Kepware.Api.TestIntg/ApiClient/ProjectApiHandlerTests.cs

@@ -47,7 +47,7 @@ public async Task GetOrCreateChannelAsync_ShouldCreateChannel_WhenChannelDoesNot
             var channel = CreateTestChannel();
 
             // Act
-            var result = await _projectApiHandler.Channels.GetOrCreateChannelAsync(channel.Name, channel.DeviceDriver);
+            var result = await _projectApiHandler.Channels.GetOrCreateChannelAsync(channel.Name, channel.DeviceDriver!);
 
             // Assert
             Assert.NotNull(result);

Kepware.Api/Model/ApiMessages.cs

@@ -66,13 +66,14 @@ public enum ProductType
         /// </summary>
         Unknown = 0,
         /// <summary>
-        /// Thing worx Kepware Edge.
+        /// Kepware Edge - This covers Edge branded products including Thingworx Kepware Edge.
         /// </summary>
-        ThingWorxKepwareEdge = 13,
+        KepwareEdge = 13,
         /// <summary>
-        /// KEPServerEX.
+        /// Kepware Server - This covers all Kepware branded products including KEPServerEX,
+        /// Thingworx Kepware Server, and future products that use the Kepware Server codebase.
         /// </summary>
-        KEPServerEX = 12
+        KepwareServer = 12
     }
 
     /// <summary>
@@ -149,8 +150,9 @@ public ProductType ProductType
         /// </summary>
         [JsonIgnore]
         public bool SupportsJsonProjectLoadService =>
-            (ProductType == ProductType.KEPServerEX && (ProductVersionMajor > 6 || (ProductVersionMajor == 6 && ProductVersionMinor >= 17))) ||
-            (ProductType == ProductType.ThingWorxKepwareEdge && (ProductVersionMajor > 1 || (ProductVersionMajor == 1 && ProductVersionMinor >= 10)));
+            (ProductType == ProductType.KepwareServer && (ProductVersionMajor > 6 || (ProductVersionMajor == 6 && ProductVersionMinor >= 17))) ||
+            (ProductType == ProductType.KepwareEdge && (ProductVersionMajor > 1 || (ProductVersionMajor == 1 && ProductVersionMinor >= 10))) ||
+            (ProductType == ProductType.KepwareEdge && ProductName == "Kepware Edge");
     }