@vendure/core 2.0.0-next.2 → 2.0.0-next.21

package/dist/service/services/product-option-group.service.js

@@ -11,16 +11,20 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductOptionGroupService = void 0;
 const common_1 = require("@nestjs/common");
+const generated_types_1 = require("@vendure/common/lib/generated-types");
 const typeorm_1 = require("typeorm");
 const utils_1 = require("../../common/utils");
+const index_1 = require("../../config/index");
 const transactional_connection_1 = require("../../connection/transactional-connection");
+const index_2 = require("../../entity/index");
 const product_option_group_translation_entity_1 = require("../../entity/product-option-group/product-option-group-translation.entity");
 const product_option_group_entity_1 = require("../../entity/product-option-group/product-option-group.entity");
 const event_bus_1 = require("../../event-bus");
 const product_option_group_event_1 = require("../../event-bus/events/product-option-group-event");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
-const translate_entity_1 = require("../helpers/utils/translate-entity");
+const translator_service_1 = require("../helpers/translator/translator.service");
+const product_option_service_1 = require("./product-option.service");
 /**
  * @description
  * Contains methods relating to {@link ProductOptionGroup} entities.
@@ -28,15 +32,17 @@ const translate_entity_1 = require("../helpers/utils/translate-entity");
  * @docsCategory services
  */
 let ProductOptionGroupService = class ProductOptionGroupService {
-    constructor(connection, translatableSaver, customFieldRelationService, eventBus) {
+    constructor(connection, translatableSaver, customFieldRelationService, productOptionService, eventBus, translator) {
         this.connection = connection;
         this.translatableSaver = translatableSaver;
         this.customFieldRelationService = customFieldRelationService;
+        this.productOptionService = productOptionService;
         this.eventBus = eventBus;
+        this.translator = translator;
     }
-    findAll(ctx, filterTerm) {
+    findAll(ctx, filterTerm, relations) {
         const findOptions = {
-            relations: ['options'],
+            relations: relations !== null && relations !== void 0 ? relations : ['options'],
         };
         if (filterTerm) {
             findOptions.where = {
@@ -46,15 +52,15 @@ let ProductOptionGroupService = class ProductOptionGroupService {
         return this.connection
             .getRepository(ctx, product_option_group_entity_1.ProductOptionGroup)
             .find(findOptions)
-            .then(groups => groups.map(group => (0, translate_entity_1.translateDeep)(group, ctx.languageCode, ['options'])));
+            .then(groups => groups.map(group => this.translator.translate(group, ctx, ['options'])));
     }
-    findOne(ctx, id) {
+    findOne(ctx, id, relations) {
         return this.connection
             .getRepository(ctx, product_option_group_entity_1.ProductOptionGroup)
             .findOne(id, {
-            relations: ['options'],
+            relations: relations !== null && relations !== void 0 ? relations : ['options'],
         })
-            .then(group => group && (0, translate_entity_1.translateDeep)(group, ctx.languageCode, ['options']));
+            .then(group => group && this.translator.translate(group, ctx, ['options']));
     }
     getOptionGroupsByProductId(ctx, id) {
         return this.connection
@@ -68,7 +74,7 @@ let ProductOptionGroupService = class ProductOptionGroupService {
                 id: 'ASC',
             },
         })
-            .then(groups => groups.map(group => (0, translate_entity_1.translateDeep)(group, ctx.languageCode, ['options'])));
+            .then(groups => groups.map(group => this.translator.translate(group, ctx, ['options'])));
     }
     async create(ctx, input) {
         const group = await this.translatableSaver.create({
@@ -92,13 +98,93 @@ let ProductOptionGroupService = class ProductOptionGroupService {
         this.eventBus.publish(new product_option_group_event_1.ProductOptionGroupEvent(ctx, group, 'updated', input));
         return (0, utils_1.assertFound)(this.findOne(ctx, group.id));
     }
+    /**
+     * @description
+     * Deletes the ProductOptionGroup and any associated ProductOptions. If the ProductOptionGroup
+     * is still referenced by a soft-deleted Product, then a soft-delete will be used to preserve
+     * referential integrity. Otherwise a hard-delete will be performed.
+     */
+    async deleteGroupAndOptionsFromProduct(ctx, id, productId) {
+        const optionGroup = await this.connection.getEntityOrThrow(ctx, product_option_group_entity_1.ProductOptionGroup, id, {
+            relations: ['options', 'product'],
+        });
+        const inUseByActiveProducts = await this.isInUseByOtherProducts(ctx, optionGroup, productId);
+        if (0 < inUseByActiveProducts) {
+            return {
+                result: generated_types_1.DeletionResult.NOT_DELETED,
+                message: ctx.translate('message.product-option-group-used', {
+                    code: optionGroup.code,
+                    count: inUseByActiveProducts,
+                }),
+            };
+        }
+        for (const option of optionGroup.options) {
+            const { result, message } = await this.productOptionService.delete(ctx, option.id);
+            if (result === generated_types_1.DeletionResult.NOT_DELETED) {
+                await this.connection.rollBackTransaction(ctx);
+                return { result, message };
+            }
+        }
+        const hasOptionsWhichAreInUse = await this.groupOptionsAreInUse(ctx, optionGroup);
+        if (0 < hasOptionsWhichAreInUse) {
+            // soft delete
+            optionGroup.deletedAt = new Date();
+            await this.connection.getRepository(ctx, product_option_group_entity_1.ProductOptionGroup).save(optionGroup, { reload: false });
+        }
+        else {
+            // hard delete
+            const product = await this.connection
+                .getRepository(ctx, index_2.Product)
+                .findOne(productId, { relations: ['optionGroups'] });
+            if (product) {
+                product.optionGroups = product.optionGroups.filter(og => !(0, utils_1.idsAreEqual)(og.id, id));
+                await this.connection.getRepository(ctx, index_2.Product).save(product, { reload: false });
+            }
+            // TODO: V2 rely on onDelete: CASCADE rather than this manual loop
+            for (const translation of optionGroup.translations) {
+                await this.connection
+                    .getRepository(ctx, product_option_group_translation_entity_1.ProductOptionGroupTranslation)
+                    .remove(translation);
+            }
+            try {
+                await this.connection.getRepository(ctx, product_option_group_entity_1.ProductOptionGroup).remove(optionGroup);
+            }
+            catch (e) {
+                index_1.Logger.error(e.message, undefined, e.stack);
+            }
+        }
+        this.eventBus.publish(new product_option_group_event_1.ProductOptionGroupEvent(ctx, optionGroup, 'deleted', id));
+        return {
+            result: generated_types_1.DeletionResult.DELETED,
+        };
+    }
+    async isInUseByOtherProducts(ctx, productOptionGroup, targetProductId) {
+        return this.connection
+            .getRepository(ctx, index_2.Product)
+            .createQueryBuilder('product')
+            .leftJoin('product.optionGroups', 'optionGroup')
+            .where('product.deletedAt IS NULL')
+            .andWhere('optionGroup.id = :id', { id: productOptionGroup.id })
+            .andWhere('product.id != :productId', { productId: targetProductId })
+            .getCount();
+    }
+    async groupOptionsAreInUse(ctx, productOptionGroup) {
+        return this.connection
+            .getRepository(ctx, index_2.ProductVariant)
+            .createQueryBuilder('variant')
+            .leftJoin('variant.options', 'option')
+            .where('option.groupId = :groupId', { groupId: productOptionGroup.id })
+            .getCount();
+    }
 };
 ProductOptionGroupService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         translatable_saver_1.TranslatableSaver,
         custom_field_relation_service_1.CustomFieldRelationService,
-        event_bus_1.EventBus])
+        product_option_service_1.ProductOptionService,
+        event_bus_1.EventBus,
+        translator_service_1.TranslatorService])
 ], ProductOptionGroupService);
 exports.ProductOptionGroupService = ProductOptionGroupService;
 //# sourceMappingURL=product-option-group.service.js.map

package/dist/service/services/product-option-group.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-option-group.service.js","sourceRoot":"","sources":["../../../src/service/services/product-option-group.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"product-option-group.service.js","sourceRoot":"","sources":["../../../src/service/services/product-option-group.service.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import { CreateGroupOptionInput, CreateProductOptionInput, UpdateProductOptionInput } from '@vendure/common/lib/generated-types';
+import { CreateGroupOptionInput, CreateProductOptionInput, DeletionResponse, UpdateProductOptionInput } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
 import { Translated } from '../../common/types/locale-types';
@@ -8,6 +8,7 @@ import { ProductOption } from '../../entity/product-option/product-option.entity
 import { EventBus } from '../../event-bus';
 import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
 import { TranslatableSaver } from '../helpers/translatable-saver/translatable-saver';
+import { TranslatorService } from '../helpers/translator/translator.service';
 /**
  * @description
  * Contains methods relating to {@link ProductOption} entities.
@@ -19,9 +20,21 @@ export declare class ProductOptionService {
     private translatableSaver;
     private customFieldRelationService;
     private eventBus;
-    constructor(connection: TransactionalConnection, translatableSaver: TranslatableSaver, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus);
+    private translator;
+    constructor(connection: TransactionalConnection, translatableSaver: TranslatableSaver, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus, translator: TranslatorService);
     findAll(ctx: RequestContext): Promise<Array<Translated<ProductOption>>>;
     findOne(ctx: RequestContext, id: ID): Promise<Translated<ProductOption> | undefined>;
     create(ctx: RequestContext, group: ProductOptionGroup | ID, input: CreateGroupOptionInput | CreateProductOptionInput): Promise<Translated<ProductOption>>;
     update(ctx: RequestContext, input: UpdateProductOptionInput): Promise<Translated<ProductOption>>;
+    /**
+     * @description
+     * Deletes a ProductOption.
+     *
+     * - If the ProductOption is used by any ProductVariants, the deletion will fail.
+     * - If the ProductOption is used only by soft-deleted ProductVariants, the option will itself
+     *   be soft-deleted.
+     * - If the ProductOption is not used by any ProductVariant at all, it will be hard-deleted.
+     */
+    delete(ctx: RequestContext, id: ID): Promise<DeletionResponse>;
+    private isInUse;
 }

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

@@ -11,8 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductOptionService = void 0;
 const common_1 = require("@nestjs/common");
+const generated_types_1 = require("@vendure/common/lib/generated-types");
 const utils_1 = require("../../common/utils");
+const index_1 = require("../../config/index");
 const transactional_connection_1 = require("../../connection/transactional-connection");
+const index_2 = require("../../entity/index");
 const product_option_group_entity_1 = require("../../entity/product-option-group/product-option-group.entity");
 const product_option_translation_entity_1 = require("../../entity/product-option/product-option-translation.entity");
 const product_option_entity_1 = require("../../entity/product-option/product-option.entity");
@@ -20,7 +23,7 @@ const event_bus_1 = require("../../event-bus");
 const product_option_event_1 = require("../../event-bus/events/product-option-event");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
-const translate_entity_1 = require("../helpers/utils/translate-entity");
+const translator_service_1 = require("../helpers/translator/translator.service");
 /**
  * @description
  * Contains methods relating to {@link ProductOption} entities.
@@ -28,11 +31,12 @@ const translate_entity_1 = require("../helpers/utils/translate-entity");
  * @docsCategory services
  */
 let ProductOptionService = class ProductOptionService {
-    constructor(connection, translatableSaver, customFieldRelationService, eventBus) {
+    constructor(connection, translatableSaver, customFieldRelationService, eventBus, translator) {
         this.connection = connection;
         this.translatableSaver = translatableSaver;
         this.customFieldRelationService = customFieldRelationService;
         this.eventBus = eventBus;
+        this.translator = translator;
     }
     findAll(ctx) {
         return this.connection
@@ -40,7 +44,7 @@ let ProductOptionService = class ProductOptionService {
             .find({
             relations: ['group'],
         })
-            .then(options => options.map(option => (0, translate_entity_1.translateDeep)(option, ctx.languageCode)));
+            .then(options => options.map(option => this.translator.translate(option, ctx)));
     }
     findOne(ctx, id) {
         return this.connection
@@ -48,7 +52,7 @@ let ProductOptionService = class ProductOptionService {
             .findOne(id, {
             relations: ['group'],
         })
-            .then(option => option && (0, translate_entity_1.translateDeep)(option, ctx.languageCode));
+            .then(option => option && this.translator.translate(option, ctx));
     }
     async create(ctx, group, input) {
         const productOptionGroup = group instanceof product_option_group_entity_1.ProductOptionGroup
@@ -76,13 +80,70 @@ let ProductOptionService = class ProductOptionService {
         this.eventBus.publish(new product_option_event_1.ProductOptionEvent(ctx, option, 'updated', input));
         return (0, utils_1.assertFound)(this.findOne(ctx, option.id));
     }
+    /**
+     * @description
+     * Deletes a ProductOption.
+     *
+     * - If the ProductOption is used by any ProductVariants, the deletion will fail.
+     * - If the ProductOption is used only by soft-deleted ProductVariants, the option will itself
+     *   be soft-deleted.
+     * - If the ProductOption is not used by any ProductVariant at all, it will be hard-deleted.
+     */
+    async delete(ctx, id) {
+        const productOption = await this.connection.getEntityOrThrow(ctx, product_option_entity_1.ProductOption, id);
+        const inUseByActiveVariants = await this.isInUse(ctx, productOption, 'active');
+        if (0 < inUseByActiveVariants) {
+            return {
+                result: generated_types_1.DeletionResult.NOT_DELETED,
+                message: ctx.translate('message.product-option-used', {
+                    code: productOption.code,
+                    count: inUseByActiveVariants,
+                }),
+            };
+        }
+        const isInUseBySoftDeletedVariants = await this.isInUse(ctx, productOption, 'soft-deleted');
+        if (0 < isInUseBySoftDeletedVariants) {
+            // soft delete
+            productOption.deletedAt = new Date();
+            await this.connection.getRepository(ctx, product_option_entity_1.ProductOption).save(productOption, { reload: false });
+        }
+        else {
+            // hard delete
+            try {
+                // TODO: V2 rely on onDelete: CASCADE rather than this manual loop
+                for (const translation of productOption.translations) {
+                    await this.connection
+                        .getRepository(ctx, product_option_translation_entity_1.ProductOptionTranslation)
+                        .remove(translation);
+                }
+                await this.connection.getRepository(ctx, product_option_entity_1.ProductOption).remove(productOption);
+            }
+            catch (e) {
+                index_1.Logger.error(e.message, undefined, e.stack);
+            }
+        }
+        this.eventBus.publish(new product_option_event_1.ProductOptionEvent(ctx, productOption, 'deleted', id));
+        return {
+            result: generated_types_1.DeletionResult.DELETED,
+        };
+    }
+    async isInUse(ctx, productOption, variantState) {
+        return this.connection
+            .getRepository(ctx, index_2.ProductVariant)
+            .createQueryBuilder('variant')
+            .leftJoin('variant.options', 'option')
+            .where(variantState === 'active' ? 'variant.deletedAt IS NULL' : 'variant.deletedAt IS NOT NULL')
+            .andWhere('option.id = :id', { id: productOption.id })
+            .getCount();
+    }
 };
 ProductOptionService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         translatable_saver_1.TranslatableSaver,
         custom_field_relation_service_1.CustomFieldRelationService,
-        event_bus_1.EventBus])
+        event_bus_1.EventBus,
+        translator_service_1.TranslatorService])
 ], ProductOptionService);
 exports.ProductOptionService = ProductOptionService;
 //# sourceMappingURL=product-option.service.js.map

package/dist/service/services/product-option.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-option.service.js","sourceRoot":"","sources":["../../../src/service/services/product-option.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"product-option.service.js","sourceRoot":"","sources":["../../../src/service/services/product-option.service.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,7 @@
 import { AssignProductVariantsToChannelInput, CreateProductVariantInput, DeletionResponse, RemoveProductVariantsFromChannelInput, UpdateProductVariantInput } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { RequestContextCacheService } from '../../cache/request-context-cache.service';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';
@@ -16,6 +17,7 @@ import { CustomFieldRelationService } from '../helpers/custom-field-relation/cus
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
 import { ProductPriceApplicator } from '../helpers/product-price-applicator/product-price-applicator';
 import { TranslatableSaver } from '../helpers/translatable-saver/translatable-saver';
+import { TranslatorService } from '../helpers/translator/translator.service';
 import { AssetService } from './asset.service';
 import { ChannelService } from './channel.service';
 import { FacetValueService } from './facet-value.service';
@@ -45,16 +47,17 @@ export declare class ProductVariantService {
     private customFieldRelationService;
     private requestCache;
     private productPriceApplicator;
-    constructor(connection: TransactionalConnection, configService: ConfigService, taxCategoryService: TaxCategoryService, facetValueService: FacetValueService, assetService: AssetService, translatableSaver: TranslatableSaver, eventBus: EventBus, listQueryBuilder: ListQueryBuilder, globalSettingsService: GlobalSettingsService, stockMovementService: StockMovementService, channelService: ChannelService, roleService: RoleService, customFieldRelationService: CustomFieldRelationService, requestCache: RequestContextCacheService, productPriceApplicator: ProductPriceApplicator);
+    private translator;
+    constructor(connection: TransactionalConnection, configService: ConfigService, taxCategoryService: TaxCategoryService, facetValueService: FacetValueService, assetService: AssetService, translatableSaver: TranslatableSaver, eventBus: EventBus, listQueryBuilder: ListQueryBuilder, globalSettingsService: GlobalSettingsService, stockMovementService: StockMovementService, channelService: ChannelService, roleService: RoleService, customFieldRelationService: CustomFieldRelationService, requestCache: RequestContextCacheService, productPriceApplicator: ProductPriceApplicator, translator: TranslatorService);
     findAll(ctx: RequestContext, options?: ListQueryOptions<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
-    findOne(ctx: RequestContext, productVariantId: ID): Promise<Translated<ProductVariant> | undefined>;
+    findOne(ctx: RequestContext, productVariantId: ID, relations?: RelationPaths<ProductVariant>): Promise<Translated<ProductVariant> | undefined>;
     findByIds(ctx: RequestContext, ids: ID[]): Promise<Array<Translated<ProductVariant>>>;
-    getVariantsByProductId(ctx: RequestContext, productId: ID, options?: ListQueryOptions<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
+    getVariantsByProductId(ctx: RequestContext, productId: ID, options?: ListQueryOptions<ProductVariant>, relations?: RelationPaths<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
     /**
      * @description
      * Returns a {@link PaginatedList} of all ProductVariants associated with the given Collection.
      */
-    getVariantsByCollectionId(ctx: RequestContext, collectionId: ID, options: ListQueryOptions<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
+    getVariantsByCollectionId(ctx: RequestContext, collectionId: ID, options: ListQueryOptions<ProductVariant>, relations?: RelationPaths<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
     /**
      * @description
      * Returns all Channels to which the ProductVariant is assigned.
@@ -85,6 +88,7 @@ export declare class ProductVariantService {
      * as well as the local and global `outOfStockThreshold` settings.
      */
     getSaleableStockLevel(ctx: RequestContext, variant: ProductVariant): Promise<number>;
+    private getOutOfStockThreshold;
     /**
      * @description
      * Returns the stockLevel to display to the customer, as specified by the configured
@@ -116,6 +120,12 @@ export declare class ProductVariantService {
      * Is optimized to make as few DB calls as possible using caching based on the open request.
      */
     hydratePriceFields<F extends 'currencyCode' | 'price' | 'priceWithTax' | 'taxRateApplied'>(ctx: RequestContext, variant: ProductVariant, priceField: F): Promise<ProductVariant[F]>;
+    /**
+     * @description
+     * Given an array of ProductVariants from the database, this method will apply the correct price and tax
+     * and translate each item.
+     */
+    private applyPricesAndTranslateVariants;
     /**
      * @description
      * Populates the `price` field with the price for the specified channel.