@vendure/core 2.0.0-next.9 → 2.0.0

package/dist/service/services/facet.service.js

@@ -12,19 +12,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FacetService = void 0;
 const common_1 = require("@nestjs/common");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
+const typeorm_1 = require("typeorm");
+const request_context_1 = require("../../api/common/request-context");
+const common_2 = require("../../common");
 const utils_1 = require("../../common/utils");
 const config_service_1 = require("../../config/config.service");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const facet_translation_entity_1 = require("../../entity/facet/facet-translation.entity");
 const facet_entity_1 = require("../../entity/facet/facet.entity");
+const facet_value_entity_1 = require("../../entity/facet-value/facet-value.entity");
 const event_bus_1 = require("../../event-bus");
 const facet_event_1 = require("../../event-bus/events/facet-event");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
+const translator_service_1 = require("../helpers/translator/translator.service");
 const translate_entity_1 = require("../helpers/utils/translate-entity");
 const channel_service_1 = require("./channel.service");
 const facet_value_service_1 = require("./facet-value.service");
+const role_service_1 = require("./role.service");
 /**
  * @description
  * Contains methods relating to {@link Facet} entities.
@@ -32,7 +38,7 @@ const facet_value_service_1 = require("./facet-value.service");
  * @docsCategory services
  */
 let FacetService = class FacetService {
-    constructor(connection, facetValueService, translatableSaver, listQueryBuilder, configService, channelService, customFieldRelationService, eventBus) {
+    constructor(connection, facetValueService, translatableSaver, listQueryBuilder, configService, channelService, customFieldRelationService, eventBus, translator, roleService) {
         this.connection = connection;
         this.facetValueService = facetValueService;
         this.translatableSaver = translatableSaver;
@@ -41,6 +47,8 @@ let FacetService = class FacetService {
         this.channelService = channelService;
         this.customFieldRelationService = customFieldRelationService;
         this.eventBus = eventBus;
+        this.translator = translator;
+        this.roleService = roleService;
     }
     findAll(ctx, options, relations) {
         return this.listQueryBuilder
@@ -51,7 +59,7 @@ let FacetService = class FacetService {
         })
             .getManyAndCount()
             .then(([facets, totalItems]) => {
-            const items = facets.map(facet => (0, translate_entity_1.translateDeep)(facet, ctx.languageCode, ['values', ['values', 'facet']]));
+            const items = facets.map(facet => this.translator.translate(facet, ctx, ['values', ['values', 'facet']]));
             return {
                 items,
                 totalItems,
@@ -63,19 +71,33 @@ let FacetService = class FacetService {
             .findOneInChannel(ctx, facet_entity_1.Facet, facetId, ctx.channelId, {
             relations: relations !== null && relations !== void 0 ? relations : ['values', 'values.facet', 'channels'],
         })
-            .then(facet => facet && (0, translate_entity_1.translateDeep)(facet, ctx.languageCode, ['values', ['values', 'facet']]));
+            .then(facet => {
+            var _a;
+            return (_a = (facet && this.translator.translate(facet, ctx, ['values', ['values', 'facet']]))) !== null && _a !== void 0 ? _a : undefined;
+        });
     }
-    findByCode(facetCode, lang) {
+    findByCode(ctxOrFacetCode, facetCodeOrLang, lang) {
         const relations = ['values', 'values.facet'];
-        return this.connection
-            .getRepository(facet_entity_1.Facet)
+        const [repository, facetCode, languageCode] = ctxOrFacetCode instanceof request_context_1.RequestContext
+            ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                [this.connection.getRepository(ctxOrFacetCode, facet_entity_1.Facet), facetCodeOrLang, lang]
+            : [
+                this.connection.rawConnection.getRepository(facet_entity_1.Facet),
+                ctxOrFacetCode,
+                facetCodeOrLang,
+            ];
+        // TODO: Implement usage of channelLanguageCode
+        return repository
             .findOne({
             where: {
                 code: facetCode,
             },
             relations,
         })
-            .then(facet => facet && (0, translate_entity_1.translateDeep)(facet, lang, ['values', ['values', 'facet']]));
+            .then(facet => {
+            var _a;
+            return (_a = (facet && (0, translate_entity_1.translateDeep)(facet, languageCode, ['values', ['values', 'facet']]))) !== null && _a !== void 0 ? _a : undefined;
+        });
     }
     /**
      * @description
@@ -90,7 +112,7 @@ let FacetService = class FacetService {
             .where('facetValue.id = :id', { id })
             .getOne();
         if (facet) {
-            return (0, translate_entity_1.translateDeep)(facet, ctx.languageCode);
+            return this.translator.translate(facet, ctx);
         }
     }
     async create(ctx, input) {
@@ -115,7 +137,9 @@ let FacetService = class FacetService {
             entityType: facet_entity_1.Facet,
             translationType: facet_translation_entity_1.FacetTranslation,
             beforeSave: async (f) => {
-                f.code = await this.ensureUniqueCode(ctx, f.code, f.id);
+                if (f.code) {
+                    f.code = await this.ensureUniqueCode(ctx, f.code, f.id);
+                }
             },
         });
         await this.customFieldRelationService.updateRelations(ctx, facet_entity_1.Facet, input, facet);
@@ -136,18 +160,20 @@ let FacetService = class FacetService {
         }
         const isInUse = !!(productCount || variantCount);
         const both = !!(productCount && variantCount) ? 'both' : 'single';
-        const i18nVars = { products: productCount, variants: variantCount, both };
+        const i18nVars = { products: productCount, variants: variantCount, both, facetCode: facet.code };
         let message = '';
         let result;
+        const deletedFacet = new facet_entity_1.Facet(facet);
         if (!isInUse) {
             await this.connection.getRepository(ctx, facet_entity_1.Facet).remove(facet);
+            this.eventBus.publish(new facet_event_1.FacetEvent(ctx, deletedFacet, 'deleted', id));
             result = generated_types_1.DeletionResult.DELETED;
         }
         else if (force) {
             await this.connection.getRepository(ctx, facet_entity_1.Facet).remove(facet);
+            this.eventBus.publish(new facet_event_1.FacetEvent(ctx, deletedFacet, 'deleted', id));
             message = ctx.translate('message.facet-force-deleted', i18nVars);
             result = generated_types_1.DeletionResult.DELETED;
-            this.eventBus.publish(new facet_event_1.FacetEvent(ctx, facet, 'deleted', id));
         }
         else {
             message = ctx.translate('message.facet-used', i18nVars);
@@ -184,6 +210,78 @@ let FacetService = class FacetService {
         } while (conflict);
         return candidate;
     }
+    /**
+     * @description
+     * Assigns Facets to the specified Channel
+     */
+    async assignFacetsToChannel(ctx, input) {
+        const hasPermission = await this.roleService.userHasAnyPermissionsOnChannel(ctx, input.channelId, [
+            generated_types_1.Permission.UpdateFacet,
+            generated_types_1.Permission.UpdateCatalog,
+        ]);
+        if (!hasPermission) {
+            throw new common_2.ForbiddenError();
+        }
+        const facetsToAssign = await this.connection
+            .getRepository(ctx, facet_entity_1.Facet)
+            .find({ where: { id: (0, typeorm_1.In)(input.facetIds) }, relations: ['values'] });
+        const valuesToAssign = facetsToAssign.reduce((values, facet) => [...values, ...facet.values], []);
+        await Promise.all([
+            ...facetsToAssign.map(async (facet) => {
+                return this.channelService.assignToChannels(ctx, facet_entity_1.Facet, facet.id, [input.channelId]);
+            }),
+            ...valuesToAssign.map(async (value) => this.channelService.assignToChannels(ctx, facet_value_entity_1.FacetValue, value.id, [input.channelId])),
+        ]);
+        return this.connection
+            .findByIdsInChannel(ctx, facet_entity_1.Facet, facetsToAssign.map(f => f.id), ctx.channelId, {})
+            .then(facets => facets.map(facet => (0, translate_entity_1.translateDeep)(facet, ctx.languageCode)));
+    }
+    /**
+     * @description
+     * Remove Facets from the specified Channel
+     */
+    async removeFacetsFromChannel(ctx, input) {
+        const hasPermission = await this.roleService.userHasAnyPermissionsOnChannel(ctx, input.channelId, [
+            generated_types_1.Permission.DeleteFacet,
+            generated_types_1.Permission.DeleteCatalog,
+        ]);
+        if (!hasPermission) {
+            throw new common_2.ForbiddenError();
+        }
+        const defaultChannel = await this.channelService.getDefaultChannel(ctx);
+        if ((0, utils_1.idsAreEqual)(input.channelId, defaultChannel.id)) {
+            throw new common_2.UserInputError('error.items-cannot-be-removed-from-default-channel');
+        }
+        const facetsToRemove = await this.connection
+            .getRepository(ctx, facet_entity_1.Facet)
+            .find({ where: { id: (0, typeorm_1.In)(input.facetIds) }, relations: ['values'] });
+        const results = [];
+        for (const facet of facetsToRemove) {
+            let productCount = 0;
+            let variantCount = 0;
+            if (facet.values.length) {
+                const counts = await this.facetValueService.checkFacetValueUsage(ctx, facet.values.map(fv => fv.id), input.channelId);
+                productCount = counts.productCount;
+                variantCount = counts.variantCount;
+                const isInUse = !!(productCount || variantCount);
+                const both = !!(productCount && variantCount) ? 'both' : 'single';
+                const i18nVars = { products: productCount, variants: variantCount, both };
+                let result;
+                if (!isInUse || input.force) {
+                    await this.channelService.removeFromChannels(ctx, facet_entity_1.Facet, facet.id, [input.channelId]);
+                    await Promise.all(facet.values.map(fv => this.channelService.removeFromChannels(ctx, facet_value_entity_1.FacetValue, fv.id, [input.channelId])));
+                    result = await this.findOne(ctx, facet.id);
+                    if (result) {
+                        results.push(result);
+                    }
+                }
+                else {
+                    results.push(new common_2.FacetInUseError({ facetCode: facet.code, productCount, variantCount }));
+                }
+            }
+        }
+        return results;
+    }
 };
 FacetService = __decorate([
     (0, common_1.Injectable)(),
@@ -194,7 +292,9 @@ FacetService = __decorate([
         config_service_1.ConfigService,
         channel_service_1.ChannelService,
         custom_field_relation_service_1.CustomFieldRelationService,
-        event_bus_1.EventBus])
+        event_bus_1.EventBus,
+        translator_service_1.TranslatorService,
+        role_service_1.RoleService])
 ], FacetService);
 exports.FacetService = FacetService;
 //# sourceMappingURL=facet.service.js.map

package/dist/service/services/facet.service.js.map

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

package/dist/service/services/fulfillment.service.d.ts

@@ -1,12 +1,12 @@
-import { ConfigurableOperationInput } from '@vendure/common/lib/generated-types';
+import { ConfigurableOperationInput, OrderLineInput } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
 import { CreateFulfillmentError, FulfillmentStateTransitionError, InvalidFulfillmentHandlerError } from '../../common/error/generated-graphql-admin-errors';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
 import { Order } from '../../entity/order/order.entity';
+import { FulfillmentLine } from '../../entity/order-line-reference/fulfillment-line.entity';
 import { EventBus } from '../../event-bus/event-bus';
 import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
 import { FulfillmentState } from '../helpers/fulfillment-state-machine/fulfillment-state';
@@ -29,18 +29,9 @@ export declare class FulfillmentService {
      * Creates a new Fulfillment for the given Orders and OrderItems, using the specified
      * {@link FulfillmentHandler}.
      */
-    create(ctx: RequestContext, orders: Order[], items: OrderItem[], handler: ConfigurableOperationInput): Promise<Fulfillment | InvalidFulfillmentHandlerError | CreateFulfillmentError>;
-    private findOneOrThrow;
-    /**
-     * @description
-     * Returns all OrderItems associated with the specified Fulfillment.
-     */
-    getOrderItemsByFulfillmentId(ctx: RequestContext, id: ID): Promise<OrderItem[]>;
-    /**
-     * @description
-     * Returns the Fulfillment for the given OrderItem (if one exists).
-     */
-    getFulfillmentByOrderItemId(ctx: RequestContext, orderItemId: ID): Promise<Fulfillment | undefined>;
+    create(ctx: RequestContext, orders: Order[], lines: OrderLineInput[], handler: ConfigurableOperationInput): Promise<Fulfillment | InvalidFulfillmentHandlerError | CreateFulfillmentError>;
+    getFulfillmentLines(ctx: RequestContext, id: ID): Promise<FulfillmentLine[]>;
+    getFulfillmentsLinesForOrderLine(ctx: RequestContext, orderLineId: ID): Promise<FulfillmentLine[]>;
     /**
      * @description
      * Transitions the specified Fulfillment to a new state and upon successful transition
@@ -56,5 +47,5 @@ export declare class FulfillmentService {
      * @description
      * Returns an array of the next valid states for the Fulfillment.
      */
-    getNextStates(fulfillment: Fulfillment): ReadonlyArray<FulfillmentState>;
+    getNextStates(fulfillment: Fulfillment): readonly FulfillmentState[];
 }

package/dist/service/services/fulfillment.service.js

@@ -12,11 +12,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FulfillmentService = void 0;
 const common_1 = require("@nestjs/common");
 const shared_utils_1 = require("@vendure/common/lib/shared-utils");
+const unique_1 = require("@vendure/common/lib/unique");
+const typeorm_1 = require("typeorm");
 const generated_graphql_admin_errors_1 = require("../../common/error/generated-graphql-admin-errors");
 const config_service_1 = require("../../config/config.service");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const fulfillment_entity_1 = require("../../entity/fulfillment/fulfillment.entity");
-const order_item_entity_1 = require("../../entity/order-item/order-item.entity");
+const order_entity_1 = require("../../entity/order/order.entity");
+const order_line_entity_1 = require("../../entity/order-line/order-line.entity");
+const fulfillment_line_entity_1 = require("../../entity/order-line-reference/fulfillment-line.entity");
 const event_bus_1 = require("../../event-bus/event-bus");
 const fulfillment_event_1 = require("../../event-bus/events/fulfillment-event");
 const fulfillment_state_transition_event_1 = require("../../event-bus/events/fulfillment-state-transition-event");
@@ -41,14 +45,14 @@ let FulfillmentService = class FulfillmentService {
      * Creates a new Fulfillment for the given Orders and OrderItems, using the specified
      * {@link FulfillmentHandler}.
      */
-    async create(ctx, orders, items, handler) {
+    async create(ctx, orders, lines, handler) {
         const fulfillmentHandler = this.configService.shippingOptions.fulfillmentHandlers.find(h => h.code === handler.code);
         if (!fulfillmentHandler) {
             return new generated_graphql_admin_errors_1.InvalidFulfillmentHandlerError();
         }
         let fulfillmentPartial;
         try {
-            fulfillmentPartial = await fulfillmentHandler.createFulfillment(ctx, orders, items, handler.arguments);
+            fulfillmentPartial = await fulfillmentHandler.createFulfillment(ctx, orders, lines, handler.arguments);
         }
         catch (e) {
             let message = 'No error message';
@@ -57,37 +61,48 @@ let FulfillmentService = class FulfillmentService {
             }
             return new generated_graphql_admin_errors_1.CreateFulfillmentError({ fulfillmentHandlerError: message });
         }
-        const newFulfillment = await this.connection.getRepository(ctx, fulfillment_entity_1.Fulfillment).save(new fulfillment_entity_1.Fulfillment(Object.assign(Object.assign({ method: '', trackingCode: '' }, fulfillmentPartial), { orderItems: items, state: this.fulfillmentStateMachine.getInitialState(), handlerCode: fulfillmentHandler.code })));
+        const orderLines = await this.connection
+            .getRepository(ctx, order_line_entity_1.OrderLine)
+            .find({ where: { id: (0, typeorm_1.In)(lines.map(l => l.orderLineId)) } });
+        const newFulfillment = await this.connection.getRepository(ctx, fulfillment_entity_1.Fulfillment).save(new fulfillment_entity_1.Fulfillment(Object.assign(Object.assign({ method: '', trackingCode: '' }, fulfillmentPartial), { lines: [], state: this.fulfillmentStateMachine.getInitialState(), handlerCode: fulfillmentHandler.code })));
+        const fulfillmentLines = [];
+        for (const { orderLineId, quantity } of lines) {
+            const fulfillmentLine = await this.connection.getRepository(ctx, fulfillment_line_entity_1.FulfillmentLine).save(new fulfillment_line_entity_1.FulfillmentLine({
+                orderLineId,
+                quantity,
+            }));
+            fulfillmentLines.push(fulfillmentLine);
+        }
+        await this.connection
+            .getRepository(ctx, fulfillment_entity_1.Fulfillment)
+            .createQueryBuilder()
+            .relation('lines')
+            .of(newFulfillment)
+            .add(fulfillmentLines);
         const fulfillmentWithRelations = await this.customFieldRelationService.updateRelations(ctx, fulfillment_entity_1.Fulfillment, fulfillmentPartial, newFulfillment);
         this.eventBus.publish(new fulfillment_event_1.FulfillmentEvent(ctx, fulfillmentWithRelations, {
             orders,
-            items,
+            lines,
             handler,
         }));
         return newFulfillment;
     }
-    async findOneOrThrow(ctx, id, relations = ['orderItems']) {
-        return await this.connection.getEntityOrThrow(ctx, fulfillment_entity_1.Fulfillment, id, {
-            relations,
-        });
-    }
-    /**
-     * @description
-     * Returns all OrderItems associated with the specified Fulfillment.
-     */
-    async getOrderItemsByFulfillmentId(ctx, id) {
-        const fulfillment = await this.findOneOrThrow(ctx, id);
-        return fulfillment.orderItems;
+    async getFulfillmentLines(ctx, id) {
+        return this.connection
+            .getEntityOrThrow(ctx, fulfillment_entity_1.Fulfillment, id, {
+            relations: ['lines'],
+        })
+            .then(fulfillment => fulfillment.lines);
     }
-    /**
-     * @description
-     * Returns the Fulfillment for the given OrderItem (if one exists).
-     */
-    async getFulfillmentByOrderItemId(ctx, orderItemId) {
-        const orderItem = await this.connection
-            .getRepository(ctx, order_item_entity_1.OrderItem)
-            .findOne(orderItemId, { relations: ['fulfillments'] });
-        return orderItem === null || orderItem === void 0 ? void 0 : orderItem.fulfillment;
+    async getFulfillmentsLinesForOrderLine(ctx, orderLineId) {
+        const fulfillmentLines = await this.connection
+            .getRepository(ctx, fulfillment_line_entity_1.FulfillmentLine)
+            .createQueryBuilder('fulfillmentLine')
+            .leftJoin('fulfillmentLine.fulfillment', 'fulfillment')
+            .where('fulfillmentLine.orderLineId = :orderLineId', { orderLineId })
+            .andWhere('fulfillment.state != :cancelledState', { cancelledState: 'Cancelled' })
+            .getMany();
+        return fulfillmentLines;
     }
     /**
      * @description
@@ -95,17 +110,21 @@ let FulfillmentService = class FulfillmentService {
      * publishes a {@link FulfillmentStateTransitionEvent}.
      */
     async transitionToState(ctx, fulfillmentId, state) {
-        const fulfillment = await this.findOneOrThrow(ctx, fulfillmentId, [
-            'orderItems',
-            'orderItems.line',
-            'orderItems.line.order',
-        ]);
-        // Find orders based on order items filtering by id, removing duplicated orders
-        const ordersInOrderItems = fulfillment.orderItems.map(oi => oi.line.order);
-        const orders = ordersInOrderItems.filter((v, i, a) => a.findIndex(t => t.id === v.id) === i);
+        const fulfillment = await this.connection.getEntityOrThrow(ctx, fulfillment_entity_1.Fulfillment, fulfillmentId, {
+            relations: ['lines'],
+        });
+        const orderLinesIds = (0, unique_1.unique)(fulfillment.lines.map(lines => lines.orderLineId));
+        const orders = await this.connection
+            .getRepository(ctx, order_entity_1.Order)
+            .createQueryBuilder('order')
+            .leftJoinAndSelect('order.lines', 'line')
+            .where('line.id IN (:...lineIds)', { lineIds: orderLinesIds })
+            .getMany();
         const fromState = fulfillment.state;
+        let finalize;
         try {
-            await this.fulfillmentStateMachine.transition(ctx, fulfillment, orders, state);
+            const result = await this.fulfillmentStateMachine.transition(ctx, fulfillment, orders, state);
+            finalize = result.finalize;
         }
         catch (e) {
             const transitionError = ctx.translate(e.message, { fromState, toState: state });
@@ -113,6 +132,7 @@ let FulfillmentService = class FulfillmentService {
         }
         await this.connection.getRepository(ctx, fulfillment_entity_1.Fulfillment).save(fulfillment, { reload: false });
         this.eventBus.publish(new fulfillment_state_transition_event_1.FulfillmentStateTransitionEvent(fromState, state, ctx, fulfillment));
+        await finalize();
         return { fulfillment, orders, fromState, toState: state };
     }
     /**

package/dist/service/services/fulfillment.service.js.map

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

package/dist/service/services/global-settings.service.d.ts

@@ -1,5 +1,6 @@
 import { UpdateGlobalSettingsInput } from '@vendure/common/lib/generated-types';
 import { RequestContext } from '../../api/common/request-context';
+import { RequestContextCacheService } from '../../cache/index';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { GlobalSettings } from '../../entity/global-settings/global-settings.entity';
@@ -16,7 +17,8 @@ export declare class GlobalSettingsService {
     private configService;
     private customFieldRelationService;
     private eventBus;
-    constructor(connection: TransactionalConnection, configService: ConfigService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus);
+    private requestCache;
+    constructor(connection: TransactionalConnection, configService: ConfigService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus, requestCache: RequestContextCacheService);
     /**
      * Ensure there is a single global settings row in the database.
      * @internal

package/dist/service/services/global-settings.service.js

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlobalSettingsService = void 0;
 const common_1 = require("@nestjs/common");
+const index_1 = require("../../cache/index");
 const errors_1 = require("../../common/error/errors");
 const config_service_1 = require("../../config/config.service");
 const transactional_connection_1 = require("../../connection/transactional-connection");
@@ -26,11 +27,12 @@ const patch_entity_1 = require("../helpers/utils/patch-entity");
  * @docsCategory services
  */
 let GlobalSettingsService = class GlobalSettingsService {
-    constructor(connection, configService, customFieldRelationService, eventBus) {
+    constructor(connection, configService, customFieldRelationService, eventBus, requestCache) {
         this.connection = connection;
         this.configService = configService;
         this.customFieldRelationService = customFieldRelationService;
         this.eventBus = eventBus;
+        this.requestCache = requestCache;
     }
     /**
      * Ensure there is a single global settings row in the database.
@@ -38,21 +40,23 @@ let GlobalSettingsService = class GlobalSettingsService {
      */
     async initGlobalSettings() {
         try {
-            const result = await this.connection.getRepository(global_settings_entity_1.GlobalSettings).find();
+            const result = await this.connection.rawConnection.getRepository(global_settings_entity_1.GlobalSettings).find();
             if (result.length === 0) {
                 throw new Error('No global settings');
             }
             if (1 < result.length) {
                 // Strange edge case, see https://github.com/vendure-ecommerce/vendure/issues/987
                 const toDelete = result.slice(1);
-                await this.connection.getRepository(global_settings_entity_1.GlobalSettings).remove(toDelete);
+                await this.connection.rawConnection.getRepository(global_settings_entity_1.GlobalSettings).remove(toDelete);
             }
         }
         catch (err) {
             const settings = new global_settings_entity_1.GlobalSettings({
                 availableLanguages: [this.configService.defaultLanguageCode],
             });
-            await this.connection.getRepository(global_settings_entity_1.GlobalSettings).save(settings, { reload: false });
+            await this.connection.rawConnection
+                .getRepository(global_settings_entity_1.GlobalSettings)
+                .save(settings, { reload: false });
         }
     }
     /**
@@ -60,13 +64,13 @@ let GlobalSettingsService = class GlobalSettingsService {
      * Returns the GlobalSettings entity.
      */
     async getSettings(ctx) {
-        const settings = await this.connection.getRepository(ctx, global_settings_entity_1.GlobalSettings).findOne({
-            order: {
-                createdAt: 'ASC',
-            },
-        });
+        const settings = await this.requestCache.get(ctx, 'globalSettings', () => this.connection
+            .getRepository(ctx, global_settings_entity_1.GlobalSettings)
+            .createQueryBuilder('global_settings')
+            .orderBy(this.connection.rawConnection.driver.escape('createdAt'), 'ASC')
+            .getOne());
         if (!settings) {
-            throw new errors_1.InternalServerError(`error.global-settings-not-found`);
+            throw new errors_1.InternalServerError('error.global-settings-not-found');
         }
         return settings;
     }
@@ -83,7 +87,8 @@ GlobalSettingsService = __decorate([
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         config_service_1.ConfigService,
         custom_field_relation_service_1.CustomFieldRelationService,
-        event_bus_1.EventBus])
+        event_bus_1.EventBus,
+        index_1.RequestContextCacheService])
 ], GlobalSettingsService);
 exports.GlobalSettingsService = GlobalSettingsService;
 //# sourceMappingURL=global-settings.service.js.map

package/dist/service/services/global-settings.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"global-settings.service.js","sourceRoot":"","sources":["../../../src/service/services/global-settings.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAI5C,sDAAgE;AAChE,gEAA4D;AAC5D,wFAAoF;AACpF,gGAAqF;AACrF,+CAA2C;AAC3C,wFAAmF;AACnF,kHAA4G;AAC5G,gEAA4D;AAE5D;;;;;GAKG;AAEH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAC9B,YACY,UAAmC,EACnC,aAA4B,EAC5B,0BAAsD,EACtD,QAAkB;QAHlB,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEJ;;;OAGG;IACH,KAAK,CAAC,kBAAkB;QACpB,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,uCAAc,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACzC;YACD,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;gBACnB,iFAAiF;gBACjF,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,uCAAc,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aACxE;SACJ;QAAC,OAAO,GAAQ,EAAE;YACf,MAAM,QAAQ,GAAG,IAAI,uCAAc,CAAC;gBAChC,kBAAkB,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;aAC/D,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,uCAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SACzF;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW,CAAC,GAAmB;QACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE;gBACH,SAAS,EAAE,KAAK;aACnB;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,4BAAmB,CAAC,iCAAiC,CAAC,CAAC;SACpE;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAmB,EAAE,KAAgC;QACtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,2CAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;QACrE,IAAA,0BAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,uCAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7E,CAAC;CACJ,CAAA;AAtDY,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACpB,8BAAa;QACA,0DAA0B;QAC5C,oBAAQ;GALrB,qBAAqB,CAsDjC;AAtDY,sDAAqB"}
+{"version":3,"file":"global-settings.service.js","sourceRoot":"","sources":["../../../src/service/services/global-settings.service.ts"],"names":[],"mappings":"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"}