@vendure/core 1.3.4 → 1.4.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/common/validate-custom-field-value.d.ts +1 -1
- package/dist/api/common/validate-custom-field-value.js +12 -2
- package/dist/api/common/validate-custom-field-value.js.map +1 -1
- package/dist/api/resolvers/admin/search.resolver.js +1 -1
- package/dist/api/resolvers/admin/search.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/order.api.graphql +4 -1
- package/dist/api/schema/common/custom-field-types.graphql +9 -0
- package/dist/api/schema/shop-api/shop.api.graphql +1 -1
- package/dist/common/configurable-operation.d.ts +1 -23
- package/dist/common/configurable-operation.js.map +1 -1
- package/dist/common/self-refreshing-cache.d.ts +6 -1
- package/dist/common/self-refreshing-cache.js +23 -17
- package/dist/common/self-refreshing-cache.js.map +1 -1
- package/dist/config/catalog/default-collection-filters.js +4 -2
- package/dist/config/catalog/default-collection-filters.js.map +1 -1
- package/dist/config/custom-field/custom-field-types.d.ts +10 -2
- package/dist/config/default-config.js +8 -1
- package/dist/config/default-config.js.map +1 -1
- package/dist/config/merge-config.d.ts +7 -0
- package/dist/config/merge-config.js +7 -0
- package/dist/config/merge-config.js.map +1 -1
- package/dist/config/payment/payment-method-handler.d.ts +2 -2
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/connection/transaction-subscriber.js +8 -1
- package/dist/connection/transaction-subscriber.js.map +1 -1
- package/dist/data-import/providers/import-parser/import-parser.d.ts +40 -40
- package/dist/data-import/providers/import-parser/import-parser.js +343 -56
- package/dist/data-import/providers/import-parser/import-parser.js.map +1 -1
- package/dist/data-import/providers/importer/importer.d.ts +1 -0
- package/dist/data-import/providers/importer/importer.js +69 -41
- package/dist/data-import/providers/importer/importer.js.map +1 -1
- package/dist/entity/country/country-translation.entity.d.ts +4 -1
- package/dist/entity/country/country-translation.entity.js +5 -0
- package/dist/entity/country/country-translation.entity.js.map +1 -1
- package/dist/entity/country/country.entity.d.ts +4 -1
- package/dist/entity/country/country.entity.js +5 -0
- package/dist/entity/country/country.entity.js.map +1 -1
- package/dist/entity/custom-entity-fields.d.ts +28 -12
- package/dist/entity/custom-entity-fields.js +44 -20
- package/dist/entity/custom-entity-fields.js.map +1 -1
- package/dist/entity/customer-group/customer-group.entity.d.ts +4 -1
- package/dist/entity/customer-group/customer-group.entity.js +6 -1
- package/dist/entity/customer-group/customer-group.entity.js.map +1 -1
- package/dist/entity/payment-method/payment-method.entity.d.ts +4 -1
- package/dist/entity/payment-method/payment-method.entity.js +5 -0
- package/dist/entity/payment-method/payment-method.entity.js.map +1 -1
- package/dist/entity/promotion/promotion.entity.d.ts +4 -1
- package/dist/entity/promotion/promotion.entity.js +5 -0
- package/dist/entity/promotion/promotion.entity.js.map +1 -1
- package/dist/entity/register-custom-entity-fields.js +9 -1
- package/dist/entity/register-custom-entity-fields.js.map +1 -1
- package/dist/entity/tax-category/tax-category.entity.d.ts +4 -1
- package/dist/entity/tax-category/tax-category.entity.js +5 -0
- package/dist/entity/tax-category/tax-category.entity.js.map +1 -1
- package/dist/entity/tax-rate/tax-rate.entity.d.ts +4 -1
- package/dist/entity/tax-rate/tax-rate.entity.js +5 -0
- package/dist/entity/tax-rate/tax-rate.entity.js.map +1 -1
- package/dist/entity/zone/zone.entity.d.ts +4 -1
- package/dist/entity/zone/zone.entity.js +5 -0
- package/dist/entity/zone/zone.entity.js.map +1 -1
- package/dist/event-bus/events/account-verified-event.d.ts +16 -0
- package/dist/event-bus/events/account-verified-event.js +21 -0
- package/dist/event-bus/events/account-verified-event.js.map +1 -0
- package/dist/event-bus/events/administrator-event.d.ts +18 -0
- package/dist/event-bus/events/administrator-event.js +19 -0
- package/dist/event-bus/events/administrator-event.js.map +1 -0
- package/dist/event-bus/events/asset-event.d.ts +17 -9
- package/dist/event-bus/events/asset-event.js +15 -9
- package/dist/event-bus/events/asset-event.js.map +1 -1
- package/dist/event-bus/events/change-channel-event.d.ts +22 -0
- package/dist/event-bus/events/change-channel-event.js +25 -0
- package/dist/event-bus/events/change-channel-event.js.map +1 -0
- package/dist/event-bus/events/channel-event.d.ts +18 -0
- package/dist/event-bus/events/channel-event.js +19 -0
- package/dist/event-bus/events/channel-event.js.map +1 -0
- package/dist/event-bus/events/collection-event.d.ts +18 -0
- package/dist/event-bus/events/collection-event.js +19 -0
- package/dist/event-bus/events/collection-event.js.map +1 -0
- package/dist/event-bus/events/country-event.d.ts +18 -0
- package/dist/event-bus/events/country-event.js +19 -0
- package/dist/event-bus/events/country-event.js.map +1 -0
- package/dist/event-bus/events/coupon-code-event.d.ts +19 -0
- package/dist/event-bus/events/coupon-code-event.js +24 -0
- package/dist/event-bus/events/coupon-code-event.js.map +1 -0
- package/dist/event-bus/events/customer-address-event.d.ts +21 -6
- package/dist/event-bus/events/customer-address-event.js +16 -6
- package/dist/event-bus/events/customer-address-event.js.map +1 -1
- package/dist/event-bus/events/customer-event.d.ts +16 -6
- package/dist/event-bus/events/customer-event.js +13 -7
- package/dist/event-bus/events/customer-event.js.map +1 -1
- package/dist/event-bus/events/customer-group-entity-event.d.ts +19 -0
- package/dist/event-bus/events/customer-group-entity-event.js +21 -0
- package/dist/event-bus/events/customer-group-entity-event.js.map +1 -0
- package/dist/event-bus/events/customer-group-event.d.ts +17 -0
- package/dist/event-bus/events/customer-group-event.js +21 -1
- package/dist/event-bus/events/customer-group-event.js.map +1 -1
- package/dist/event-bus/events/facet-event.d.ts +18 -0
- package/dist/event-bus/events/facet-event.js +19 -0
- package/dist/event-bus/events/facet-event.js.map +1 -0
- package/dist/event-bus/events/facet-value-event.d.ts +18 -0
- package/dist/event-bus/events/facet-value-event.js +19 -0
- package/dist/event-bus/events/facet-value-event.js.map +1 -0
- package/dist/event-bus/events/fulfillment-event.d.ts +27 -0
- package/dist/event-bus/events/fulfillment-event.js +19 -0
- package/dist/event-bus/events/fulfillment-event.js.map +1 -0
- package/dist/event-bus/events/global-settings-event.d.ts +16 -0
- package/dist/event-bus/events/global-settings-event.js +20 -0
- package/dist/event-bus/events/global-settings-event.js.map +1 -0
- package/dist/event-bus/events/history-entry-event.d.ts +22 -0
- package/dist/event-bus/events/history-entry-event.js +20 -0
- package/dist/event-bus/events/history-entry-event.js.map +1 -0
- package/dist/event-bus/events/order-placed-event.d.ts +22 -0
- package/dist/event-bus/events/order-placed-event.js +26 -0
- package/dist/event-bus/events/order-placed-event.js.map +1 -0
- package/dist/event-bus/events/order-state-transition-event.js.map +1 -1
- package/dist/event-bus/events/password-reset-verified-event.d.ts +16 -0
- package/dist/event-bus/events/password-reset-verified-event.js +21 -0
- package/dist/event-bus/events/password-reset-verified-event.js.map +1 -0
- package/dist/event-bus/events/payment-method-event.d.ts +18 -0
- package/dist/event-bus/events/payment-method-event.js +19 -0
- package/dist/event-bus/events/payment-method-event.js.map +1 -0
- package/dist/event-bus/events/product-event.d.ts +14 -6
- package/dist/event-bus/events/product-event.js +13 -7
- package/dist/event-bus/events/product-event.js.map +1 -1
- package/dist/event-bus/events/product-option-event.d.ts +18 -0
- package/dist/event-bus/events/product-option-event.js +19 -0
- package/dist/event-bus/events/product-option-event.js.map +1 -0
- package/dist/event-bus/events/product-option-group-change-event.d.ts +19 -0
- package/dist/event-bus/events/product-option-group-change-event.js +23 -0
- package/dist/event-bus/events/product-option-group-change-event.js.map +1 -0
- package/dist/event-bus/events/product-option-group-event.d.ts +18 -0
- package/dist/event-bus/events/product-option-group-event.js +19 -0
- package/dist/event-bus/events/product-option-group-event.js.map +1 -0
- package/dist/event-bus/events/product-variant-event.d.ts +14 -6
- package/dist/event-bus/events/product-variant-event.js +13 -7
- package/dist/event-bus/events/product-variant-event.js.map +1 -1
- package/dist/event-bus/events/promotion-event.d.ts +18 -0
- package/dist/event-bus/events/promotion-event.js +19 -0
- package/dist/event-bus/events/promotion-event.js.map +1 -0
- package/dist/event-bus/events/role-change-event.d.ts +20 -0
- package/dist/event-bus/events/role-change-event.js +24 -0
- package/dist/event-bus/events/role-change-event.js.map +1 -0
- package/dist/event-bus/events/role-event.d.ts +18 -0
- package/dist/event-bus/events/role-event.js +19 -0
- package/dist/event-bus/events/role-event.js.map +1 -0
- package/dist/event-bus/events/shipping-method-event.d.ts +18 -0
- package/dist/event-bus/events/shipping-method-event.js +19 -0
- package/dist/event-bus/events/shipping-method-event.js.map +1 -0
- package/dist/event-bus/events/tax-category-event.d.ts +18 -0
- package/dist/event-bus/events/tax-category-event.js +19 -0
- package/dist/event-bus/events/tax-category-event.js.map +1 -0
- package/dist/event-bus/events/tax-rate-event.d.ts +18 -0
- package/dist/event-bus/events/tax-rate-event.js +19 -0
- package/dist/event-bus/events/tax-rate-event.js.map +1 -0
- package/dist/event-bus/events/tax-rate-modification-event.d.ts +1 -0
- package/dist/event-bus/events/tax-rate-modification-event.js +1 -0
- package/dist/event-bus/events/tax-rate-modification-event.js.map +1 -1
- package/dist/event-bus/events/zone-event.d.ts +18 -0
- package/dist/event-bus/events/zone-event.js +19 -0
- package/dist/event-bus/events/zone-event.js.map +1 -0
- package/dist/event-bus/events/zone-members-event.d.ts +19 -0
- package/dist/event-bus/events/zone-members-event.js +23 -0
- package/dist/event-bus/events/zone-members-event.js.map +1 -0
- package/dist/event-bus/index.d.ts +32 -4
- package/dist/event-bus/index.js +32 -4
- package/dist/event-bus/index.js.map +1 -1
- package/dist/event-bus/vendure-entity-event.d.ts +17 -0
- package/dist/event-bus/vendure-entity-event.js +23 -0
- package/dist/event-bus/vendure-entity-event.js.map +1 -0
- package/dist/i18n/messages/en.json +2 -1
- package/dist/plugin/default-search-plugin/api/fulltext-search.resolver.js +1 -1
- package/dist/plugin/default-search-plugin/api/fulltext-search.resolver.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.js +1 -1
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.js.map +1 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.d.ts +1 -3
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.js +2 -10
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.js.map +1 -1
- package/dist/service/helpers/order-calculator/order-calculator.js +3 -0
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.d.ts +3 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js +10 -2
- package/dist/service/helpers/order-state-machine/order-state-machine.js.map +1 -1
- package/dist/service/services/administrator.service.d.ts +3 -1
- package/dist/service/services/administrator.service.js +16 -2
- package/dist/service/services/administrator.service.js.map +1 -1
- package/dist/service/services/asset.service.js +14 -6
- package/dist/service/services/asset.service.js.map +1 -1
- package/dist/service/services/channel.service.d.ts +4 -2
- package/dist/service/services/channel.service.js +14 -3
- package/dist/service/services/channel.service.js.map +1 -1
- package/dist/service/services/collection.service.js +6 -2
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/country.service.d.ts +3 -3
- package/dist/service/services/country.service.js +8 -4
- package/dist/service/services/country.service.js.map +1 -1
- package/dist/service/services/customer-group.service.js +8 -1
- package/dist/service/services/customer-group.service.js.map +1 -1
- package/dist/service/services/customer.service.js +13 -8
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/facet-value.service.d.ts +3 -1
- package/dist/service/services/facet-value.service.js +10 -3
- package/dist/service/services/facet-value.service.js.map +1 -1
- package/dist/service/services/facet.service.d.ts +3 -1
- package/dist/service/services/facet.service.js +10 -3
- package/dist/service/services/facet.service.js.map +1 -1
- package/dist/service/services/fulfillment.service.js +7 -1
- package/dist/service/services/fulfillment.service.js.map +1 -1
- package/dist/service/services/global-settings.service.d.ts +3 -1
- package/dist/service/services/global-settings.service.js +7 -2
- package/dist/service/services/global-settings.service.js.map +1 -1
- package/dist/service/services/history.service.d.ts +3 -1
- package/dist/service/services/history.service.js +20 -6
- package/dist/service/services/history.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +1 -0
- package/dist/service/services/order.service.js +31 -1
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/payment-method.service.js +9 -1
- package/dist/service/services/payment-method.service.js.map +1 -1
- package/dist/service/services/product-option-group.service.d.ts +3 -1
- package/dist/service/services/product-option-group.service.js +9 -3
- package/dist/service/services/product-option-group.service.js.map +1 -1
- package/dist/service/services/product-option.service.d.ts +3 -1
- package/dist/service/services/product-option.service.js +9 -3
- package/dist/service/services/product-option.service.js.map +1 -1
- package/dist/service/services/product-variant.service.js +3 -3
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.js +6 -3
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/promotion.service.d.ts +3 -1
- package/dist/service/services/promotion.service.js +10 -3
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/role.service.d.ts +3 -1
- package/dist/service/services/role.service.js +12 -4
- package/dist/service/services/role.service.js.map +1 -1
- package/dist/service/services/shipping-method.service.d.ts +3 -1
- package/dist/service/services/shipping-method.service.js +10 -3
- package/dist/service/services/shipping-method.service.js.map +1 -1
- package/dist/service/services/stock-movement.service.d.ts +11 -0
- package/dist/service/services/stock-movement.service.js +15 -5
- package/dist/service/services/stock-movement.service.js.map +1 -1
- package/dist/service/services/tax-category.service.d.ts +3 -1
- package/dist/service/services/tax-category.service.js +8 -2
- package/dist/service/services/tax-category.service.js.map +1 -1
- package/dist/service/services/tax-rate.service.js +4 -0
- package/dist/service/services/tax-rate.service.js.map +1 -1
- package/dist/service/services/zone.service.d.ts +5 -3
- package/dist/service/services/zone.service.js +24 -12
- package/dist/service/services/zone.service.js.map +1 -1
- package/package.json +4 -4
|
@@ -3,6 +3,7 @@ import { StateMachineConfig } from '../../../common/finite-state-machine/types';
|
|
|
3
3
|
import { ConfigService } from '../../../config/config.service';
|
|
4
4
|
import { TransactionalConnection } from '../../../connection/transactional-connection';
|
|
5
5
|
import { Order } from '../../../entity/order/order.entity';
|
|
6
|
+
import { EventBus } from '../../../event-bus/index';
|
|
6
7
|
import { HistoryService } from '../../services/history.service';
|
|
7
8
|
import { PromotionService } from '../../services/promotion.service';
|
|
8
9
|
import { StockMovementService } from '../../services/stock-movement.service';
|
|
@@ -13,9 +14,10 @@ export declare class OrderStateMachine {
|
|
|
13
14
|
private stockMovementService;
|
|
14
15
|
private historyService;
|
|
15
16
|
private promotionService;
|
|
17
|
+
private eventBus;
|
|
16
18
|
readonly config: StateMachineConfig<OrderState, OrderTransitionData>;
|
|
17
19
|
private readonly initialState;
|
|
18
|
-
constructor(connection: TransactionalConnection, configService: ConfigService, stockMovementService: StockMovementService, historyService: HistoryService, promotionService: PromotionService);
|
|
20
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, stockMovementService: StockMovementService, historyService: HistoryService, promotionService: PromotionService, eventBus: EventBus);
|
|
19
21
|
getInitialState(): OrderState;
|
|
20
22
|
canTransition(currentState: OrderState, newState: OrderState): boolean;
|
|
21
23
|
getNextStates(order: Order): ReadonlyArray<OrderState>;
|
|
@@ -24,18 +24,21 @@ const order_modification_entity_1 = require("../../../entity/order-modification/
|
|
|
24
24
|
const order_entity_1 = require("../../../entity/order/order.entity");
|
|
25
25
|
const payment_entity_1 = require("../../../entity/payment/payment.entity");
|
|
26
26
|
const product_variant_entity_1 = require("../../../entity/product-variant/product-variant.entity");
|
|
27
|
+
const order_placed_event_1 = require("../../../event-bus/events/order-placed-event");
|
|
28
|
+
const index_1 = require("../../../event-bus/index");
|
|
27
29
|
const history_service_1 = require("../../services/history.service");
|
|
28
30
|
const promotion_service_1 = require("../../services/promotion.service");
|
|
29
31
|
const stock_movement_service_1 = require("../../services/stock-movement.service");
|
|
30
32
|
const order_utils_1 = require("../utils/order-utils");
|
|
31
33
|
const order_state_1 = require("./order-state");
|
|
32
34
|
let OrderStateMachine = class OrderStateMachine {
|
|
33
|
-
constructor(connection, configService, stockMovementService, historyService, promotionService) {
|
|
35
|
+
constructor(connection, configService, stockMovementService, historyService, promotionService, eventBus) {
|
|
34
36
|
this.connection = connection;
|
|
35
37
|
this.configService = configService;
|
|
36
38
|
this.stockMovementService = stockMovementService;
|
|
37
39
|
this.historyService = historyService;
|
|
38
40
|
this.promotionService = promotionService;
|
|
41
|
+
this.eventBus = eventBus;
|
|
39
42
|
this.initialState = 'Created';
|
|
40
43
|
this.config = this.initConfig();
|
|
41
44
|
}
|
|
@@ -115,6 +118,9 @@ let OrderStateMachine = class OrderStateMachine {
|
|
|
115
118
|
if (!data.order.customer) {
|
|
116
119
|
return `message.cannot-transition-to-payment-without-customer`;
|
|
117
120
|
}
|
|
121
|
+
if (!data.order.shippingLines || data.order.shippingLines.length === 0) {
|
|
122
|
+
return `message.cannot-transition-to-payment-without-shipping-method`;
|
|
123
|
+
}
|
|
118
124
|
}
|
|
119
125
|
if (toState === 'PaymentAuthorized') {
|
|
120
126
|
const hasAnAuthorizedPayment = !!data.order.payments.find(p => p.state === 'Authorized');
|
|
@@ -167,6 +173,7 @@ let OrderStateMachine = class OrderStateMachine {
|
|
|
167
173
|
order.active = false;
|
|
168
174
|
order.orderPlacedAt = new Date();
|
|
169
175
|
await this.promotionService.addPromotionsToOrder(ctx, order);
|
|
176
|
+
this.eventBus.publish(new order_placed_event_1.OrderPlacedEvent(fromState, toState, ctx, order));
|
|
170
177
|
}
|
|
171
178
|
}
|
|
172
179
|
const shouldAllocateStock = await stockAllocationStrategy.shouldAllocateStock(ctx, fromState, toState, order);
|
|
@@ -232,7 +239,8 @@ OrderStateMachine = __decorate([
|
|
|
232
239
|
config_service_1.ConfigService,
|
|
233
240
|
stock_movement_service_1.StockMovementService,
|
|
234
241
|
history_service_1.HistoryService,
|
|
235
|
-
promotion_service_1.PromotionService
|
|
242
|
+
promotion_service_1.PromotionService,
|
|
243
|
+
index_1.EventBus])
|
|
236
244
|
], OrderStateMachine);
|
|
237
245
|
exports.OrderStateMachine = OrderStateMachine;
|
|
238
246
|
//# sourceMappingURL=order-state-machine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-state-machine/order-state-machine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAAuE;AAEvE,uDAAoD;AAGpD,yDAAqE;AACrE,oGAAgF;AAChF,oHAA+G;AAE/G,wHAAmH;AACnH,iDAAiE;AACjE,mEAA+D;AAC/D,2FAAuF;AACvF,4GAAiG;AACjG,qEAA2D;AAC3D,2EAAiE;AACjE,mGAAwF;AACxF,oEAAgE;AAChE,wEAAoE;AACpE,kFAA6E;AAC7E,sDAQ8B;AAE9B,+CAAuF;AAGvF,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAI1B,YACY,UAAmC,EACnC,aAA4B,EAC5B,oBAA0C,EAC1C,cAA8B,EAC9B,gBAAkC;
|
|
1
|
+
{"version":3,"file":"order-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-state-machine/order-state-machine.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { ListQueryOptions } from '../../common/types/common-types';
|
|
|
5
5
|
import { ConfigService } from '../../config';
|
|
6
6
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
7
7
|
import { Administrator } from '../../entity/administrator/administrator.entity';
|
|
8
|
+
import { EventBus } from '../../event-bus';
|
|
8
9
|
import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
|
|
9
10
|
import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
|
|
10
11
|
import { PasswordCipher } from '../helpers/password-cipher/password-cipher';
|
|
@@ -24,7 +25,8 @@ export declare class AdministratorService {
|
|
|
24
25
|
private userService;
|
|
25
26
|
private roleService;
|
|
26
27
|
private customFieldRelationService;
|
|
27
|
-
|
|
28
|
+
private eventBus;
|
|
29
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, listQueryBuilder: ListQueryBuilder, passwordCipher: PasswordCipher, userService: UserService, roleService: RoleService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus);
|
|
28
30
|
/** @internal */
|
|
29
31
|
initAdministrators(): Promise<void>;
|
|
30
32
|
/**
|
|
@@ -19,6 +19,9 @@ const transactional_connection_1 = require("../../connection/transactional-conne
|
|
|
19
19
|
const administrator_entity_1 = require("../../entity/administrator/administrator.entity");
|
|
20
20
|
const native_authentication_method_entity_1 = require("../../entity/authentication-method/native-authentication-method.entity");
|
|
21
21
|
const user_entity_1 = require("../../entity/user/user.entity");
|
|
22
|
+
const event_bus_1 = require("../../event-bus");
|
|
23
|
+
const administrator_event_1 = require("../../event-bus/events/administrator-event");
|
|
24
|
+
const role_change_event_1 = require("../../event-bus/events/role-change-event");
|
|
22
25
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
23
26
|
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
24
27
|
const password_cipher_1 = require("../helpers/password-cipher/password-cipher");
|
|
@@ -32,7 +35,7 @@ const user_service_1 = require("./user.service");
|
|
|
32
35
|
* @docsCategory services
|
|
33
36
|
*/
|
|
34
37
|
let AdministratorService = class AdministratorService {
|
|
35
|
-
constructor(connection, configService, listQueryBuilder, passwordCipher, userService, roleService, customFieldRelationService) {
|
|
38
|
+
constructor(connection, configService, listQueryBuilder, passwordCipher, userService, roleService, customFieldRelationService, eventBus) {
|
|
36
39
|
this.connection = connection;
|
|
37
40
|
this.configService = configService;
|
|
38
41
|
this.listQueryBuilder = listQueryBuilder;
|
|
@@ -40,6 +43,7 @@ let AdministratorService = class AdministratorService {
|
|
|
40
43
|
this.userService = userService;
|
|
41
44
|
this.roleService = roleService;
|
|
42
45
|
this.customFieldRelationService = customFieldRelationService;
|
|
46
|
+
this.eventBus = eventBus;
|
|
43
47
|
}
|
|
44
48
|
/** @internal */
|
|
45
49
|
async initAdministrators() {
|
|
@@ -100,6 +104,7 @@ let AdministratorService = class AdministratorService {
|
|
|
100
104
|
createdAdministrator = await this.assignRole(ctx, createdAdministrator.id, roleId);
|
|
101
105
|
}
|
|
102
106
|
await this.customFieldRelationService.updateRelations(ctx, administrator_entity_1.Administrator, input, createdAdministrator);
|
|
107
|
+
this.eventBus.publish(new administrator_event_1.AdministratorEvent(ctx, createdAdministrator, 'created', input));
|
|
103
108
|
return createdAdministrator;
|
|
104
109
|
}
|
|
105
110
|
/**
|
|
@@ -126,13 +131,20 @@ let AdministratorService = class AdministratorService {
|
|
|
126
131
|
}
|
|
127
132
|
}
|
|
128
133
|
if (input.roleIds) {
|
|
134
|
+
const removeIds = administrator.user.roles
|
|
135
|
+
.map(role => role.id)
|
|
136
|
+
.filter(roleId => input.roleIds.indexOf(roleId) === -1);
|
|
137
|
+
const addIds = input.roleIds.filter(roleId => !administrator.user.roles.some(role => role.id === roleId));
|
|
129
138
|
administrator.user.roles = [];
|
|
130
139
|
await this.connection.getRepository(ctx, user_entity_1.User).save(administrator.user, { reload: false });
|
|
131
140
|
for (const roleId of input.roleIds) {
|
|
132
141
|
updatedAdministrator = await this.assignRole(ctx, administrator.id, roleId);
|
|
133
142
|
}
|
|
143
|
+
this.eventBus.publish(new role_change_event_1.RoleChangeEvent(ctx, administrator, addIds, 'assigned'));
|
|
144
|
+
this.eventBus.publish(new role_change_event_1.RoleChangeEvent(ctx, administrator, removeIds, 'removed'));
|
|
134
145
|
}
|
|
135
146
|
await this.customFieldRelationService.updateRelations(ctx, administrator_entity_1.Administrator, input, updatedAdministrator);
|
|
147
|
+
this.eventBus.publish(new administrator_event_1.AdministratorEvent(ctx, administrator, 'updated', input));
|
|
136
148
|
return updatedAdministrator;
|
|
137
149
|
}
|
|
138
150
|
/**
|
|
@@ -163,6 +175,7 @@ let AdministratorService = class AdministratorService {
|
|
|
163
175
|
await this.connection.getRepository(ctx, administrator_entity_1.Administrator).update({ id }, { deletedAt: new Date() });
|
|
164
176
|
// tslint:disable-next-line:no-non-null-assertion
|
|
165
177
|
await this.userService.softDelete(ctx, administrator.user.id);
|
|
178
|
+
this.eventBus.publish(new administrator_event_1.AdministratorEvent(ctx, administrator, 'deleted', id));
|
|
166
179
|
return {
|
|
167
180
|
result: generated_types_1.DeletionResult.DELETED,
|
|
168
181
|
};
|
|
@@ -201,7 +214,8 @@ AdministratorService = __decorate([
|
|
|
201
214
|
password_cipher_1.PasswordCipher,
|
|
202
215
|
user_service_1.UserService,
|
|
203
216
|
role_service_1.RoleService,
|
|
204
|
-
custom_field_relation_service_1.CustomFieldRelationService
|
|
217
|
+
custom_field_relation_service_1.CustomFieldRelationService,
|
|
218
|
+
event_bus_1.EventBus])
|
|
205
219
|
], AdministratorService);
|
|
206
220
|
exports.AdministratorService = AdministratorService;
|
|
207
221
|
//# sourceMappingURL=administrator.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"administrator.service.js","sourceRoot":"","sources":["../../../src/service/services/administrator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAI6C;AAG7C,sEAAkE;AAClE,sDAAgE;AAEhE,yCAA6C;AAC7C,wFAAoF;AACpF,0FAAgF;AAChF,gIAAoH;AACpH,+DAAqD;AACrD,kHAA4G;AAC5G,yFAAoF;AACpF,gFAA4E;AAC5E,gEAA4D;AAE5D,iDAA6C;AAC7C,iDAA6C;AAE7C;;;;;GAKG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YACY,UAAmC,EACnC,aAA4B,EAC5B,gBAAkC,EAClC,cAA8B,EAC9B,WAAwB,EACxB,WAAwB,EACxB,0BAAsD;
|
|
1
|
+
{"version":3,"file":"administrator.service.js","sourceRoot":"","sources":["../../../src/service/services/administrator.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
|
18
18
|
const omit_1 = require("@vendure/common/lib/omit");
|
|
19
19
|
const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
20
20
|
const unique_1 = require("@vendure/common/lib/unique");
|
|
21
|
+
const fs_1 = require("fs");
|
|
21
22
|
const fs_extra_1 = require("fs-extra");
|
|
22
23
|
const mime_types_1 = __importDefault(require("mime-types"));
|
|
23
24
|
const path_1 = __importDefault(require("path"));
|
|
@@ -202,7 +203,14 @@ let AssetService = class AssetService {
|
|
|
202
203
|
stream.on('error', (err) => {
|
|
203
204
|
reject(err);
|
|
204
205
|
});
|
|
205
|
-
|
|
206
|
+
let result;
|
|
207
|
+
try {
|
|
208
|
+
result = await this.createAssetInternal(ctx, stream, filename, mimetype, input.customFields);
|
|
209
|
+
}
|
|
210
|
+
catch (e) {
|
|
211
|
+
reject(e);
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
206
214
|
if (error_result_1.isGraphQlErrorResult(result)) {
|
|
207
215
|
resolve(result);
|
|
208
216
|
return;
|
|
@@ -213,7 +221,7 @@ let AssetService = class AssetService {
|
|
|
213
221
|
result.tags = tags;
|
|
214
222
|
await this.connection.getRepository(ctx, asset_entity_1.Asset).save(result);
|
|
215
223
|
}
|
|
216
|
-
this.eventBus.publish(new asset_event_1.AssetEvent(ctx, result, 'created'));
|
|
224
|
+
this.eventBus.publish(new asset_event_1.AssetEvent(ctx, result, 'created', input));
|
|
217
225
|
resolve(result);
|
|
218
226
|
});
|
|
219
227
|
}
|
|
@@ -230,7 +238,7 @@ let AssetService = class AssetService {
|
|
|
230
238
|
asset.tags = await this.tagService.valuesToTags(ctx, input.tags);
|
|
231
239
|
}
|
|
232
240
|
const updatedAsset = await this.connection.getRepository(ctx, asset_entity_1.Asset).save(asset);
|
|
233
|
-
this.eventBus.publish(new asset_event_1.AssetEvent(ctx, updatedAsset, 'updated'));
|
|
241
|
+
this.eventBus.publish(new asset_event_1.AssetEvent(ctx, updatedAsset, 'updated', input));
|
|
234
242
|
return updatedAsset;
|
|
235
243
|
}
|
|
236
244
|
async delete(ctx, ids, force = false, deleteFromAllChannels = false) {
|
|
@@ -301,7 +309,7 @@ let AssetService = class AssetService {
|
|
|
301
309
|
return this.connection.findByIdsInChannel(ctx, asset_entity_1.Asset, assets.map(a => a.id), ctx.channelId, {});
|
|
302
310
|
}
|
|
303
311
|
async createFromFileStream(stream, maybeFilePath) {
|
|
304
|
-
const filePath = stream instanceof fs_extra_1.ReadStream ? stream.path : maybeFilePath;
|
|
312
|
+
const filePath = stream instanceof fs_extra_1.ReadStream || stream instanceof fs_1.ReadStream ? stream.path : maybeFilePath;
|
|
305
313
|
if (typeof filePath === 'string') {
|
|
306
314
|
const filename = path_1.default.basename(filePath);
|
|
307
315
|
const mimetype = mime_types_1.default.lookup(filename) || 'application/octet-stream';
|
|
@@ -328,7 +336,7 @@ let AssetService = class AssetService {
|
|
|
328
336
|
catch (e) {
|
|
329
337
|
vendure_logger_1.Logger.error(`error.could-not-delete-asset-file`, undefined, e.stack);
|
|
330
338
|
}
|
|
331
|
-
this.eventBus.publish(new asset_event_1.AssetEvent(ctx, deletedAsset, 'deleted'));
|
|
339
|
+
this.eventBus.publish(new asset_event_1.AssetEvent(ctx, deletedAsset, 'deleted', deletedAsset.id));
|
|
332
340
|
}
|
|
333
341
|
return {
|
|
334
342
|
result: generated_types_1.DeletionResult.DELETED,
|
|
@@ -358,7 +366,7 @@ let AssetService = class AssetService {
|
|
|
358
366
|
preview = await assetPreviewStrategy.generatePreviewImage(ctx, mimetype, sourceFile);
|
|
359
367
|
}
|
|
360
368
|
catch (e) {
|
|
361
|
-
vendure_logger_1.Logger.error(`Could not create Asset preview image: ${e.message}
|
|
369
|
+
vendure_logger_1.Logger.error(`Could not create Asset preview image: ${e.message}`, undefined, e.stack);
|
|
362
370
|
throw e;
|
|
363
371
|
}
|
|
364
372
|
const previewFileIdentifier = await assetStorageStrategy.writeFileFromBuffer(previewFileName, preview);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset.service.js","sourceRoot":"","sources":["../../../src/service/services/asset.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"asset.service.js","sourceRoot":"","sources":["../../../src/service/services/asset.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { ConfigService } from '../../config/config.service';
|
|
|
7
7
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
8
8
|
import { VendureEntity } from '../../entity/base/base.entity';
|
|
9
9
|
import { Channel } from '../../entity/channel/channel.entity';
|
|
10
|
+
import { EventBus } from '../../event-bus';
|
|
10
11
|
import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
|
|
11
12
|
import { GlobalSettingsService } from './global-settings.service';
|
|
12
13
|
/**
|
|
@@ -20,8 +21,9 @@ export declare class ChannelService {
|
|
|
20
21
|
private configService;
|
|
21
22
|
private globalSettingsService;
|
|
22
23
|
private customFieldRelationService;
|
|
24
|
+
private eventBus;
|
|
23
25
|
private allChannels;
|
|
24
|
-
constructor(connection: TransactionalConnection, configService: ConfigService, globalSettingsService: GlobalSettingsService, customFieldRelationService: CustomFieldRelationService);
|
|
26
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, globalSettingsService: GlobalSettingsService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus);
|
|
25
27
|
/**
|
|
26
28
|
* When the app is bootstrapped, ensure a default Channel exists and populate the
|
|
27
29
|
* channel lookup array.
|
|
@@ -34,7 +36,7 @@ export declare class ChannelService {
|
|
|
34
36
|
* Assigns a ChannelAware entity to the default Channel as well as any channel
|
|
35
37
|
* specified in the RequestContext.
|
|
36
38
|
*/
|
|
37
|
-
assignToCurrentChannel<T extends ChannelAware>(entity: T, ctx: RequestContext): Promise<T>;
|
|
39
|
+
assignToCurrentChannel<T extends ChannelAware & VendureEntity>(entity: T, ctx: RequestContext): Promise<T>;
|
|
38
40
|
/**
|
|
39
41
|
* @description
|
|
40
42
|
* Assigns the entity to the given Channels and saves.
|
|
@@ -26,6 +26,9 @@ const channel_entity_1 = require("../../entity/channel/channel.entity");
|
|
|
26
26
|
const product_variant_price_entity_1 = require("../../entity/product-variant/product-variant-price.entity");
|
|
27
27
|
const session_entity_1 = require("../../entity/session/session.entity");
|
|
28
28
|
const zone_entity_1 = require("../../entity/zone/zone.entity");
|
|
29
|
+
const event_bus_1 = require("../../event-bus");
|
|
30
|
+
const change_channel_event_1 = require("../../event-bus/events/change-channel-event");
|
|
31
|
+
const channel_event_1 = require("../../event-bus/events/channel-event");
|
|
29
32
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
30
33
|
const patch_entity_1 = require("../helpers/utils/patch-entity");
|
|
31
34
|
const global_settings_service_1 = require("./global-settings.service");
|
|
@@ -36,11 +39,12 @@ const global_settings_service_1 = require("./global-settings.service");
|
|
|
36
39
|
* @docsCategory services
|
|
37
40
|
*/
|
|
38
41
|
let ChannelService = class ChannelService {
|
|
39
|
-
constructor(connection, configService, globalSettingsService, customFieldRelationService) {
|
|
42
|
+
constructor(connection, configService, globalSettingsService, customFieldRelationService, eventBus) {
|
|
40
43
|
this.connection = connection;
|
|
41
44
|
this.configService = configService;
|
|
42
45
|
this.globalSettingsService = globalSettingsService;
|
|
43
46
|
this.customFieldRelationService = customFieldRelationService;
|
|
47
|
+
this.eventBus = eventBus;
|
|
44
48
|
}
|
|
45
49
|
/**
|
|
46
50
|
* When the app is bootstrapped, ensure a default Channel exists and populate the
|
|
@@ -65,6 +69,7 @@ let ChannelService = class ChannelService {
|
|
|
65
69
|
const defaultChannel = await this.getDefaultChannel();
|
|
66
70
|
const channelIds = unique_1.unique([ctx.channelId, defaultChannel.id]);
|
|
67
71
|
entity.channels = channelIds.map(id => ({ id }));
|
|
72
|
+
this.eventBus.publish(new change_channel_event_1.ChangeChannelEvent(ctx, entity, [ctx.channelId], 'assigned'));
|
|
68
73
|
return entity;
|
|
69
74
|
}
|
|
70
75
|
/**
|
|
@@ -80,6 +85,7 @@ let ChannelService = class ChannelService {
|
|
|
80
85
|
entity.channels.push(channel);
|
|
81
86
|
}
|
|
82
87
|
await this.connection.getRepository(ctx, entityType).save(entity, { reload: false });
|
|
88
|
+
this.eventBus.publish(new change_channel_event_1.ChangeChannelEvent(ctx, entity, channelIds, 'assigned', entityType));
|
|
83
89
|
return entity;
|
|
84
90
|
}
|
|
85
91
|
/**
|
|
@@ -97,6 +103,7 @@ let ChannelService = class ChannelService {
|
|
|
97
103
|
entity.channels = entity.channels.filter(c => !utils_1.idsAreEqual(c.id, id));
|
|
98
104
|
}
|
|
99
105
|
await this.connection.getRepository(ctx, entityType).save(entity, { reload: false });
|
|
106
|
+
this.eventBus.publish(new change_channel_event_1.ChangeChannelEvent(ctx, entity, channelIds, 'removed', entityType));
|
|
100
107
|
return entity;
|
|
101
108
|
}
|
|
102
109
|
/**
|
|
@@ -153,6 +160,7 @@ let ChannelService = class ChannelService {
|
|
|
153
160
|
const newChannel = await this.connection.getRepository(ctx, channel_entity_1.Channel).save(channel);
|
|
154
161
|
await this.customFieldRelationService.updateRelations(ctx, channel_entity_1.Channel, input, newChannel);
|
|
155
162
|
await this.allChannels.refresh(ctx);
|
|
163
|
+
this.eventBus.publish(new channel_event_1.ChannelEvent(ctx, newChannel, 'created', input));
|
|
156
164
|
return channel;
|
|
157
165
|
}
|
|
158
166
|
async update(ctx, input) {
|
|
@@ -174,15 +182,17 @@ let ChannelService = class ChannelService {
|
|
|
174
182
|
await this.connection.getRepository(ctx, channel_entity_1.Channel).save(updatedChannel, { reload: false });
|
|
175
183
|
await this.customFieldRelationService.updateRelations(ctx, channel_entity_1.Channel, input, updatedChannel);
|
|
176
184
|
await this.allChannels.refresh(ctx);
|
|
185
|
+
this.eventBus.publish(new channel_event_1.ChannelEvent(ctx, channel, 'updated', input));
|
|
177
186
|
return utils_1.assertFound(this.findOne(ctx, channel.id));
|
|
178
187
|
}
|
|
179
188
|
async delete(ctx, id) {
|
|
180
|
-
await this.connection.getEntityOrThrow(ctx, channel_entity_1.Channel, id);
|
|
189
|
+
const channel = await this.connection.getEntityOrThrow(ctx, channel_entity_1.Channel, id);
|
|
181
190
|
await this.connection.getRepository(ctx, session_entity_1.Session).delete({ activeChannelId: id });
|
|
182
191
|
await this.connection.getRepository(ctx, channel_entity_1.Channel).delete(id);
|
|
183
192
|
await this.connection.getRepository(ctx, product_variant_price_entity_1.ProductVariantPrice).delete({
|
|
184
193
|
channelId: id,
|
|
185
194
|
});
|
|
195
|
+
this.eventBus.publish(new channel_event_1.ChannelEvent(ctx, channel, 'deleted', id));
|
|
186
196
|
return {
|
|
187
197
|
result: generated_types_1.DeletionResult.DELETED,
|
|
188
198
|
};
|
|
@@ -240,7 +250,8 @@ ChannelService = __decorate([
|
|
|
240
250
|
__metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
|
|
241
251
|
config_service_1.ConfigService,
|
|
242
252
|
global_settings_service_1.GlobalSettingsService,
|
|
243
|
-
custom_field_relation_service_1.CustomFieldRelationService
|
|
253
|
+
custom_field_relation_service_1.CustomFieldRelationService,
|
|
254
|
+
event_bus_1.EventBus])
|
|
244
255
|
], ChannelService);
|
|
245
256
|
exports.ChannelService = ChannelService;
|
|
246
257
|
//# sourceMappingURL=channel.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.service.js","sourceRoot":"","sources":["../../../src/service/services/channel.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAQ6C;AAC7C,2EAA4E;AAE5E,uDAAoD;AAEpD,sEAAkE;AAClE,kEAAyF;AACzF,sDAA2G;AAC3G,sGAA8F;AAC9F,8EAAoG;AAEpG,8CAA8D;AAC9D,gEAA4D;AAC5D,wFAAoF;AAEpF,wEAA8D;AAC9D,4GAAgG;AAChG,wEAA8D;AAC9D,+DAAqD;AACrD,kHAA4G;AAC5G,gEAA4D;AAE5D,uEAAkE;AAElE;;;;;GAKG;AAEH,IAAa,cAAc,GAA3B,MAAa,cAAc;IAGvB,YACY,UAAmC,EACnC,aAA4B,EAC5B,qBAA4C,EAC5C,0BAAsD;
|
|
1
|
+
{"version":3,"file":"channel.service.js","sourceRoot":"","sources":["../../../src/service/services/channel.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ const collection_translation_entity_1 = require("../../entity/collection/collect
|
|
|
26
26
|
const collection_entity_1 = require("../../entity/collection/collection.entity");
|
|
27
27
|
const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
|
|
28
28
|
const event_bus_1 = require("../../event-bus/event-bus");
|
|
29
|
+
const collection_event_1 = require("../../event-bus/events/collection-event");
|
|
29
30
|
const collection_modification_event_1 = require("../../event-bus/events/collection-modification-event");
|
|
30
31
|
const product_event_1 = require("../../event-bus/events/product-event");
|
|
31
32
|
const product_variant_event_1 = require("../../event-bus/events/product-variant-event");
|
|
@@ -226,7 +227,7 @@ let CollectionService = class CollectionService {
|
|
|
226
227
|
const getChildren = async (id, _descendants = [], depth = 1) => {
|
|
227
228
|
const children = await this.connection
|
|
228
229
|
.getRepository(ctx, collection_entity_1.Collection)
|
|
229
|
-
.find({ where: { parent: { id } } });
|
|
230
|
+
.find({ where: { parent: { id } }, order: { position: 'ASC' } });
|
|
230
231
|
for (const child of children) {
|
|
231
232
|
_descendants.push(child);
|
|
232
233
|
if (depth < maxDepth) {
|
|
@@ -288,11 +289,12 @@ let CollectionService = class CollectionService {
|
|
|
288
289
|
},
|
|
289
290
|
});
|
|
290
291
|
await this.assetService.updateEntityAssets(ctx, collection, input);
|
|
291
|
-
await this.customFieldRelationService.updateRelations(ctx, collection_entity_1.Collection, input, collection);
|
|
292
|
+
const collectionWithRelations = await this.customFieldRelationService.updateRelations(ctx, collection_entity_1.Collection, input, collection);
|
|
292
293
|
await this.applyFiltersQueue.add({
|
|
293
294
|
ctx: ctx.serialize(),
|
|
294
295
|
collectionIds: [collection.id],
|
|
295
296
|
});
|
|
297
|
+
this.eventBus.publish(new collection_event_1.CollectionEvent(ctx, collectionWithRelations, 'created', input));
|
|
296
298
|
return utils_1.assertFound(this.findOne(ctx, collection.id));
|
|
297
299
|
}
|
|
298
300
|
async update(ctx, input) {
|
|
@@ -322,6 +324,7 @@ let CollectionService = class CollectionService {
|
|
|
322
324
|
const affectedVariantIds = await this.getCollectionProductVariantIds(collection);
|
|
323
325
|
this.eventBus.publish(new collection_modification_event_1.CollectionModificationEvent(ctx, collection, affectedVariantIds));
|
|
324
326
|
}
|
|
327
|
+
this.eventBus.publish(new collection_event_1.CollectionEvent(ctx, collection, 'updated', input));
|
|
325
328
|
return utils_1.assertFound(this.findOne(ctx, collection.id));
|
|
326
329
|
}
|
|
327
330
|
async delete(ctx, id) {
|
|
@@ -334,6 +337,7 @@ let CollectionService = class CollectionService {
|
|
|
334
337
|
await this.connection.getRepository(ctx, collection_entity_1.Collection).remove(coll);
|
|
335
338
|
this.eventBus.publish(new collection_modification_event_1.CollectionModificationEvent(ctx, coll, affectedVariantIds));
|
|
336
339
|
}
|
|
340
|
+
this.eventBus.publish(new collection_event_1.CollectionEvent(ctx, collection, 'deleted', id));
|
|
337
341
|
return {
|
|
338
342
|
result: generated_types_1.DeletionResult.DELETED,
|
|
339
343
|
};
|