fix: regression for final N+1 manager models solution

Author: danh91

ee/insiders

@@ -187,6 +187,11 @@ class Meta:
         on_delete=models.SET_NULL,
     )
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution."""
+        return queryset.resolve_config_for(context)
+
     def __str__(self):
         return self.carrier_id
 
@@ -229,10 +234,16 @@ def carrier_config(self):
 
     @property
     def config(self) -> dict:
-        if hasattr(self, '_computed_config'):
-            return self._computed_config or {}
-
-        return getattr(self.carrier_config, "config", {})
+        if hasattr(self, "_computed_config"):
+            annotated_config = self._computed_config
+            if annotated_config is not None:
+                return annotated_config
+            # If the annotation didn't resolve (eg. context missing), fall back to DB lookup.
+        resolved_config = getattr(self.carrier_config, "config", None)
+        if resolved_config is not None:
+            return resolved_config
+        # Return empty dict if no config is found - do NOT fallback to credentials
+        return {}
 
     @property
     def services(self) -> typing.Optional[typing.List[dict]]:

modules/core/karrio/server/providers/models/carrier.py

@@ -201,7 +201,7 @@ def create(
         context: serializers.Context,
         **kwargs,
     ) -> providers.Carrier:
-        config = validated_data.pop("config")
+        config = validated_data.pop("config", None)
         carrier_name = validated_data.pop("carrier_name")
         default_capabilities = references.get_carrier_capabilities(carrier_name)
         capabilities = lib.identity(

modules/core/karrio/server/providers/serializers/base.py

@@ -107,11 +107,6 @@ def get_queryset(self):
 
 class TrackingManager(models.Manager):
     def get_queryset(self):
-        from karrio.server.providers.models.carrier import Carrier
-
-        # Prefetch carrier with config resolution to avoid N+1 queries
-        carrier_queryset = Carrier.objects.resolve_config_for(None)
-
         return (
             super()
             .get_queryset()
@@ -120,13 +115,8 @@ def get_queryset(self):
                 "shipment",
                 "shipment__recipient",
                 "shipment__shipper",
-                "tracking_carrier",
-                "tracking_carrier__created_by",
-                "tracking_carrier__rate_sheet",
             )
             .prefetch_related(
-                "tracking_carrier__active_users",
-                models.Prefetch("tracking_carrier", queryset=carrier_queryset),
                 *(("org",) if conf.settings.MULTI_ORGANIZATIONS else tuple()),
             )
         )
@@ -553,6 +543,16 @@ def delete(self, *args, **kwargs):
         handle = self.address or super()
         return handle.delete(*args, **kwargs)
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution for pickup_carrier."""
+        from karrio.server.providers.models.carrier import Carrier
+
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+        return queryset.prefetch_related(
+            models.Prefetch("pickup_carrier", queryset=carrier_queryset),
+        )
+
     @property
     def object_type(self):
         return "pickup"
@@ -649,6 +649,16 @@ class Meta:
         "Shipment", on_delete=models.CASCADE, related_name="shipment_tracker", null=True
     )
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution for tracking_carrier."""
+        from karrio.server.providers.models.carrier import Carrier
+
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+        return queryset.prefetch_related(
+            models.Prefetch("tracking_carrier", queryset=carrier_queryset),
+        )
+
     @property
     def object_type(self):
         return "tracker"
@@ -843,6 +853,25 @@ def delete(self, *args, **kwargs):
         self.customs and self.customs.delete()
         return super().delete(*args, **kwargs)
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """
+        Apply context-aware prefetching for carriers with proper config resolution.
+        This is called by access_by() to ensure carrier configs are resolved for the request context.
+        """
+        from karrio.server.providers.models.carrier import Carrier
+
+        # Resolve carrier configs with the request context for user/org-specific config
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+
+        # Re-apply carrier prefetches with context-aware config resolution
+        # Note: Manager's get_queryset() already sets up base prefetches with context=None
+        # This overrides those prefetches with context-aware ones when called via access_by()
+        return queryset.prefetch_related(
+            models.Prefetch("carriers", queryset=carrier_queryset),
+            models.Prefetch("selected_rate_carrier", queryset=carrier_queryset),
+        )
+
     @property
     def object_type(self):
         return "shipment"
@@ -962,6 +991,16 @@ class Meta:
         related_name="shipment_upload_record",
     )
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution for upload_carrier."""
+        from karrio.server.providers.models.carrier import Carrier
+
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+        return queryset.prefetch_related(
+            models.Prefetch("upload_carrier", queryset=carrier_queryset),
+        )
+
     # Computed properties
 
     @property
@@ -1029,6 +1068,16 @@ class Meta:
 
     manifest_carrier = models.ForeignKey(providers.Carrier, on_delete=models.CASCADE)
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution for manifest_carrier."""
+        from karrio.server.providers.models.carrier import Carrier
+
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+        return queryset.prefetch_related(
+            models.Prefetch("manifest_carrier", queryset=carrier_queryset),
+        )
+
     # Computed properties
 
     @property