Fix findInterface to return an actual DeliveryInterface

unchainedshop · Nov 9, 2023 · e00d351 · e00d351
1 parent bf84575
commit e00d351
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/packages/api/src/resolvers/type/delivery-provider-types.ts b/packages/api/src/resolvers/type/delivery-provider-types.ts
@@ -40,15 +40,8 @@ export interface DeliveryProviderHelperTypes {
 export const DeliveryProvider: DeliveryProviderHelperTypes = {
   interface(obj, _, { modules }) {
     const Interface = modules.delivery.findInterface(obj);
-
-    // TODO: Harmonize with Payment, eliminate double mappings (_id -> key -> _id ...)
     if (!Interface) return null;
-
-    return {
-      _id: Interface.key,
-      label: Interface.label,
-      version: Interface.version,
-    };
+    return Interface;
   },
 
   async isActive(deliveryProvider, _, requestContext) {

diff --git a/packages/core-delivery/src/module/configureDeliveryModule.ts b/packages/core-delivery/src/module/configureDeliveryModule.ts
@@ -85,8 +85,14 @@ export const configureDeliveryModule = async ({
 
     // Delivery Adapter
 
-    findInterface: (deliveryProvider) => {
-      return DeliveryDirector.getAdapter(deliveryProvider.adapterKey);
+    findInterface: (paymentProvider) => {
+      const Adapter = DeliveryDirector.getAdapter(paymentProvider.adapterKey);
+      if (!Adapter) return null;
+      return {
+        _id: Adapter.key,
+        label: Adapter.label,
+        version: Adapter.version,
+      };
     },
 
     findInterfaces: ({ type }) => {

diff --git a/packages/platform/src/templates/utils/getOrderSummaryData.ts b/packages/platform/src/templates/utils/getOrderSummaryData.ts
@@ -2,7 +2,6 @@ import { UnchainedCore } from '@unchainedshop/types/core.js';
 import { Order } from '@unchainedshop/types/orders.js';
 import { OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
 import { Locale } from '@unchainedshop/types/common.js';
-import { DeliveryInterface } from '@unchainedshop/types/delivery.js';
 import formatPrice from './formatPrice.js';
 import { formatAddress } from './formatAddress.js';
 

diff --git a/packages/types/delivery.ts b/packages/types/delivery.ts
@@ -134,7 +134,7 @@ export type DeliveryModule = ModuleMutationsWithReturnDoc<DeliveryProvider> & {
   }) => IDeliveryPricingSheet;
 
   // Delivery adapter
-  findInterface: (params: DeliveryProvider) => IDeliveryAdapter;
+  findInterface: (params: DeliveryProvider) => DeliveryInterface;
   findInterfaces: (params: { type: DeliveryProviderType }) => Array<DeliveryInterface>;
   findSupported: (
     params: { order: Order },