Change to generic update functions

Author: qdegraaf

src/commercetools/testing/cart_discounts.py

@@ -12,7 +12,8 @@
 )
 from commercetools.testing import utils
 from commercetools.testing.abstract import BaseModel, ServiceBackend
-from commercetools.testing.utils import update_attribute, update_enum_attribute
+from commercetools.testing.utils import update_attribute, update_enum_attribute, \
+    update_datetime_attribute
 
 
 class CartDiscountsModel(BaseModel):
@@ -65,18 +66,6 @@ def urls(self):
             ("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
         ]
 
-    def set_valid_from(self, obj, action: models.CartDiscountSetValidFromAction):
-        # real API always increments version, so always apply new value.
-        new = copy.deepcopy(obj)
-        new["validFrom"] = action.valid_from.isoformat()
-        return new
-
-    def set_valid_until(self, obj, action: models.CartDiscountSetValidUntilAction):
-        # real API always increments version, so always apply new value.
-        new = copy.deepcopy(obj)
-        new["validUntil"] = action.valid_until.isoformat()
-        return new
-
     _actions = {
         "setKey": update_attribute("key", "key"),
         "changeSortOrder": update_attribute("sortOrder", "sort_order"),
@@ -85,6 +74,6 @@ def set_valid_until(self, obj, action: models.CartDiscountSetValidUntilAction):
         "setName": update_attribute("name", "name"),
         "setDescription": update_attribute("description", "description"),
         "setCartPredicate": update_attribute("cartPredicate", "cart_predicate"),
-        "setValidFrom": set_valid_from,
-        "setValidUntil": set_valid_until,
+        "setValidFrom": update_datetime_attribute("validFrom", "valid_from"),
+        "setValidUntil": update_datetime_attribute("validUntil", "valid_until"),
     }

src/commercetools/testing/discount_codes.py

@@ -12,7 +12,8 @@
 )
 from commercetools.testing import utils
 from commercetools.testing.abstract import BaseModel, ServiceBackend
-from commercetools.testing.utils import update_attribute
+from commercetools.testing.utils import update_attribute, update_datetime_attribute, \
+    update_nested_object_attribute
 
 
 class DiscountCodesModel(BaseModel):
@@ -59,28 +60,6 @@ def urls(self):
             ("^(?P<id>[^/]+)$", "POST", self.update_by_id),
         ]
 
-    def set_valid_from(self, obj, action: models.DiscountCodeSetValidFromAction):
-        # real API always increments version, so always apply new value.
-        new = copy.deepcopy(obj)
-        new["validFrom"] = action.valid_from.isoformat()
-        return new
-
-    def set_valid_until(self, obj, action: models.DiscountCodeSetValidUntilAction):
-        # real API always increments version, so always apply new value.
-        new = copy.deepcopy(obj)
-        new["validUntil"] = action.valid_until.isoformat()
-        return new
-
-    def change_cart_discounts(
-        self, obj, action: models.DiscountCodeChangeCartDiscountsAction
-    ):
-        # real API always increments version, so always apply new value.
-        new = copy.deepcopy(obj)
-        new["cartDiscounts"] = [
-            cart_discount.serialize() for cart_discount in action.cart_discounts
-        ]
-        return new
-
     _actions = {
         "changeIsActive": update_attribute("isActive", "is_active"),
         "setName": update_attribute("name", "name"),
@@ -90,7 +69,7 @@ def change_cart_discounts(
         "setMaxApplicationsPerCustomer": update_attribute(
             "maxApplicationsPerCustomer", "max_applications_per_customer"
         ),
-        "setValidFrom": set_valid_from,
-        "setValidUntil": set_valid_until,
-        "changeCartDiscounts": change_cart_discounts,
+        "setValidFrom": update_datetime_attribute("validFrom", "valid_from"),
+        "setValidUntil": update_datetime_attribute("validUntil", "valid_until"),
+        "changeCartDiscounts": update_nested_object_attribute("cartDiscounts", "cart_discounts"),
     }

src/commercetools/testing/extensions.py

@@ -11,7 +11,7 @@
     ExtensionUpdateSchema,
 )
 from commercetools.testing.abstract import BaseModel, ServiceBackend
-from commercetools.testing.utils import update_attribute
+from commercetools.testing.utils import update_attribute, update_nested_object_attribute
 
 
 class ExtensionsModel(BaseModel):
@@ -59,5 +59,5 @@ def change_triggers(self, obj, action: models.ExtensionChangeTriggersAction):
         return new
 
     _actions = {
-        "changeTriggers": change_triggers,
+        "changeTriggers": update_nested_object_attribute("triggers", "triggers"),
     }

src/commercetools/testing/utils.py

@@ -3,6 +3,7 @@
 import json
 import typing
 import uuid
+from datetime import datetime
 
 from marshmallow import Schema
 from requests_mock import create_response
@@ -113,6 +114,37 @@ def updater(self, obj, action):
     return updater
 
 
+def update_datetime_attribute(dst: str, src: str):
+    def updater(self, obj, action):
+        value = getattr(action, src)
+
+        if not isinstance(value, datetime):
+            raise TypeError(f"Unsupported datetime object type: f{type(value)}")
+
+        if obj.get(dst) != value:
+            new = copy.deepcopy(obj)
+            new[dst] = value.isoformat()
+            return new
+        return obj
+
+    return updater
+
+
+def update_nested_object_attribute(dst: str, src: str):
+    def updater(self, obj, action):
+        values = getattr(action, src)
+
+        if not isinstance(values, typing.List):
+            raise TypeError(f"Unsupported nested object type: f{type(values)}")
+
+        if obj.get(dst) != values:
+            new = copy.deepcopy(obj)
+            new[dst] = [item.serialize() for item in values]
+            return new
+        return obj
+
+    return updater
+
 def update_enum_attribute(dst: str, src: str):
     def updater(self, obj, action):
         value = getattr(action, src).value