[FEAT] Make structure and title optional (#76)

* feat ⭐ make structure and title optional

* tests ✅ update test

* tests ✅ dont clean if there is no structure

* refactor 📦 update exception message

* feat ⭐ make upc optional for product's related models

Author: samar-hassan

oscar_odin/mappings/context.py

@@ -408,7 +408,9 @@ def bulk_update_or_create_many_to_many(self):
                             # Instead of failing bulk_create here below, we will add an error.
                             self.errors.add_error(
                                 OscarOdinException(
-                                    f"Cannot create m2m relationship {Through.__name__} - related model '{relation.related_model.__name__}' is missing a primary key"
+                                    {
+                                        Through.__name__: f"Cannot create m2m relationship {Through.__name__} - related model '{relation.related_model.__name__}' is missing a primary key"
+                                    }
                                 ),
                                 instance,
                             )

oscar_odin/resources/catalogue.py

@@ -70,7 +70,7 @@ class CategoryResource(OscarCatalogueResource):
     depth: Optional[int]
     path: Optional[str]
     children: Optional[List["CategoryResource"]] = odin.ListOf.delayed(
-        lambda: CategoryResource
+        lambda: CategoryResource, null=True
     )
 
 
@@ -89,11 +89,11 @@ class ProductAttributeValueResource(OscarCatalogueResource):
 
 
 class ParentProductResource(OscarCatalogueResource):
-    upc: str
+    upc: Optional[str]
 
 
 class ProductRecommentationResource(OscarCatalogueResource):
-    upc: str
+    upc: Optional[str]
 
 
 class ProductResource(OscarCatalogueResource):
@@ -102,8 +102,10 @@ class ProductResource(OscarCatalogueResource):
     id: Optional[int]
     code: Optional[str]
     upc: Optional[str]
-    structure: str = StringField(choices=ProductModel.STRUCTURE_CHOICES)
-    title: str
+    structure: Optional[str] = StringField(
+        choices=ProductModel.STRUCTURE_CHOICES, null=True
+    )
+    title: Optional[str]
     slug: Optional[str]
     description: Optional[str] = ""
     meta_title: Optional[str]

tests/reverse/test_catalogue.py

@@ -27,6 +27,7 @@
     PRODUCT_TITLE,
     PRODUCT_UPC,
     PRODUCT_DESCRIPTION,
+    PRODUCT_IS_DISCOUNTABLE,
     PRODUCTCLASS_REQUIRESSHIPPING,
     MODEL_IDENTIFIERS_MAPPING,
 )
@@ -240,14 +241,12 @@ def test_resource_default_value(self):
         prd = Product.objects.get(upc="1234")
         self.assertEqual(prd.is_discountable, False)
 
-        product_resource = ProductResource(
-            upc="1234",
-            title="bat",
-            slug="asdf",
-            structure=Product.STANDALONE,
-            product_class=product_class,
+        product_resource = ProductResource(upc="1234", is_discountable=True)
+        _, errors = products_to_db(
+            product_resource,
+            fields_to_update=[PRODUCT_IS_DISCOUNTABLE],
+            clean_instances=False,
         )
-        _, errors = products_to_db(product_resource)
         self.assertEqual(len(errors), 0)
         prd.refresh_from_db()
         # Default value of is_discountable is considered from the ProductResource
@@ -678,7 +677,7 @@ def test_recommendation_non_existing(self):
         _, errors = products_to_db(product_resource)
         self.assertEqual(len(errors), 1)
         self.assertEqual(
-            str(errors[0]),
+            str(errors[0].args[0]["ProductRecommendation"]),
             "Cannot create m2m relationship ProductRecommendation - related model 'Product' is missing a primary key",
         )