@things-factory/marketplace-base 4.1.3 → 4.1.4

package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts

@@ -1,4 +1,5 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, IsNull } from 'typeorm'
+import uuid from 'uuid/v4'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
@@ -11,6 +12,7 @@ import {
   MarketplaceOrder,
   MarketplaceOrderItem,
   MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem,
   MarketplaceProductVariation
 } from '../../../entities'
 import { NoGenerator } from '../../../utils'
@@ -100,8 +102,9 @@ export const syncMarketplaceOrder = {
             'domain',
             'fulfillmentCenter',
             'marketplaceOrderItems',
-            'marketplaceOrderItems.marketplaceProductVariation',
-            'marketplaceOrderItems.marketplaceOrderShipping'
+            'marketplaceOrderItems.marketplaceOrderShippingItems',
+            'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+            'marketplaceOrderItems.marketplaceProductVariation'
           ]
         })
 
@@ -317,7 +320,9 @@ export const syncMarketplaceOrder = {
             } else {
               if (existingMarketplaceOrder?.marketplaceOrderItems) {
                 let existingOrderShipping: MarketplaceOrderShipping
-                existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping
+                existingOrderShipping =
+                  existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShippingItems[0]
+                    .marketplaceOrderShipping
 
                 marketplaceOrderShipping = {
                   ...existingOrderShipping,
@@ -378,7 +383,6 @@ export const syncMarketplaceOrder = {
           marketplaceOrderItem.marketplaceProductVariation = foundVariation
           marketplaceOrderItem.trackingCode = order.trackingNo
           marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-          marketplaceOrderItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
           marketplaceOrderItem.originalPrice = item.originalPrice
           marketplaceOrderItem.discount = item.discount
           marketplaceOrderItem.promotionId = item.promotionId
@@ -676,6 +680,61 @@ export const syncMarketplaceOrder = {
         await tx.getRepository(MarketplaceOrder).save(marketplaceOrder)
         await tx.getRepository(MarketplaceOrderItem).save(marketplaceOrderItems)
 
+        for (let i = 0; i < marketplaceOrderItems.length; i++) {
+          const marketplaceOrderItem: MarketplaceOrderItem = marketplaceOrderItems[i]
+          const marketplaceProductVariation: MarketplaceProductVariation =
+            marketplaceOrderItem.marketplaceProductVariation
+          let existingMarketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = await tx
+            .getRepository(MarketplaceOrderShippingItem)
+            .find({
+              where: { domain: marketplaceStore.domain, marketplaceOrderItem }
+            })
+
+          let product: Product = await tx.getRepository(Product).findOne({
+            where: { domain: marketplaceStore.domain, sku: marketplaceProductVariation.sku, deletedAt: IsNull() },
+            relations: ['productDetails']
+          })
+
+          let productBundle: ProductBundle
+          if (!product) {
+            productBundle = await tx.getRepository(ProductBundle).findOne({
+              where: { domain: marketplaceStore.domain, sku: marketplaceProductVariation.sku },
+              relations: ['productBundleSettings', 'productBundleSettings.product']
+            })
+          }
+
+          if (existingMarketplaceOrderShippingItems && existingMarketplaceOrderShippingItems?.length) {
+          } else {
+            if (productBundle) {
+              const productBundleSettings: ProductBundleSetting[] = productBundle.productBundleSettings
+              let marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = []
+              productBundleSettings.map(productBundleSetting => {
+                let marketplaceOrderShippingItem: MarketplaceOrderShippingItem = new MarketplaceOrderShippingItem()
+                marketplaceOrderShippingItem.name = uuid()
+                marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty * productBundleSetting.bundleQty
+                marketplaceOrderShippingItem.domain = marketplaceStore.domain
+                marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+                marketplaceOrderShippingItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
+                marketplaceOrderShippingItem.product = productBundleSetting.product
+
+                marketplaceOrderShippingItems.push(marketplaceOrderShippingItem)
+              })
+
+              await tx.getRepository(MarketplaceOrderShippingItem).save(marketplaceOrderShippingItems)
+            } else {
+              let marketplaceOrderShippingItem: MarketplaceOrderShippingItem = new MarketplaceOrderShippingItem()
+              marketplaceOrderShippingItem.name = uuid()
+              marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty
+              marketplaceOrderShippingItem.domain = marketplaceStore.domain
+              marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+              marketplaceOrderShippingItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
+              marketplaceOrderShippingItem.product = product ? product : null
+
+              await tx.getRepository(MarketplaceOrderShippingItem).save(marketplaceOrderShippingItem)
+            }
+          }
+        }
+
         if (i == marketplaceOrders.length - 1) {
           lastOrderId = order.name
         }

package/server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts

@@ -2,7 +2,12 @@ import { EntityManager } from 'typeorm'
 
 import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
 
-import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '../../../entities'
+import {
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem
+} from '../../../entities'
 
 export const updateOrderReadyToShip = {
   async updateOrderReadyToShip(_: any, { shippingProvider, deliveryType, orderNo }, context: any) {
@@ -12,7 +17,8 @@ export const updateOrderReadyToShip = {
       relations: [
         'marketplaceStore',
         'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceOrderShipping',
+        'marketplaceOrderItems.marketplaceOrderShippingItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
         'marketplaceOrderItems.marketplaceProductVariation'
       ]
     })
@@ -25,9 +31,12 @@ export const updateOrderReadyToShip = {
     let marketplaceOrderShippings: MarketplaceOrderShipping[] = []
 
     foundMarketplaceOrder.marketplaceOrderItems.map(item => {
-      if (item?.marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(item.marketplaceOrderShipping)
-      }
+      const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = item.marketplaceOrderShippingItems
+      marketplaceOrderShippingItems.map(itm => {
+        if (itm?.marketplaceOrderShipping) {
+          marketplaceOrderShippings.push(itm.marketplaceOrderShipping)
+        }
+      })
     })
 
     const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {

package/server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shipping.ts

@@ -1,20 +1,25 @@
 import { getRepository } from 'typeorm'
+
 import { MarketplaceOrderShipping } from '../../../entities'
 
 export const marketplaceOrderShippingResolver = {
   async marketplaceOrderShipping(_: any, { name }, context: any) {
     const repository = getRepository(MarketplaceOrderShipping)
 
-    return await getRepository(MarketplaceOrderShipping).findOne({
+    const items: MarketplaceOrderShipping = await repository.findOne({
       where: { domain: context.state.domain, name },
       relations: [
         'domain',
         'creator',
         'updater',
-        'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceProductVariation',
-        'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct'
+        'marketplaceOrderShippingItems',
+        'marketplaceOrderShippingItems.product',
+        'marketplaceOrderShippingItems.marketplaceOrderItem',
+        'marketplaceOrderShippingItems.marketplaceOrderItem.marketplaceProductVariation',
+        'marketplaceOrderShippingItems.marketplaceOrderItem.marketplaceProductVariation.marketplaceProduct'
       ]
     })
+
+    return items
   }
 }

package/server/graphql/resolvers/marketplace-order-shipping-item/create-marketplace-order-shipping-item.ts

@@ -0,0 +1,14 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const createMarketplaceOrderShippingItem = {
+  async createMarketplaceOrderShippingItem(_: any, { marketplaceOrderShippingItem }, context: any) {
+    return await getRepository(MarketplaceOrderShippingItem).save({
+      ...marketplaceOrderShippingItem,
+      domain: context.state.domain,
+      creator: context.state.user,
+      updater: context.state.user
+    })
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-item.ts

@@ -0,0 +1,10 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const deleteMarketplaceOrderShippingItem = {
+  async deleteMarketplaceOrderShippingItem(_: any, { name }, context: any) {
+    await getRepository(MarketplaceOrderShippingItem).delete({ domain: context.state.domain, name })
+    return true
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-items.ts

@@ -0,0 +1,13 @@
+import { getRepository, In } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const deleteMarketplaceOrderShippingItems = {
+  async deleteMarketplaceOrderShippingItems(_: any, { names }, context: any) {
+    await getRepository(MarketplaceOrderShippingItem).delete({
+      domain: context.state.domain,
+      name: In(names)
+    })
+    return true
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/index.ts

@@ -0,0 +1,20 @@
+import { createMarketplaceOrderShippingItem } from './create-marketplace-order-shipping-item'
+import { deleteMarketplaceOrderShippingItem } from './delete-marketplace-order-shipping-item'
+import { deleteMarketplaceOrderShippingItems } from './delete-marketplace-order-shipping-items'
+import { marketplaceOrderShippingItemResolver } from './marketplace-order-shipping-item'
+import { updateMarketplaceOrderShippingItem } from './update-marketplace-order-shipping-item'
+import { updateMultipleMarketplaceOrderShippingItem } from './update-multiple-marketplace-order-shipping-item'
+
+export const MarketplaceOrderShippingItemResolver = {
+  Query: {
+    ...marketplaceOrderShippingItemResolver,
+    ...marketplaceOrderShippingItemResolver
+  },
+  Mutation: {
+    ...updateMarketplaceOrderShippingItem,
+    ...updateMultipleMarketplaceOrderShippingItem,
+    ...createMarketplaceOrderShippingItem,
+    ...deleteMarketplaceOrderShippingItem,
+    ...deleteMarketplaceOrderShippingItems
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-item.ts

@@ -0,0 +1,21 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const marketplaceOrderShippingItemResolver = {
+  async marketplaceOrderShippingItem(_: any, { name }, context: any) {
+    const repository = getRepository(MarketplaceOrderShippingItem)
+
+    return await getRepository(MarketplaceOrderShippingItem).findOne({
+      where: { domain: context.state.domain, name },
+      relations: [
+        'domain',
+        'creator',
+        'updater',
+        'marketplaceOrderItem',
+        'marketplaceOrderItem.marketplaceProductVariation',
+        'marketplaceOrderItem.marketplaceProductVariation.marketplaceProduct'
+      ]
+    })
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-items.ts

@@ -0,0 +1,16 @@
+import { getRepository } from 'typeorm'
+
+import { convertListParams, ListParam } from '@things-factory/shell'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const marketplaceOrderShippingItemsResolver = {
+  async marketplaceOrderShippingItems(_: any, params: ListParam, context: any) {
+    const convertedParams = convertListParams(params)
+    const [items, total] = await getRepository(MarketplaceOrderShippingItem).findAndCount({
+      ...convertedParams,
+      relations: ['domain', 'creator', 'updater']
+    })
+    return { items, total }
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/update-marketplace-order-shipping-item.ts

@@ -0,0 +1,18 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const updateMarketplaceOrderShippingItem = {
+  async updateMarketplaceOrderShippingItem(_: any, { name, patch }, context: any) {
+    const repository = getRepository(MarketplaceOrderShippingItem)
+    const marketplaceOrderShippingItem = await repository.findOne({
+      where: { domain: context.state.domain, name }
+    })
+
+    return await repository.save({
+      ...marketplaceOrderShippingItem,
+      ...patch,
+      updater: context.state.user
+    })
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/update-multiple-marketplace-order-shipping-item.ts

@@ -0,0 +1,44 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const updateMultipleMarketplaceOrderShippingItem = {
+  async updateMultipleMarketplaceOrderShippingItem(_: any, { patches }, context: any) {
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+    const marketplaceOrderShippingItemRepo = getRepository(MarketplaceOrderShippingItem)
+
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        const result = await marketplaceOrderShippingItemRepo.save({
+          ...newRecord,
+          domain: context.state.domain,
+          creator: context.state.user,
+          updater: context.state.user
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const newRecord = _updateRecords[i]
+        const marketplaceOrderShippingItem = await marketplaceOrderShippingItemRepo.findOne(newRecord.id)
+
+        const result = await marketplaceOrderShippingItemRepo.save({
+          ...marketplaceOrderShippingItem,
+          ...newRecord,
+          updater: context.state.user
+        })
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
+    }
+
+    return results
+  }
+}

package/server/graphql/types/index.ts

@@ -10,3 +10,4 @@ export * from './store-replenishment-item'
 export * from './marketplace-product-variation-price'
 export * from './marketplace-refund-order'
 export * from './marketplace-report'
+export * from './marketplace-order-shipping-item'

package/server/graphql/types/marketplace-order-item/marketplace-order-item.ts

@@ -6,8 +6,8 @@ export const MarketplaceOrderItem = gql`
     name: String
     domain: Domain
     marketplaceOrder: MarketplaceOrder
+    marketplaceOrderShippingItems: [MarketplaceOrderShippingItem]
     marketplaceProductVariation: MarketplaceProductVariation
-    marketplaceOrderShipping: MarketplaceOrderShipping
     orderType: String
     cancelBy: String
     returnStatus: String

package/server/graphql/types/marketplace-order-item/new-marketplace-order-item.ts

@@ -12,7 +12,6 @@ export const NewMarketplaceOrderItem = gql`
     packageId: String
     invoiceNo: String
     status: String
-    marketplaceOrderShipping: NewMarketplaceOrderShipping
     marketplaceProductVariation: MarketplaceProductVariationPatch
   }
 `

package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts

@@ -5,7 +5,6 @@ export const MarketplaceOrderShippingPatch = gql`
     id: String
     name: String
     description: String
-    marketplaceOrderItems: [ObjectRef]
     orderNoRef: String
     subOrderNoRef: String
     address1: String

package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts

@@ -7,7 +7,7 @@ export const MarketplaceOrderShipping = gql`
     domain: Domain
     description: String
     marketplaceOrder: MarketplaceOrder
-    marketplaceOrderItems: [MarketplaceOrderItem]
+    marketplaceOrderShippingItems: [MarketplaceOrderShippingItem]
     marketplaceStore: MarketplaceStore
     orderNoRef: String
     subOrderNoRef: String

package/server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts

@@ -4,7 +4,6 @@ export const NewMarketplaceOrderShipping = gql`
   input NewMarketplaceOrderShipping {
     name: String
     description: String
-    marketplaceOrderItems: [ObjectRef]
     orderNoRef: String
     subOrderNoRef: String
     shippingId: String

package/server/graphql/types/marketplace-order-shipping-item/index.ts

@@ -0,0 +1,32 @@
+import gql from 'graphql-tag'
+
+export * from './marketplace-order-shipping-item'
+export * from './marketplace-order-shipping-item-list'
+export * from './marketplace-order-shipping-item-patch'
+export * from './new-marketplace-order-shipping-item'
+
+export const MarketplaceOrderShippingItemResolver = gql`
+  extend type Mutation {
+    createMarketplaceOrderShippingItem(
+      marketplaceOrderShippingItem: NewMarketplaceOrderShippingItem!
+    ): MarketplaceOrderShippingItem
+    updateMarketplaceOrderShippingItem(
+      name: String!
+      patch: MarketplaceOrderShippingItemPatch!
+    ): MarketplaceOrderShippingItem @transaction
+    updateMultipleMarketplaceOrderShippingItem(
+      patches: [MarketplaceOrderShippingItemPatch]!
+    ): [MarketplaceOrderShippingItem]
+    deleteMarketplaceOrderShippingItem(name: String!): Boolean
+    deleteMarketplaceOrderShippingItems(names: [String]!): Boolean
+  }
+
+  extend type Query {
+    marketplaceOrderShippingItems(
+      filters: [Filter]
+      pagination: Pagination
+      sortings: [Sorting]
+    ): MarketplaceOrderShippingItemList
+    marketplaceOrderShippingItem(name: String!): MarketplaceOrderShippingItem
+  }
+`

package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderShippingItemList = gql`
+  type MarketplaceOrderShippingItemList {
+    items: [MarketplaceOrderShippingItemList]
+    total: Int
+  }
+`

package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-patch.ts

@@ -0,0 +1,13 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderShippingItemPatch = gql`
+  input MarketplaceOrderShippingItemPatch {
+    id: String
+    name: String
+    marketplaceOrderItem: ObjectRef
+    marketplaceOrderShipping: ObjectRef
+    product: ObjectRef
+    qty: Int
+    cuFlag: String
+  }
+`

package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item.ts

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderShippingItem = gql`
+  type MarketplaceOrderShippingItem {
+    id: String
+    name: String
+    marketplaceOrderItem: MarketplaceOrderItem
+    marketplaceOrderShipping: MarketplaceOrderShipping
+    product: Product
+    qty: Int
+    updater: User
+    creator: User
+    updatedAt: String
+    createdAt: String
+  }
+`

package/server/graphql/types/marketplace-order-shipping-item/new-marketplace-order-shipping-item.ts

@@ -0,0 +1,12 @@
+import gql from 'graphql-tag'
+
+export const NewMarketplaceOrderShippingItem = gql`
+  input NewMarketplaceOrderShippingItem {
+    id: String
+    name: String
+    marketplaceOrderItem: ObjectRef
+    marketplaceOrderShipping: ObjectRef
+    product: ObjectRef
+    qty: Int
+  }
+`