@haus-tech/product-import-export-plugin 3.0.0 → 3.0.2

package/dist/providers/import-providers/product-importer.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ConfigService, ChannelService, FacetService, FacetValueService, TaxCategoryService, ID, ImportProgress, LanguageCode, RequestContext, OnProgressFn, ParsedFacet, ProductService, TransactionalConnection, TranslatableSaver, AssetService, Asset, ProductOptionGroupService } from '@vendure/core';
+import { ConfigService, ChannelService, FacetService, FacetValueService, TaxCategoryService, ID, ImportProgress, LanguageCode, RequestContext, OnProgressFn, ParsedFacet, ProductService, Product, TransactionalConnection, TranslatableSaver, AssetService, Asset, ProductOptionGroupService } from '@vendure/core';
 import { Stream } from 'stream';
 import { Observable } from 'rxjs';
 import { ExtendedFastImporterService } from '../../services/extended-fast-importer.service';
@@ -44,4 +44,5 @@ export declare class ProductImporter {
     private getMatchingTaxCategoryId;
     private getTranslationByCodeOrFirst;
     createFacetAndValue(facet: ParsedFacet, facetCode: string, valueCode: string): Promise<ID>;
+    getProductByIdWithRelations(ctx: RequestContext, id?: ID): Promise<Product | undefined>;
 }

package/dist/providers/import-providers/product-importer.js

@@ -207,6 +207,7 @@ let ProductImporter = class ProductImporter {
                 };
             }
             catch (err) {
+                core_1.Logger.error('Error while importing products:', 'ProductImporter', err?.stack);
                 return {
                     errors: [err.message],
                     imported: 0,
@@ -282,22 +283,7 @@ let ProductImporter = class ProductImporter {
                     checkExistingProduct = { id: foundVariants[0].productId };
                 }
             }
-            const existingProduct = checkExistingProduct
-                ? await this.connection.getRepository(ctx, core_1.Product).findOne({
-                    where: { id: checkExistingProduct?.id },
-                    withDeleted: true,
-                    relations: [
-                        'facetValues',
-                        'facetValues.facet',
-                        'optionGroups',
-                        'optionGroups.options',
-                        'variants',
-                        'variants.facetValues',
-                        'assets',
-                        'featuredAsset',
-                    ],
-                })
-                : undefined;
+            const existingProduct = await this.getProductByIdWithRelations(ctx, checkExistingProduct?.id);
             try {
                 if (existingProduct?.deletedAt) {
                     existingProduct.deletedAt = null;
@@ -306,13 +292,13 @@ let ProductImporter = class ProductImporter {
                     }
                     catch (error) {
                         errors.push(`Error while restoring the product: ${error}`);
-                        console.error('Error while restoring the product:', error);
+                        core_1.Logger.error('Error while restoring the product:', 'ProductImporter', error?.stack);
                     }
                 }
             }
             catch (error) {
                 errors.push(`Error while restoring the product: ${error}`);
-                console.error('Error while restoring the product:', error);
+                core_1.Logger.error('Error while restoring the product:', 'ProductImporter', error?.stack);
             }
             const existingProductName = existingProduct?.translations.find((t) => t.languageCode === languageCode)?.name;
             const productNameHasChanged = existingProduct && existingProductName !== productMainTranslation.name
@@ -447,7 +433,7 @@ let ProductImporter = class ProductImporter {
                     }
                     catch (error) {
                         errors.push(`Error while restoring the variant: ${error}`);
-                        console.error('Error while restoring the variant:', error);
+                        core_1.Logger.error('Error while restoring the variant:', 'ProductImporter', error?.stack);
                     }
                 }
                 if (existingVariant && updatingStrategy === 'replace') {
@@ -494,18 +480,7 @@ let ProductImporter = class ProductImporter {
                 }
             }
             if (existingProduct) {
-                const productAfterUpdate = (await this.connection.getRepository(ctx, core_1.Product).findOne({
-                    where: { id: createdProductId },
-                    relations: [
-                        'facetValues',
-                        'facetValues.facet',
-                        'optionGroups',
-                        'optionGroups.options',
-                        'variants',
-                        'variants.facetValues',
-                        'assets',
-                    ],
-                })); // We know that the product exists, so we can safely cast it to Product
+                const productAfterUpdate = (await this.getProductByIdWithRelations(ctx, createdProductId)); // We know that the product exists, so we can safely cast it to Product
                 const existingProductHash = (0, crypto_1.createHash)('md5')
                     .update(JSON.stringify((0, remove_update_at_fields_1.removeUpdatedAtFields)(existingProduct)))
                     .digest('hex');
@@ -726,6 +701,38 @@ let ProductImporter = class ProductImporter {
         });
         return facetValueId;
     }
+    async getProductByIdWithRelations(ctx, id) {
+        if (!id) {
+            return undefined;
+        }
+        const product = (await this.connection.getRepository(ctx, core_1.Product).findOne({
+            where: { id },
+            withDeleted: true,
+        })) ?? undefined;
+        if (product) {
+            const [facetValues, optionGroups, variants, assets, featuredAsset] = await Promise.all([
+                this.connection
+                    .getRepository(ctx, core_1.FacetValue)
+                    .find({ where: { products: { id: product.id } }, relations: ['facet'] }),
+                this.connection
+                    .getRepository(ctx, core_1.ProductOptionGroup)
+                    .find({ where: { product: { id: product.id } }, relations: ['options'] }),
+                this.connection
+                    .getRepository(ctx, core_1.ProductVariant)
+                    .find({ where: { product: { id: product.id } }, relations: ['facetValues'] }),
+                this.connection.getRepository(ctx, core_1.ProductAsset).find({ where: { productId: product.id } }),
+                this.connection
+                    .getRepository(ctx, core_1.Asset)
+                    .findOne({ where: { id: product.featuredAssetId } }),
+            ]);
+            product.facetValues = facetValues;
+            product.optionGroups = optionGroups;
+            product.variants = variants;
+            product.assets = assets;
+            featuredAsset && (product.featuredAsset = featuredAsset);
+        }
+        return product;
+    }
 };
 ProductImporter = __decorate([
     (0, common_1.Injectable)(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haus-tech/product-import-export-plugin",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "A Vendure plugin for importing and exporting products using a CSV file",
   "author": "Haus Tech",
   "repository": {
@@ -32,4 +32,4 @@
     "csv-stringify": "^6.5.1",
     "slug": "^9.1.0"
   }
-}
+}