@things-factory/marketplace-base 4.3.11 → 4.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/marketplace-base",
-  "version": "4.3.11",
+  "version": "4.3.16",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,10 +24,10 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/integration-fulfillment": "^4.3.11",
-    "@things-factory/integration-marketplace": "^4.3.11",
-    "@things-factory/product-base": "^4.3.11",
-    "@things-factory/shell": "^4.3.11"
+    "@things-factory/integration-fulfillment": "^4.3.15",
+    "@things-factory/integration-marketplace": "^4.3.15",
+    "@things-factory/product-base": "^4.3.14",
+    "@things-factory/shell": "^4.3.14"
   },
-  "gitHead": "a16381e8ddcabf722fa3590abebe32baa34fc125"
+  "gitHead": "62892327e53288b479a13a53043067c678cd9bfc"
 }

package/server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts

@@ -91,15 +91,9 @@ export const splitOrdersByBatch = {
         let marketplaceOrderShippingItem: MarketplaceOrderShippingItem = newMarketplaceOrderShippingItems[a]
         const product: Product = marketplaceOrderShippingItem.product
         const marketplaceOrderItem: MarketplaceOrderItem = marketplaceOrderShippingItem.marketplaceOrderItem
-        const marketplaceProductVariations: MarketplaceProductVariation[] = await tx
-          .getRepository(MarketplaceProductVariation)
-          .find({
-            where: { domain: marketplaceOrder.domain, sku: product.sku },
-            relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
-          })
-        const marketplaceProductVariation: MarketplaceProductVariation = marketplaceProductVariations.filter(
-          mpv => mpv.marketplaceProduct.marketplaceStore.id == marketplaceOrder.marketplaceStore.id
-        )[0]
+
+        const marketplaceProductVariation: MarketplaceProductVariation =
+          marketplaceOrderItem.marketplaceProductVariation
 
         if (!marketplaceProductVariation?.primaryUnitValue)
           throw new Error(marketplaceProductVariation.variationSku + ' weight is empty')

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

@@ -381,20 +381,26 @@ export const syncMarketplaceOrder = {
             let foundVariations = []
             for (var j = 0; j < order.orderItems.length; j++) {
               var item = order.orderItems[j]
-              let foundVariationsQuery = await tx.getRepository(MarketplaceProductVariation).find({
-                where: { domain: marketplaceStore.domain, variationId: item.variationId },
-                relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
-              })
 
-              let foundVariation = foundVariationsQuery.find(
-                fv => fv.marketplaceProduct && fv.marketplaceProduct.marketplaceStore.id == marketplaceStore.id
-              )
+              const qb: SelectQueryBuilder<MarketplaceProductVariation> = await tx
+                .getRepository(MarketplaceProductVariation)
+                .createQueryBuilder('mpv')
+                .leftJoin('mpv.marketplaceProduct', 'mp')
+                .leftJoin('mp.marketplaceStore', 'ms')
+                .where('mpv.domain_id = :domainId')
+                .andWhere('mpv.variation_id = :variationId')
+                .andWhere('ms.id = :marketplaceStoreId')
+                .setParameters({
+                  domainId: marketplaceStore.domain,
+                  variationId: item.variationId,
+                  marketplaceStoreId: marketplaceStore.id
+                })
+
+              let foundVariation: MarketplaceProductVariation = await qb.getOne()
 
               if (foundVariation) {
                 foundVariations.push(foundVariation)
-              }
-
-              if (!foundVariation) {
+              } else {
                 let newVariation: any = {
                   variationId: item.variationId,
                   name: item.variationName,