@chevre/domain 25.2.0-alpha.3 → 25.2.0-alpha.31

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.
Files changed (89) hide show
  1. package/lib/chevre/factory/customerTelephone2COATelNum.d.ts +3 -0
  2. package/lib/chevre/factory/customerTelephone2COATelNum.js +23 -0
  3. package/lib/chevre/repo/action/acceptPay.d.ts +15 -0
  4. package/lib/chevre/repo/action/acceptPay.js +47 -19
  5. package/lib/chevre/repo/action/actionProcess.js +57 -57
  6. package/lib/chevre/repo/action.d.ts +16 -9
  7. package/lib/chevre/repo/action.js +99 -180
  8. package/lib/chevre/repo/message.d.ts +1 -1
  9. package/lib/chevre/repo/message.js +1 -1
  10. package/lib/chevre/repo/mongoose/schemas/action.js +67 -66
  11. package/lib/chevre/repo/mongoose/schemas/order.d.ts +4 -0
  12. package/lib/chevre/repo/mongoose/schemas/order.js +10 -0
  13. package/lib/chevre/repo/mongoose/schemas/setting.d.ts +4 -0
  14. package/lib/chevre/repo/mongoose/schemas/task.js +12 -12
  15. package/lib/chevre/repo/order.d.ts +735 -0
  16. package/lib/chevre/repo/order.js +13 -20
  17. package/lib/chevre/repo/orderInTransaction.d.ts +45 -0
  18. package/lib/chevre/repo/orderInTransaction.js +175 -0
  19. package/lib/chevre/repo/person.d.ts +0 -15
  20. package/lib/chevre/repo/person.js +122 -108
  21. package/lib/chevre/repo/transaction/placeOrder.d.ts +2 -45
  22. package/lib/chevre/repo/transaction/placeOrder.js +43 -83
  23. package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js +1 -1
  24. package/lib/chevre/service/assetTransaction/pay/start/factory.js +3 -4
  25. package/lib/chevre/service/offer/event/authorize/factory.d.ts +5 -5
  26. package/lib/chevre/service/offer/event/authorize/factory.js +30 -20
  27. package/lib/chevre/service/offer/event/authorize.d.ts +2 -2
  28. package/lib/chevre/service/offer/event/authorize.js +3 -3
  29. package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts +6 -7
  30. package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js +10 -10
  31. package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts +0 -5
  32. package/lib/chevre/service/offer/eventServiceByCOA/authorize.js +17 -14
  33. package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.d.ts +0 -5
  34. package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.js +2 -2
  35. package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js +1 -1
  36. package/lib/chevre/service/order/deleteOrder.d.ts +5 -1
  37. package/lib/chevre/service/order/deleteOrder.js +8 -1
  38. package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.d.ts +2 -0
  39. package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.d.ts +2 -0
  40. package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts +2 -0
  41. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts +5 -1
  42. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js +95 -33
  43. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.d.ts +2 -0
  44. package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +2 -6
  45. package/lib/chevre/service/order/payOrder.d.ts +2 -0
  46. package/lib/chevre/service/order/placeOrder.d.ts +2 -0
  47. package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.js +1 -2
  48. package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts +3 -2
  49. package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts +4 -3
  50. package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js +3 -31
  51. package/lib/chevre/service/payment/any/authorize.js +13 -37
  52. package/lib/chevre/service/payment/any/factory.d.ts +6 -6
  53. package/lib/chevre/service/payment/any/factory.js +19 -22
  54. package/lib/chevre/service/payment/any/findAcceptAction.d.ts +3 -1
  55. package/lib/chevre/service/payment/any/findAcceptAction.js +14 -6
  56. package/lib/chevre/service/payment/any/invalidatePaymentUrl.d.ts +2 -0
  57. package/lib/chevre/service/payment/any/invalidatePaymentUrl.js +4 -66
  58. package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts +4 -0
  59. package/lib/chevre/service/payment/any/publishPaymentUrl.js +4 -18
  60. package/lib/chevre/service/payment/any/voidPayTransaction.d.ts +2 -0
  61. package/lib/chevre/service/payment/any/voidPayTransaction.js +1 -23
  62. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.d.ts +1 -1
  63. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js +5 -9
  64. package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js +17 -8
  65. package/lib/chevre/service/reserve/searchByOrder.js +2 -6
  66. package/lib/chevre/service/task/confirmReserveTransaction.js +2 -7
  67. package/lib/chevre/service/task/onAssetTransactionStatusChanged.js +2 -2
  68. package/lib/chevre/service/task/onOrderPaymentCompleted.js +2 -0
  69. package/lib/chevre/service/task/placeOrder.js +2 -2
  70. package/lib/chevre/service/task/publishPaymentUrl.js +7 -3
  71. package/lib/chevre/service/task/voidPayTransaction.js +3 -7
  72. package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.d.ts +15 -0
  73. package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.js +51 -0
  74. package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.d.ts +23 -0
  75. package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.js +64 -0
  76. package/lib/chevre/service/transaction/deleteTransaction.js +15 -152
  77. package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js +0 -1
  78. package/lib/chevre/service/transaction/placeOrder/confirm/prepareUnitPriceOfferConditions.d.ts +7 -2
  79. package/lib/chevre/service/transaction/placeOrder/confirm/prepareUnitPriceOfferConditions.js +16 -12
  80. package/lib/chevre/service/transaction/placeOrder/confirm/validation/factory.d.ts +5 -1
  81. package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts +11 -2
  82. package/lib/chevre/service/transaction/placeOrder/confirm/validation.js +112 -91
  83. package/lib/chevre/service/transaction/placeOrder/confirm.d.ts +4 -0
  84. package/lib/chevre/service/transaction/placeOrder/confirm.js +31 -74
  85. package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.d.ts +4 -7
  86. package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.js +33 -15
  87. package/lib/chevre/service/transaction/placeOrder/updateAgent.d.ts +2 -0
  88. package/lib/chevre/service/transaction/placeOrder/updateAgent.js +19 -9
  89. package/package.json +5 -4
@@ -0,0 +1,23 @@
1
+ import { factory } from '../../../factory';
2
+ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
3
+ import type { ReservationRepo } from '../../../repo/reservation';
4
+ type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
5
+ type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
6
+ interface IDeleteResult {
7
+ n?: number;
8
+ ok?: number;
9
+ deletedCount?: number;
10
+ }
11
+ export declare function deleteReservationsByPlaceOrder(params: {
12
+ authorizeActions: (IAuthorizeOfferAction | IAuthorizePaymentAction)[];
13
+ transaction: Pick<factory.transaction.placeOrder.ITransaction, 'project'>;
14
+ }): (repos: {
15
+ assetTransaction: AssetTransactionRepo;
16
+ reservation: ReservationRepo;
17
+ }) => Promise<{
18
+ deleteResult?: IDeleteResult;
19
+ deleteReserveTransactionResult?: IDeleteResult;
20
+ deleteCancelReservationTransactionResult?: IDeleteResult;
21
+ reserveTransactionNumbers: string[];
22
+ }>;
23
+ export {};
@@ -0,0 +1,64 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.deleteReservationsByPlaceOrder = deleteReservationsByPlaceOrder;
4
+ const factory_1 = require("../../../factory");
5
+ function deleteReservationsByPlaceOrder(params) {
6
+ return async (repos) => {
7
+ let deleteResult;
8
+ let deleteReserveTransactionResult;
9
+ let deleteCancelReservationTransactionResult;
10
+ const authorizeActions = params.authorizeActions;
11
+ // 予約取引番号を抽出
12
+ const authorizeReservationOfferActions = authorizeActions
13
+ .filter((a) => {
14
+ return a.object.typeOf === factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation
15
+ && a.instrument?.transactionNumber === 'string'
16
+ && a.instrument.transactionNumber.length > 0;
17
+ });
18
+ const reserveTransactionNumbers = authorizeReservationOfferActions
19
+ .map((a) => String(a.instrument?.transactionNumber));
20
+ if (reserveTransactionNumbers.length > 0) {
21
+ // 該当予約番号の予約を削除する(プロジェクトでも絞ること)
22
+ const deleteReservationsResult = await repos.reservation.deleteByReservationNumbers({
23
+ project: { id: params.transaction.project.id },
24
+ reservationNumbers: reserveTransactionNumbers
25
+ });
26
+ deleteResult = {
27
+ n: deleteReservationsResult?.n,
28
+ ok: deleteReservationsResult?.ok,
29
+ deletedCount: deleteReservationsResult?.deletedCount
30
+ };
31
+ // 予約取引を削除(プロジェクトでも絞ること)(2022-06-07~)
32
+ const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
33
+ project: { id: params.transaction.project.id },
34
+ transactionNumbers: reserveTransactionNumbers,
35
+ typeOf: factory_1.factory.assetTransactionType.Reserve
36
+ });
37
+ deleteReserveTransactionResult = {
38
+ n: deleteAssetTransactionsResult?.n,
39
+ ok: deleteAssetTransactionsResult?.ok,
40
+ deletedCount: deleteAssetTransactionsResult?.deletedCount
41
+ };
42
+ // 予約番号で予約取消取引を検索
43
+ const deletingCancelReservationTransactions = await repos.assetTransaction.search({
44
+ project: { id: { $eq: params.transaction.project.id } },
45
+ object: { reservationNumber: { $in: reserveTransactionNumbers } },
46
+ typeOf: factory_1.factory.assetTransactionType.CancelReservation
47
+ }, ['transactionNumber'], []);
48
+ if (deletingCancelReservationTransactions.length > 0) {
49
+ // 予約取消取引も削除(2024-04-18~)
50
+ const deleteCancelReservationResult = await repos.assetTransaction.deleteByTransactionNumber({
51
+ project: { id: params.transaction.project.id },
52
+ transactionNumbers: deletingCancelReservationTransactions.map(({ transactionNumber }) => String(transactionNumber)),
53
+ typeOf: factory_1.factory.assetTransactionType.CancelReservation
54
+ });
55
+ deleteCancelReservationTransactionResult = {
56
+ n: deleteCancelReservationResult?.n,
57
+ ok: deleteCancelReservationResult?.ok,
58
+ deletedCount: deleteCancelReservationResult?.deletedCount
59
+ };
60
+ }
61
+ }
62
+ return { deleteResult, deleteReserveTransactionResult, deleteCancelReservationTransactionResult, reserveTransactionNumbers };
63
+ };
64
+ }
@@ -4,6 +4,8 @@ exports.deleteTransaction = deleteTransaction;
4
4
  /* eslint-disable @typescript-eslint/no-explicit-any */
5
5
  const factory_1 = require("../../factory");
6
6
  const deleteOrder_1 = require("../order/deleteOrder");
7
+ const deletePayTransactionsByPlaceOrder_1 = require("./deleteTransaction/deletePayTransactionsByPlaceOrder");
8
+ const deleteReservationsByPlaceOrder_1 = require("./deleteTransaction/deleteReservationsByPlaceOrder");
7
9
  /**
8
10
  * 取引に関わるリソースを削除する
9
11
  * 冪等性を確保すること
@@ -30,7 +32,6 @@ function deleteTransactionById(params) {
30
32
  if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
31
33
  throw new factory_1.factory.errors.ArgumentNull('object.id');
32
34
  }
33
- // let deletingOrderNumberByTask: string | undefined;
34
35
  let transaction;
35
36
  if (params.object.typeOf === factory_1.factory.transactionType.PlaceOrder) {
36
37
  transaction = (await repos.placeOrder.findPlaceOrderTransactions({
@@ -38,7 +39,6 @@ function deleteTransactionById(params) {
38
39
  typeOf: params.object.typeOf,
39
40
  inclusion: ['typeOf', 'project', 'status']
40
41
  })).shift();
41
- // deletingOrderNumberByTask = params.object.object.orderNumber;
42
42
  }
43
43
  else if (params.object.typeOf === factory_1.factory.transactionType.ReturnOrder) {
44
44
  transaction = (await repos.returnOrder.findReturnOrderTransactions({
@@ -70,7 +70,7 @@ function deleteTransactionById(params) {
70
70
  let deleteCancelReservationTransactionResult;
71
71
  let deletedReservationNumbers = [];
72
72
  let deleteActionResult;
73
- // let deleteMessagessResult: IDeleteResult | undefined;
73
+ let deleteOrderResult;
74
74
  const action = await repos.action.start(actionAttributes);
75
75
  try {
76
76
  const transactionTypeOf = transaction.typeOf;
@@ -90,12 +90,7 @@ function deleteTransactionById(params) {
90
90
  break;
91
91
  case factory_1.factory.transactionStatusType.Confirmed: {
92
92
  // identifierによる削除に変更(2026-06-28~)
93
- // if (typeof deletingOrderNumberByTask === 'string') {
94
- // await deleteOrder({
95
- // object: { orderNumber: deletingOrderNumberByTask }
96
- // })(repos);
97
- // }
98
- await (0, deleteOrder_1.deleteOrder)({
93
+ deleteOrderResult = await (0, deleteOrder_1.deleteOrder)({
99
94
  object: { identifier: transaction.id }
100
95
  })(repos);
101
96
  break;
@@ -104,27 +99,29 @@ function deleteTransactionById(params) {
104
99
  throw new factory_1.factory.errors.NotImplemented(`${transaction.status} not implemented`);
105
100
  }
106
101
  // 決済取引を削除
107
- const deletePayTransactionsByPlaceOrderResult = await deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);
102
+ const deletePayTransactionsByPlaceOrderResult = await (0, deletePayTransactionsByPlaceOrder_1.deletePayTransactionsByPlaceOrder)({ authorizeActions, transaction })(repos);
108
103
  deletePayTransactionResult = deletePayTransactionsByPlaceOrderResult.deletePayTransactionResult;
109
104
  deleteRefundResult = deletePayTransactionsByPlaceOrderResult.deleteRefundResult;
110
105
  payTransactionNumbers = deletePayTransactionsByPlaceOrderResult.payTransactionNumbers;
111
106
  // 取引上での予約を削除
112
- const deleteReservationsByPlaceOrderResult = await deleteReservationsByPlaceOrder({ authorizeActions, transaction })(repos);
107
+ const deleteReservationsByPlaceOrderResult = await (0, deleteReservationsByPlaceOrder_1.deleteReservationsByPlaceOrder)({ authorizeActions, transaction })(repos);
113
108
  deleteReservationsResult = deleteReservationsByPlaceOrderResult.deleteResult;
114
109
  deleteReserveTransactionResult = deleteReservationsByPlaceOrderResult.deleteReserveTransactionResult;
115
110
  deleteCancelReservationTransactionResult =
116
111
  deleteReservationsByPlaceOrderResult.deleteCancelReservationTransactionResult;
117
112
  deletedReservationNumbers = deleteReservationsByPlaceOrderResult.reserveTransactionNumbers;
118
113
  // アクション削除(2023-05-19~)
119
- deleteActionResult = await repos.action.deleteByPurpose({
114
+ deleteActionResult = await repos.action.deleteActionsByTransactionId({
120
115
  project: { id: transaction.project.id },
121
- purpose: { id: transaction.id, typeOf: transactionTypeOf },
116
+ transaction: { id: transaction.id, typeOf: transactionTypeOf },
122
117
  typeOf: {
123
118
  $in: [
124
- factory_1.factory.actionType.AuthorizeAction,
125
- factory_1.factory.actionType.CheckAction,
126
- factory_1.factory.actionType.InformAction,
127
- factory_1.factory.actionType.OrderAction
119
+ factory_1.factory.actionType.AcceptAction, // オファー採用、決済採用
120
+ factory_1.factory.actionType.AuthorizeAction, // オファー承認、決済承認
121
+ factory_1.factory.actionType.CheckAction, // 決済カード認証
122
+ // factory.actionType.InformAction, // 通知は特になし
123
+ factory_1.factory.actionType.OrderAction, // 注文
124
+ factory_1.factory.actionType.RefundAction // 決済採用返金
128
125
  ]
129
126
  }
130
127
  });
@@ -166,143 +163,9 @@ function deleteTransactionById(params) {
166
163
  deleteCancelReservationTransactionResult,
167
164
  deletedReservationNumbers,
168
165
  deleteActionResult,
166
+ deleteOrderResult // 2026-07-10~
169
167
  // ...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
170
168
  };
171
169
  await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
172
170
  };
173
171
  }
174
- function deleteReservationsByPlaceOrder(params) {
175
- return async (repos) => {
176
- let deleteResult;
177
- let deleteReserveTransactionResult;
178
- let deleteCancelReservationTransactionResult;
179
- const authorizeActions = params.authorizeActions;
180
- // 予約取引番号を抽出
181
- const authorizeReservationOfferActions = authorizeActions
182
- .filter((a) => {
183
- const pendingTransactionNumber = a.instrument?.transactionNumber;
184
- return a.object.typeOf === factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation
185
- && typeof pendingTransactionNumber === 'string'
186
- && pendingTransactionNumber.length > 0;
187
- });
188
- const reserveTransactionNumbers = authorizeReservationOfferActions
189
- .map((a) => String(a.instrument?.transactionNumber));
190
- if (reserveTransactionNumbers.length > 0) {
191
- // 該当予約番号の予約を削除する(プロジェクトでも絞ること)
192
- const deleteReservationsResult = await repos.reservation.deleteByReservationNumbers({
193
- project: { id: params.transaction.project.id },
194
- reservationNumbers: reserveTransactionNumbers
195
- });
196
- deleteResult = {
197
- n: deleteReservationsResult?.n,
198
- ok: deleteReservationsResult?.ok,
199
- deletedCount: deleteReservationsResult?.deletedCount
200
- };
201
- // 予約取引を削除(プロジェクトでも絞ること)(2022-06-07~)
202
- const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
203
- project: { id: params.transaction.project.id },
204
- transactionNumbers: reserveTransactionNumbers,
205
- typeOf: factory_1.factory.assetTransactionType.Reserve
206
- });
207
- deleteReserveTransactionResult = {
208
- n: deleteAssetTransactionsResult?.n,
209
- ok: deleteAssetTransactionsResult?.ok,
210
- deletedCount: deleteAssetTransactionsResult?.deletedCount
211
- };
212
- // 予約番号で予約取消取引を検索
213
- const deletingCancelReservationTransactions = await repos.assetTransaction.search({
214
- project: { id: { $eq: params.transaction.project.id } },
215
- object: { reservationNumber: { $in: reserveTransactionNumbers } },
216
- typeOf: factory_1.factory.assetTransactionType.CancelReservation
217
- }, ['transactionNumber'], []);
218
- if (deletingCancelReservationTransactions.length > 0) {
219
- // 予約取消取引も削除(2024-04-18~)
220
- const deleteCancelReservationResult = await repos.assetTransaction.deleteByTransactionNumber({
221
- project: { id: params.transaction.project.id },
222
- transactionNumbers: deletingCancelReservationTransactions.map(({ transactionNumber }) => String(transactionNumber)),
223
- typeOf: factory_1.factory.assetTransactionType.CancelReservation
224
- });
225
- deleteCancelReservationTransactionResult = {
226
- n: deleteCancelReservationResult?.n,
227
- ok: deleteCancelReservationResult?.ok,
228
- deletedCount: deleteCancelReservationResult?.deletedCount
229
- };
230
- }
231
- }
232
- return { deleteResult, deleteReserveTransactionResult, deleteCancelReservationTransactionResult, reserveTransactionNumbers };
233
- };
234
- }
235
- function deletePayTransactionsByPlaceOrder(params) {
236
- return async (repos) => {
237
- let deletePayTransactionResult;
238
- let deleteRefundResult;
239
- const authorizeActions = params.authorizeActions;
240
- // 決済取引番号を抽出
241
- const authorizePaymentActions = authorizeActions
242
- .filter((a) => {
243
- const pendingTransactionNumber = a.object?.paymentMethodId;
244
- return a.object.typeOf === factory_1.factory.action.authorize.paymentMethod.any.ResultType.Payment
245
- && typeof pendingTransactionNumber === 'string'
246
- && pendingTransactionNumber.length > 0;
247
- });
248
- const payTransactionNumbers = authorizePaymentActions.map((a) => String(a.object.paymentMethodId));
249
- if (payTransactionNumbers.length > 0) {
250
- // 決済取引を削除(プロジェクトでも絞ること)(2022-06-07~)
251
- const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
252
- project: { id: params.transaction.project.id },
253
- transactionNumbers: payTransactionNumbers,
254
- typeOf: factory_1.factory.assetTransactionType.Pay
255
- });
256
- deletePayTransactionResult = {
257
- n: deleteAssetTransactionsResult?.n,
258
- ok: deleteAssetTransactionsResult?.ok,
259
- deletedCount: deleteAssetTransactionsResult?.deletedCount
260
- };
261
- // 返金取引も削除(2023-05-19~)
262
- const refundTransactions = await repos.assetTransaction.search({
263
- typeOf: factory_1.factory.assetTransactionType.Refund,
264
- object: { paymentMethodId: { $in: payTransactionNumbers } }
265
- }, ['transactionNumber'], []);
266
- if (refundTransactions.length > 0) {
267
- const deleteRefundAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
268
- project: { id: params.transaction.project.id },
269
- transactionNumbers: refundTransactions.map(({ transactionNumber }) => transactionNumber),
270
- typeOf: factory_1.factory.assetTransactionType.Refund
271
- });
272
- deleteRefundResult = {
273
- n: deleteRefundAssetTransactionsResult?.n,
274
- ok: deleteRefundAssetTransactionsResult?.ok,
275
- deletedCount: deleteRefundAssetTransactionsResult?.deletedCount
276
- };
277
- }
278
- }
279
- return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
280
- };
281
- }
282
- // function deleteMessagesByPlaceOrder(params: {
283
- // transaction: factory.task.deleteTransaction.IObject;
284
- // }) {
285
- // return async (repos: {
286
- // message: MessageRepo;
287
- // }): Promise<{
288
- // deleteResult?: IDeleteResult;
289
- // }> => {
290
- // let deleteResult: IDeleteResult | undefined;
291
- // if (params.transaction.typeOf === factory.transactionType.PlaceOrder
292
- // && params.transaction.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
293
- // const orderNumber = params.transaction.object.orderNumber;
294
- // if (typeof orderNumber === 'string' && orderNumber.length > 0) {
295
- // const deleteReservationsResult = await repos.message.deleteByMainEntityOrderNumber({
296
- // project: { id: params.transaction.project.id },
297
- // mainEntity: { orderNumber }
298
- // });
299
- // deleteResult = {
300
- // n: deleteReservationsResult?.n,
301
- // ok: deleteReservationsResult?.ok,
302
- // deletedCount: deleteReservationsResult?.deletedCount
303
- // };
304
- // }
305
- // }
306
- // return { deleteResult };
307
- // };
308
- // }
@@ -13,7 +13,6 @@ async function createPotentialActions(params, setting) {
13
13
  potentialActions: {
14
14
  order: {
15
15
  onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } // optimize(2024-06-29~)
16
- // potentialActions: { sendOrder: sendOrderActionAttributes }
17
16
  }
18
17
  }
19
18
  };
@@ -5,6 +5,11 @@ type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'o
5
5
  export declare function createAuthorizeOfferResultsExpected(params: {
6
6
  authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
7
7
  }): Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
8
+ /**
9
+ * 注文ドキュメントと予約取引ドキュメントを参照することによって生成した、単価オファー検証条件
10
+ * 元々オファー承認アクションのresultに保管されていた
11
+ */
12
+ type IPreparedUnitPriceOfferConditions = Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>;
8
13
  declare function prepareUnitPriceOfferConditions(params: {
9
14
  project: {
10
15
  id: string;
@@ -13,5 +18,5 @@ declare function prepareUnitPriceOfferConditions(params: {
13
18
  authorizeEventServiceOfferActions: IAuthorizeEventServiceOffer[];
14
19
  }): (repos: {
15
20
  offer: OfferRepo;
16
- }) => Promise<Pick<IAuthorizeEventServiceOffer, "id" | "result">[]>;
17
- export { prepareUnitPriceOfferConditions };
21
+ }) => Promise<IPreparedUnitPriceOfferConditions[]>;
22
+ export { IPreparedUnitPriceOfferConditions, prepareUnitPriceOfferConditions };
@@ -1,9 +1,13 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.createAuthorizeOfferResultsExpected = createAuthorizeOfferResultsExpected;
4
7
  exports.prepareUnitPriceOfferConditions = prepareUnitPriceOfferConditions;
5
- const util_1 = require("util");
8
+ const debug_1 = __importDefault(require("debug"));
6
9
  const factory_1 = require("../../../../factory");
10
+ const debug = (0, debug_1.default)('chevre-domain:service:transaction:placeOrder:confirm:prepareUnitPriceOfferConditions');
7
11
  function acceptedOffers2authorizeResult(params) {
8
12
  const { acceptedOffers4result, unitPriceOffers } = params;
9
13
  const programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
@@ -32,7 +36,7 @@ function acceptedOffers2authorizeResult(params) {
32
36
  };
33
37
  });
34
38
  return {
35
- amount: [],
39
+ // amount: [], // discontinue(2026-07-06~)
36
40
  itemOffered: {
37
41
  serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
38
42
  },
@@ -77,11 +81,20 @@ function createAuthorizeOfferResultsExpected(params) {
77
81
  }
78
82
  function prepareUnitPriceOfferConditions(params) {
79
83
  return async (repos) => {
84
+ // COAの場合は単価オファーを参照せずにそのまま返す
85
+ const isCOA = params.authorizeEventServiceOfferActions.some((action) => action.instrument.typeOf === factory_1.factory.assetTransactionType.COAReserveTransaction);
86
+ if (isCOA) {
87
+ return params.authorizeEventServiceOfferActions.map(({ id, result }) => ({ id, result }));
88
+ }
80
89
  const conditions = [];
81
90
  const offerIds = [...new Set(params.acceptedOffers.map((o) => String(o.id)))];
82
91
  const unitPriceOffers = await repos.offer.search({
83
92
  id: { $in: offerIds }
93
+ }, {
94
+ acceptedPaymentMethod: 1,
95
+ priceSpecification: 1,
84
96
  });
97
+ debug('unitPriceOffers:', unitPriceOffers);
85
98
  for (const authorizeEventServiceOfferAction of params.authorizeEventServiceOfferActions) {
86
99
  if (authorizeEventServiceOfferAction.result === undefined) {
87
100
  throw new Error('authorizeEventServiceOfferAction.result should exist');
@@ -93,7 +106,7 @@ function prepareUnitPriceOfferConditions(params) {
93
106
  id: authorizeEventServiceOfferAction.id,
94
107
  result: {
95
108
  typeOf: authorizeEventServiceOfferAction.result.typeOf,
96
- priceCurrency: authorizeEventServiceOfferAction.result.priceCurrency,
109
+ // priceCurrency: authorizeEventServiceOfferAction.result.priceCurrency,
97
110
  price: authorizeEventServiceOfferAction.result.price,
98
111
  ...acceptedOffers2authorizeResult({
99
112
  acceptedOffers4result: acceptedOffers4action,
@@ -102,15 +115,6 @@ function prepareUnitPriceOfferConditions(params) {
102
115
  }
103
116
  });
104
117
  }
105
- // 承認アクションと比較する
106
- for (const authorizeEventServiceOfferAction of params.authorizeEventServiceOfferActions) {
107
- const conditionExpected = conditions.find(({ id }) => id === authorizeEventServiceOfferAction.id);
108
- const resultMatched = (0, util_1.isDeepStrictEqual)(conditionExpected?.result, authorizeEventServiceOfferAction.result);
109
- console.log('resultMatched?', resultMatched, authorizeEventServiceOfferAction.id, authorizeEventServiceOfferAction.instrument.transactionNumber);
110
- if (!resultMatched) {
111
- console.log(conditionExpected?.result, authorizeEventServiceOfferAction.result);
112
- }
113
- }
114
118
  return conditions;
115
119
  };
116
120
  }
@@ -1,6 +1,10 @@
1
1
  import { factory } from '../../../../../factory';
2
2
  export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object' | 'result' | 'endDate'>;
3
- export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
3
+ export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction & {
4
+ result?: factory.action.authorize.offer.eventService.IResult & {
5
+ onlyPrice?: boolean;
6
+ };
7
+ };
4
8
  export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate'> & {
5
9
  object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf' | 'paymentMethodId'>;
6
10
  instrument?: never;
@@ -1,11 +1,16 @@
1
1
  import { factory } from '../../../../factory';
2
2
  import { PlaceOrderFactory } from '../../../../factory/transaction';
3
+ import { IPreparedUnitPriceOfferConditions } from './prepareUnitPriceOfferConditions';
3
4
  import { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IPayTransaction } from './validation/factory';
4
5
  export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IPayTransaction };
5
6
  /**
6
7
  * 取引が確定可能な状態かどうかをチェックする
7
8
  */
8
- export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
9
+ export declare function validateTransaction(transaction: {
10
+ id: string;
11
+ }, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer, options: {
12
+ paymentMethodIdByTransaction?: string;
13
+ }): void;
9
14
  /**
10
15
  * 注文オファー数検証
11
16
  */
@@ -35,6 +40,9 @@ export declare function validatePaymentMethods(params: {
35
40
  * 興行オファー適用条件確認
36
41
  */
37
42
  export declare function validateEventOffers(params: {
43
+ project: {
44
+ id: string;
45
+ };
38
46
  order: {
39
47
  price: number;
40
48
  };
@@ -42,5 +50,6 @@ export declare function validateEventOffers(params: {
42
50
  /**
43
51
  * 承認アクションのresultに条件が保管されているはず(2026-07-06時点で)
44
52
  */
45
- authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
53
+ authorizeOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
54
+ unitPriceOfferConditions: IPreparedUnitPriceOfferConditions[];
46
55
  }): void;