@vendure/core 3.6.3-master-202604290307 → 3.6.3-master-202605010307
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/resolvers/admin/global-settings.resolver.js +5 -0
- package/dist/api/resolvers/admin/global-settings.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/customer-entity.resolver.d.ts +2 -4
- package/dist/api/resolvers/entity/customer-entity.resolver.js +11 -9
- package/dist/api/resolvers/entity/customer-entity.resolver.js.map +1 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js +1 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map +1 -1
- package/dist/service/services/fulfillment.service.d.ts +1 -1
- package/dist/service/services/fulfillment.service.js +28 -25
- package/dist/service/services/fulfillment.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +60 -2
- package/dist/service/services/order.service.js +226 -54
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/payment.service.js +94 -62
- package/dist/service/services/payment.service.js.map +1 -1
- package/dist/service/services/promotion.service.d.ts +15 -1
- package/dist/service/services/promotion.service.js +57 -11
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/stock-movement.service.js +1 -1
- package/dist/service/services/stock-movement.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -132,6 +132,11 @@ let GlobalSettingsResolver = class GlobalSettingsResolver {
|
|
|
132
132
|
}
|
|
133
133
|
return customFieldConfig;
|
|
134
134
|
});
|
|
135
|
+
if (!customFieldsConfig.length) {
|
|
136
|
+
// All custom fields were filtered out (e.g. all marked as internal
|
|
137
|
+
// or hidden from the dashboard), so skip this entity entirely.
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
135
140
|
return { entityName: entityType, customFields: customFieldsConfig };
|
|
136
141
|
})
|
|
137
142
|
.filter(shared_utils_1.notNullOrUndefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-settings.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/global-settings.resolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"global-settings.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/global-settings.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,18 +6,16 @@ import { Order } from '../../../entity/order/order.entity';
|
|
|
6
6
|
import { CustomerService } from '../../../service/services/customer.service';
|
|
7
7
|
import { HistoryService } from '../../../service/services/history.service';
|
|
8
8
|
import { OrderService } from '../../../service/services/order.service';
|
|
9
|
-
import { UserService } from '../../../service/services/user.service';
|
|
10
9
|
import { ApiType } from '../../common/get-api-type';
|
|
11
10
|
import { RequestContext } from '../../common/request-context';
|
|
12
11
|
import { RelationPaths } from '../../decorators/relations.decorator';
|
|
13
12
|
export declare class CustomerEntityResolver {
|
|
14
13
|
private customerService;
|
|
15
14
|
private orderService;
|
|
16
|
-
|
|
17
|
-
constructor(customerService: CustomerService, orderService: OrderService, userService: UserService);
|
|
15
|
+
constructor(customerService: CustomerService, orderService: OrderService);
|
|
18
16
|
addresses(ctx: RequestContext, customer: Customer, apiType: ApiType): Promise<Address[]>;
|
|
19
17
|
orders(ctx: RequestContext, customer: Customer, args: QueryOrdersArgs, apiType: ApiType, relations: RelationPaths<Order>): Promise<PaginatedList<Order>>;
|
|
20
|
-
user(ctx: RequestContext, customer: Customer):
|
|
18
|
+
user(ctx: RequestContext, customer: Customer): Promise<import("../../..").User | null>;
|
|
21
19
|
}
|
|
22
20
|
export declare class CustomerAdminEntityResolver {
|
|
23
21
|
private customerService;
|
|
@@ -20,16 +20,14 @@ const order_entity_1 = require("../../../entity/order/order.entity");
|
|
|
20
20
|
const customer_service_1 = require("../../../service/services/customer.service");
|
|
21
21
|
const history_service_1 = require("../../../service/services/history.service");
|
|
22
22
|
const order_service_1 = require("../../../service/services/order.service");
|
|
23
|
-
const user_service_1 = require("../../../service/services/user.service");
|
|
24
23
|
const request_context_1 = require("../../common/request-context");
|
|
25
24
|
const api_decorator_1 = require("../../decorators/api.decorator");
|
|
26
25
|
const relations_decorator_1 = require("../../decorators/relations.decorator");
|
|
27
26
|
const request_context_decorator_1 = require("../../decorators/request-context.decorator");
|
|
28
27
|
let CustomerEntityResolver = class CustomerEntityResolver {
|
|
29
|
-
constructor(customerService, orderService
|
|
28
|
+
constructor(customerService, orderService) {
|
|
30
29
|
this.customerService = customerService;
|
|
31
30
|
this.orderService = orderService;
|
|
32
|
-
this.userService = userService;
|
|
33
31
|
}
|
|
34
32
|
async addresses(ctx, customer, apiType) {
|
|
35
33
|
if (apiType === 'shop' && !ctx.activeUserId) {
|
|
@@ -45,11 +43,15 @@ let CustomerEntityResolver = class CustomerEntityResolver {
|
|
|
45
43
|
}
|
|
46
44
|
return this.orderService.findByCustomerId(ctx, customer.id, args.options || undefined, relations);
|
|
47
45
|
}
|
|
48
|
-
user(ctx, customer) {
|
|
46
|
+
async user(ctx, customer) {
|
|
47
|
+
var _a;
|
|
49
48
|
if (customer.user) {
|
|
50
49
|
return customer.user;
|
|
51
50
|
}
|
|
52
|
-
|
|
51
|
+
// Re-load the customer's actual user relation rather than looking up by email,
|
|
52
|
+
// since an email lookup can return a User belonging to a different Customer entity.
|
|
53
|
+
const loaded = await this.customerService.findOne(ctx, customer.id, ['user']);
|
|
54
|
+
return (_a = loaded === null || loaded === void 0 ? void 0 : loaded.user) !== null && _a !== void 0 ? _a : null;
|
|
53
55
|
}
|
|
54
56
|
};
|
|
55
57
|
exports.CustomerEntityResolver = CustomerEntityResolver;
|
|
@@ -81,13 +83,12 @@ __decorate([
|
|
|
81
83
|
__param(1, (0, graphql_1.Parent)()),
|
|
82
84
|
__metadata("design:type", Function),
|
|
83
85
|
__metadata("design:paramtypes", [request_context_1.RequestContext, customer_entity_1.Customer]),
|
|
84
|
-
__metadata("design:returntype",
|
|
86
|
+
__metadata("design:returntype", Promise)
|
|
85
87
|
], CustomerEntityResolver.prototype, "user", null);
|
|
86
88
|
exports.CustomerEntityResolver = CustomerEntityResolver = __decorate([
|
|
87
89
|
(0, graphql_1.Resolver)('Customer'),
|
|
88
90
|
__metadata("design:paramtypes", [customer_service_1.CustomerService,
|
|
89
|
-
order_service_1.OrderService
|
|
90
|
-
user_service_1.UserService])
|
|
91
|
+
order_service_1.OrderService])
|
|
91
92
|
], CustomerEntityResolver);
|
|
92
93
|
let CustomerAdminEntityResolver = class CustomerAdminEntityResolver {
|
|
93
94
|
constructor(customerService, historyService) {
|
|
@@ -130,6 +131,7 @@ __decorate([
|
|
|
130
131
|
], CustomerAdminEntityResolver.prototype, "history", null);
|
|
131
132
|
exports.CustomerAdminEntityResolver = CustomerAdminEntityResolver = __decorate([
|
|
132
133
|
(0, graphql_1.Resolver)('Customer'),
|
|
133
|
-
__metadata("design:paramtypes", [customer_service_1.CustomerService,
|
|
134
|
+
__metadata("design:paramtypes", [customer_service_1.CustomerService,
|
|
135
|
+
history_service_1.HistoryService])
|
|
134
136
|
], CustomerAdminEntityResolver);
|
|
135
137
|
//# sourceMappingURL=customer-entity.resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/customer-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAuE;AACvE,yEAA0G;AAI1G,8EAAoE;AACpE,qEAA2D;AAC3D,iFAA6E;AAC7E,+EAA2E;AAC3E,2EAAuE;
|
|
1
|
+
{"version":3,"file":"customer-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/customer-entity.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-hydrator.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/entity-hydrator/entity-hydrator.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"entity-hydrator.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/entity-hydrator/entity-hydrator.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ import { CreateFulfillmentError, FulfillmentStateTransitionError, InvalidFulfill
|
|
|
6
6
|
import { ConfigService } from '../../config/config.service';
|
|
7
7
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
8
8
|
import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
|
|
9
|
-
import { FulfillmentLine } from '../../entity/order-line-reference/fulfillment-line.entity';
|
|
10
9
|
import { Order } from '../../entity/order/order.entity';
|
|
10
|
+
import { FulfillmentLine } from '../../entity/order-line-reference/fulfillment-line.entity';
|
|
11
11
|
import { EventBus } from '../../event-bus/event-bus';
|
|
12
12
|
import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
|
|
13
13
|
import { FulfillmentState } from '../helpers/fulfillment-state-machine/fulfillment-state';
|
|
@@ -19,9 +19,9 @@ const instrument_decorator_1 = require("../../common/instrument-decorator");
|
|
|
19
19
|
const config_service_1 = require("../../config/config.service");
|
|
20
20
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
21
21
|
const fulfillment_entity_1 = require("../../entity/fulfillment/fulfillment.entity");
|
|
22
|
-
const fulfillment_line_entity_1 = require("../../entity/order-line-reference/fulfillment-line.entity");
|
|
23
|
-
const order_line_entity_1 = require("../../entity/order-line/order-line.entity");
|
|
24
22
|
const order_entity_1 = require("../../entity/order/order.entity");
|
|
23
|
+
const order_line_entity_1 = require("../../entity/order-line/order-line.entity");
|
|
24
|
+
const fulfillment_line_entity_1 = require("../../entity/order-line-reference/fulfillment-line.entity");
|
|
25
25
|
const event_bus_1 = require("../../event-bus/event-bus");
|
|
26
26
|
const fulfillment_event_1 = require("../../event-bus/events/fulfillment-event");
|
|
27
27
|
const fulfillment_state_transition_event_1 = require("../../event-bus/events/fulfillment-state-transition-event");
|
|
@@ -113,30 +113,33 @@ let FulfillmentService = class FulfillmentService {
|
|
|
113
113
|
* publishes a {@link FulfillmentStateTransitionEvent}.
|
|
114
114
|
*/
|
|
115
115
|
async transitionToState(ctx, fulfillmentId, state) {
|
|
116
|
-
|
|
117
|
-
|
|
116
|
+
// Wrapped in withTransaction so the state save and onTransitionEnd hooks
|
|
117
|
+
// are atomic — see the equivalent comment on OrderService.transitionToState.
|
|
118
|
+
// #4686.
|
|
119
|
+
return this.connection.withTransaction(ctx, async (txCtx) => {
|
|
120
|
+
const fulfillment = await this.connection.getEntityOrThrow(txCtx, fulfillment_entity_1.Fulfillment, fulfillmentId, { relations: ['lines'] });
|
|
121
|
+
const orderLinesIds = (0, unique_1.unique)(fulfillment.lines.map(lines => lines.orderLineId));
|
|
122
|
+
const orders = await this.connection
|
|
123
|
+
.getRepository(txCtx, order_entity_1.Order)
|
|
124
|
+
.createQueryBuilder('order')
|
|
125
|
+
.leftJoinAndSelect('order.lines', 'line')
|
|
126
|
+
.where('line.id IN (:...lineIds)', { lineIds: orderLinesIds })
|
|
127
|
+
.getMany();
|
|
128
|
+
const fromState = fulfillment.state;
|
|
129
|
+
let finalize;
|
|
130
|
+
try {
|
|
131
|
+
const result = await this.fulfillmentStateMachine.transition(txCtx, fulfillment, orders, state);
|
|
132
|
+
finalize = result.finalize;
|
|
133
|
+
}
|
|
134
|
+
catch (e) {
|
|
135
|
+
const transitionError = txCtx.translate(e.message, { fromState, toState: state });
|
|
136
|
+
return new generated_graphql_admin_errors_1.FulfillmentStateTransitionError({ transitionError, fromState, toState: state });
|
|
137
|
+
}
|
|
138
|
+
await this.connection.getRepository(txCtx, fulfillment_entity_1.Fulfillment).save(fulfillment, { reload: false });
|
|
139
|
+
await this.eventBus.publish(new fulfillment_state_transition_event_1.FulfillmentStateTransitionEvent(fromState, state, txCtx, fulfillment));
|
|
140
|
+
await finalize();
|
|
141
|
+
return { fulfillment, orders, fromState, toState: state };
|
|
118
142
|
});
|
|
119
|
-
const orderLinesIds = (0, unique_1.unique)(fulfillment.lines.map(lines => lines.orderLineId));
|
|
120
|
-
const orders = await this.connection
|
|
121
|
-
.getRepository(ctx, order_entity_1.Order)
|
|
122
|
-
.createQueryBuilder('order')
|
|
123
|
-
.leftJoinAndSelect('order.lines', 'line')
|
|
124
|
-
.where('line.id IN (:...lineIds)', { lineIds: orderLinesIds })
|
|
125
|
-
.getMany();
|
|
126
|
-
const fromState = fulfillment.state;
|
|
127
|
-
let finalize;
|
|
128
|
-
try {
|
|
129
|
-
const result = await this.fulfillmentStateMachine.transition(ctx, fulfillment, orders, state);
|
|
130
|
-
finalize = result.finalize;
|
|
131
|
-
}
|
|
132
|
-
catch (e) {
|
|
133
|
-
const transitionError = ctx.translate(e.message, { fromState, toState: state });
|
|
134
|
-
return new generated_graphql_admin_errors_1.FulfillmentStateTransitionError({ transitionError, fromState, toState: state });
|
|
135
|
-
}
|
|
136
|
-
await this.connection.getRepository(ctx, fulfillment_entity_1.Fulfillment).save(fulfillment, { reload: false });
|
|
137
|
-
await this.eventBus.publish(new fulfillment_state_transition_event_1.FulfillmentStateTransitionEvent(fromState, state, ctx, fulfillment));
|
|
138
|
-
await finalize();
|
|
139
|
-
return { fulfillment, orders, fromState, toState: state };
|
|
140
143
|
}
|
|
141
144
|
/**
|
|
142
145
|
* @description
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fulfillment.service.js","sourceRoot":"","sources":["../../../src/service/services/fulfillment.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,mEAA4D;AAC5D,uDAAoD;AACpD,qCAAkC;AAIlC,sGAI2D;AAC3D,4EAA+D;AAC/D,gEAA4D;AAC5D,wFAAoF;AACpF,oFAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"fulfillment.service.js","sourceRoot":"","sources":["../../../src/service/services/fulfillment.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,9 @@ import { Channel } from '../../entity/channel/channel.entity';
|
|
|
14
14
|
import { Customer } from '../../entity/customer/customer.entity';
|
|
15
15
|
import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
|
|
16
16
|
import { HistoryEntry } from '../../entity/history-entry/history-entry.entity';
|
|
17
|
+
import { Order } from '../../entity/order/order.entity';
|
|
17
18
|
import { OrderLine } from '../../entity/order-line/order-line.entity';
|
|
18
19
|
import { OrderModification } from '../../entity/order-modification/order-modification.entity';
|
|
19
|
-
import { Order } from '../../entity/order/order.entity';
|
|
20
20
|
import { Payment } from '../../entity/payment/payment.entity';
|
|
21
21
|
import { Promotion } from '../../entity/promotion/promotion.entity';
|
|
22
22
|
import { Refund } from '../../entity/refund/refund.entity';
|
|
@@ -341,7 +341,65 @@ export declare class OrderService {
|
|
|
341
341
|
*/
|
|
342
342
|
addPaymentToOrder(ctx: RequestContext, orderId: ID, input: PaymentInput): Promise<ErrorResultUnion<AddPaymentToOrderResult, Order>>;
|
|
343
343
|
/**
|
|
344
|
-
*
|
|
344
|
+
* Re-validates all coupon codes on the order with a pessimistic lock on
|
|
345
|
+
* the Promotion rows. This serializes concurrent payment attempts so that
|
|
346
|
+
* only one order can "claim" a usage-limited coupon at a time.
|
|
347
|
+
* If a coupon is no longer valid (e.g. usage limit reached), it is removed
|
|
348
|
+
* from the order and the order totals are recalculated.
|
|
349
|
+
* Returns true if any coupons were removed, false otherwise.
|
|
350
|
+
*
|
|
351
|
+
* Note on selection semantics: the lock guarantees the bug case ("everyone
|
|
352
|
+
* wins" — N orders all keeping a `usageLimit: 1` coupon) is impossible.
|
|
353
|
+
* The exact resolution under contention depends on the database's
|
|
354
|
+
* transaction-isolation default:
|
|
355
|
+
*
|
|
356
|
+
* - Postgres (READ COMMITTED): each non-locking SELECT sees the
|
|
357
|
+
* latest committed data. The first lock holder observes N-1 other
|
|
358
|
+
* orders associated with the promotion (because `countPromotionUsages`
|
|
359
|
+
* joins through `order.promotions` and counts `ArrangingPayment`
|
|
360
|
+
* orders) and fails validation, so its coupon is stripped. Each
|
|
361
|
+
* subsequent lock holder sees one fewer associated order, and the
|
|
362
|
+
* final lock holder sees zero and succeeds. Net: exactly one winner,
|
|
363
|
+
* specifically whichever order acquires the lock last ("last-wins").
|
|
364
|
+
*
|
|
365
|
+
* - MySQL/MariaDB (REPEATABLE READ): the consistent-read snapshot is
|
|
366
|
+
* established by the very first non-locking SELECT in the resolver's
|
|
367
|
+
* transaction (the order lookup at the top of `addPaymentToOrder`),
|
|
368
|
+
* before this lock is acquired. Every subsequent non-locking SELECT
|
|
369
|
+
* in the same transaction reads from that fixed snapshot, so each
|
|
370
|
+
* concurrent transaction's count query still sees the *other* orders
|
|
371
|
+
* as holding the coupon. Result: every contender sees `count >= 1`
|
|
372
|
+
* and strips, yielding zero winners. This is over-protective rather
|
|
373
|
+
* than buggy — the over-application invariant still holds — but it
|
|
374
|
+
* is a worse outcome than Postgres's last-wins. Closing this gap
|
|
375
|
+
* properly requires either bypassing the snapshot for the count
|
|
376
|
+
* query (`SELECT ... FOR UPDATE`) or restructuring so the lock
|
|
377
|
+
* query is the very first read in the transaction; both come with
|
|
378
|
+
* trade-offs (gap locks, broader scope) and are deferred.
|
|
379
|
+
*
|
|
380
|
+
* Do not "fix" the resolution into first-wins without re-deriving the
|
|
381
|
+
* count semantics from scratch.
|
|
382
|
+
*
|
|
383
|
+
* See https://github.com/vendurehq/vendure/pull/4660
|
|
384
|
+
*/
|
|
385
|
+
private revalidateCouponCodesForOrder;
|
|
386
|
+
/**
|
|
387
|
+
* Throws if the given RequestContext is not associated with an active
|
|
388
|
+
* database transaction. Used to guard methods whose correctness depends
|
|
389
|
+
* on a wrapping transaction — both for atomicity (so a partial failure
|
|
390
|
+
* rolls back rather than leaving the order in a half-updated state) and
|
|
391
|
+
* to ensure the pessimistic lock acquired by `revalidateCouponCodesForOrder`
|
|
392
|
+
* is held for the duration of the payment work, not silently released
|
|
393
|
+
* by an autocommit one-statement transaction.
|
|
394
|
+
*
|
|
395
|
+
* Resolvers reach these methods through the `@Transaction()` decorator,
|
|
396
|
+
* which is the supported entry path. Callers from outside the resolver
|
|
397
|
+
* layer (background jobs, plugin services, lifecycle hooks) must wrap
|
|
398
|
+
* the call themselves via `TransactionalConnection.startTransaction()`
|
|
399
|
+
* or the equivalent helper.
|
|
400
|
+
*/
|
|
401
|
+
private assertInTransaction;
|
|
402
|
+
/**
|
|
345
403
|
* We can add a Payment to the order if:
|
|
346
404
|
* 1. the Order is in the `ArrangingPayment` state or
|
|
347
405
|
* 2. the Order's current state can transition to `PaymentAuthorized` and `PaymentSettled`
|