@vendure/core 1.9.5 → 2.0.0-beta.0

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

@@ -13,13 +13,14 @@ 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 index_1 = require("../../entity/index");
-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");
@@ -44,90 +45,64 @@ 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';
-            if (shared_utils_1.isObject(e)) {
+            if ((0, shared_utils_1.isObject)(e)) {
                 message = e.message || e.toString();
             }
-            return new generated_graphql_admin_errors_1.CreateFulfillmentError(message);
+            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 getFulfillmentLineSummary(ctx, id) {
-        const result = await this.connection
-            .getRepository(ctx, index_1.OrderLine)
-            .createQueryBuilder('line')
-            .leftJoinAndSelect('line.items', 'item')
-            .leftJoin('item.fulfillments', 'fulfillment')
-            .select('line.id', 'lineId')
-            .addSelect('COUNT(item.id)', 'itemCount')
-            .groupBy('line.id')
-            .where('fulfillment.id = :id', { id })
-            .getRawMany();
-        return Promise.all(result.map(async ({ lineId, itemCount }) => {
-            return {
-                orderLine: await this.connection.getEntityOrThrow(ctx, index_1.OrderLine, lineId),
-                quantity: +itemCount,
-            };
-        }));
+    async getFulfillmentLines(ctx, id) {
+        return this.connection
+            .getEntityOrThrow(ctx, fulfillment_entity_1.Fulfillment, id, {
+            relations: ['lines'],
+        })
+            .then(fulfillment => fulfillment.lines);
     }
-    async getFulfillmentsByOrderLineId(ctx, orderLineId) {
-        const itemIdsQb = await this.connection
-            .getRepository(ctx, order_item_entity_1.OrderItem)
-            .createQueryBuilder('item')
-            .select('item.id', 'id')
-            .where('item.lineId = :orderLineId', { orderLineId });
-        const fulfillments = await this.connection
-            .getRepository(ctx, fulfillment_entity_1.Fulfillment)
-            .createQueryBuilder('fulfillment')
-            .leftJoinAndSelect('fulfillment.orderItems', 'item')
-            .where(`item.id IN (${itemIdsQb.getQuery()})`)
+    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' })
-            .setParameters(itemIdsQb.getParameters())
             .getMany();
-        return fulfillments.map(fulfillment => ({
-            fulfillment,
-            orderItemIds: new Set(fulfillment.orderItems.map(i => i.id)),
-        }));
-    }
-    /**
-     * @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;
+        return fulfillmentLines;
     }
     /**
      * @description
@@ -135,24 +110,29 @@ let FulfillmentService = class FulfillmentService {
      * publishes a {@link FulfillmentStateTransitionEvent}.
      */
     async transitionToState(ctx, fulfillmentId, state) {
-        const fulfillment = await this.findOneOrThrow(ctx, fulfillmentId, ['orderItems']);
-        const lineIds = unique_1.unique(fulfillment.orderItems.map(item => item.lineId));
+        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 })
+            .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 });
-            return new generated_graphql_admin_errors_1.FulfillmentStateTransitionError(transitionError, fromState, state);
+            return new generated_graphql_admin_errors_1.FulfillmentStateTransitionError({ transitionError, fromState, toState: state });
         }
         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 };
     }
     /**
@@ -164,7 +144,7 @@ let FulfillmentService = class FulfillmentService {
     }
 };
 FulfillmentService = __decorate([
-    common_1.Injectable(),
+    (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         fulfillment_state_machine_1.FulfillmentStateMachine,
         event_bus_1.EventBus,

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":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,mEAA4D;AAC5D,uDAAoD;AAIpD,sGAI2D;AAC3D,gEAA4D;AAC5D,wFAAoF;AACpF,oFAA0E;AAC1E,8CAA+C;AAC/C,iFAAsE;AACtE,kEAAwD;AACxD,yDAAqD;AACrD,gFAA4E;AAC5E,kHAA4G;AAC5G,kHAA4G;AAE5G,8GAAyG;AAEzG;;;;;GAKG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC3B,YACY,UAAmC,EACnC,uBAAgD,EAChD,QAAkB,EAClB,aAA4B,EAC5B,0BAAsD;QAJtD,eAAU,GAAV,UAAU,CAAyB;QACnC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,aAAQ,GAAR,QAAQ,CAAU;QAClB,kBAAa,GAAb,aAAa,CAAe;QAC5B,+BAA0B,GAA1B,0BAA0B,CAA4B;IAC/D,CAAC;IAEJ;;;;OAIG;IACH,KAAK,CAAC,MAAM,CACR,GAAmB,EACnB,MAAe,EACf,KAAkB,EAClB,OAAmC;QAEnC,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,mBAAmB,CAAC,IAAI,CAClF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAC/B,CAAC;QACF,IAAI,CAAC,kBAAkB,EAAE;YACrB,OAAO,IAAI,+DAA8B,EAAE,CAAC;SAC/C;QACD,IAAI,kBAAkB,CAAC;QACvB,IAAI;YACA,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,CAC3D,GAAG,EACH,MAAM,EACN,KAAK,EACL,OAAO,CAAC,SAAS,CACpB,CAAC;SACL;QAAC,OAAO,CAAU,EAAE;YACjB,IAAI,OAAO,GAAG,kBAAkB,CAAC;YACjC,IAAI,uBAAQ,CAAC,CAAC,CAAC,EAAE;gBACb,OAAO,GAAI,CAAS,CAAC,OAAO,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;aAChD;YACD,OAAO,IAAI,uDAAsB,CAAC,OAAO,CAAC,CAAC;SAC9C;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gCAAW,CAAC,CAAC,IAAI,CAC7E,IAAI,gCAAW,+BACX,MAAM,EAAE,EAAE,EACV,YAAY,EAAE,EAAE,IACb,kBAAkB,KACrB,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,IAAI,CAAC,uBAAuB,CAAC,eAAe,EAAE,EACrD,WAAW,EAAE,kBAAkB,CAAC,IAAI,IACtC,CACL,CAAC;QACF,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAClF,GAAG,EACH,gCAAW,EACX,kBAAkB,EAClB,cAAc,CACjB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CACjB,IAAI,oCAAgB,CAAC,GAAG,EAAE,wBAAwB,EAAE;YAChD,MAAM;YACN,KAAK;YACL,OAAO;SACV,CAAC,CACL,CAAC;QACF,OAAO,cAAc,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,GAAmB,EACnB,EAAM,EACN,YAAsB,CAAC,YAAY,CAAC;QAEpC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,gCAAW,EAAE,EAAE,EAAE;YAChE,SAAS;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,4BAA4B,CAAC,GAAmB,EAAE,EAAM;QAC1D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACvD,OAAO,WAAW,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,GAAmB,EACnB,EAAM;QAEN,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;aAC/B,aAAa,CAAC,GAAG,EAAE,iBAAS,CAAC;aAC7B,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC;aACvC,QAAQ,CAAC,mBAAmB,EAAE,aAAa,CAAC;aAC5C,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC;aAC3B,SAAS,CAAC,gBAAgB,EAAE,WAAW,CAAC;aACxC,OAAO,CAAC,SAAS,CAAC;aAClB,KAAK,CAAC,sBAAsB,EAAE,EAAE,EAAE,EAAE,CAAC;aACrC,UAAU,EAAE,CAAC;QAElB,OAAO,OAAO,CAAC,GAAG,CACd,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,EAAqC,EAAE,EAAE;YAC1E,OAAO;gBACH,SAAS,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,iBAAS,EAAE,MAAM,CAAC;gBACzE,QAAQ,EAAE,CAAC,SAAS;aACvB,CAAC;QACN,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAED,KAAK,CAAC,4BAA4B,CAC9B,GAAmB,EACnB,WAAe;QAEf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,aAAa,CAAC,GAAG,EAAE,6BAAS,CAAC;aAC7B,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC;aACvB,KAAK,CAAC,4BAA4B,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAE1D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU;aACrC,aAAa,CAAC,GAAG,EAAE,gCAAW,CAAC;aAC/B,kBAAkB,CAAC,aAAa,CAAC;aACjC,iBAAiB,CAAC,wBAAwB,EAAE,MAAM,CAAC;aACnD,KAAK,CAAC,eAAe,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC;aAC7C,QAAQ,CAAC,sCAAsC,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC;aACjF,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;aACxC,OAAO,EAAE,CAAC;QAEf,OAAO,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACpC,WAAW;YACX,YAAY,EAAE,IAAI,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC/D,CAAC,CAAC,CAAC;IACR,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,2BAA2B,CAC7B,GAAmB,EACnB,WAAe;QAEf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,aAAa,CAAC,GAAG,EAAE,6BAAS,CAAC;aAC7B,OAAO,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAC3D,OAAO,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,iBAAiB,CACnB,GAAmB,EACnB,aAAiB,EACjB,KAAuB;QAUvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAClF,MAAM,OAAO,GAAG,eAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;aAC/B,aAAa,CAAC,GAAG,EAAE,oBAAK,CAAC;aACzB,kBAAkB,CAAC,OAAO,CAAC;aAC3B,iBAAiB,CAAC,aAAa,EAAE,MAAM,CAAC;aACxC,KAAK,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9C,OAAO,EAAE,CAAC;QACf,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC;QACpC,IAAI;YACA,MAAM,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;SAClF;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YAChF,OAAO,IAAI,gEAA+B,CAAC,eAAe,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;SACjF;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gCAAW,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3F,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,oEAA+B,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;QAE/F,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9D,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,WAAwB;QAClC,OAAO,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IACnE,CAAC;CACJ,CAAA;AArMY,kBAAkB;IAD9B,mBAAU,EAAE;qCAGe,kDAAuB;QACV,mDAAuB;QACtC,oBAAQ;QACH,8BAAa;QACA,0DAA0B;GANzD,kBAAkB,CAqM9B;AArMY,gDAAkB"}
+{"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.
@@ -52,7 +54,9 @@ let GlobalSettingsService = class GlobalSettingsService {
             const settings = new global_settings_entity_1.GlobalSettings({
                 availableLanguages: [this.configService.defaultLanguageCode],
             });
-            await this.connection.rawConnection.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,30 +64,31 @@ 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;
     }
     async updateSettings(ctx, input) {
         const settings = await this.getSettings(ctx);
         this.eventBus.publish(new global_settings_event_1.GlobalSettingsEvent(ctx, settings, input));
-        patch_entity_1.patchEntity(settings, input);
+        (0, patch_entity_1.patchEntity)(settings, input);
         await this.customFieldRelationService.updateRelations(ctx, global_settings_entity_1.GlobalSettings, input, settings);
         return this.connection.getRepository(ctx, global_settings_entity_1.GlobalSettings).save(settings);
     }
 };
 GlobalSettingsService = __decorate([
-    common_1.Injectable(),
+    (0, common_1.Injectable)(),
     __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,aAAa,CAAC,uCAAc,CAAC,CAAC,IAAI,EAAE,CAAC;YACxF,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,aAAa,CAAC,uCAAc,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aACtF;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,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,aAAa,CAAC,uCAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SACvG;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,0BAAW,CAAC,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,mBAAU,EAAE;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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"}

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

@@ -1,5 +1,5 @@
 import { UpdateCustomerInput as UpdateCustomerShopInput } from '@vendure/common/lib/generated-shop-types';
-import { HistoryEntryListOptions, HistoryEntryType, UpdateAddressInput, UpdateCustomerInput } from '@vendure/common/lib/generated-types';
+import { HistoryEntryListOptions, HistoryEntryType, OrderLineInput, UpdateAddressInput, UpdateCustomerInput } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
 import { TransactionalConnection } from '../../connection/transactional-connection';
@@ -38,9 +38,9 @@ export interface CustomerHistoryEntryData {
     [HistoryEntryType.CUSTOMER_ADDRESS_DELETED]: {
         address: string;
     };
-    [HistoryEntryType.CUSTOMER_PASSWORD_UPDATED]: {};
-    [HistoryEntryType.CUSTOMER_PASSWORD_RESET_REQUESTED]: {};
-    [HistoryEntryType.CUSTOMER_PASSWORD_RESET_VERIFIED]: {};
+    [HistoryEntryType.CUSTOMER_PASSWORD_UPDATED]: Record<string, never>;
+    [HistoryEntryType.CUSTOMER_PASSWORD_RESET_REQUESTED]: Record<string, never>;
+    [HistoryEntryType.CUSTOMER_PASSWORD_RESET_VERIFIED]: Record<string, never>;
     [HistoryEntryType.CUSTOMER_EMAIL_UPDATE_REQUESTED]: {
         oldEmailAddress: string;
         newEmailAddress: string;
@@ -72,7 +72,7 @@ export interface OrderHistoryEntryData {
         fulfillmentId: ID;
     };
     [HistoryEntryType.ORDER_CANCELLATION]: {
-        orderItemIds: ID[];
+        lines: OrderLineInput[];
         shippingCancelled: boolean;
         reason?: string;
     };

package/dist/service/services/history.service.js

@@ -228,12 +228,12 @@ let HistoryService = class HistoryService {
     async getAdministratorFromContext(ctx) {
         const administrator = ctx.activeUserId
             ? await this.administratorService.findOneByUserId(ctx, ctx.activeUserId)
-            : undefined;
-        return administrator;
+            : null;
+        return administrator !== null && administrator !== void 0 ? administrator : undefined;
     }
 };
 HistoryService = __decorate([
-    common_1.Injectable(),
+    (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         administrator_service_1.AdministratorService,
         list_query_builder_1.ListQueryBuilder,

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

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

package/dist/service/services/order-testing.service.js

@@ -14,9 +14,8 @@ const common_1 = require("@nestjs/common");
 const tax_utils_1 = require("../../common/tax-utils");
 const config_service_1 = require("../../config/config.service");
 const transactional_connection_1 = require("../../connection/transactional-connection");
-const order_item_entity_1 = require("../../entity/order-item/order-item.entity");
-const order_line_entity_1 = require("../../entity/order-line/order-line.entity");
 const order_entity_1 = require("../../entity/order/order.entity");
+const order_line_entity_1 = require("../../entity/order-line/order-line.entity");
 const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
 const shipping_line_entity_1 = require("../../entity/shipping-line/shipping-line.entity");
 const shipping_method_entity_1 = require("../../entity/shipping-method/shipping-method.entity");
@@ -59,8 +58,8 @@ let OrderTestingService = class OrderTestingService {
         if (result) {
             const { price, priceIncludesTax, taxRate, metadata } = result;
             quote = {
-                price: priceIncludesTax ? tax_utils_1.netPriceOf(price, taxRate) : price,
-                priceWithTax: priceIncludesTax ? price : tax_utils_1.grossPriceOf(price, taxRate),
+                price: priceIncludesTax ? (0, tax_utils_1.netPriceOf)(price, taxRate) : price,
+                priceWithTax: priceIncludesTax ? price : (0, tax_utils_1.grossPriceOf)(price, taxRate),
                 metadata,
             };
         }
@@ -86,8 +85,8 @@ let OrderTestingService = class OrderTestingService {
             const { price, taxRate, priceIncludesTax, metadata } = result.result;
             return {
                 id: result.method.id,
-                price: priceIncludesTax ? tax_utils_1.netPriceOf(price, taxRate) : price,
-                priceWithTax: priceIncludesTax ? price : tax_utils_1.grossPriceOf(price, taxRate),
+                price: priceIncludesTax ? (0, tax_utils_1.netPriceOf)(price, taxRate) : price,
+                priceWithTax: priceIncludesTax ? price : (0, tax_utils_1.grossPriceOf)(price, taxRate),
                 name: result.method.name,
                 code: result.method.code,
                 description: result.method.description,
@@ -108,22 +107,16 @@ let OrderTestingService = class OrderTestingService {
             await this.productPriceApplicator.applyChannelPriceAndTax(productVariant, ctx, mockOrder);
             const orderLine = new order_line_entity_1.OrderLine({
                 productVariant,
-                items: [],
+                adjustments: [],
+                taxLines: [],
+                quantity: line.quantity,
                 taxCategory: productVariant.taxCategory,
             });
             mockOrder.lines.push(orderLine);
             const { price, priceIncludesTax } = await orderItemPriceCalculationStrategy.calculateUnitPrice(ctx, productVariant, orderLine.customFields || {}, mockOrder);
             const taxRate = productVariant.taxRateApplied;
-            const unitPrice = priceIncludesTax ? taxRate.netPriceOf(price) : price;
-            for (let i = 0; i < line.quantity; i++) {
-                const orderItem = new order_item_entity_1.OrderItem({
-                    listPrice: price,
-                    listPriceIncludesTax: priceIncludesTax,
-                    adjustments: [],
-                    taxLines: [],
-                });
-                orderLine.items.push(orderItem);
-            }
+            orderLine.listPrice = price;
+            orderLine.listPriceIncludesTax = priceIncludesTax;
         }
         mockOrder.shippingLines = [
             new shipping_line_entity_1.ShippingLine({
@@ -138,7 +131,7 @@ let OrderTestingService = class OrderTestingService {
     }
 };
 OrderTestingService = __decorate([
-    common_1.Injectable(),
+    (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         order_calculator_1.OrderCalculator,
         shipping_calculator_1.ShippingCalculator,

package/dist/service/services/order-testing.service.js.map

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

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

@@ -10,13 +10,13 @@ import { OrderStateTransitionError } from '../../common/error/generated-graphql-
 import { ListQueryOptions } from '../../common/types/common-types';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
+import { Channel } from '../../entity/channel/channel.entity';
 import { Customer } from '../../entity/customer/customer.entity';
 import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
 import { HistoryEntry } from '../../entity/history-entry/history-entry.entity';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
+import { Order } from '../../entity/order/order.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { OrderModification } from '../../entity/order-modification/order-modification.entity';
-import { Order } from '../../entity/order/order.entity';
 import { Payment } from '../../entity/payment/payment.entity';
 import { Promotion } from '../../entity/promotion/promotion.entity';
 import { Refund } from '../../entity/refund/refund.entity';
@@ -45,6 +45,7 @@ import { PaymentMethodService } from './payment-method.service';
 import { PaymentService } from './payment.service';
 import { ProductVariantService } from './product-variant.service';
 import { PromotionService } from './promotion.service';
+import { StockLevelService } from './stock-level.service';
 import { StockMovementService } from './stock-movement.service';
 /**
  * @description
@@ -77,7 +78,8 @@ export declare class OrderService {
     private customFieldRelationService;
     private requestCache;
     private translator;
-    constructor(connection: TransactionalConnection, configService: ConfigService, productVariantService: ProductVariantService, customerService: CustomerService, countryService: CountryService, orderCalculator: OrderCalculator, shippingCalculator: ShippingCalculator, orderStateMachine: OrderStateMachine, orderMerger: OrderMerger, paymentService: PaymentService, paymentStateMachine: PaymentStateMachine, paymentMethodService: PaymentMethodService, fulfillmentService: FulfillmentService, listQueryBuilder: ListQueryBuilder, stockMovementService: StockMovementService, refundStateMachine: RefundStateMachine, historyService: HistoryService, promotionService: PromotionService, eventBus: EventBus, channelService: ChannelService, orderModifier: OrderModifier, customFieldRelationService: CustomFieldRelationService, requestCache: RequestContextCacheService, translator: TranslatorService);
+    private stockLevelService;
+    constructor(connection: TransactionalConnection, configService: ConfigService, productVariantService: ProductVariantService, customerService: CustomerService, countryService: CountryService, orderCalculator: OrderCalculator, shippingCalculator: ShippingCalculator, orderStateMachine: OrderStateMachine, orderMerger: OrderMerger, paymentService: PaymentService, paymentStateMachine: PaymentStateMachine, paymentMethodService: PaymentMethodService, fulfillmentService: FulfillmentService, listQueryBuilder: ListQueryBuilder, stockMovementService: StockMovementService, refundStateMachine: RefundStateMachine, historyService: HistoryService, promotionService: PromotionService, eventBus: EventBus, channelService: ChannelService, orderModifier: OrderModifier, customFieldRelationService: CustomFieldRelationService, requestCache: RequestContextCacheService, translator: TranslatorService, stockLevelService: StockLevelService);
     /**
      * @description
      * Returns an array of all the configured states and transitions of the order process. This is
@@ -95,11 +97,6 @@ export declare class OrderService {
      * Returns all {@link Payment} entities associated with the Order.
      */
     getOrderPayments(ctx: RequestContext, orderId: ID): Promise<Payment[]>;
-    /**
-     * @description
-     * Returns all OrderItems associated with the given {@link Refund}.
-     */
-    getRefundOrderItems(ctx: RequestContext, refundId: ID): Promise<OrderItem[]>;
     /**
      * @description
      * Returns an array of any {@link OrderModification} entities associated with the Order.
@@ -110,6 +107,9 @@ export declare class OrderService {
      * Returns any {@link Refund}s associated with a {@link Payment}.
      */
     getPaymentRefunds(ctx: RequestContext, paymentId: ID): Promise<Refund[]>;
+    getSellerOrders(ctx: RequestContext, order: Order): Promise<Order[]>;
+    getAggregateOrder(ctx: RequestContext, order: Order): Promise<Order | undefined>;
+    getOrderChannels(ctx: RequestContext, order: Order): Promise<Channel[]>;
     /**
      * @description
      * Returns any Order associated with the specified User's Customer account
@@ -185,7 +185,7 @@ export declare class OrderService {
      * @description
      * Returns the next possible states that the Order may transition to.
      */
-    getNextOrderStates(order: Order): ReadonlyArray<OrderState>;
+    getNextOrderStates(order: Order): readonly OrderState[];
     /**
      * @description
      * Sets the shipping address for the Order.
@@ -214,7 +214,7 @@ export declare class OrderService {
      * @description
      * Sets the ShippingMethod to be used on this Order.
      */
-    setShippingMethod(ctx: RequestContext, orderId: ID, shippingMethodId: ID): Promise<ErrorResultUnion<SetOrderShippingMethodResult, Order>>;
+    setShippingMethod(ctx: RequestContext, orderId: ID, shippingMethodIds: ID[]): Promise<ErrorResultUnion<SetOrderShippingMethodResult, Order>>;
     /**
      * @description
      * Transitions the Order to the given state.
@@ -242,7 +242,6 @@ export declare class OrderService {
      *
      */
     modifyOrder(ctx: RequestContext, input: ModifyOrderInput): Promise<ErrorResultUnion<ModifyOrderResult, Order>>;
-    private handleFulfillmentStateTransitByOrder;
     /**
      * @description
      * Transitions the given {@link Payment} to a new state. If the order totalWithTax price is then
@@ -263,7 +262,6 @@ export declare class OrderService {
      * 2. the Order's current state can transition to `PaymentAuthorized` and `PaymentSettled`
      */
     private canAddPaymentToOrder;
-    private transitionOrderIfTotalIsCovered;
     /**
      * @description
      * This method is used after modifying an existing completed order using the `modifyOrder()` method. If the modifications
@@ -291,6 +289,7 @@ export declare class OrderService {
      * Creates a new Fulfillment associated with the given Order and OrderItems.
      */
     createFulfillment(ctx: RequestContext, input: FulfillOrderInput): Promise<ErrorResultUnion<AddFulfillmentToOrderResult, Fulfillment>>;
+    private requestedFulfillmentQuantityExceedsLineQuantity;
     private ensureSufficientStockForFulfillment;
     /**
      * @description
@@ -309,8 +308,6 @@ export declare class OrderService {
      */
     cancelOrder(ctx: RequestContext, input: CancelOrderInput): Promise<ErrorResultUnion<CancelOrderResult, Order>>;
     private cancelOrderById;
-    private cancelOrderByOrderLines;
-    private getAllocatedItems;
     /**
      * @description
      * Creates a {@link Refund} against the order and in doing so invokes the `createRefund()` method of the
@@ -375,8 +372,4 @@ export declare class OrderService {
      * then all of those OrderLines will have their prices re-calculated using the configured {@link OrderItemPriceCalculationStrategy}.
      */
     applyPriceAdjustments(ctx: RequestContext, order: Order, updatedOrderLines?: OrderLine[]): Promise<Order>;
-    private getOrderWithFulfillments;
-    private getOrdersAndItemsFromLines;
-    private mergePaymentMetadata;
-    private groupOrderItemsIntoLines;
 }