Feature/generate from version 1.211.0 (#42)

* Skip flaky test

* Update relewise client to 1.211.0

* Generated the new moddels

* Updated the search hightlight test to use the new model

* Single is a float not an int

* Floats instead of ints

* Date time should be handled like date time

* A struct is also a value type so we should not go into this if when type is struct

* Also handle key value pair generically

* new models after hydration changes

* Add a test proving recently purchased facet not working

* Add a non generated time span

* Do not use depricated stuff

* Make custom types more generic

* Optional generic lists cannot have a defualt value

* new recently purches facet model

* rename test

* Override chosen constructor for `FieldIndexConfiguration`.

* Updated unit test to fit old constructor again.

* Review comments

* Remove timespan

* Rename test

---------

Co-authored-by: KSGRelewise <KSGRelewise@users.noreply.github.com>

Author: SWH-Relewise

Generator/Generator.csproj

@@ -9,7 +9,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AngleSharp.Xml" Version="1.0.0" />
-		<PackageReference Include="Relewise.Client" Version="1.193.0" />
+		<PackageReference Include="Relewise.Client" Version="1.211.0" />
 	</ItemGroup>
 
 </Project>

Generator/PhpMemberWriters/PhpCreatorMethodWriter.cs

@@ -2,6 +2,8 @@
 using System.CodeDom.Compiler;
 using System.Globalization;
 using System.Reflection;
+using Relewise.Client.DataTypes.Search.Configuration;
+using Relewise.Client.DataTypes.Search.Configuration.Parsers;
 using Relewise.Client.Requests;
 using Relewise.Client.Requests.RelevanceModifiers;
 using Relewise.Client.Requests.Conditions;
@@ -24,6 +26,10 @@ public class PhpCreatorMethodWriter
         [typeof(ProductRecentlyViewedByUserRelevanceModifier)] = typeof(ProductRecentlyViewedByUserRelevanceModifier).GetConstructor(new[] { typeof(DateTimeOffset), typeof(double), typeof(double) })!,
         // For backwards compatibility remove in next major release.
         [typeof(VariantDataRelevanceModifier)] = typeof(VariantDataRelevanceModifier).GetConstructor(new[] { typeof(string), typeof(List<ValueCondition>), typeof(ValueSelector), typeof(bool), typeof(bool) })!,
+        // For backwards compatibility remove in next major release.
+#pragma warning disable CS0618 // Type or member is obsolete
+        [typeof(FieldIndexConfiguration)] = typeof(FieldIndexConfiguration).GetConstructor(new[] { typeof(bool), typeof(byte), typeof(PredictionSourceType), typeof(Parser), typeof(MatchTypeSettings) })!,
+#pragma warning restore CS0618 // Type or member is obsolete
     };
 
     /// <summary>
@@ -281,7 +287,28 @@ public void Write(IndentedTextWriter writer, Type type, string typeName,
 
     private string DefaultValueSetter(ParameterInfo parameter)
     {
-        return parameter.HasDefaultValue && parameter.DefaultValue is null ? " = Null" : parameter.DefaultValue is { } defaultValue && (defaultValue.GetType().IsValueType || defaultValue is string) ? $" = {LiteralValueExpression(defaultValue)}" : "";
+        bool isGenericList = parameter.ParameterType.IsGenericType 
+                            && parameter.ParameterType.GetGenericTypeDefinition() == typeof(List<>)
+                            && parameter.ParameterType.GenericTypeArguments is [_];
+
+        if (parameter.HasDefaultValue && parameter.DefaultValue is null)
+        {
+            // Optional generic lists cannot have a default value
+            if (isGenericList && parameter.IsOptional)
+            {
+                return "";
+            }
+
+            return " = Null";
+        }
+
+        if (parameter.DefaultValue is { } defaultValue &&
+            (defaultValue.GetType().IsValueType || defaultValue is string))
+        {
+            return $" = {LiteralValueExpression(defaultValue)}";
+        }
+
+        return "";
     }
 
     private string LiteralValueExpression(object obj)

Generator/PhpMemberWriters/PhpHydrationMethodsWriter.cs

@@ -141,11 +141,23 @@ private string HydrationExpression(Type type, string jsonValue)
         {
             return $"{phpWriter.PhpTypeName(type)}::from({jsonValue})";
         }
-        if (type == typeof(DateTimeOffset))
+        if (type == typeof(DateTimeOffset) || type == typeof(DateTime))
         {
             return $"new DateTime({jsonValue})";
         }
-        if (type.IsValueType || type == typeof(string) || type == typeof(Guid) || type == typeof(object) || type.IsArray || (type.IsGenericType && (type.GetGenericTypeDefinition() == typeof(List<>) || type.GetGenericTypeDefinition() == typeof(Dictionary<,>))))
+        if (type == typeof(TimeSpan))
+        {
+            return $"DateIntervalFactory::fromTimeSpanString({jsonValue})";
+        }
+        if (type.IsPrimitive ||
+            type == typeof(string) ||
+            type == typeof(Guid) ||
+            type == typeof(object) ||
+            type == typeof(decimal) ||
+            type.IsArray ||
+            (type.IsGenericType && (type.GetGenericTypeDefinition() == typeof(List<>) ||
+                                    type.GetGenericTypeDefinition() == typeof(Dictionary<,>) ||
+                                    type.GetGenericTypeDefinition() == typeof(KeyValuePair<,>))))
         {
             return jsonValue;
         }

Generator/PhpTypeResolver.cs

@@ -19,11 +19,12 @@ public PhpTypeResolver(Assembly assembly)
     public string ResolveType(Type type) => type.Name switch
     {
         "String" or "Guid" => "string",
-        "Int32" or "Int64" or "UInt16" or "Single" or "Byte" => "int",
-        "Float" or "Double" or "Decimal" => "float",
+        "Int32" or "Int64" or "UInt16" or "Byte" => "int",
+        "Float" or "Double" or "Decimal" or "Single" => "float",
         "Boolean" => "bool",
         "Object" => "mixed",
         "DateTimeOffset" or "DateTime" => "DateTime",
+        "TimeSpan" => "DateInterval",
         var value when value.StartsWith("Nullable") => $"?{ResolveType(type.GetGenericArguments()[0])}",
         var value when value.StartsWith("List") || value.StartsWith("Dictionary") || value.EndsWith("[]") || value.StartsWith("IEnumerable") => AddCollectionTypeDefinition(type),
         _ when type.IsGenericType => GetGenericTypeDefinition(type),
@@ -55,7 +56,7 @@ private static string GetTypeName(Type type)
         while (typeToPrependToName is not null)
         {
             name = typeToPrependToName.Name + name;
-            
+
             typeToPrependToName = typeToPrependToName.DeclaringType;
         }
 
@@ -131,4 +132,4 @@ private string GetGenericTypeDefinition(Type type)
         }
         return ResolveType(derivedTypes.First());
     }
-}
+}

Generator/PhpTypeWriters/PhpClassWriter.cs

@@ -11,6 +11,15 @@ public class PhpClassWriter : IPhpTypeWriter
     private static readonly Type[] ExtractableFacetResultTypes = { typeof(ProductFacetResult), typeof(ContentFacetResult), typeof(ProductCategoryFacetResult) };
     private static readonly string[] IgnoredProperties = new[] { "Channel", "SubChannel", "TrackingNumber" };
 
+    private static readonly Dictionary<string, string[]> TypesWithCustomUsings = new()
+    {
+        { "DateInterval",
+            [
+                "use DateInterval;",
+                @"use Relewise\Factory\DateIntervalFactory;"
+            ]
+        }
+    };
     private readonly PhpWriter phpWriter;
 
     public PhpClassWriter(PhpWriter phpWriter)
@@ -70,6 +79,22 @@ public void Write(IndentedTextWriter writer, Type type, string typeName)
         if (hasDateTimeOrDateTimeOffsetProperty)
         {
             writer.WriteLine("use DateTime;");
+        }
+
+        IEnumerable<string?> customUsings = gettableProperties
+            .SelectMany(p => TypesWithCustomUsings.GetValueOrDefault(p.propertyTypeName) ?? [])
+            .Distinct();
+
+        foreach (string? customUsing in customUsings)
+        {
+            if (customUsing != null)
+            {
+                writer.WriteLine(customUsing);
+            }
+        }
+
+        if (hasDateTimeOrDateTimeOffsetProperty)
+        {
             writer.WriteLine("use JsonSerializable;");
             writer.WriteLine();
         }
@@ -168,4 +193,4 @@ public void Write(IndentedTextWriter writer, Type type, string typeName)
     {
         return (info, propertyTypeName: phpWriter.PhpTypeName(info), propertyName: info.Name, lowerCaseName: info.Name.ToCamelCase());
     }
-}
+}

src/Factory/DateIntervalFactory.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+namespace Relewise\Factory;
+
+use DateInterval;
+use InvalidArgumentException;
+
+class DateIntervalFactory {
+    public static function fromTimeSpanString(string $timeSpanString) {
+        
+        // Match [days.]hh:mm:ss[.fffffff]
+        if (!preg_match('/^(?:(\d+)\.)?(\d{1,2}):(\d{2}):(\d{2})(?:\.(\d{1,7}))?$/', $timeSpanString, $m)) {
+            throw new InvalidArgumentException("Invalid TimeSpan format: '$timeSpanString'");
+        }
+
+        $days = isset($m[1]) ? (int)$m[1] : 0;
+        $hours = ($days * 24) + (int)$m[2];
+        $minutes = (int)$m[3];
+        $seconds = (int)$m[4];
+        $fraction = isset($m[5]) ? $m[5] : '0';
+
+        // Pad/truncate to 6 digits for microseconds
+        $microseconds = (int)str_pad(substr($fraction, 0, 6), 6, '0');
+        
+        return DateInterval::createFromDateString("$hours hours + $minutes minutes + $seconds seconds + $microseconds microseconds");
+    }
+}

src/Models/Campaign.php

@@ -11,6 +11,7 @@ class Campaign extends CampaignEntityStateCampaignMetadataValuesRetailMediaEntit
     public string $advertiserId;
     public Budget $budget;
     public CampaignStatusWithHistory $status;
+    public ?CampaignCampaignConditions $conditions;
 
     public static function create(?string $id, CampaignEntityState $state, string $name, string $advertiserId, Budget $budget, ?ISchedule $schedule, PromotionCollection $promotions) : Campaign
     {
@@ -52,6 +53,10 @@ public static function hydrate(array $arr) : Campaign
         {
             $result->status = CampaignStatusWithHistory::hydrate($arr["status"]);
         }
+        if (array_key_exists("conditions", $arr))
+        {
+            $result->conditions = CampaignCampaignConditions::hydrate($arr["conditions"]);
+        }
         return $result;
     }
 
@@ -91,6 +96,12 @@ function setStatus(CampaignStatusWithHistory $status)
         return $this;
     }
 
+    function setConditions(?CampaignCampaignConditions $conditions)
+    {
+        $this->conditions = $conditions;
+        return $this;
+    }
+    
     function setState(CampaignEntityState $state)
     {
         $this->state = $state;

src/Models/CampaignAnalyticsProductAnalytics.php

@@ -28,7 +28,7 @@ public static function hydrate(array $arr) : CampaignAnalyticsProductAnalytics
             $result->timeSeries = array();
             foreach($arr["timeSeries"] as &$value)
             {
-                array_push($result->timeSeries, $value);
+                array_push($result->timeSeries, CampaignAnalyticsProductAnalyticsPeriodMetrics::hydrate($value));
             }
         }
         if (array_key_exists("promotions", $arr))
@@ -40,7 +40,7 @@ public static function hydrate(array $arr) : CampaignAnalyticsProductAnalytics
             $result->promotedProducts = array();
             foreach($arr["promotedProducts"] as &$value)
             {
-                array_push($result->promotedProducts, $value);
+                array_push($result->promotedProducts, CampaignAnalyticsProductAnalyticsPromotedProductMetrics::hydrate($value));
             }
         }
         return $result;

src/Models/CampaignAnalyticsProductAnalyticsPeriodMetrics.php

@@ -43,7 +43,7 @@ public static function hydrate(array $arr) : CampaignAnalyticsProductAnalyticsPe
             $result->currencies = array();
             foreach($arr["currencies"] as &$value)
             {
-                array_push($result->currencies, $value);
+                array_push($result->currencies, CampaignAnalyticsProductAnalyticsPeriodMetricsCurrencyMetrics::hydrate($value));
             }
         }
         return $result;

src/Models/CampaignCampaignConditions.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace Relewise\Models;
+
+class CampaignCampaignConditions extends RetailMediaConditions
+{
+    public string $typeDefinition = "Relewise.Client.DataTypes.RetailMedia.Campaign+CampaignConditions, Relewise.Client";
+    public ?RetailMediaSearchTermConditionCollection $searchTerm;
+    
+    public static function create() : CampaignCampaignConditions
+    {
+        $result = new CampaignCampaignConditions();
+        return $result;
+    }
+    
+    public static function hydrate(array $arr) : CampaignCampaignConditions
+    {
+        $result = RetailMediaConditions::hydrateBase(new CampaignCampaignConditions(), $arr);
+        if (array_key_exists("searchTerm", $arr))
+        {
+            $result->searchTerm = RetailMediaSearchTermConditionCollection::hydrate($arr["searchTerm"]);
+        }
+        return $result;
+    }
+    
+    function setSearchTerm(?RetailMediaSearchTermConditionCollection $searchTerm)
+    {
+        $this->searchTerm = $searchTerm;
+        return $this;
+    }
+}