fix(generators): auto-infer discriminator fields from unique required properties (generated)

algolia/api-clients-automation#6199

Co-authored-by: algolia-bot <accounts+algolia-api-client-bot@algolia.com>
Co-authored-by: Thomas Raffray <Fluf22@users.noreply.github.com>

Author: algolia-bot

algoliasearch/Models/Composition/BatchCompositionAction.cs

@@ -168,7 +168,11 @@ JsonSerializerOptions options
   {
     var jsonDocument = JsonDocument.ParseValue(ref reader);
     var root = jsonDocument.RootElement;
-    if (root.ValueKind == JsonValueKind.Object)
+    if (
+      root.ValueKind == JsonValueKind.Object
+      && root.TryGetProperty("behavior", out _)
+      && root.TryGetProperty("name", out _)
+    )
     {
       try
       {

algoliasearch/Models/Composition/CompositionBehavior.cs

@@ -168,7 +168,7 @@ JsonSerializerOptions options
   {
     var jsonDocument = JsonDocument.ParseValue(ref reader);
     var root = jsonDocument.RootElement;
-    if (root.ValueKind == JsonValueKind.Object)
+    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("injection", out _))
     {
       try
       {
@@ -184,7 +184,7 @@ JsonSerializerOptions options
         );
       }
     }
-    if (root.ValueKind == JsonValueKind.Object)
+    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("multifeed", out _))
     {
       try
       {

algoliasearch/Models/Composition/RulesBatchCompositionAction.cs

@@ -168,7 +168,7 @@ JsonSerializerOptions options
   {
     var jsonDocument = JsonDocument.ParseValue(ref reader);
     var root = jsonDocument.RootElement;
-    if (root.ValueKind == JsonValueKind.Object)
+    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("consequence", out _))
     {
       try
       {

algoliasearch/Models/Ingestion/TaskInput.cs

@@ -22,32 +22,32 @@ public partial class TaskInput : AbstractSchema
 {
   /// <summary>
   /// Initializes a new instance of the TaskInput class
-  /// with a StreamingInput
+  /// with a ShopifyInput
   /// </summary>
-  /// <param name="actualInstance">An instance of StreamingInput.</param>
-  public TaskInput(StreamingInput actualInstance)
+  /// <param name="actualInstance">An instance of ShopifyInput.</param>
+  public TaskInput(ShopifyInput actualInstance)
   {
     ActualInstance =
       actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null.");
   }
 
   /// <summary>
   /// Initializes a new instance of the TaskInput class
-  /// with a DockerStreamsInput
+  /// with a StreamingInput
   /// </summary>
-  /// <param name="actualInstance">An instance of DockerStreamsInput.</param>
-  public TaskInput(DockerStreamsInput actualInstance)
+  /// <param name="actualInstance">An instance of StreamingInput.</param>
+  public TaskInput(StreamingInput actualInstance)
   {
     ActualInstance =
       actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null.");
   }
 
   /// <summary>
   /// Initializes a new instance of the TaskInput class
-  /// with a ShopifyInput
+  /// with a DockerStreamsInput
   /// </summary>
-  /// <param name="actualInstance">An instance of ShopifyInput.</param>
-  public TaskInput(ShopifyInput actualInstance)
+  /// <param name="actualInstance">An instance of DockerStreamsInput.</param>
+  public TaskInput(DockerStreamsInput actualInstance)
   {
     ActualInstance =
       actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null.");
@@ -58,6 +58,16 @@ public TaskInput(ShopifyInput actualInstance)
   /// </summary>
   public sealed override object ActualInstance { get; set; }
 
+  /// <summary>
+  /// Get the actual instance of `ShopifyInput`. If the actual instance is not `ShopifyInput`,
+  /// the InvalidClassException will be thrown
+  /// </summary>
+  /// <returns>An instance of ShopifyInput</returns>
+  public ShopifyInput AsShopifyInput()
+  {
+    return (ShopifyInput)ActualInstance;
+  }
+
   /// <summary>
   /// Get the actual instance of `StreamingInput`. If the actual instance is not `StreamingInput`,
   /// the InvalidClassException will be thrown
@@ -79,13 +89,12 @@ public DockerStreamsInput AsDockerStreamsInput()
   }
 
   /// <summary>
-  /// Get the actual instance of `ShopifyInput`. If the actual instance is not `ShopifyInput`,
-  /// the InvalidClassException will be thrown
+  /// Check if the actual instance is of `ShopifyInput` type.
   /// </summary>
-  /// <returns>An instance of ShopifyInput</returns>
-  public ShopifyInput AsShopifyInput()
+  /// <returns>Whether or not the instance is the type</returns>
+  public bool IsShopifyInput()
   {
-    return (ShopifyInput)ActualInstance;
+    return ActualInstance.GetType() == typeof(ShopifyInput);
   }
 
   /// <summary>
@@ -106,15 +115,6 @@ public bool IsDockerStreamsInput()
     return ActualInstance.GetType() == typeof(DockerStreamsInput);
   }
 
-  /// <summary>
-  /// Check if the actual instance is of `ShopifyInput` type.
-  /// </summary>
-  /// <returns>Whether or not the instance is the type</returns>
-  public bool IsShopifyInput()
-  {
-    return ActualInstance.GetType() == typeof(ShopifyInput);
-  }
-
   /// <summary>
   /// Returns the string presentation of the object
   /// </summary>
@@ -198,44 +198,48 @@ JsonSerializerOptions options
   {
     var jsonDocument = JsonDocument.ParseValue(ref reader);
     var root = jsonDocument.RootElement;
-    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("mapping", out _))
+    if (
+      root.ValueKind == JsonValueKind.Object
+      && root.TryGetProperty("market", out _)
+      && root.TryGetProperty("metafields", out _)
+    )
     {
       try
       {
-        return new TaskInput(jsonDocument.Deserialize<StreamingInput>(JsonConfig.Options));
+        return new TaskInput(jsonDocument.Deserialize<ShopifyInput>(JsonConfig.Options));
       }
       catch (Exception exception)
       {
         // deserialization failed, try the next one
-        System.Diagnostics.Debug.WriteLine(
-          $"Failed to deserialize into StreamingInput: {exception}"
-        );
+        System.Diagnostics.Debug.WriteLine($"Failed to deserialize into ShopifyInput: {exception}");
       }
     }
-    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("streams", out _))
+    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("mapping", out _))
     {
       try
       {
-        return new TaskInput(jsonDocument.Deserialize<DockerStreamsInput>(JsonConfig.Options));
+        return new TaskInput(jsonDocument.Deserialize<StreamingInput>(JsonConfig.Options));
       }
       catch (Exception exception)
       {
         // deserialization failed, try the next one
         System.Diagnostics.Debug.WriteLine(
-          $"Failed to deserialize into DockerStreamsInput: {exception}"
+          $"Failed to deserialize into StreamingInput: {exception}"
         );
       }
     }
-    if (root.ValueKind == JsonValueKind.Object)
+    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("streams", out _))
     {
       try
       {
-        return new TaskInput(jsonDocument.Deserialize<ShopifyInput>(JsonConfig.Options));
+        return new TaskInput(jsonDocument.Deserialize<DockerStreamsInput>(JsonConfig.Options));
       }
       catch (Exception exception)
       {
         // deserialization failed, try the next one
-        System.Diagnostics.Debug.WriteLine($"Failed to deserialize into ShopifyInput: {exception}");
+        System.Diagnostics.Debug.WriteLine(
+          $"Failed to deserialize into DockerStreamsInput: {exception}"
+        );
       }
     }
     throw new InvalidDataException(

algoliasearch/Models/Ingestion/TransformationInput.cs

@@ -168,7 +168,7 @@ JsonSerializerOptions options
   {
     var jsonDocument = JsonDocument.ParseValue(ref reader);
     var root = jsonDocument.RootElement;
-    if (root.ValueKind == JsonValueKind.Object)
+    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("code", out _))
     {
       try
       {
@@ -184,7 +184,7 @@ JsonSerializerOptions options
         );
       }
     }
-    if (root.ValueKind == JsonValueKind.Object)
+    if (root.ValueKind == JsonValueKind.Object && root.TryGetProperty("steps", out _))
     {
       try
       {

algoliasearch/Models/Ingestion/Trigger.cs

@@ -22,21 +22,21 @@ public partial class Trigger : AbstractSchema
 {
   /// <summary>
   /// Initializes a new instance of the Trigger class
-  /// with a OnDemandTrigger
+  /// with a ScheduleTrigger
   /// </summary>
-  /// <param name="actualInstance">An instance of OnDemandTrigger.</param>
-  public Trigger(OnDemandTrigger actualInstance)
+  /// <param name="actualInstance">An instance of ScheduleTrigger.</param>
+  public Trigger(ScheduleTrigger actualInstance)
   {
     ActualInstance =
       actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null.");
   }
 
   /// <summary>
   /// Initializes a new instance of the Trigger class
-  /// with a ScheduleTrigger
+  /// with a OnDemandTrigger
   /// </summary>
-  /// <param name="actualInstance">An instance of ScheduleTrigger.</param>
-  public Trigger(ScheduleTrigger actualInstance)
+  /// <param name="actualInstance">An instance of OnDemandTrigger.</param>
+  public Trigger(OnDemandTrigger actualInstance)
   {
     ActualInstance =
       actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null.");
@@ -70,23 +70,23 @@ public Trigger(StreamingTrigger actualInstance)
   public sealed override object ActualInstance { get; set; }
 
   /// <summary>
-  /// Get the actual instance of `OnDemandTrigger`. If the actual instance is not `OnDemandTrigger`,
+  /// Get the actual instance of `ScheduleTrigger`. If the actual instance is not `ScheduleTrigger`,
   /// the InvalidClassException will be thrown
   /// </summary>
-  /// <returns>An instance of OnDemandTrigger</returns>
-  public OnDemandTrigger AsOnDemandTrigger()
+  /// <returns>An instance of ScheduleTrigger</returns>
+  public ScheduleTrigger AsScheduleTrigger()
   {
-    return (OnDemandTrigger)ActualInstance;
+    return (ScheduleTrigger)ActualInstance;
   }
 
   /// <summary>
-  /// Get the actual instance of `ScheduleTrigger`. If the actual instance is not `ScheduleTrigger`,
+  /// Get the actual instance of `OnDemandTrigger`. If the actual instance is not `OnDemandTrigger`,
   /// the InvalidClassException will be thrown
   /// </summary>
-  /// <returns>An instance of ScheduleTrigger</returns>
-  public ScheduleTrigger AsScheduleTrigger()
+  /// <returns>An instance of OnDemandTrigger</returns>
+  public OnDemandTrigger AsOnDemandTrigger()
   {
-    return (ScheduleTrigger)ActualInstance;
+    return (OnDemandTrigger)ActualInstance;
   }
 
   /// <summary>
@@ -110,21 +110,21 @@ public StreamingTrigger AsStreamingTrigger()
   }
 
   /// <summary>
-  /// Check if the actual instance is of `OnDemandTrigger` type.
+  /// Check if the actual instance is of `ScheduleTrigger` type.
   /// </summary>
   /// <returns>Whether or not the instance is the type</returns>
-  public bool IsOnDemandTrigger()
+  public bool IsScheduleTrigger()
   {
-    return ActualInstance.GetType() == typeof(OnDemandTrigger);
+    return ActualInstance.GetType() == typeof(ScheduleTrigger);
   }
 
   /// <summary>
-  /// Check if the actual instance is of `ScheduleTrigger` type.
+  /// Check if the actual instance is of `OnDemandTrigger` type.
   /// </summary>
   /// <returns>Whether or not the instance is the type</returns>
-  public bool IsScheduleTrigger()
+  public bool IsOnDemandTrigger()
   {
-    return ActualInstance.GetType() == typeof(ScheduleTrigger);
+    return ActualInstance.GetType() == typeof(OnDemandTrigger);
   }
 
   /// <summary>
@@ -228,31 +228,35 @@ JsonSerializerOptions options
   {
     var jsonDocument = JsonDocument.ParseValue(ref reader);
     var root = jsonDocument.RootElement;
-    if (root.ValueKind == JsonValueKind.Object)
+    if (
+      root.ValueKind == JsonValueKind.Object
+      && root.TryGetProperty("cron", out _)
+      && root.TryGetProperty("nextRun", out _)
+    )
     {
       try
       {
-        return new Trigger(jsonDocument.Deserialize<OnDemandTrigger>(JsonConfig.Options));
+        return new Trigger(jsonDocument.Deserialize<ScheduleTrigger>(JsonConfig.Options));
       }
       catch (Exception exception)
       {
         // deserialization failed, try the next one
         System.Diagnostics.Debug.WriteLine(
-          $"Failed to deserialize into OnDemandTrigger: {exception}"
+          $"Failed to deserialize into ScheduleTrigger: {exception}"
         );
       }
     }
     if (root.ValueKind == JsonValueKind.Object)
     {
       try
       {
-        return new Trigger(jsonDocument.Deserialize<ScheduleTrigger>(JsonConfig.Options));
+        return new Trigger(jsonDocument.Deserialize<OnDemandTrigger>(JsonConfig.Options));
       }
       catch (Exception exception)
       {
         // deserialization failed, try the next one
         System.Diagnostics.Debug.WriteLine(
-          $"Failed to deserialize into ScheduleTrigger: {exception}"
+          $"Failed to deserialize into OnDemandTrigger: {exception}"
         );
       }
     }