@chevre/domain 24.1.0-alpha.46 → 24.1.0-alpha.48
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/lib/chevre/repo/acceptedOffer.d.ts +1 -7
- package/lib/chevre/repo/acceptedOffer.js +9 -7
- package/lib/chevre/repo/acceptedOfferInReserve.d.ts +1 -3
- package/lib/chevre/repo/acceptedOfferInReserve.js +5 -3
- package/lib/chevre/repo/order.js +5 -175
- package/lib/chevre/repo/orderInTransaction.d.ts +5 -1
- package/lib/chevre/repo/setting/integration.d.ts +2 -1
- package/lib/chevre/repo/setting/integration.js +8 -0
- package/lib/chevre/service/offer/event/authorize.d.ts +5 -5
- package/lib/chevre/service/offer/event/authorize.js +15 -12
- package/lib/chevre/service/order/deleteOrder.js +1 -4
- package/lib/chevre/service/order/sendOrder.js +1 -4
- package/lib/chevre/service/reserve/findByCode.js +1 -4
- package/lib/chevre/service/reserve/searchByOrder.js +1 -4
- package/lib/chevre/service/task/acceptCOAOffer.js +3 -1
- package/lib/chevre/service/task/authorizePayment.js +3 -1
- package/lib/chevre/service/task/cancelPendingReservation.js +3 -1
- package/lib/chevre/service/task/checkMovieTicket.js +3 -1
- package/lib/chevre/service/task/confirmReserveTransaction.js +4 -5
- package/lib/chevre/service/task/importEventCapacitiesFromCOA.js +3 -1
- package/lib/chevre/service/task/importEventsFromCOA.js +3 -1
- package/lib/chevre/service/task/importOffersFromCOA.js +3 -1
- package/lib/chevre/service/task/invalidatePaymentUrl.js +3 -1
- package/lib/chevre/service/task/onAssetTransactionStatusChanged.js +3 -1
- package/lib/chevre/service/task/onOrderPaymentCompleted.js +3 -1
- package/lib/chevre/service/task/pay.js +3 -1
- package/lib/chevre/service/task/payment/payByTask.js +1 -4
- package/lib/chevre/service/task/placeOrder.js +3 -1
- package/lib/chevre/service/task/publishPaymentUrl.js +3 -1
- package/lib/chevre/service/task/refund.js +3 -1
- package/lib/chevre/service/task/returnReserveTransaction.js +3 -1
- package/lib/chevre/service/task/syncResourcesFromCOA.js +3 -1
- package/lib/chevre/service/task/voidPayment.js +3 -1
- package/lib/chevre/service/task/voidReserveTransaction.js +3 -1
- package/lib/chevre/service/task.js +2 -10
- package/lib/chevre/service/transaction/returnOrder/preStart.js +1 -4
- package/lib/chevre/service/validation/validateOrder.js +1 -4
- package/lib/chevre/taskSettings.d.ts +0 -5
- package/lib/chevre/taskSettings.js +1 -11
- package/package.json +2 -2
|
@@ -18,9 +18,7 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
|
|
|
18
18
|
/**
|
|
19
19
|
* オファー展開の注文検索
|
|
20
20
|
*/
|
|
21
|
-
searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers
|
|
22
|
-
useItemOfferedByReserve: boolean;
|
|
23
|
-
}): Promise<(factory.order.IOrder & {
|
|
21
|
+
searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers): Promise<(factory.order.IOrder & {
|
|
24
22
|
acceptedOffers: [IAcceptedOffer];
|
|
25
23
|
_id?: never;
|
|
26
24
|
})[]>;
|
|
@@ -61,8 +59,6 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
|
|
|
61
59
|
reservedTicket?: never;
|
|
62
60
|
};
|
|
63
61
|
};
|
|
64
|
-
}, options: {
|
|
65
|
-
useItemOfferedByReserve: boolean;
|
|
66
62
|
}): Promise<IAcceptedOffer[]>;
|
|
67
63
|
/**
|
|
68
64
|
* 注文オファーをsliceして検索する(2024-01-10~)
|
|
@@ -77,8 +73,6 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
|
|
|
77
73
|
$eq: string;
|
|
78
74
|
};
|
|
79
75
|
};
|
|
80
|
-
}, options: {
|
|
81
|
-
useItemOfferedByReserve: boolean;
|
|
82
76
|
}): Promise<ISearchSlicedAcceptedOffersResult>;
|
|
83
77
|
countByOrderNumber(filter: {
|
|
84
78
|
orderNumber: {
|
|
@@ -19,7 +19,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
19
19
|
/**
|
|
20
20
|
* オファー展開の注文検索
|
|
21
21
|
*/
|
|
22
|
-
async searchWithUnwoundAcceptedOffers(params, projection
|
|
22
|
+
async searchWithUnwoundAcceptedOffers(params, projection) {
|
|
23
23
|
const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
|
|
24
24
|
const aggregate = this.orderModel.aggregate();
|
|
25
25
|
// unwind->matchでは遅い
|
|
@@ -54,7 +54,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
54
54
|
// 予約取引を参照(2026-05-17~)
|
|
55
55
|
const offeredThroughIdentifier = orders.at(0)?.acceptedOffers[0].offeredThrough?.identifier;
|
|
56
56
|
const useReserveTransaction = offeredThroughIdentifier !== factory_1.factory.service.webAPI.Identifier.COA; // COAでは予約取引を参照しない
|
|
57
|
-
const { useItemOfferedByReserve } = options;
|
|
57
|
+
// const { useItemOfferedByReserve } = options;
|
|
58
58
|
if (useReserveTransaction) {
|
|
59
59
|
const reservationNumbers = [...new Set(orders.map((order) => String(order.acceptedOffers[0].serialNumber)))];
|
|
60
60
|
let acceptedOffersByReserveTransaction = [];
|
|
@@ -86,7 +86,9 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
86
86
|
{
|
|
87
87
|
...acceptedOfferWithoutPrice,
|
|
88
88
|
...((priceSpecByReserveTransaction !== undefined) && { priceSpecification: priceSpecByReserveTransaction }), // 予約取引参照の値で上書き
|
|
89
|
-
|
|
89
|
+
// useItemOfferedByReserve: always true(2026-06-03~)
|
|
90
|
+
// ...(useItemOfferedByReserve && itemOfferedByReserve !== undefined))
|
|
91
|
+
...(itemOfferedByReserve !== undefined)
|
|
90
92
|
? { itemOffered: itemOfferedByReserve } // 予約取引参照の値で上書き(2026-05-25~)
|
|
91
93
|
: { itemOffered }
|
|
92
94
|
}
|
|
@@ -128,7 +130,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
128
130
|
/**
|
|
129
131
|
* 注文オファーを展開して検索する
|
|
130
132
|
*/
|
|
131
|
-
async searchAcceptedOffersByOrderNumber(filter
|
|
133
|
+
async searchAcceptedOffersByOrderNumber(filter) {
|
|
132
134
|
/**
|
|
133
135
|
* unwind前に1ドキュメントを特定するためのstage
|
|
134
136
|
*/
|
|
@@ -192,12 +194,12 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
192
194
|
.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
|
|
193
195
|
.exec();
|
|
194
196
|
// 予約取引を参照(2026-05-18~)
|
|
195
|
-
return this.addAcceptedOffersDetails(acceptedOffers
|
|
197
|
+
return this.addAcceptedOffersDetails(acceptedOffers);
|
|
196
198
|
}
|
|
197
199
|
/**
|
|
198
200
|
* 注文オファーをsliceして検索する(2024-01-10~)
|
|
199
201
|
*/
|
|
200
|
-
async searchSlicedAcceptedOffersByOrderNumber(filter
|
|
202
|
+
async searchSlicedAcceptedOffersByOrderNumber(filter) {
|
|
201
203
|
const aggregate = this.orderModel.aggregate([
|
|
202
204
|
{ $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
|
|
203
205
|
{ $match: { 'project.id': { $eq: filter.project.id.$eq } } },
|
|
@@ -219,7 +221,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
219
221
|
const { acceptedOffers, numAcceptedOffers } = result;
|
|
220
222
|
// 予約取引を参照(2026-05-18~)
|
|
221
223
|
return {
|
|
222
|
-
acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers
|
|
224
|
+
acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers),
|
|
223
225
|
numAcceptedOffers
|
|
224
226
|
};
|
|
225
227
|
}
|
|
@@ -26,7 +26,5 @@ export declare class AcceptedOfferInReserveRepo {
|
|
|
26
26
|
/**
|
|
27
27
|
* 予約取引からオファー詳細情報を付加する
|
|
28
28
|
*/
|
|
29
|
-
protected addAcceptedOffersDetails(acceptedOffers: IAcceptedOffer[]
|
|
30
|
-
useItemOfferedByReserve: boolean;
|
|
31
|
-
}): Promise<IAcceptedOffer[]>;
|
|
29
|
+
protected addAcceptedOffersDetails(acceptedOffers: IAcceptedOffer[]): Promise<IAcceptedOffer[]>;
|
|
32
30
|
}
|
|
@@ -41,7 +41,7 @@ class AcceptedOfferInReserveRepo {
|
|
|
41
41
|
/**
|
|
42
42
|
* 予約取引からオファー詳細情報を付加する
|
|
43
43
|
*/
|
|
44
|
-
async addAcceptedOffersDetails(acceptedOffers
|
|
44
|
+
async addAcceptedOffersDetails(acceptedOffers) {
|
|
45
45
|
const offeredThroughIdentifier = acceptedOffers.at(0)?.offeredThrough?.identifier;
|
|
46
46
|
if (offeredThroughIdentifier === factory_1.factory.service.webAPI.Identifier.COA) {
|
|
47
47
|
// COAでは予約取引を参照しない
|
|
@@ -52,7 +52,7 @@ class AcceptedOfferInReserveRepo {
|
|
|
52
52
|
if (reservationNumbers.length > 0) {
|
|
53
53
|
acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
|
|
54
54
|
}
|
|
55
|
-
const { useItemOfferedByReserve } = options;
|
|
55
|
+
// const { useItemOfferedByReserve } = options;
|
|
56
56
|
return acceptedOffers.map((acceptedOffer) => {
|
|
57
57
|
const acceptedOfferByReserveTransaction = acceptedOffersByReserveTransaction.find(((offer) => offer.itemOffered.id === acceptedOffer.itemOffered.id));
|
|
58
58
|
// 予約は必ず存在するはず
|
|
@@ -74,7 +74,9 @@ class AcceptedOfferInReserveRepo {
|
|
|
74
74
|
return {
|
|
75
75
|
...acceptedOfferWithoutPrice,
|
|
76
76
|
...((priceSpecByReserveTransaction !== undefined) && { priceSpecification: priceSpecByReserveTransaction }), // 予約取引参照の値で上書き
|
|
77
|
-
|
|
77
|
+
// useItemOfferedByReserve: always true(2026-06-03~)
|
|
78
|
+
// ...(useItemOfferedByReserve && itemOfferedByReserve !== undefined)
|
|
79
|
+
...(itemOfferedByReserve !== undefined)
|
|
78
80
|
? { itemOffered: itemOfferedByReserve } // 予約取引参照の値で上書き
|
|
79
81
|
: { itemOffered }
|
|
80
82
|
};
|
package/lib/chevre/repo/order.js
CHANGED
|
@@ -31,27 +31,6 @@ class OrderRepo {
|
|
|
31
31
|
if (typeof projectIdEq === 'string') {
|
|
32
32
|
andConditions.push({ 'project.id': { $eq: projectIdEq } });
|
|
33
33
|
}
|
|
34
|
-
// /* istanbul ignore else */
|
|
35
|
-
// if (params.identifier !== undefined) {
|
|
36
|
-
// /* istanbul ignore else */
|
|
37
|
-
// if (Array.isArray(params.identifier.$all)) {
|
|
38
|
-
// andConditions.push({
|
|
39
|
-
// identifier: {
|
|
40
|
-
// $exists: true,
|
|
41
|
-
// $all: params.identifier.$all
|
|
42
|
-
// }
|
|
43
|
-
// });
|
|
44
|
-
// }
|
|
45
|
-
// /* istanbul ignore else */
|
|
46
|
-
// if (Array.isArray(params.identifier.$in)) {
|
|
47
|
-
// andConditions.push({
|
|
48
|
-
// identifier: {
|
|
49
|
-
// $exists: true,
|
|
50
|
-
// $in: params.identifier.$in
|
|
51
|
-
// }
|
|
52
|
-
// });
|
|
53
|
-
// }
|
|
54
|
-
// }
|
|
55
34
|
const providerIdEq = params.provider?.id?.$eq;
|
|
56
35
|
if (typeof providerIdEq === 'string') {
|
|
57
36
|
andConditions.push({ 'seller.id': { $exists: true, $eq: providerIdEq } });
|
|
@@ -129,44 +108,6 @@ class OrderRepo {
|
|
|
129
108
|
});
|
|
130
109
|
}
|
|
131
110
|
}
|
|
132
|
-
// if (params.customer.additionalProperty !== undefined && params.customer.additionalProperty !== null) {
|
|
133
|
-
// if (Array.isArray(params.customer.additionalProperty.$all)) {
|
|
134
|
-
// andConditions.push({
|
|
135
|
-
// 'customer.additionalProperty': {
|
|
136
|
-
// $exists: true,
|
|
137
|
-
// $all: params.customer.additionalProperty.$all
|
|
138
|
-
// }
|
|
139
|
-
// });
|
|
140
|
-
// }
|
|
141
|
-
// if (Array.isArray(params.customer.additionalProperty.$in)) {
|
|
142
|
-
// andConditions.push({
|
|
143
|
-
// 'customer.additionalProperty': {
|
|
144
|
-
// $exists: true,
|
|
145
|
-
// $in: params.customer.additionalProperty.$in
|
|
146
|
-
// }
|
|
147
|
-
// });
|
|
148
|
-
// }
|
|
149
|
-
// }
|
|
150
|
-
// if (params.customer.memberOf !== undefined && params.customer.memberOf !== null) {
|
|
151
|
-
// if (params.customer.memberOf.membershipNumber !== undefined && params.customer.memberOf.membershipNumber !== null) {
|
|
152
|
-
// if (typeof params.customer.memberOf.membershipNumber.$eq === 'string') {
|
|
153
|
-
// andConditions.push({
|
|
154
|
-
// 'customer.memberOf.membershipNumber': {
|
|
155
|
-
// $exists: true,
|
|
156
|
-
// $eq: params.customer.memberOf.membershipNumber.$eq
|
|
157
|
-
// }
|
|
158
|
-
// });
|
|
159
|
-
// }
|
|
160
|
-
// if (Array.isArray(params.customer.memberOf.membershipNumber.$in)) {
|
|
161
|
-
// andConditions.push({
|
|
162
|
-
// 'customer.memberOf.membershipNumber': {
|
|
163
|
-
// $exists: true,
|
|
164
|
-
// $in: params.customer.memberOf.membershipNumber.$in
|
|
165
|
-
// }
|
|
166
|
-
// });
|
|
167
|
-
// }
|
|
168
|
-
// }
|
|
169
|
-
// }
|
|
170
111
|
if (typeof params.customer.givenName === 'string') {
|
|
171
112
|
if (params.customer.givenName.length > 0) {
|
|
172
113
|
andConditions.push({
|
|
@@ -325,82 +266,20 @@ class OrderRepo {
|
|
|
325
266
|
andConditions.push({ confirmationNumber: { $exists: true, $in: params.confirmationNumbers } });
|
|
326
267
|
}
|
|
327
268
|
}
|
|
328
|
-
// const orderedItemSize = params.orderedItem?.$size;
|
|
329
|
-
// if (typeof orderedItemSize === 'number') {
|
|
330
|
-
// andConditions.push({ orderedItem: { $size: orderedItemSize } });
|
|
331
|
-
// }
|
|
332
|
-
// const acceptedOffersSize = params.acceptedOffers?.$size;
|
|
333
|
-
// if (typeof acceptedOffersSize === 'number') {
|
|
334
|
-
// andConditions.push({ acceptedOffers: { $size: acceptedOffersSize } });
|
|
335
|
-
// }
|
|
336
269
|
const serialNumberEq = params.acceptedOffers?.serialNumber?.$eq;
|
|
337
270
|
if (typeof serialNumberEq === 'string') {
|
|
338
271
|
andConditions.push({ 'acceptedOffers.serialNumber': { $exists: true, $eq: serialNumberEq } });
|
|
339
272
|
}
|
|
340
|
-
//
|
|
341
|
-
//
|
|
342
|
-
//
|
|
343
|
-
// 'acceptedOffers.itemOffered.identifier': {
|
|
344
|
-
// $exists: true,
|
|
345
|
-
// $in: itemOfferedIdentifierIn
|
|
346
|
-
// }
|
|
347
|
-
// });
|
|
348
|
-
// }
|
|
349
|
-
// const itemOfferedTypeOfIn = params.acceptedOffers?.itemOffered?.typeOf?.$in;
|
|
350
|
-
// if (Array.isArray(itemOfferedTypeOfIn)) {
|
|
351
|
-
// andConditions.push({
|
|
352
|
-
// 'acceptedOffers.itemOffered.typeOf': {
|
|
353
|
-
// $exists: true,
|
|
354
|
-
// $in: itemOfferedTypeOfIn
|
|
355
|
-
// }
|
|
356
|
-
// });
|
|
357
|
-
// }
|
|
358
|
-
// const itemOfferedIssuedThroughTypeOfEq = params.acceptedOffers?.itemOffered?.issuedThrough?.typeOf?.$eq;
|
|
359
|
-
// if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
|
|
360
|
-
// andConditions.push({
|
|
361
|
-
// 'acceptedOffers.itemOffered.issuedThrough.typeOf': {
|
|
362
|
-
// $exists: true,
|
|
363
|
-
// $eq: itemOfferedIssuedThroughTypeOfEq
|
|
364
|
-
// }
|
|
365
|
-
// });
|
|
366
|
-
// }
|
|
367
|
-
// const itemOfferedIssuedThroughIdIn = params.acceptedOffers?.itemOffered?.issuedThrough?.id?.$in;
|
|
368
|
-
// if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
|
|
369
|
-
// andConditions.push({
|
|
370
|
-
// 'acceptedOffers.itemOffered.issuedThrough.id': {
|
|
371
|
-
// $exists: true,
|
|
372
|
-
// $in: itemOfferedIssuedThroughIdIn
|
|
373
|
-
// }
|
|
374
|
-
// });
|
|
375
|
-
// }
|
|
376
|
-
// const itemOfferedProgramMembershipUsedIdentifierEq = params.acceptedOffers?.itemOffered?.programMembershipUsed?.identifier?.$eq;
|
|
377
|
-
// if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
|
|
273
|
+
// reservedTicket?.identifierはそもそも注文ドキュメントから廃止(2026-06-03~)
|
|
274
|
+
// const itemOfferedReservedTicketIdentifierEq = params.acceptedOffers?.itemOffered?.reservedTicket?.identifier?.$eq;
|
|
275
|
+
// if (typeof itemOfferedReservedTicketIdentifierEq === 'string') {
|
|
378
276
|
// andConditions.push({
|
|
379
|
-
// 'acceptedOffers.itemOffered.
|
|
277
|
+
// 'acceptedOffers.itemOffered.reservedTicket.identifier': {
|
|
380
278
|
// $exists: true,
|
|
381
|
-
// $eq:
|
|
279
|
+
// $eq: itemOfferedReservedTicketIdentifierEq
|
|
382
280
|
// }
|
|
383
281
|
// });
|
|
384
282
|
// }
|
|
385
|
-
// const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq =
|
|
386
|
-
// params.acceptedOffers?.itemOffered?.programMembershipUsed?.issuedThrough?.serviceType?.codeValue?.$eq;
|
|
387
|
-
// if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
|
|
388
|
-
// andConditions.push({
|
|
389
|
-
// 'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
|
|
390
|
-
// $exists: true,
|
|
391
|
-
// $eq: itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq
|
|
392
|
-
// }
|
|
393
|
-
// });
|
|
394
|
-
// }
|
|
395
|
-
const itemOfferedReservedTicketIdentifierEq = params.acceptedOffers?.itemOffered?.reservedTicket?.identifier?.$eq;
|
|
396
|
-
if (typeof itemOfferedReservedTicketIdentifierEq === 'string') {
|
|
397
|
-
andConditions.push({
|
|
398
|
-
'acceptedOffers.itemOffered.reservedTicket.identifier': {
|
|
399
|
-
$exists: true,
|
|
400
|
-
$eq: itemOfferedReservedTicketIdentifierEq
|
|
401
|
-
}
|
|
402
|
-
});
|
|
403
|
-
}
|
|
404
283
|
/* istanbul ignore else */
|
|
405
284
|
if (params.acceptedOffers !== undefined) {
|
|
406
285
|
/* istanbul ignore else */
|
|
@@ -435,25 +314,6 @@ class OrderRepo {
|
|
|
435
314
|
}
|
|
436
315
|
});
|
|
437
316
|
}
|
|
438
|
-
// /* istanbul ignore else */
|
|
439
|
-
// if (typeof reservationForConditions.name === 'string' && reservationForConditions.name.length > 0) {
|
|
440
|
-
// andConditions.push({
|
|
441
|
-
// $or: [
|
|
442
|
-
// {
|
|
443
|
-
// 'acceptedOffers.itemOffered.reservationFor.name.ja': {
|
|
444
|
-
// $exists: true,
|
|
445
|
-
// $regex: new RegExp(reservationForConditions.name)
|
|
446
|
-
// }
|
|
447
|
-
// },
|
|
448
|
-
// {
|
|
449
|
-
// 'acceptedOffers.itemOffered.reservationFor.name.en': {
|
|
450
|
-
// $exists: true,
|
|
451
|
-
// $regex: new RegExp(reservationForConditions.name)
|
|
452
|
-
// }
|
|
453
|
-
// }
|
|
454
|
-
// ]
|
|
455
|
-
// });
|
|
456
|
-
// }
|
|
457
317
|
/* istanbul ignore else */
|
|
458
318
|
if (reservationForConditions.location !== undefined) {
|
|
459
319
|
if (Array.isArray(reservationForConditions.location.branchCodes)) {
|
|
@@ -609,18 +469,6 @@ class OrderRepo {
|
|
|
609
469
|
}
|
|
610
470
|
});
|
|
611
471
|
}
|
|
612
|
-
// /* istanbul ignore else */
|
|
613
|
-
// if (params.orderDateFrom instanceof Date) {
|
|
614
|
-
// andConditions.push({
|
|
615
|
-
// orderDate: { $gte: params.orderDateFrom }
|
|
616
|
-
// });
|
|
617
|
-
// }
|
|
618
|
-
// /* istanbul ignore else */
|
|
619
|
-
// if (params.orderDateThrough instanceof Date) {
|
|
620
|
-
// andConditions.push({
|
|
621
|
-
// orderDate: { $lte: params.orderDateThrough }
|
|
622
|
-
// });
|
|
623
|
-
// }
|
|
624
472
|
if (params.orderDate !== undefined && params.orderDate !== null) {
|
|
625
473
|
if (params.orderDate.$gte instanceof Date) {
|
|
626
474
|
andConditions.push({
|
|
@@ -633,24 +481,6 @@ class OrderRepo {
|
|
|
633
481
|
});
|
|
634
482
|
}
|
|
635
483
|
}
|
|
636
|
-
// if (params.price !== undefined && params.price !== null) {
|
|
637
|
-
// if (typeof params.price.$gte === 'number') {
|
|
638
|
-
// andConditions.push({
|
|
639
|
-
// price: {
|
|
640
|
-
// $exists: true,
|
|
641
|
-
// $gte: params.price.$gte
|
|
642
|
-
// }
|
|
643
|
-
// });
|
|
644
|
-
// }
|
|
645
|
-
// if (typeof params.price.$lte === 'number') {
|
|
646
|
-
// andConditions.push({
|
|
647
|
-
// price: {
|
|
648
|
-
// $exists: true,
|
|
649
|
-
// $lte: params.price.$lte
|
|
650
|
-
// }
|
|
651
|
-
// });
|
|
652
|
-
// }
|
|
653
|
-
// }
|
|
654
484
|
return andConditions;
|
|
655
485
|
}
|
|
656
486
|
/**
|
|
@@ -34,7 +34,11 @@ export type IMinimizedReservationFor = Pick<factory.order.IEventAsReservationFor
|
|
|
34
34
|
};
|
|
35
35
|
};
|
|
36
36
|
export type IMinimizedItemOffered = Pick<factory.order.IEventReservation, 'id' | 'reservationNumber' | 'typeOf'> & {
|
|
37
|
-
|
|
37
|
+
/**
|
|
38
|
+
* そもそも注文ドキュメントから廃止なのでoptionalに
|
|
39
|
+
* 2026-06-03~
|
|
40
|
+
*/
|
|
41
|
+
reservedTicket?: Pick<factory.order.IReservedTicket, 'identifier' | 'ticketedSeat' | 'typeOf'>;
|
|
38
42
|
reservationFor: IMinimizedReservationFor;
|
|
39
43
|
};
|
|
40
44
|
export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer, 'id' | 'name' | 'offeredThrough' | 'priceSpecification' | 'serialNumber' | 'typeOf'> & {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Connection } from 'mongoose';
|
|
2
|
-
import { IIntegrationSettings, ISendGridSettings } from '../mongoose/schemas/setting';
|
|
2
|
+
import { IIntegrationSettings, ISendGridSettings, IHubSettings } from '../mongoose/schemas/setting';
|
|
3
3
|
interface IDBOptions {
|
|
4
4
|
connection: Connection;
|
|
5
5
|
}
|
|
@@ -22,5 +22,6 @@ export declare class IntegrationSettingRepo {
|
|
|
22
22
|
*/
|
|
23
23
|
getByKey<T extends keyof IIntegrationSettings>(key: T): Promise<IIntegrationSettings[T]>;
|
|
24
24
|
addSendGridSettings(params: ISendGridSettings): Promise<import("mongoose").UpdateWriteOpResult>;
|
|
25
|
+
addHubSettings(params: IHubSettings): Promise<import("mongoose").UpdateWriteOpResult>;
|
|
25
26
|
}
|
|
26
27
|
export {};
|
|
@@ -90,5 +90,13 @@ class IntegrationSettingRepo {
|
|
|
90
90
|
})
|
|
91
91
|
.exec();
|
|
92
92
|
}
|
|
93
|
+
async addHubSettings(params) {
|
|
94
|
+
return this.settingModel.updateOne({ 'project.id': { $eq: '*' } }, {
|
|
95
|
+
$set: {
|
|
96
|
+
'integration.hub': params
|
|
97
|
+
}
|
|
98
|
+
})
|
|
99
|
+
.exec();
|
|
100
|
+
}
|
|
93
101
|
}
|
|
94
102
|
exports.IntegrationSettingRepo = IntegrationSettingRepo;
|
|
@@ -67,16 +67,16 @@ interface IAuthorizeOptions {
|
|
|
67
67
|
* 最大n日前から予約可能
|
|
68
68
|
*/
|
|
69
69
|
maxReservationGracePeriodInDays: number;
|
|
70
|
-
/**
|
|
71
|
-
* acceptedOfferのitemOfferedを最小化するかどうか
|
|
72
|
-
* 2026-05-25~
|
|
73
|
-
*/
|
|
74
|
-
useAcceptedOfferItemOfferedMinimized: boolean;
|
|
75
70
|
/**
|
|
76
71
|
* ticketedSeatなしのacceptedOfferを採用するかどうか
|
|
77
72
|
* 2026-06-01~
|
|
78
73
|
*/
|
|
79
74
|
useAcceptedOfferNoTicketedSeat: boolean;
|
|
75
|
+
/**
|
|
76
|
+
* reservedTicketなしのacceptedOfferを採用するかどうか
|
|
77
|
+
* 2026-06-03~
|
|
78
|
+
*/
|
|
79
|
+
useAcceptedOfferNoReservedTicket: boolean;
|
|
80
80
|
}
|
|
81
81
|
/**
|
|
82
82
|
* 興行オファー承認
|
|
@@ -51,19 +51,19 @@ function authorize(params, options) {
|
|
|
51
51
|
}, options)(repos, settings);
|
|
52
52
|
acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
|
|
53
53
|
if (!noOfferSpecified) {
|
|
54
|
-
const useAcceptedOfferItemOfferedMinimized = options.useAcceptedOfferItemOfferedMinimized === true;
|
|
55
54
|
const useAcceptedOfferNoTicketedSeat = options.useAcceptedOfferNoTicketedSeat === true;
|
|
55
|
+
const useAcceptedOfferNoReservedTicket = options.useAcceptedOfferNoReservedTicket === true;
|
|
56
56
|
await (0, any_1.acceptOffer)({
|
|
57
57
|
orderNumber,
|
|
58
58
|
project: transaction.project,
|
|
59
59
|
acceptedOffers: acceptedOffers4result.map((acceptOffer4result) => {
|
|
60
|
-
// support useAcceptedOfferNoPriceSpec(2026-05-19~)
|
|
61
60
|
const { priceSpecification: _priceSpecification, itemOffered, ...acceptOfferNoPriceSpec } = acceptOffer4result;
|
|
62
61
|
return {
|
|
63
62
|
...acceptOfferNoPriceSpec,
|
|
64
|
-
itemOffered: (
|
|
65
|
-
|
|
66
|
-
|
|
63
|
+
itemOffered: minimizeItemOffered(itemOffered, {
|
|
64
|
+
useAcceptedOfferNoTicketedSeat,
|
|
65
|
+
useAcceptedOfferNoReservedTicket
|
|
66
|
+
})
|
|
67
67
|
};
|
|
68
68
|
})
|
|
69
69
|
})(repos);
|
|
@@ -88,7 +88,7 @@ function authorize(params, options) {
|
|
|
88
88
|
* 2026-05-25~
|
|
89
89
|
*/
|
|
90
90
|
function minimizeItemOffered(itemOffered, options) {
|
|
91
|
-
const { useAcceptedOfferNoTicketedSeat } = options;
|
|
91
|
+
const { useAcceptedOfferNoTicketedSeat, useAcceptedOfferNoReservedTicket } = options;
|
|
92
92
|
const { id, reservationNumber, typeOf, reservationFor, reservedTicket } = itemOffered;
|
|
93
93
|
const minimizedReservation = {
|
|
94
94
|
id: reservationFor.id,
|
|
@@ -117,12 +117,15 @@ function minimizeItemOffered(itemOffered, options) {
|
|
|
117
117
|
reservationNumber,
|
|
118
118
|
typeOf,
|
|
119
119
|
reservationFor: minimizedReservation,
|
|
120
|
-
reservedTicket
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
120
|
+
// useAcceptedOfferNoReservedTicketでない場合のみreservedTicket保管(2026-06-03~)
|
|
121
|
+
...((!useAcceptedOfferNoReservedTicket) && {
|
|
122
|
+
reservedTicket: {
|
|
123
|
+
typeOf: reservedTicket.typeOf,
|
|
124
|
+
// useAcceptedOfferNoTicketedSeatでない場合のみ座席保管(2026-06-01~)
|
|
125
|
+
...((!useAcceptedOfferNoTicketedSeat && typeof reservedTicket.ticketedSeat?.typeOf === 'string') && { ticketedSeat: reservedTicket.ticketedSeat }),
|
|
126
|
+
...((typeof reservedTicket.identifier === 'string') && { identifier: reservedTicket.identifier })
|
|
127
|
+
}
|
|
128
|
+
})
|
|
126
129
|
};
|
|
127
130
|
}
|
|
128
131
|
function validateCreateRequest(params) {
|
|
@@ -96,10 +96,7 @@ function deleteReservationsByOrder(order) {
|
|
|
96
96
|
acceptedOffers: {
|
|
97
97
|
// itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
|
|
98
98
|
}
|
|
99
|
-
}
|
|
100
|
-
useItemOfferedByReserve: true // 2026-05-25~
|
|
101
|
-
} // 予約取引参照(2026-05-18~)
|
|
102
|
-
);
|
|
99
|
+
});
|
|
103
100
|
const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
|
|
104
101
|
if (reservationIds.length > 0) {
|
|
105
102
|
await repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });
|
|
@@ -101,10 +101,7 @@ function sendOrder(params) {
|
|
|
101
101
|
$slice: [offerIndexBase, limit],
|
|
102
102
|
orderNumber: { $eq: order.orderNumber },
|
|
103
103
|
project: { id: { $eq: order.project.id } }
|
|
104
|
-
}
|
|
105
|
-
useItemOfferedByReserve: true // 2026-05-25~
|
|
106
|
-
} // 予約取引参照(2026-05-18~)
|
|
107
|
-
);
|
|
104
|
+
});
|
|
108
105
|
acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
|
|
109
106
|
debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
110
107
|
params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
|
|
@@ -39,10 +39,7 @@ function findByCode(params) {
|
|
|
39
39
|
// typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
}
|
|
43
|
-
useItemOfferedByReserve: true // 2026-05-25~
|
|
44
|
-
} // 予約取引参照(2026-05-18~)
|
|
45
|
-
)).shift();
|
|
42
|
+
})).shift();
|
|
46
43
|
if (acceptedOffer === undefined) {
|
|
47
44
|
throw new factory_1.factory.errors.NotFound('acceptedOffer');
|
|
48
45
|
}
|
|
@@ -16,10 +16,7 @@ function searchByOrder(params) {
|
|
|
16
16
|
// typeOf: { $in: [reservationType] }
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
|
-
}
|
|
20
|
-
useItemOfferedByReserve: true // 2026-05-25~
|
|
21
|
-
} // 予約取引参照(2026-05-18~)
|
|
22
|
-
);
|
|
19
|
+
});
|
|
23
20
|
const reservationIds = acceptedOffers.map((offer) => {
|
|
24
21
|
if (offer.itemOffered.typeOf === reservationType) {
|
|
25
22
|
return offer.itemOffered.id;
|
|
@@ -11,6 +11,7 @@ const event_1 = require("../../repo/event");
|
|
|
11
11
|
const orderNumber_1 = require("../../repo/orderNumber");
|
|
12
12
|
const project_1 = require("../../repo/project");
|
|
13
13
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
14
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
14
15
|
// import { TransactionRepo } from '../../repo/transaction';
|
|
15
16
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
16
17
|
const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
|
|
@@ -19,7 +20,7 @@ let coaAuthClient;
|
|
|
19
20
|
* タスク実行関数
|
|
20
21
|
*/
|
|
21
22
|
function call(params) {
|
|
22
|
-
return async ({ connection, redisClient
|
|
23
|
+
return async ({ connection, redisClient }, options) => {
|
|
23
24
|
if (redisClient === undefined) {
|
|
24
25
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
25
26
|
}
|
|
@@ -27,6 +28,7 @@ function call(params) {
|
|
|
27
28
|
if (!options.executeById) {
|
|
28
29
|
return;
|
|
29
30
|
}
|
|
31
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
30
32
|
const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
|
|
31
33
|
const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
|
|
32
34
|
if (typeof coaAPI?.id !== 'string') {
|
|
@@ -24,6 +24,7 @@ const potentialAction_1 = require("../../repo/potentialAction");
|
|
|
24
24
|
const product_1 = require("../../repo/product");
|
|
25
25
|
const project_1 = require("../../repo/project");
|
|
26
26
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
27
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
27
28
|
const task_1 = require("../../repo/task");
|
|
28
29
|
const ticket_1 = require("../../repo/ticket");
|
|
29
30
|
// import { TransactionRepo } from '../../repo/transaction';
|
|
@@ -35,7 +36,7 @@ const any_1 = require("../payment/any");
|
|
|
35
36
|
* タスク実行関数
|
|
36
37
|
*/
|
|
37
38
|
function call(params) {
|
|
38
|
-
return async ({ connection, redisClient
|
|
39
|
+
return async ({ connection, redisClient }, options) => {
|
|
39
40
|
if (redisClient === undefined) {
|
|
40
41
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
41
42
|
}
|
|
@@ -44,6 +45,7 @@ function call(params) {
|
|
|
44
45
|
return;
|
|
45
46
|
}
|
|
46
47
|
let callResult;
|
|
48
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
47
49
|
// const actionRepo = new ActionRepo(connection);
|
|
48
50
|
const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
|
|
49
51
|
// const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
|
|
@@ -9,6 +9,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
|
|
|
9
9
|
const reservation_1 = require("../../repo/reservation");
|
|
10
10
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
11
11
|
const setting_1 = require("../../repo/setting");
|
|
12
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
12
13
|
const stockHolder_1 = require("../../repo/stockHolder");
|
|
13
14
|
const task_1 = require("../../repo/task");
|
|
14
15
|
const cancelReservation_1 = require("../reserve/cancelReservation");
|
|
@@ -23,10 +24,11 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
|
|
|
23
24
|
* タスク実行関数
|
|
24
25
|
*/
|
|
25
26
|
function call(params) {
|
|
26
|
-
return async ({ connection, redisClient
|
|
27
|
+
return async ({ connection, redisClient }) => {
|
|
27
28
|
if (redisClient === undefined) {
|
|
28
29
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
29
30
|
}
|
|
31
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
30
32
|
const { data } = params;
|
|
31
33
|
// support COAReserve(2025-03-01~)
|
|
32
34
|
if (data.purpose?.typeOf === factory_1.factory.assetTransactionType.Reserve) {
|
|
@@ -8,13 +8,14 @@ const event_1 = require("../../repo/event");
|
|
|
8
8
|
const paymentService_1 = require("../../repo/paymentService");
|
|
9
9
|
const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
10
10
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
11
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
11
12
|
// import { TransactionProcessRepo } from '../../repo/transactionProcess';
|
|
12
13
|
const pay_1 = require("../assetTransaction/pay");
|
|
13
14
|
/**
|
|
14
15
|
* タスク実行関数
|
|
15
16
|
*/
|
|
16
17
|
function call(params) {
|
|
17
|
-
return async ({ connection, redisClient
|
|
18
|
+
return async ({ connection, redisClient }, options) => {
|
|
18
19
|
if (redisClient === undefined) {
|
|
19
20
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
20
21
|
}
|
|
@@ -22,6 +23,7 @@ function call(params) {
|
|
|
22
23
|
if (!options.executeById) {
|
|
23
24
|
return;
|
|
24
25
|
}
|
|
26
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
25
27
|
const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
|
|
26
28
|
// const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
|
|
27
29
|
const paymentServiceId = params.data.object[0]?.id;
|
|
@@ -17,6 +17,7 @@ const order_1 = require("../../repo/order");
|
|
|
17
17
|
const reservation_1 = require("../../repo/reservation");
|
|
18
18
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
19
19
|
const setting_1 = require("../../repo/setting");
|
|
20
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
20
21
|
const task_1 = require("../../repo/task");
|
|
21
22
|
let coaAuthClientCreated = false;
|
|
22
23
|
let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
|
|
@@ -28,7 +29,8 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
|
|
|
28
29
|
* タスク実行関数
|
|
29
30
|
*/
|
|
30
31
|
function call(params) {
|
|
31
|
-
return async ({ connection
|
|
32
|
+
return async ({ connection }) => {
|
|
33
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
32
34
|
if (!coaAuthClientCreated) {
|
|
33
35
|
const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
|
|
34
36
|
const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
|
|
@@ -137,10 +139,7 @@ function fixOrderAsPurpose(params) {
|
|
|
137
139
|
const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
|
|
138
140
|
orderNumber: { $eq: order.orderNumber },
|
|
139
141
|
project: { id: { $eq: params.project.id } }
|
|
140
|
-
}
|
|
141
|
-
useItemOfferedByReserve: true // 2026-05-25~
|
|
142
|
-
} // 予約取引参照(2026-05-18~)
|
|
143
|
-
);
|
|
142
|
+
});
|
|
144
143
|
return {
|
|
145
144
|
...order,
|
|
146
145
|
acceptedOffers
|
|
@@ -37,6 +37,7 @@ exports.call = call;
|
|
|
37
37
|
const coa_service_1 = require("@motionpicture/coa-service");
|
|
38
38
|
const event_1 = require("../../repo/event");
|
|
39
39
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
40
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
40
41
|
const factory_1 = require("../../factory");
|
|
41
42
|
const EventAggregationService = __importStar(require("../aggregation/event"));
|
|
42
43
|
let coaAuthClient;
|
|
@@ -44,7 +45,7 @@ let coaAuthClient;
|
|
|
44
45
|
* タスク実行関数
|
|
45
46
|
*/
|
|
46
47
|
function call(params) {
|
|
47
|
-
return async ({ connection
|
|
48
|
+
return async ({ connection }) => {
|
|
48
49
|
if (coaAuthClient === undefined) {
|
|
49
50
|
const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
|
|
50
51
|
const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
|
|
@@ -54,6 +55,7 @@ function call(params) {
|
|
|
54
55
|
}
|
|
55
56
|
coaAuthClient = new coa_service_1.COA.auth.RefreshToken(credentials);
|
|
56
57
|
}
|
|
58
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
57
59
|
const reserveService = new coa_service_1.COA.service.Reserve({
|
|
58
60
|
endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
|
|
59
61
|
auth: coaAuthClient
|
|
@@ -44,6 +44,7 @@ const movieTheater_1 = require("../../repo/place/movieTheater");
|
|
|
44
44
|
const screeningRoom_1 = require("../../repo/place/screeningRoom");
|
|
45
45
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
46
46
|
const seller_1 = require("../../repo/seller");
|
|
47
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
47
48
|
const factory_1 = require("../../factory");
|
|
48
49
|
const EventService = __importStar(require("../event"));
|
|
49
50
|
let coaAuthClient;
|
|
@@ -51,7 +52,7 @@ let coaAuthClient;
|
|
|
51
52
|
* タスク実行関数
|
|
52
53
|
*/
|
|
53
54
|
function call(params) {
|
|
54
|
-
return async ({ connection
|
|
55
|
+
return async ({ connection }) => {
|
|
55
56
|
if (coaAuthClient === undefined) {
|
|
56
57
|
const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
|
|
57
58
|
const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
|
|
@@ -61,6 +62,7 @@ function call(params) {
|
|
|
61
62
|
}
|
|
62
63
|
coaAuthClient = new coa_service_1.COA.auth.RefreshToken(credentials);
|
|
63
64
|
}
|
|
65
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
64
66
|
const masterService = new coa_service_1.COA.service.Master({
|
|
65
67
|
endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
|
|
66
68
|
auth: coaAuthClient
|
|
@@ -38,6 +38,7 @@ const coa_service_1 = require("@motionpicture/coa-service");
|
|
|
38
38
|
const aggregateOffer_1 = require("../../repo/aggregateOffer");
|
|
39
39
|
const categoryCode_1 = require("../../repo/categoryCode");
|
|
40
40
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
41
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
41
42
|
const factory_1 = require("../../factory");
|
|
42
43
|
const OfferService = __importStar(require("../offer"));
|
|
43
44
|
let coaAuthClient;
|
|
@@ -46,7 +47,7 @@ let paymentMethodType4membershipCoupon;
|
|
|
46
47
|
* タスク実行関数
|
|
47
48
|
*/
|
|
48
49
|
function call(params) {
|
|
49
|
-
return async ({ connection
|
|
50
|
+
return async ({ connection }) => {
|
|
50
51
|
if (coaAuthClient === undefined || paymentMethodType4membershipCoupon === undefined) {
|
|
51
52
|
const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
|
|
52
53
|
const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
|
|
@@ -61,6 +62,7 @@ function call(params) {
|
|
|
61
62
|
}
|
|
62
63
|
paymentMethodType4membershipCoupon = paymentMethodType4membershipCouponByInterface;
|
|
63
64
|
}
|
|
65
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
64
66
|
const aggregateOfferRepo = new aggregateOffer_1.AggregateOfferRepo(connection);
|
|
65
67
|
const categoryCodeRepo = new categoryCode_1.CategoryCodeRepo(connection);
|
|
66
68
|
// const taskRepo = new TaskRepo(connection);
|
|
@@ -9,10 +9,12 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
|
|
|
9
9
|
const paymentService_1 = require("../../repo/paymentService");
|
|
10
10
|
const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
11
11
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
12
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
12
13
|
const task_1 = require("../../repo/task");
|
|
13
14
|
const invalidatePaymentUrlByTask_1 = require("./payment/invalidatePaymentUrlByTask");
|
|
14
15
|
function call(params) {
|
|
15
|
-
return async ({ connection
|
|
16
|
+
return async ({ connection }) => {
|
|
17
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
16
18
|
await (0, invalidatePaymentUrlByTask_1.invalidatePaymentUrlByTask)({
|
|
17
19
|
...params.data,
|
|
18
20
|
sameAs: { id: params.id }
|
|
@@ -5,6 +5,7 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
|
|
|
5
5
|
const assetTransaction_1 = require("../../repo/assetTransaction");
|
|
6
6
|
const order_1 = require("../../repo/order");
|
|
7
7
|
const setting_1 = require("../../repo/setting");
|
|
8
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
8
9
|
const task_1 = require("../../repo/task");
|
|
9
10
|
// import { TransactionRepo } from '../../repo/transaction';
|
|
10
11
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
@@ -13,7 +14,8 @@ const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionSt
|
|
|
13
14
|
* タスク実行関数
|
|
14
15
|
*/
|
|
15
16
|
function call(data) {
|
|
16
|
-
return async ({ connection
|
|
17
|
+
return async ({ connection }) => {
|
|
18
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
17
19
|
await (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
|
|
18
20
|
acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
|
|
19
21
|
assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
|
|
@@ -4,6 +4,7 @@ exports.call = call;
|
|
|
4
4
|
const acceptedOffer_1 = require("../../repo/acceptedOffer");
|
|
5
5
|
const order_1 = require("../../repo/order");
|
|
6
6
|
const setting_1 = require("../../repo/setting");
|
|
7
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
7
8
|
const task_1 = require("../../repo/task");
|
|
8
9
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
9
10
|
const payOrder_1 = require("../order/payOrder");
|
|
@@ -11,7 +12,8 @@ const payOrder_1 = require("../order/payOrder");
|
|
|
11
12
|
* タスク実行関数
|
|
12
13
|
*/
|
|
13
14
|
function call(data) {
|
|
14
|
-
return async ({ connection
|
|
15
|
+
return async ({ connection }) => {
|
|
16
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
15
17
|
await (0, payOrder_1.payOrder)(data)({
|
|
16
18
|
acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
|
|
17
19
|
order: new order_1.OrderRepo(connection),
|
|
@@ -17,16 +17,18 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
|
17
17
|
const product_1 = require("../../repo/product");
|
|
18
18
|
const project_1 = require("../../repo/project");
|
|
19
19
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
20
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
20
21
|
const task_1 = require("../../repo/task");
|
|
21
22
|
const payByTask_1 = require("./payment/payByTask");
|
|
22
23
|
/**
|
|
23
24
|
* タスク実行関数
|
|
24
25
|
*/
|
|
25
26
|
function call(params) {
|
|
26
|
-
return async ({ connection, redisClient
|
|
27
|
+
return async ({ connection, redisClient }) => {
|
|
27
28
|
if (redisClient === undefined) {
|
|
28
29
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
29
30
|
}
|
|
31
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
30
32
|
const payActionAttributes = await (0, payByTask_1.payTask2payActionAttributes)({
|
|
31
33
|
...params.data,
|
|
32
34
|
sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
|
|
@@ -77,10 +77,7 @@ function fixOrderAsPurpose(params, transaction) {
|
|
|
77
77
|
// reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } } // 座席番号により絞りは廃止(2026-06-01~)
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
|
-
}
|
|
81
|
-
useItemOfferedByReserve: true // 2026-05-25~
|
|
82
|
-
} // 予約取引参照(2026-05-18~)
|
|
83
|
-
);
|
|
80
|
+
});
|
|
84
81
|
}
|
|
85
82
|
return {
|
|
86
83
|
...orderWithoutAcceptedOffers,
|
|
@@ -9,6 +9,7 @@ const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMeth
|
|
|
9
9
|
const order_1 = require("../../repo/order");
|
|
10
10
|
const orderInTransaction_1 = require("../../repo/orderInTransaction");
|
|
11
11
|
const setting_1 = require("../../repo/setting");
|
|
12
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
12
13
|
const task_1 = require("../../repo/task");
|
|
13
14
|
// import { TransactionRepo } from '../../repo/transaction';
|
|
14
15
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
@@ -17,7 +18,8 @@ const placeOrder_2 = require("../order/placeOrder");
|
|
|
17
18
|
* タスク実行関数
|
|
18
19
|
*/
|
|
19
20
|
function call(data) {
|
|
20
|
-
return async ({ connection
|
|
21
|
+
return async ({ connection }) => {
|
|
22
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
21
23
|
await (0, placeOrder_2.placeOrder)({
|
|
22
24
|
...data,
|
|
23
25
|
useOnOrderStatusChanged: true
|
|
@@ -15,6 +15,7 @@ const paymentService_1 = require("../../repo/paymentService");
|
|
|
15
15
|
const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
16
16
|
const project_1 = require("../../repo/project");
|
|
17
17
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
18
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
18
19
|
const ticket_1 = require("../../repo/ticket");
|
|
19
20
|
// import { TransactionRepo } from '../../repo/transaction';
|
|
20
21
|
const placeOrder_1 = require("../../repo/transaction/placeOrder");
|
|
@@ -25,7 +26,7 @@ const any_1 = require("../payment/any");
|
|
|
25
26
|
* タスク実行関数
|
|
26
27
|
*/
|
|
27
28
|
function call(params) {
|
|
28
|
-
return async ({ connection, redisClient
|
|
29
|
+
return async ({ connection, redisClient }, options) => {
|
|
29
30
|
if (redisClient === undefined) {
|
|
30
31
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
31
32
|
}
|
|
@@ -33,6 +34,7 @@ function call(params) {
|
|
|
33
34
|
if (!options.executeById) {
|
|
34
35
|
return;
|
|
35
36
|
}
|
|
37
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
36
38
|
const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
|
|
37
39
|
// const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
|
|
38
40
|
try {
|
|
@@ -13,6 +13,7 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
|
13
13
|
const product_1 = require("../../repo/product");
|
|
14
14
|
const project_1 = require("../../repo/project");
|
|
15
15
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
16
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
16
17
|
const task_1 = require("../../repo/task");
|
|
17
18
|
const transactionNumber_1 = require("../../repo/transactionNumber");
|
|
18
19
|
const refundByTask_1 = require("./payment/refundByTask");
|
|
@@ -20,10 +21,11 @@ const refundByTask_1 = require("./payment/refundByTask");
|
|
|
20
21
|
* タスク実行関数
|
|
21
22
|
*/
|
|
22
23
|
function call(params) {
|
|
23
|
-
return async ({ connection, redisClient
|
|
24
|
+
return async ({ connection, redisClient }) => {
|
|
24
25
|
if (redisClient === undefined) {
|
|
25
26
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
26
27
|
}
|
|
28
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
27
29
|
let data;
|
|
28
30
|
if (params.name === factory_1.factory.taskName.Refund) {
|
|
29
31
|
data = {
|
|
@@ -48,6 +48,7 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
|
|
|
48
48
|
const project_1 = require("../../repo/project");
|
|
49
49
|
const reservation_1 = require("../../repo/reservation");
|
|
50
50
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
51
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
51
52
|
const transactionNumber_1 = require("../../repo/transactionNumber");
|
|
52
53
|
let coaAuthClientCreated = false;
|
|
53
54
|
let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
|
|
@@ -59,7 +60,7 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
|
|
|
59
60
|
* タスク実行関数
|
|
60
61
|
*/
|
|
61
62
|
function call(params) {
|
|
62
|
-
return async ({ connection, redisClient
|
|
63
|
+
return async ({ connection, redisClient }) => {
|
|
63
64
|
if (redisClient === undefined) {
|
|
64
65
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
65
66
|
}
|
|
@@ -72,6 +73,7 @@ function call(params) {
|
|
|
72
73
|
coaAuthClientCreated = true;
|
|
73
74
|
}
|
|
74
75
|
}
|
|
76
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
75
77
|
const reserveService = new coa_service_1.COA.service.Reserve({
|
|
76
78
|
endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
|
|
77
79
|
auth: coaAuthClient
|
|
@@ -16,6 +16,7 @@ const eventSeries_1 = require("../../repo/eventSeries");
|
|
|
16
16
|
const movieTheater_1 = require("../../repo/place/movieTheater");
|
|
17
17
|
const screeningRoom_1 = require("../../repo/place/screeningRoom");
|
|
18
18
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
19
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
19
20
|
const saveScreeningEvents_1 = require("../event/saveScreeningEvents");
|
|
20
21
|
const saveScreeningEventSeries_1 = require("../event/saveScreeningEventSeries");
|
|
21
22
|
let coaAuthClient;
|
|
@@ -23,7 +24,7 @@ let coaAuthClient;
|
|
|
23
24
|
* タスク実行関数
|
|
24
25
|
*/
|
|
25
26
|
function call(params) {
|
|
26
|
-
return async ({ connection, redisClient
|
|
27
|
+
return async ({ connection, redisClient }, options) => {
|
|
27
28
|
if (redisClient === undefined) {
|
|
28
29
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
29
30
|
}
|
|
@@ -31,6 +32,7 @@ function call(params) {
|
|
|
31
32
|
if (!options.executeById) {
|
|
32
33
|
return;
|
|
33
34
|
}
|
|
35
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
34
36
|
const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
|
|
35
37
|
const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
|
|
36
38
|
if (typeof coaAPI?.id !== 'string') {
|
|
@@ -13,16 +13,18 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
|
|
|
13
13
|
const product_1 = require("../../repo/product");
|
|
14
14
|
const project_1 = require("../../repo/project");
|
|
15
15
|
const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
|
|
16
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
16
17
|
const task_1 = require("../../repo/task");
|
|
17
18
|
const voidPaymentByTask_1 = require("./payment/voidPaymentByTask");
|
|
18
19
|
/**
|
|
19
20
|
* タスク実行関数
|
|
20
21
|
*/
|
|
21
22
|
function call(data) {
|
|
22
|
-
return async ({ connection, redisClient
|
|
23
|
+
return async ({ connection, redisClient }) => {
|
|
23
24
|
if (redisClient === undefined) {
|
|
24
25
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
25
26
|
}
|
|
27
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
26
28
|
const paymentServiceId = data.object.object.id;
|
|
27
29
|
const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
|
|
28
30
|
const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
|
|
@@ -13,6 +13,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
|
|
|
13
13
|
const reservation_1 = require("../../repo/reservation");
|
|
14
14
|
const reserveInterface_1 = require("../../repo/reserveInterface");
|
|
15
15
|
const setting_1 = require("../../repo/setting");
|
|
16
|
+
const integration_1 = require("../../repo/setting/integration");
|
|
16
17
|
const stockHolder_1 = require("../../repo/stockHolder");
|
|
17
18
|
const task_1 = require("../../repo/task");
|
|
18
19
|
// import { TransactionRepo } from '../../repo/transaction';
|
|
@@ -27,7 +28,7 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
|
|
|
27
28
|
* タスク実行関数
|
|
28
29
|
*/
|
|
29
30
|
function call(params) {
|
|
30
|
-
return async ({ connection, redisClient
|
|
31
|
+
return async ({ connection, redisClient }, options) => {
|
|
31
32
|
if (redisClient === undefined) {
|
|
32
33
|
throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
|
|
33
34
|
}
|
|
@@ -47,6 +48,7 @@ function call(params) {
|
|
|
47
48
|
coaAuthClientCreated = true;
|
|
48
49
|
}
|
|
49
50
|
}
|
|
51
|
+
const settings = new integration_1.IntegrationSettingRepo({ connection });
|
|
50
52
|
const reserveService = new coa_service_1.COA.service.Reserve({
|
|
51
53
|
endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
|
|
52
54
|
auth: coaAuthClient
|
|
@@ -17,7 +17,6 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
|
|
|
17
17
|
function executeById(params, next) {
|
|
18
18
|
return async (settings) => {
|
|
19
19
|
const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
|
|
20
|
-
const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
|
|
21
20
|
const { id, status, executor, expires } = params;
|
|
22
21
|
let task = null;
|
|
23
22
|
try {
|
|
@@ -35,10 +34,7 @@ function executeById(params, next) {
|
|
|
35
34
|
}
|
|
36
35
|
// タスクがなければ終了
|
|
37
36
|
if (task !== null) {
|
|
38
|
-
await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)({
|
|
39
|
-
...settings,
|
|
40
|
-
settings: integrationSettingRepo
|
|
41
|
-
}, {
|
|
37
|
+
await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)(settings, {
|
|
42
38
|
executeById: true,
|
|
43
39
|
executeByName: false
|
|
44
40
|
});
|
|
@@ -48,7 +44,6 @@ function executeById(params, next) {
|
|
|
48
44
|
function executeOneIfExists(params) {
|
|
49
45
|
return async (settings) => {
|
|
50
46
|
const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
|
|
51
|
-
const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
|
|
52
47
|
// 未実行のタスクを取得
|
|
53
48
|
let task = null;
|
|
54
49
|
try {
|
|
@@ -66,10 +61,7 @@ function executeOneIfExists(params) {
|
|
|
66
61
|
}
|
|
67
62
|
// タスクがなければ終了
|
|
68
63
|
if (task !== null) {
|
|
69
|
-
await (0, taskHandler_1.executeTask)(task)({
|
|
70
|
-
...settings,
|
|
71
|
-
settings: integrationSettingRepo
|
|
72
|
-
}, {
|
|
64
|
+
await (0, taskHandler_1.executeTask)(task)(settings, {
|
|
73
65
|
executeById: false,
|
|
74
66
|
executeByName: (typeof params.name?.$eq === 'string')
|
|
75
67
|
});
|
|
@@ -144,10 +144,7 @@ function fixOrders(params) {
|
|
|
144
144
|
const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
|
|
145
145
|
orderNumber: { $eq: params.object.order[0].orderNumber },
|
|
146
146
|
project: { id: { $eq: params.project.id } }
|
|
147
|
-
}
|
|
148
|
-
useItemOfferedByReserve: true // 2026-05-25~
|
|
149
|
-
} // 予約取引参照(2026-05-18~)
|
|
150
|
-
);
|
|
147
|
+
});
|
|
151
148
|
return { acceptedOffers, eventIds, offerIds, orders };
|
|
152
149
|
};
|
|
153
150
|
}
|
|
@@ -22,10 +22,7 @@ function validateOrder(params) {
|
|
|
22
22
|
const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
|
|
23
23
|
orderNumber: { $eq: params.orderNumber },
|
|
24
24
|
project: { id: { $eq: params.project.id } }
|
|
25
|
-
}
|
|
26
|
-
useItemOfferedByReserve: true // 2026-05-25~
|
|
27
|
-
} // 予約取引参照(2026-05-18~)
|
|
28
|
-
);
|
|
25
|
+
});
|
|
29
26
|
let payTransactions = [];
|
|
30
27
|
if (order.paymentMethods.length > 0) {
|
|
31
28
|
payTransactions = await repos.assetTransaction.search({
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { IExecuteSettings as IMinimumExecuteSettings } from './eventEmitter/task';
|
|
2
2
|
import { factory } from './factory';
|
|
3
|
-
import type { IntegrationSettingRepo } from './repo/setting/integration';
|
|
4
3
|
interface ICallableTask {
|
|
5
4
|
aggregateOnSystem?: ICallableTaskOperation;
|
|
6
5
|
handleNotification?: ICallableTaskOperation;
|
|
@@ -19,10 +18,6 @@ declare class AggregationSettings {
|
|
|
19
18
|
constructor(options: IOptions);
|
|
20
19
|
}
|
|
21
20
|
interface IExecuteSettings extends IMinimumExecuteSettings {
|
|
22
|
-
/**
|
|
23
|
-
* 外部連携設定リポジトリ
|
|
24
|
-
*/
|
|
25
|
-
settings: IntegrationSettingRepo;
|
|
26
21
|
aggregationSettings?: AggregationSettings;
|
|
27
22
|
}
|
|
28
23
|
interface IExecuteOptions {
|
|
@@ -6,18 +6,8 @@ exports.AggregationSettings = void 0;
|
|
|
6
6
|
*/
|
|
7
7
|
class AggregationSettings {
|
|
8
8
|
callableTask;
|
|
9
|
-
// public readonly onOrderStatusChanged: IOnOrderStatusChanged;
|
|
10
|
-
// public readonly onReservationStatusChanged: IOnReservationStatusChanged;
|
|
11
|
-
// public readonly onTaskStatusChanged: IOnTaskStatusChanged;
|
|
12
9
|
constructor(options) {
|
|
13
|
-
const { callableTask,
|
|
14
|
-
// onOrderStatusChanged,
|
|
15
|
-
// onReservationStatusChanged,
|
|
16
|
-
// onTaskStatusChanged
|
|
17
|
-
} = options;
|
|
18
|
-
// this.onOrderStatusChanged = onOrderStatusChanged;
|
|
19
|
-
// this.onReservationStatusChanged = onReservationStatusChanged;
|
|
20
|
-
// this.onTaskStatusChanged = onTaskStatusChanged;
|
|
10
|
+
const { callableTask, } = options;
|
|
21
11
|
if (callableTask !== undefined) {
|
|
22
12
|
this.callableTask = callableTask;
|
|
23
13
|
}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@aws-sdk/client-cognito-identity-provider": "3.600.0",
|
|
13
13
|
"@aws-sdk/credential-providers": "3.600.0",
|
|
14
|
-
"@chevre/factory": "8.2.0-alpha.
|
|
14
|
+
"@chevre/factory": "8.2.0-alpha.5",
|
|
15
15
|
"@motionpicture/coa-service": "10.0.0",
|
|
16
16
|
"@motionpicture/gmo-service": "6.1.0-alpha.0",
|
|
17
17
|
"@sendgrid/client": "8.1.4",
|
|
@@ -91,5 +91,5 @@
|
|
|
91
91
|
"postversion": "git push origin --tags",
|
|
92
92
|
"prepublishOnly": "npm run clean && npm run build"
|
|
93
93
|
},
|
|
94
|
-
"version": "24.1.0-alpha.
|
|
94
|
+
"version": "24.1.0-alpha.48"
|
|
95
95
|
}
|