@pinelab/vendure-plugin-qls-fulfillment 1.0.0-beta.3 → 1.0.0-beta.5

package/README.md

@@ -59,8 +59,9 @@ Make sure to monitor failed jobs: A job that failed after its retries were exhau
 2. A product was not synced to QLS
 
 Monitor your logs for the following text:
-* `QLS webhook error` - This means an incoming stock update webhook was not processed correctly.
-* `Error creating or updating variant` - This means a product was not synced to QLS.
+
+- `QLS webhook error` - This means an incoming stock update webhook was not processed correctly.
+- `Error creating or updating variant` - This means a product was not synced to QLS.
 
 Make sure to filter by logger context `QlsPlugin`, to prevent false positive alerts.
 

package/dist/lib/qls-client.js

@@ -86,7 +86,7 @@ class QlsClient {
         if (!response.ok) {
             const errorText = await response.text();
             // Log error including the request body
-            core_1.Logger.error(`QLS request failed: ${response.status} ${response.statusText} - ${errorText}`, constants_1.loggerCtx, data ? JSON.stringify(data, null, 2) : undefined);
+            core_1.Logger.error(`QLS request to '${url}' failed: ${response.status} ${response.statusText} - ${errorText}`, constants_1.loggerCtx, data ? JSON.stringify(data, null, 2) : undefined);
             throw new Error(errorText);
         }
         const contentType = response.headers.get('content-type') ?? '';

package/dist/services/qls-product.service.d.ts

@@ -1,12 +1,13 @@
 import { OnApplicationBootstrap, OnModuleInit } from '@nestjs/common';
-import { EventBus, ID, Job, JobQueueService, ProductVariant, ProductVariantService, RequestContext, StockLevelService, StockLocationService, TransactionalConnection } from '@vendure/core';
+import { EventBus, ID, Job, JobQueueService, ListQueryBuilder, ProductPriceApplicator, ProductVariant, ProductVariantService, RequestContext, StockLevelService, StockLocationService, TransactionalConnection } from '@vendure/core';
+import { FulfillmentProduct } from '../lib/client-types';
 import { QlsClient } from '../lib/qls-client';
 import { QlsPluginOptions, QlsProductJobData } from '../types';
-import { FulfillmentProduct } from '../lib/client-types';
 type SyncProductsJobResult = {
     updatedInQls: number;
     createdInQls: number;
     updatedStock: number;
+    failed: number;
 };
 export declare class QlsProductService implements OnModuleInit, OnApplicationBootstrap {
     private connection;
@@ -16,8 +17,10 @@ export declare class QlsProductService implements OnModuleInit, OnApplicationBoo
     private readonly variantService;
     private readonly stockLocationService;
     private readonly eventBus;
+    private readonly listQueryBuilder;
+    private readonly productPriceApplicator;
     private productJobQueue;
-    constructor(connection: TransactionalConnection, options: QlsPluginOptions, jobQueueService: JobQueueService, stockLevelService: StockLevelService, variantService: ProductVariantService, stockLocationService: StockLocationService, eventBus: EventBus);
+    constructor(connection: TransactionalConnection, options: QlsPluginOptions, jobQueueService: JobQueueService, stockLevelService: StockLevelService, variantService: ProductVariantService, stockLocationService: StockLocationService, eventBus: EventBus, listQueryBuilder: ListQueryBuilder, productPriceApplicator: ProductPriceApplicator);
     onApplicationBootstrap(): void;
     onModuleInit(): Promise<void>;
     /**

package/dist/services/qls-product.service.js

@@ -19,11 +19,12 @@ exports.QlsProductService = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@vendure/core");
 const catch_unknown_1 = require("catch-unknown");
+const typeorm_1 = require("typeorm");
 const util_1 = __importDefault(require("util"));
 const constants_1 = require("../constants");
 const qls_client_1 = require("../lib/qls-client");
 let QlsProductService = class QlsProductService {
-    constructor(connection, options, jobQueueService, stockLevelService, variantService, stockLocationService, eventBus) {
+    constructor(connection, options, jobQueueService, stockLevelService, variantService, stockLocationService, eventBus, listQueryBuilder, productPriceApplicator) {
         this.connection = connection;
         this.options = options;
         this.jobQueueService = jobQueueService;
@@ -31,6 +32,8 @@ let QlsProductService = class QlsProductService {
         this.variantService = variantService;
         this.stockLocationService = stockLocationService;
         this.eventBus = eventBus;
+        this.listQueryBuilder = listQueryBuilder;
+        this.productPriceApplicator = productPriceApplicator;
     }
     onApplicationBootstrap() {
         // Listen for ProductVariantEvent and add a job to the queue
@@ -107,6 +110,7 @@ let QlsProductService = class QlsProductService {
             // Create or update products in QLS
             let createdQlsProductsCount = 0;
             let updatedQlsProductsCount = 0;
+            let failedCount = 0;
             for (const variant of allVariants) {
                 try {
                     const existingQlsProduct = allQlsProducts.find((p) => p.sku == variant.sku);
@@ -121,7 +125,9 @@ let QlsProductService = class QlsProductService {
                 catch (e) {
                     const error = (0, catch_unknown_1.asError)(e);
                     core_1.Logger.error(`Error creating or updating variant '${variant.sku}' in QLS: ${error.message}`, constants_1.loggerCtx, error.stack);
+                    failedCount += 1;
                 }
+                await new Promise((resolve) => setTimeout(resolve, 700)); // Avoid rate limit of 500/5 minutes (700ms delay = 85/minute)
             }
             core_1.Logger.info(`Created ${createdQlsProductsCount} products in QLS`, constants_1.loggerCtx);
             core_1.Logger.info(`Updated ${updatedQlsProductsCount} products in QLS`, constants_1.loggerCtx);
@@ -129,6 +135,7 @@ let QlsProductService = class QlsProductService {
                 updatedInQls: updatedQlsProductsCount,
                 createdInQls: createdQlsProductsCount,
                 updatedStock: updateStockCount,
+                failed: failedCount,
             };
         }
         catch (e) {
@@ -148,29 +155,44 @@ let QlsProductService = class QlsProductService {
                 updatedInQls: 0,
                 createdInQls: 0,
                 updatedStock: 0,
+                failed: 0,
             };
         }
         let updatedInQls = 0;
         let createdInQls = 0;
+        let failedCount = 0;
         for (const variantId of productVariantIds) {
-            const variant = await this.variantService.findOne(ctx, variantId);
-            if (!variant) {
-                core_1.Logger.error(`Variant with id ${variantId} not found. Not creating or updating product in QLS.`, constants_1.loggerCtx);
-                continue;
-            }
-            const existingQlsProduct = await client.getFulfillmentProductBySku(variant.sku);
-            const result = await this.createOrUpdateProductInQls(ctx, client, variant, existingQlsProduct ?? null);
-            if (result === 'created') {
-                createdInQls += 1;
+            try {
+                const variant = await this.variantService.findOne(ctx, variantId, [
+                    'featuredAsset',
+                    'taxCategory',
+                    'channels',
+                    'product.featuredAsset',
+                ]);
+                if (!variant) {
+                    core_1.Logger.error(`Variant with id ${variantId} not found. Not creating or updating product in QLS.`, constants_1.loggerCtx);
+                    continue;
+                }
+                const existingQlsProduct = await client.getFulfillmentProductBySku(variant.sku);
+                const result = await this.createOrUpdateProductInQls(ctx, client, variant, existingQlsProduct ?? null);
+                if (result === 'created') {
+                    createdInQls += 1;
+                }
+                else if (result === 'updated') {
+                    updatedInQls += 1;
+                }
             }
-            else if (result === 'updated') {
-                updatedInQls += 1;
+            catch (e) {
+                const error = (0, catch_unknown_1.asError)(e);
+                core_1.Logger.error(`Error syncing variant ${variantId} to QLS: ${error.message}`, constants_1.loggerCtx, error.stack);
+                failedCount += 1;
             }
         }
         return {
             updatedInQls,
             createdInQls,
             updatedStock: 0,
+            failed: failedCount,
         };
     }
     /**
@@ -270,16 +292,27 @@ let QlsProductService = class QlsProductService {
         const take = 100;
         let hasMore = true;
         while (hasMore) {
-            const result = await this.variantService.findAll(ctx, {
-                filter: { deletedAt: { isNull: true } },
+            const relations = [
+                'featuredAsset',
+                'taxCategory',
+                'channels',
+                'product.featuredAsset',
+            ];
+            const [items, totalItems] = await this.listQueryBuilder
+                .build(core_1.ProductVariant, {
                 skip,
                 take,
-            });
-            if (!result.items.length) {
-                break;
-            }
-            allVariants.push(...result.items);
-            if (allVariants.length >= result.totalItems) {
+            }, {
+                relations,
+                channelId: ctx.channelId,
+                where: { deletedAt: (0, typeorm_1.IsNull)() },
+                ctx,
+            })
+                .getManyAndCount();
+            let variants = await Promise.all(items.map(async (item) => this.productPriceApplicator.applyChannelPriceAndTax(item, ctx, undefined, false)));
+            variants = variants.map((v) => (0, core_1.translateDeep)(v, ctx.languageCode));
+            allVariants.push(...variants);
+            if (allVariants.length >= totalItems) {
                 hasMore = false;
             }
             skip += take;
@@ -311,5 +344,7 @@ exports.QlsProductService = QlsProductService = __decorate([
         core_1.StockLevelService,
         core_1.ProductVariantService,
         core_1.StockLocationService,
-        core_1.EventBus])
+        core_1.EventBus,
+        core_1.ListQueryBuilder,
+        core_1.ProductPriceApplicator])
 ], QlsProductService);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-qls-fulfillment",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "description": "Vendure plugin to fulfill orders via QLS.",
   "keywords": [
     "fulfillment",