@unchainedshop/core-orders 2.0.0-beta7 → 2.0.0-beta9

package/src/service/createUserCartService.ts

@@ -2,37 +2,33 @@ import { CreateUserCartService } from '@unchainedshop/types/orders';
 
 export const createUserCartService: CreateUserCartService = async (
   { user, orderNumber, countryCode },
-  requestContext,
+  unchainedAPI,
 ) => {
-  const { countryContext, modules, services } = requestContext;
-
-  const normalizedCountryCode = countryCode || countryContext;
+  const { modules, services } = unchainedAPI;
 
   const currency = await services.countries.resolveDefaultCurrencyCode(
     {
-      isoCode: normalizedCountryCode,
+      isoCode: countryCode,
     },
-    requestContext,
+    unchainedAPI,
   );
 
-  const order = await modules.orders.create(
-    {
-      orderNumber,
-      currency,
-      countryCode: normalizedCountryCode,
-      billingAddress: user.lastBillingAddress || user.profile?.address,
-      contact:
-        user.lastContact ||
-        (!user.guest
-          ? {
-              telNumber: user.profile?.phoneMobile,
-              emailAddress: modules.users.primaryEmail(user)?.address,
-            }
-          : {}),
-    },
-    user._id,
-  );
+  const order = await modules.orders.create({
+    userId: user._id,
+    orderNumber,
+    currency,
+    countryCode,
+    billingAddress: user.lastBillingAddress || user.profile?.address,
+    contact:
+      user.lastContact ||
+      (!user.guest
+        ? {
+            telNumber: user.profile?.phoneMobile,
+            emailAddress: modules.users.primaryEmail(user)?.address,
+          }
+        : {}),
+  });
 
-  await modules.orders.initProviders(order, requestContext);
+  await modules.orders.initProviders(order, unchainedAPI);
   return order;
 };

package/src/service/migrateOrderCartService.ts

@@ -1,4 +1,3 @@
-import { Context } from '@unchainedshop/types/api';
 import { MigrateOrderCartsService } from '@unchainedshop/types/orders';
 
 export const migrateOrderCartsService: MigrateOrderCartsService = async (
@@ -13,22 +12,15 @@ export const migrateOrderCartsService: MigrateOrderCartsService = async (
     return toCart;
   }
 
-  const artificialContext: Context = {
-    countryContext,
-    user: toUser,
-    userId: toUser._id,
-    ...unchainedAPI,
-  } as Context;
-
   if (!toCart || !shouldMerge) {
     // No destination cart, move whole cart
     unchainedAPI.modules.orders.setCartOwner({ orderId: fromCart._id, userId: toUser._id });
-    return unchainedAPI.modules.orders.updateCalculation(fromCart._id, artificialContext);
+    return unchainedAPI.modules.orders.updateCalculation(fromCart._id, unchainedAPI);
   }
 
   // Move positions
   unchainedAPI.modules.orders.moveCartPositions({ fromOrderId: fromCart._id, toOrderId: toCart._id });
 
-  await unchainedAPI.modules.orders.updateCalculation(fromCart._id, artificialContext);
-  return unchainedAPI.modules.orders.updateCalculation(toCart._id, artificialContext);
+  await unchainedAPI.modules.orders.updateCalculation(fromCart._id, unchainedAPI);
+  return unchainedAPI.modules.orders.updateCalculation(toCart._id, unchainedAPI);
 };

package/tests/orders-index.test.ts

@@ -1,50 +1,105 @@
-import { assert } from 'chai';
-import { initDb } from '@unchainedshop/mongodb';
-import { configureOrdersModule } from '@unchainedshop/core-orders';
-import { OrdersModule } from '@unchainedshop/types/orders';
-
-describe('Test exports', () => {
-  let module: OrdersModule;
-
-  before(async () => {
-    const db = await initDb();
-    module = await configureOrdersModule({ db }).catch((error) => {
-      console.error(error);
-
-      throw error;
-    });
-  });
-
-  it('Insert order', async () => {
-    let order = await module.create(
-      {
-        billingAddress: {
-          lastName: 'Mustermann',
-          firstName: 'Max',
-          addressLine: 'Teststreet 11',
-          city: 'Zürich',
-          postalCode: '8009',
-          company: 'Unchained Commerce',
-          countryCode: 'CH',
-        },
-        orderNumber: 'Nr-1234123',
-        currency: 'CHF',
-        countryCode: 'CH',
-      },
-      'Test-User-1'
-    );
-
-    assert.ok(order);
-    const orderId = order._id;
-    order = await module.findOrder({ orderId });
-
-    assert.ok(order);
-
-    const deletedCount = await module
-      .delete(orderId, 'Test-User-1')
-      .catch((error) => {
-        return 0;
+import {buildFindByIdSelector as buildFindByIdSelectorForDelivery} from '../src/module/configureOrderDeliveriesModule'
+import {buildFindByIdSelector as buildFindByIdSelectorForDiscount } from '../src/module/configureOrderDiscountsModule'
+import {buildFindByIdSelector as buildFindByIdSelectorForPayment, buildFindByContextDataSelector } from '../src/module/configureOrderPaymentsModule'
+import {buildFindByIdSelector as buildFindByIdSelectorForPosition } from '../src/module/configureOrderPositionsModule'
+import {buildFindSelector as buildFindSelectorForOrder} from '../src/module/configureOrdersModule-queries'
+
+
+describe('OrderPosition', () => {
+  describe('buildFindSelector',  () => {
+    it('Return filter object when passed no argument', async () => {   
+      expect(buildFindSelectorForOrder({})).toEqual({ status: { '$ne': null } })
+      
+    });
+
+    it('Return filter object when passed no argument includeCarts, queryString, status, userId and (status should take precedence over includeCarts', async () => {   
+      expect(buildFindSelectorForOrder({includeCarts: false, queryString: "hello world", status: 'CONFIRMED', userId: "admin-id"})).toEqual({
+        userId: 'admin-id',
+        status: 'CONFIRMED',
+        '$text': { '$search': 'hello world' }
+      }
+  )
+      
+    });
+
+    it('Return filter object when passed no argument includeCarts, queryString, userId ', async () => {   
+      expect(buildFindSelectorForOrder({includeCarts: true, queryString: "hello world", userId: "admin-id"})).toEqual( {
+        userId: 'admin-id',
+        
+        '$text': { '$search': 'hello world' }
+      }
+  )
+      
+    });
+
+    it('Return filter object when passed no argument queryString, userId ', async () => {   
+      expect(buildFindSelectorForOrder({ queryString: "hello world", userId: "admin-id"})).toEqual( {
+        userId: 'admin-id',
+        '$text': { '$search': 'hello world' },
+        status: { '$ne': null },
+      }
+  )
+      
+    });
+
+    it('Return filter object when passed no argument queryString ', async () => {   
+      expect(buildFindSelectorForOrder({ queryString: "hello world"})).toEqual( {
+        '$text': { '$search': 'hello world' },
+        status: { '$ne': null },
+      })
+      
+    });
+
+  })
+
+});
+
+describe('OrderDelivery', () => {
+
+  describe('buildFindByIdSelector',  () => {
+    it('Return correct db _id selector', async () => {
+      
+      expect(buildFindByIdSelectorForDelivery('order-delivery-id')).toEqual({ _id: 'order-delivery-id' })
+    });
+  })
+  
+});
+
+
+describe('OrderDiscount', () => {
+
+  describe('buildFindByIdSelector',  () => {
+    it('Return correct db _id selector', async () => {
+      
+      expect(buildFindByIdSelectorForDiscount('order-discount-id')).toEqual({ _id: 'order-discount-id' })
+    });
+  })
+  
+});
+
+describe('OrderPayment', () => {
+
+  describe('buildFindByIdSelector',  () => {
+    it('Return correct db _id selector', async () => {
+      
+      expect(buildFindByIdSelectorForPayment('order-payment-id')).toEqual({ _id: 'order-payment-id' })
+    });
+  })
+
+  describe('buildFindByContextDataSelector',  () => {
+      it('Return correct db context field selector object', async () => {
+        expect(buildFindByContextDataSelector({'first': 'first value', 'second': 'second value'})).toEqual({ 'context.first': 'first value', 'context.second': 'second value' })
       });
-    assert.equal(deletedCount, 1);
-  });
+  })
+  
+});
+
+
+describe('OrderPosition', () => {
+  describe('buildFindByIdSelector',  () => {
+    it('Return correct db _id selector', async () => {      
+      expect(buildFindByIdSelectorForPosition('order-position-id')).toEqual({ _id: 'order-position-id' })
+    });
+  })
+
 });