@things-factory/marketplace-base 4.3.33 → 4.3.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/marketplace-base",
-  "version": "4.3.33",
+  "version": "4.3.34",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@things-factory/integration-fulfillment": "^4.3.33",
-    "@things-factory/integration-marketplace": "^4.3.33",
+    "@things-factory/integration-marketplace": "^4.3.34",
     "@things-factory/product-base": "^4.3.32",
     "@things-factory/shell": "^4.3.32"
   },
-  "gitHead": "e4f9100eef61d010cca0a9692f413f60be2e462c"
+  "gitHead": "feaae0d28d92c8eccb6b1ae8dbedd43c460e2d32"
 }

package/server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings-for-batch-init.ts

@@ -7,43 +7,82 @@ import { getLogisticsParam } from '../marketplace-order/get-logistics-param'
 
 export const marketplaceOrderShippingsForBatchInitResolver = {
   async marketplaceOrderShippingsForBatchInit(_: any, params: ListParam, context: any) {
-    const statusFilter: any = params.filters.filter(filter => filter.name === 'status')
-    let paramsFilters: any[] = params.filters.filter(
-      filter => filter.name !== 'status' && filter.name != 'logisticsType'
-    )
-    let paramListParams: any = {
-      filters: [...paramsFilters],
-      pagination: params.pagination,
-      sortings: params.sortings
-    }
+    try {
+      const statusFilter: any = params.filters.filter(filter => filter.name === 'status')
+      let paramsFilters: any[] = params.filters.filter(
+        filter => filter.name !== 'status' && filter.name != 'logisticsType'
+      )
+      let paramListParams: any = {
+        filters: [...paramsFilters],
+        pagination: params.pagination
+      }
+
+      let sortings = params.sortings
+
+      let qb: SelectQueryBuilder<MarketplaceOrderShipping> =
+        getRepository(MarketplaceOrderShipping).createQueryBuilder('mos')
+      buildQuery(qb, paramListParams, context)
+
+      qb.leftJoinAndSelect('mos.marketplaceStore', 'marketplaceStore')
+      qb.leftJoinAndMapOne('mos.marketplaceOrder', MarketplaceOrder, 'mo', 'mo.order_no = mos.order_no_ref')
+      qb.andWhere('mo.status NOT IN (:...statuses)', { statuses: statusFilter[0].value })
+
+      if (sortings?.length !== 0) {
+        const sorter = (sortings || []).reduce((acc, sort) => {
+          const order: string = sort.desc ? 'DESC' : 'ASC'
+
+          switch (sort.name) {
+            case 'orderNoRef':
+              acc = { ...acc, ['mos.orderNoRef']: order }
+              break
+
+            case 'shippingProvider':
+              acc = { ...acc, ['mos.transporter']: order }
+              break
+
+            case 'ownShippingProvider':
+              acc = { ...acc, ['mos.ownTransporter']: order }
+              break
 
-    let qb: SelectQueryBuilder<MarketplaceOrderShipping> = getRepository(MarketplaceOrderShipping).createQueryBuilder(
-      'mos'
-    )
-    buildQuery(qb, paramListParams, context)
-
-    qb.leftJoinAndSelect('mos.marketplaceStore', 'marketplaceStore')
-    qb.leftJoinAndMapOne('mos.marketplaceOrder', MarketplaceOrder, 'mo', 'mo.orderNo = mos.orderNoRef')
-    qb.andWhere('mo.status NOT IN (:...statuses)', { statuses: statusFilter[0].value })
-
-    let [items, total] = await qb.getManyAndCount()
-
-    items = await Promise.all(
-      items.map(async (itm: any) => {
-        if (itm.marketplaceStore.platform == 'shopee' && itm.status === 'ready_to_ship') {
-          let fullLogisticsDetail = await getLogisticsParam.getLogisticsParam(
-            _,
-            { storeId: itm.marketplaceStore.id, orderNo: itm.orderNo },
-            context
-          )
-
-          return { ...itm, fullLogisticsDetail }
-        } else {
-          return itm
-        }
-      })
-    )
-
-    return { items: items.filter(itm => itm), total }
+            case 'status':
+              acc = { ...acc, ['mo.status']: order }
+              break
+
+            case 'orderCreatedAt':
+              acc = { ...acc, ['mo.orderCreatedAt']: order }
+              break
+
+            case 'orderUpdatedAt':
+              acc = { ...acc, ['mo.orderUpdatedAt']: order }
+              break
+          }
+
+          return acc
+        }, {})
+        qb.orderBy(sorter)
+      }
+
+      let [items, total] = await qb.getManyAndCount()
+
+      items = await Promise.all(
+        items.map(async (itm: any) => {
+          if (itm.marketplaceStore.platform == 'shopee' && itm.status === 'ready_to_ship') {
+            let fullLogisticsDetail = await getLogisticsParam.getLogisticsParam(
+              _,
+              { storeId: itm.marketplaceStore.id, orderNo: itm.orderNo },
+              context
+            )
+
+            return { ...itm, fullLogisticsDetail }
+          } else {
+            return itm
+          }
+        })
+      )
+
+      return { items: items.filter(itm => itm), total }
+    } catch (e) {
+      throw e
+    }
   }
 }