Merge pull request #443 from commercetools/events-sdk-fixes

Events sdk fixes

Author: jenschude

commercetools.Sdk/Tests/commercetools.Api.Serialization.Tests/MessagesTests.cs

@@ -163,6 +163,28 @@ public void DeserializationOfListOfSubscriptionDeliveryUnwrapped()
             Assert.IsType<CustomerCreatedMessage>(customerCreatedPayload.Message);
         }
 
+        [Fact]
+        public void DeserializationOfListOfEventDeliveryUnwrapped()
+        {
+            ISerializerService serializerService = this.serializationFixture.SerializerService;
+            string serialized = File.ReadAllText("Resources/Messages/NotificationPayloads.json");
+            var payloads = serializerService.Deserialize<List<ISubscriptionNotification>>(serialized);
+            Assert.NotNull(payloads);
+            Assert.Equal(5, payloads.Count);
+            var resourceCreatedPayload = payloads[0] as ResourceCreatedDeliveryPayload;
+            var resourceUpdatedPayload = payloads[1] as ResourceUpdatedDeliveryPayload;
+            var resourceDeletedPayload = payloads[2] as ResourceDeletedDeliveryPayload;
+            var customerCreatedPayload = payloads[3] as MessageDeliveryPayload;
+            var importEventPayload = payloads[4] as EventDeliveryPayload;
+
+            Assert.NotNull(resourceCreatedPayload);
+            Assert.NotNull(resourceUpdatedPayload);
+            Assert.NotNull(resourceDeletedPayload);
+            Assert.NotNull(customerCreatedPayload);
+            Assert.NotNull(importEventPayload);
+            Assert.Equal(2, resourceUpdatedPayload.OldVersion);
+            Assert.IsType<CustomerCreatedMessage>(customerCreatedPayload.Message);
+        }
         [Fact]
         public void DeserializationOfListOfMessageSubscriptionPayloadsUnwrapped()
         {

commercetools.Sdk/Tests/commercetools.Api.Serialization.Tests/Resources/Messages/NotificationPayloads.json

@@ -0,0 +1,85 @@
+[
+  {
+    "notificationType": "ResourceCreated",
+    "projectKey": "test-php-sdk-129839581278250",
+    "resource": {
+      "typeId": "customer",
+      "id": "e63d76ff-e203-42ba-af17-375040b8ecb6"
+    },
+    "resourceUserProvidedIdentifiers": {
+      "key": "test-ca15403ea56ec0e51137ff40a6f4607e"
+    },
+    "version": 1,
+    "modifiedAt": "2019-09-12T09:39:21.338Z"
+  },
+  {
+    "notificationType": "ResourceUpdated",
+    "projectKey": "test-php-sdk-129839581278250",
+    "resource": {
+      "typeId": "category",
+      "id": "e63d76ff-e203-42ba-af17-375040b8ecb6"
+    },
+    "resourceUserProvidedIdentifiers": {
+      "key": "test-ca15403ea56ec0e51137ff40a6f4607e"
+    },
+    "version": 3,
+    "oldVersion": 2,
+    "modifiedAt": "2019-09-12T09:39:21.338Z"
+  },
+  {
+    "notificationType": "ResourceDeleted",
+    "projectKey": "test-php-sdk-129839581278250",
+    "resource": {
+      "typeId": "product",
+      "id": "e63d76ff-e203-42ba-af17-375040b8ecb6"
+    },
+    "resourceUserProvidedIdentifiers": {
+      "key": "test-ca15403ea56ec0e51137ff40a6f4607e"
+    },
+    "version": 2,
+    "modifiedAt": "2019-09-12T09:39:21.338Z"
+  },
+  {
+    "notificationType": "Message",
+    "projectKey": "test-php-sdk-129839581278250",
+    "payloadNotIncluded": {
+      "reason": "does not fit into the size limit of your message queue",
+      "payloadType": "CustomerCreated"
+    },
+    "resource": {
+      "typeId": "customer",
+      "id": "14dc1379-1edc-464f-9f7f-569274820aea"
+    },
+    "resourceUserProvidedIdentifiers": {
+      "key": "test-ca15403ea56ec0e51137ff40a6f4607e"
+    },
+    "id": "f88a8c79-eb0a-4e74-843b-0c96c6e462bc",
+    "version": 1,
+    "sequenceNumber": 1,
+    "resourceVersion": 1,
+    "type": "CustomerCreated",
+    "createdAt": "2019-08-14T08:24:39.347Z",
+    "lastModifiedAt": "2019-08-14T08:24:39.347Z",
+    "lastModifiedBy": {
+      "clientId": "kdlz-oxUfPV3tV1W9Y1-czoE",
+      "isPlatformClient": false
+    },
+    "createdBy": {
+      "clientId": "kdlz-oxUfPV3tV1W9Y1-czoE",
+      "isPlatformClient": false
+    }
+  },
+  {
+    "id": "3b364ca2-cbe5-42b4-a85a-37d4e57d659e",
+    "notificationType": "Event",
+    "type": "ImportContainerCreated",
+    "resourceType": "import-api",
+    "data": {
+      "version": 1,
+      "key": "my-import-container",
+      "createdAt": "2025-03-26T17:28:20.376Z",
+      "lastModifiedAt": "2025-03-26T17:28:20.376Z"
+    },
+    "createdAt": "2025-03-26T17:28:20.397Z"
+  }
+]

commercetools.Sdk/commercetools.Base.Serialization/JsonConverters/DeserializeAsConverterFactory.cs

@@ -27,7 +27,7 @@ public DeserializeAsConverterFactory(
         public override bool CanConvert(Type typeToConvert)
         {
             return (typeToConvert.IsAbstractClass() || typeToConvert.IsInterface)
-                   && typeToConvert.IsDefined(typeof(DeserializeAsAttribute));
+                   && typeToConvert.IsDefined(typeof(DeserializeAsAttribute)) && !typeToConvert.IsDefined(typeof(TypeDiscriminatorAttribute));
         }
 
         /// <inheritdoc/>

commercetools.Sdk/commercetools.Base.Serialization/JsonConverters/TypeDiscriminatorConverter.cs

@@ -19,7 +19,7 @@ public TypeDiscriminatorConverter(JsonNamingPolicy namingPolicy, JsonSerializerO
             if (DiscriminatorAttribute == null)
                 throw new NullReferenceException($"Failed to find the required '{nameof(TypeDiscriminatorAttribute)}'");
             this.DiscriminatorProperty = typeof(T).GetProperty(DiscriminatorAttribute.Property,
-                BindingFlags.Default | BindingFlags.Public | BindingFlags.Instance);
+                BindingFlags.Default | BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
             if (this.DiscriminatorProperty == null)
                 throw new NullReferenceException(
                     $"Failed to find the specified discriminator property '{DiscriminatorAttribute.Property}' in type '{typeof(T).Name}'");

commercetools.Sdk/commercetools.Sdk.Api/Models/Subscriptions/IDeliveryPayload.cs

@@ -0,0 +1,15 @@
+using commercetools.Base.CustomAttributes;
+
+namespace commercetools.Sdk.Api.Models.Subscriptions;
+
+[TypeDiscriminator(nameof(NotificationType))]
+[DefaultTypeDiscriminator(typeof(commercetools.Sdk.Api.Models.Subscriptions.DeliveryPayload))]
+[SubTypeDiscriminator("Message", typeof(commercetools.Sdk.Api.Models.Subscriptions.MessageDeliveryPayload))]
+[SubTypeDiscriminator("ResourceCreated", typeof(commercetools.Sdk.Api.Models.Subscriptions.ResourceCreatedDeliveryPayload))]
+[SubTypeDiscriminator("ResourceDeleted", typeof(commercetools.Sdk.Api.Models.Subscriptions.ResourceDeletedDeliveryPayload))]
+[SubTypeDiscriminator("ResourceUpdated", typeof(commercetools.Sdk.Api.Models.Subscriptions.ResourceUpdatedDeliveryPayload))]
+public partial interface IDeliveryPayload
+{ 
+    new string NotificationType { get; set; }
+
+}