From 3ef15ca26d9a7d108f6cdceb411e94df060cae11 Mon Sep 17 00:00:00 2001
From: Daniel K <danielk.developer@gmail.com>
Date: Thu, 22 Aug 2024 09:56:35 -0700
Subject: [PATCH] chore: fix generic carrier configration parsing

---
 modules/core/karrio/server/core/dataunits.py | 12 ++++++------
 modules/core/karrio/server/core/gateway.py   | 12 +++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/core/karrio/server/core/dataunits.py b/modules/core/karrio/server/core/dataunits.py
index 49bf98a681..f1763faede 100644
--- a/modules/core/karrio/server/core/dataunits.py
+++ b/modules/core/karrio/server/core/dataunits.py
@@ -78,11 +78,10 @@ def contextual_reference(request: Request = None, reduced: bool = True):
 
     def _get_generic_carriers():
         system_custom_carriers = [
-            c.settings
-            for c in gateway.Carriers.list(system_only=True, carrier_name="generic")
+            c for c in gateway.Carriers.list(system_only=True, carrier_name="generic")
         ]
         custom_carriers = [
-            c.settings
+            c
             for c in (
                 gateway.Carriers.list(context=request, carrier_name="generic").exclude(
                     is_system=True
@@ -93,13 +92,14 @@ def _get_generic_carriers():
         ]
 
         extra_carriers = {
-            c.custom_carrier_name: c.display_name for c in custom_carriers
+            f"{c.credentials.get('custom_carrier_name') or "generic"}": c.display_name for c in custom_carriers
         }
         system_carriers = {
-            c.custom_carrier_name: c.display_name for c in system_custom_carriers
+            f"{c.credentials.get('custom_carrier_name') or "generic"}": c.display_name
+            for c in system_custom_carriers
         }
         extra_services = {
-            c.custom_carrier_name: {
+            f"{c.credentials.get('custom_carrier_name') or "generic"}": {
                 s.service_code: s.service_code for s in c.services.all()
             }
             for c in custom_carriers
diff --git a/modules/core/karrio/server/core/gateway.py b/modules/core/karrio/server/core/gateway.py
index a9e39fe10a..ef363a6068 100644
--- a/modules/core/karrio/server/core/gateway.py
+++ b/modules/core/karrio/server/core/gateway.py
@@ -1,7 +1,7 @@
 import uuid
 import typing
 import logging
-from datetime import datetime
+import datetime
 
 from django.db.models import Q
 from django.conf import settings
@@ -198,7 +198,7 @@ def process_meta(parent) -> dict:
                 "ext": carrier.ext,
                 "carrier": rate_provider,
                 "service_name": service_name,
-                "rate_provider": rate_provider,  # TODO: deprecate rate_provider
+                "rate_provider": rate_provider,  # TODO: deprecate 'rate_provider' in favor of 'carrier'
             }
 
         def process_selected_rate() -> dict:
@@ -263,7 +263,9 @@ def process_parcel_refs(parcels: typing.List[dict]) -> list:
                 "parcels": process_parcel_refs(payload["parcels"]),
                 "tracking_url": process_tracking_url(shipment_rate),
                 "status": serializers.ShipmentStatus.purchased.value,
-                "created_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f%z"),
+                "created_at": datetime.datetime.now().strftime(
+                    "%Y-%m-%d %H:%M:%S.%f%z"
+                ),
                 "meta": process_meta(shipment),
                 "messages": messages,
             },
@@ -361,10 +363,10 @@ def track(
             tracking_number=tracking_number,
             events=[
                 datatypes.TrackingEvent(
-                    date=datetime.now().strftime("%Y-%m-%d"),
+                    date=datetime.datetime.now().strftime("%Y-%m-%d"),
                     description="Awaiting update from carrier...",
                     code="UNKNOWN",
-                    time=datetime.now().strftime("%H:%M"),
+                    time=datetime.datetime.now().strftime("%H:%M"),
                 )
             ],
             delivered=False,