Merge branch 'development'

Author: BranDavidSebastian

OneSila/sales_channels/integrations/mirakl/factories/feeds/build.py

@@ -58,7 +58,6 @@ def _has_pending_feed_for_group(self, *, feed: MiraklSalesChannelFeed) -> bool:
             type=MiraklSalesChannelFeed.TYPE_COMBINED,
             status__in=[
                 MiraklSalesChannelFeed.STATUS_PENDING,
-                MiraklSalesChannelFeed.STATUS_SUBMITTED,
                 MiraklSalesChannelFeed.STATUS_PROCESSING,
             ],
         ).exclude(id=feed.id).exists()

OneSila/sales_channels/integrations/mirakl/factories/feeds/product_payloads.py

@@ -41,6 +41,10 @@
     MiraklSalesChannelFeed,
     MiraklSalesChannelFeedItem,
 )
+from sales_channels.integrations.mirakl.utils.helpers import (
+    build_remote_property_mapping_label,
+    get_local_instance_label,
+)
 from sales_channels.integrations.mirakl.utils.type_parameters import get_mirakl_type_parameter_value
 from sales_channels.models import SalesChannelFeedItem, SalesChannelIntegrationPricelist
 from sales_prices.models import SalesPriceListItem
@@ -86,8 +90,10 @@ def get_select_value(self, *, product_property=None, remote_property=None, langu
 
         mapped_value = self.remote_select_lookup.get((remote_property.id, local_select_value.id))
         if mapped_value is None:
+            local_value_label = get_local_instance_label(local_instance=local_select_value)
             raise MissingMappingError(
-                f"Map the OneSila select value for Mirakl field '{remote_property.code}' before pushing."
+                f"Map the OneSila select value '{local_value_label}' for "
+                f"{build_remote_property_mapping_label(remote_property=remote_property)} before pushing."
             )
         return self._serialize_remote_select_value(select_value=mapped_value)
 
@@ -110,8 +116,10 @@ def get_select_value_multiple(self, *, product_property=None, remote_property=No
         for local_select_value in product_property.value_multi_select.all():
             mapped_value = self.remote_select_lookup.get((remote_property.id, local_select_value.id))
             if mapped_value is None:
+                local_value_label = get_local_instance_label(local_instance=local_select_value)
                 raise MissingMappingError(
-                    f"Map all OneSila multiselect values for Mirakl field '{remote_property.code}' before pushing."
+                    f"Map the OneSila multiselect value '{local_value_label}' for "
+                    f"{build_remote_property_mapping_label(remote_property=remote_property)} before pushing."
                 )
             mapped_values.append(self._serialize_remote_select_value(select_value=mapped_value))
 
@@ -771,7 +779,7 @@ def _resolve_property_value(
                 representation_type=representation_type,
             ):
                 raise MissingMappingError(
-                    f"Map Mirakl field '{remote_property.code}'"
+                    f"Map {build_remote_property_mapping_label(remote_property=remote_property)} before pushing."
                 )
             raise PreFlightCheckError(
                 self._build_missing_required_value_message(
@@ -795,11 +803,7 @@ def _build_missing_required_value_message(
                 f"Mirakl required field '{remote_property.code}' is missing for product {product_label}."
             )
 
-        local_property_label = (
-            getattr(local_instance, "internal_name", None)
-            or getattr(local_instance, "name", None)
-            or str(local_instance.id)
-        )
+        local_property_label = get_local_instance_label(local_instance=local_instance)
         parent_product = product_context.get("parent_product")
         if product is not None and parent_product is not None and getattr(product, "id", None) != getattr(parent_product, "id", None):
             return (

OneSila/sales_channels/integrations/mirakl/factories/mixins.py

@@ -17,6 +17,9 @@ class GetMiraklAPIMixin:
     default_timeout = 30
     default_page_size = 100
 
+    def _build_retry_delay(self, *, attempt: int) -> int:
+        return max(1, 2 ** max(0, attempt - 1))
+
     def get_api(self):
         return self
 
@@ -82,17 +85,37 @@ def _request(
             headers.setdefault("Content-Type", "application/json")
 
         for attempt in range(1, max_attempts + 1):
-            response = self.get_mirakl_session().request(
-                method=method,
-                url=url,
-                params=request_params,
-                json=None if files else payload,
-                data=None if not files else payload,
-                files=files,
-                headers=headers,
-                timeout=request_timeout,
-                verify=self.sales_channel.verify_ssl,
-            )
+            try:
+                response = self.get_mirakl_session().request(
+                    method=method,
+                    url=url,
+                    params=request_params,
+                    json=None if files else payload,
+                    data=None if not files else payload,
+                    files=files,
+                    headers=headers,
+                    timeout=request_timeout,
+                    verify=self.sales_channel.verify_ssl,
+                )
+            except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as exc:
+                if attempt < max_attempts:
+                    sleep_for = self._build_retry_delay(attempt=attempt)
+                    logger.warning(
+                        "Mirakl request failed for %s %s (%s/%s). Retrying in %s seconds.",
+                        method,
+                        path,
+                        attempt,
+                        max_attempts,
+                        sleep_for,
+                        exc_info=exc,
+                    )
+                    time.sleep(sleep_for)
+                    continue
+                raise ValueError(
+                    f"Mirakl request timed out for {method} {path} after {max_attempts} attempts: {exc}"
+                ) from exc
+            except requests.exceptions.RequestException as exc:
+                raise ValueError(f"Mirakl request failed for {method} {path}: {exc}") from exc
 
             if response.status_code == 429 and attempt < max_attempts:
                 retry_after = response.headers.get("Retry-After", "1")

OneSila/sales_channels/integrations/mirakl/factories/sales_channels/full_schema.py

@@ -32,6 +32,8 @@
 class MiraklFullSchemaSyncFactory(GetMiraklAPIMixin):
     """Fetch and mirror the Mirakl schema metadata."""
 
+    schema_timeout = 120
+
     def __init__(self, *, sales_channel, import_process=None):
         self.sales_channel = sales_channel
         self.import_process = import_process
@@ -125,33 +127,35 @@ def run(self) -> dict[str, int]:
         return self.summary_data
 
     def _get_document_types(self) -> list[dict[str, Any]]:
-        response = self.mirakl_get(path="/api/documents")
+        response = self.mirakl_get(path="/api/documents", timeout=self.schema_timeout)
         return self._normalize_records(response.get("document_types"))
 
     def _get_offer_states(self) -> list[dict[str, Any]]:
         response = self.mirakl_get(
             path="/api/offers/states",
             params={"active": "true"},
+            timeout=self.schema_timeout,
         )
         return self._normalize_records(response.get("offer_states"))
 
     def _get_logistic_classes(self) -> list[dict[str, Any]]:
-        response = self.mirakl_get(path="/api/shipping/logistic_classes")
+        response = self.mirakl_get(path="/api/shipping/logistic_classes", timeout=self.schema_timeout)
         return self._normalize_records(response.get("logistic_classes"))
 
     def _get_hierarchies(self) -> list[dict[str, Any]]:
-        response = self.mirakl_get(path="/api/hierarchies")
+        response = self.mirakl_get(path="/api/hierarchies", timeout=self.schema_timeout)
         return self._normalize_records(response.get("hierarchies"))
 
     def _get_attributes(self) -> list[dict[str, Any]]:
         response = self.mirakl_get(
             path="/api/products/attributes",
             params={"all_operator_attributes": True},
+            timeout=self.schema_timeout,
         )
         return self._normalize_records(response.get("attributes"))
 
     def _get_value_lists(self) -> list[dict[str, Any]]:
-        response = self.mirakl_get(path="/api/values_lists")
+        response = self.mirakl_get(path="/api/values_lists", timeout=self.schema_timeout)
         return self._normalize_records(response.get("values_lists"))
 
     def _prepare_progress(

OneSila/sales_channels/integrations/mirakl/tests/tests_factories/test_product_payloads.py

@@ -9,7 +9,7 @@
 from media.models import Media, MediaProductThrough
 from products.models import ConfigurableVariation
 from properties.models import Property, ProductProperty, PropertySelectValue
-from properties.models import ProductPropertiesRule, PropertySelectValueTranslation
+from properties.models import ProductPropertiesRule, PropertySelectValueTranslation, PropertyTranslation
 from properties.models import ProductPropertyTextTranslation
 from products.models import ProductTranslation, ProductTranslationBulletPoint
 from sales_channels.exceptions import MiraklPayloadValidationError, MissingMappingError, PreFlightCheckError
@@ -272,6 +272,12 @@ def test_select_field_with_unmapped_local_value_still_raises_missing_mapping(sel
             multi_tenant_company=self.multi_tenant_company,
             type=Property.TYPES.SELECT,
         )
+        PropertyTranslation.objects.create(
+            multi_tenant_company=self.multi_tenant_company,
+            property=local_property,
+            language="en",
+            name="Colour",
+        )
         builder, _, product = self._build_builder(
             remote_code="colour",
             local_property=local_property,
@@ -283,6 +289,12 @@ def test_select_field_with_unmapped_local_value_still_raises_missing_mapping(sel
             multi_tenant_company=self.multi_tenant_company,
             property=local_property,
         )
+        PropertySelectValueTranslation.objects.create(
+            multi_tenant_company=self.multi_tenant_company,
+            propertyselectvalue=local_select_value,
+            language="en",
+            value="Purple",
+        )
         baker.make(
             ProductProperty,
             multi_tenant_company=self.multi_tenant_company,
@@ -293,7 +305,7 @@ def test_select_field_with_unmapped_local_value_still_raises_missing_mapping(sel
 
         with self.assertRaisesMessage(
             MissingMappingError,
-            "Missing Mirakl mappings:\n- Map the OneSila select value for Mirakl field 'colour' before pushing.",
+            "Missing Mirakl mappings:\n- Map the OneSila select value 'Purple' for Mirakl field 'colour' (local 'Colour') before pushing.",
         ):
             builder.build()
 

OneSila/sales_channels/integrations/mirakl/utils/helpers.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+
+def get_local_instance_label(*, local_instance=None) -> str:
+    if local_instance is None:
+        return ""
+
+    for attr_name in ("name", "internal_name", "value"):
+        label = getattr(local_instance, attr_name, None)
+        if label not in (None, "", "No Name Set", "No Value Set"):
+            return str(label)
+
+    local_instance_id = getattr(local_instance, "id", None)
+    if local_instance_id is None:
+        return ""
+    return str(local_instance_id)
+
+
+def build_remote_property_mapping_label(*, remote_property=None) -> str:
+    remote_property_code = getattr(remote_property, "code", "") or ""
+    local_property_label = get_local_instance_label(
+        local_instance=getattr(remote_property, "local_instance", None),
+    )
+    if not local_property_label:
+        return f"Mirakl field '{remote_property_code}'"
+    return f"Mirakl field '{remote_property_code}' (local '{local_property_label}')"

OneSila/sales_channels/integrations/shopify/factories/sales_channels/oauth.py

@@ -19,8 +19,8 @@ def __init__(self, sales_channel: ShopifySalesChannel):
         self.redirect_url = None
 
         shopify.Session.setup(
-            api_key=self.sales_channel.api_key,
-            secret=self.sales_channel.api_secret
+            api_key=settings.SHOPIFY_API_KEY,
+            secret=settings.SHOPIFY_API_SECRET
         )
 
     def clean_shop_hostname(self, hostname: str) -> str:
@@ -73,10 +73,7 @@ def __init__(self, sales_channel: ShopifySalesChannel, shop: str, code: str, hma
         self.host = host
 
     def exchange_token(self):
-        shopify.Session.setup(
-            api_key=self.sales_channel.api_key,
-            secret=self.sales_channel.api_secret,
-        )
+        shopify.Session.setup(api_key=settings.SHOPIFY_API_KEY, secret=settings.SHOPIFY_API_SECRET)
         session = shopify.Session(self.shop, settings.SHOPIFY_API_VERSION)
 
         try:

OneSila/sales_channels/schema/mutations/mutation_type.py

@@ -35,53 +35,7 @@
 
 @type(name='Mutation')
 class SalesChannelsMutation:
-    @strawberry_django.mutation(handle_django_errors=True, extensions=default_extensions)
-    def create_sales_import_process(
-        self,
-        data: SalesChannelImportInput,
-        info: Info,
-    ) -> SalesChannelImportType:
-        multi_tenant_company = get_multi_tenant_company(info, fail_silently=False)
-        sales_channel = SalesChannel.objects.get(
-            id=data.sales_channel.id.node_id,
-            multi_tenant_company=multi_tenant_company,
-        ).get_real_instance()
-
-        import_name = str(getattr(data, "name", "") or "").strip()
-        import_status = getattr(data, "status", SalesChannelImport.STATUS_NEW)
-
-        from sales_channels.integrations.mirakl.models import MiraklSalesChannel, MiraklSalesChannelImport
-
-        if isinstance(sales_channel, MiraklSalesChannel):
-            normalized_name = import_name.lower()
-            import_type = (
-                MiraklSalesChannelImport.TYPE_PRODUCTS
-                if normalized_name == MiraklSalesChannelImport.TYPE_PRODUCTS
-                else MiraklSalesChannelImport.TYPE_SCHEMA
-            )
-            return MiraklSalesChannelImport.objects.create(
-                multi_tenant_company=multi_tenant_company,
-                sales_channel=sales_channel,
-                name=import_name,
-                status=import_status,
-                create_only=getattr(data, "create_only", False),
-                update_only=getattr(data, "update_only", False),
-                override_only=getattr(data, "override_only", False),
-                skip_broken_records=getattr(data, "skip_broken_records", False),
-                type=import_type,
-            )
-
-        return SalesChannelImport.objects.create(
-            multi_tenant_company=multi_tenant_company,
-            sales_channel=sales_channel,
-            name=import_name,
-            status=import_status,
-            create_only=getattr(data, "create_only", False),
-            update_only=getattr(data, "update_only", False),
-            override_only=getattr(data, "override_only", False),
-            skip_broken_records=getattr(data, "skip_broken_records", False),
-        )
-
+    create_sales_import_process: SalesChannelImportType = create(SalesChannelImportInput)
     create_sales_import_processes: List[SalesChannelImportType] = create(SalesChannelImportInput)
     update_sales_import_process: SalesChannelImportType = update(SalesChannelImportPartialInput)
     delete_sales_import_process: SalesChannelImportType = delete()