@chevre/domain 25.2.0-alpha.4 → 25.2.0-alpha.40

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 (172) hide show
  1. package/lib/chevre/factory/customerTelephone2COATelNum.d.ts +3 -0
  2. package/lib/chevre/factory/customerTelephone2COATelNum.js +22 -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/aggregateOffer.d.ts +2 -3
  9. package/lib/chevre/repo/creativeWork.d.ts +2 -3
  10. package/lib/chevre/repo/customerType.d.ts +2 -3
  11. package/lib/chevre/repo/event.d.ts +10 -11
  12. package/lib/chevre/repo/eventOffer.d.ts +4 -5
  13. package/lib/chevre/repo/eventSellerMakesOffer.d.ts +2 -3
  14. package/lib/chevre/repo/eventSeries.d.ts +4 -5
  15. package/lib/chevre/repo/message.d.ts +1 -1
  16. package/lib/chevre/repo/message.js +1 -1
  17. package/lib/chevre/repo/mongoose/schemas/action.js +67 -66
  18. package/lib/chevre/repo/mongoose/schemas/order.d.ts +4 -0
  19. package/lib/chevre/repo/mongoose/schemas/order.js +10 -0
  20. package/lib/chevre/repo/mongoose/schemas/setting.d.ts +4 -0
  21. package/lib/chevre/repo/mongoose/schemas/task.js +12 -12
  22. package/lib/chevre/repo/note.d.ts +3 -4
  23. package/lib/chevre/repo/noteAboutOrder.d.ts +2 -3
  24. package/lib/chevre/repo/offerCatalog.d.ts +2 -3
  25. package/lib/chevre/repo/offerCatalogItem.d.ts +2 -3
  26. package/lib/chevre/repo/order.d.ts +2 -0
  27. package/lib/chevre/repo/order.js +14 -14
  28. package/lib/chevre/repo/orderInTransaction.d.ts +68 -1
  29. package/lib/chevre/repo/orderInTransaction.js +181 -3
  30. package/lib/chevre/repo/person.d.ts +0 -15
  31. package/lib/chevre/repo/person.js +122 -108
  32. package/lib/chevre/repo/place/entranceGate.d.ts +4 -5
  33. package/lib/chevre/repo/place/movieTheater.d.ts +3 -4
  34. package/lib/chevre/repo/place/screeningRoom.d.ts +4 -5
  35. package/lib/chevre/repo/place/seat.d.ts +4 -5
  36. package/lib/chevre/repo/place/section.d.ts +3 -4
  37. package/lib/chevre/repo/product.d.ts +3 -4
  38. package/lib/chevre/repo/rateLimit/offer.js +0 -12
  39. package/lib/chevre/repo/reservation.d.ts +2 -3
  40. package/lib/chevre/repo/sellerMakesOffer.d.ts +3 -4
  41. package/lib/chevre/repo/stockHolder.d.ts +1 -1
  42. package/lib/chevre/repo/stockHolder.js +0 -146
  43. package/lib/chevre/repo/transaction/placeOrder.d.ts +2 -45
  44. package/lib/chevre/repo/transaction/placeOrder.js +43 -83
  45. package/lib/chevre/repo/transaction.d.ts +2 -2
  46. package/lib/chevre/repo/transactionNumberCounter.js +0 -34
  47. package/lib/chevre/repo/transactionProcess.js +0 -13
  48. package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js +1 -1
  49. package/lib/chevre/service/assetTransaction/pay/start/factory.d.ts +1 -1
  50. package/lib/chevre/service/assetTransaction/pay/start/factory.js +3 -4
  51. package/lib/chevre/service/assetTransaction/pay/start.d.ts +1 -1
  52. package/lib/chevre/service/notification/factory.d.ts +2 -4
  53. package/lib/chevre/service/notification/factory.js +26 -24
  54. package/lib/chevre/service/notification/notifyAbortedTasksByEmail.d.ts +11 -5
  55. package/lib/chevre/service/notification/notifyAbortedTasksByEmail.js +11 -3
  56. package/lib/chevre/service/offer/event/authorize/factory.d.ts +3 -5
  57. package/lib/chevre/service/offer/event/authorize/factory.js +93 -75
  58. package/lib/chevre/service/offer/event/authorize.d.ts +0 -4
  59. package/lib/chevre/service/offer/event/authorize.js +2 -2
  60. package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts +6 -7
  61. package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js +10 -10
  62. package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts +0 -5
  63. package/lib/chevre/service/offer/eventServiceByCOA/authorize.js +17 -14
  64. package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.d.ts +0 -5
  65. package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.js +2 -2
  66. package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js +1 -1
  67. package/lib/chevre/service/order/deleteOrder.d.ts +5 -1
  68. package/lib/chevre/service/order/deleteOrder.js +8 -1
  69. package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionCanceled.js +19 -11
  70. package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.d.ts +2 -0
  71. package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.d.ts +2 -2
  72. package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.js +1 -7
  73. package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts +2 -0
  74. package/lib/chevre/service/order/onAssetTransactionStatusChanged.js +2 -0
  75. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts +5 -1
  76. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js +95 -33
  77. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.d.ts +2 -2
  78. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +4 -2
  79. package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +2 -6
  80. package/lib/chevre/service/order/payOrder.d.ts +2 -0
  81. package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts +2 -1
  82. package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js +13 -58
  83. package/lib/chevre/service/order/placeOrder/factory.js +3 -21
  84. package/lib/chevre/service/order/placeOrder.d.ts +4 -5
  85. package/lib/chevre/service/order/placeOrder.js +20 -31
  86. package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.js +1 -2
  87. package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts +3 -2
  88. package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts +4 -3
  89. package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js +3 -31
  90. package/lib/chevre/service/payment/any/authorize.js +13 -37
  91. package/lib/chevre/service/payment/any/factory.d.ts +7 -7
  92. package/lib/chevre/service/payment/any/factory.js +19 -22
  93. package/lib/chevre/service/payment/any/findAcceptAction.d.ts +3 -1
  94. package/lib/chevre/service/payment/any/findAcceptAction.js +14 -6
  95. package/lib/chevre/service/payment/any/invalidatePaymentUrl.d.ts +2 -0
  96. package/lib/chevre/service/payment/any/invalidatePaymentUrl.js +4 -66
  97. package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts +4 -0
  98. package/lib/chevre/service/payment/any/publishPaymentUrl.js +4 -18
  99. package/lib/chevre/service/payment/any/voidPayTransaction.d.ts +2 -0
  100. package/lib/chevre/service/payment/any/voidPayTransaction.js +1 -23
  101. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.d.ts +1 -1
  102. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js +5 -9
  103. package/lib/chevre/service/reserve/adminFindReservations.d.ts +15 -0
  104. package/lib/chevre/service/reserve/adminFindReservations.js +35 -0
  105. package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js +17 -8
  106. package/lib/chevre/service/reserve/searchByOrder.js +2 -6
  107. package/lib/chevre/service/reserve.d.ts +2 -2
  108. package/lib/chevre/service/reserve.js +3 -3
  109. package/lib/chevre/service/task/aggregateOffers.d.ts +2 -2
  110. package/lib/chevre/service/task/aggregateOffers.js +2 -1
  111. package/lib/chevre/service/task/aggregateScreeningEvent.d.ts +2 -2
  112. package/lib/chevre/service/task/aggregateScreeningEvent.js +2 -1
  113. package/lib/chevre/service/task/authorizePayment.js +3 -1
  114. package/lib/chevre/service/task/cancelReservation.d.ts +2 -2
  115. package/lib/chevre/service/task/cancelReservation.js +2 -1
  116. package/lib/chevre/service/task/confirmPayTransaction.js +0 -1
  117. package/lib/chevre/service/task/confirmReserveTransaction.js +2 -7
  118. package/lib/chevre/service/task/deleteTransaction.d.ts +2 -2
  119. package/lib/chevre/service/task/deleteTransaction.js +2 -1
  120. package/lib/chevre/service/task/onAssetTransactionStatusChanged.d.ts +2 -2
  121. package/lib/chevre/service/task/onAssetTransactionStatusChanged.js +4 -3
  122. package/lib/chevre/service/task/onEventChanged.d.ts +2 -2
  123. package/lib/chevre/service/task/onEventChanged.js +2 -1
  124. package/lib/chevre/service/task/onOrderPaymentCompleted.d.ts +2 -2
  125. package/lib/chevre/service/task/onOrderPaymentCompleted.js +4 -1
  126. package/lib/chevre/service/task/onResourceUpdated.d.ts +2 -2
  127. package/lib/chevre/service/task/onResourceUpdated.js +2 -1
  128. package/lib/chevre/service/task/placeOrder.d.ts +2 -2
  129. package/lib/chevre/service/task/placeOrder.js +6 -3
  130. package/lib/chevre/service/task/publishPaymentUrl.js +7 -3
  131. package/lib/chevre/service/task/refund.d.ts +2 -2
  132. package/lib/chevre/service/task/refund.js +4 -10
  133. package/lib/chevre/service/task/reserve.d.ts +2 -2
  134. package/lib/chevre/service/task/reserve.js +2 -1
  135. package/lib/chevre/service/task/returnOrder.d.ts +2 -2
  136. package/lib/chevre/service/task/returnOrder.js +2 -1
  137. package/lib/chevre/service/task/sendOrder.d.ts +2 -2
  138. package/lib/chevre/service/task/sendOrder.js +2 -1
  139. package/lib/chevre/service/task/voidPayTransaction.js +3 -7
  140. package/lib/chevre/service/task/voidPayment.d.ts +2 -2
  141. package/lib/chevre/service/task/voidPayment.js +2 -1
  142. package/lib/chevre/service/taskHandler.d.ts +2 -2
  143. package/lib/chevre/service/taskHandler.js +36 -37
  144. package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.d.ts +15 -0
  145. package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.js +51 -0
  146. package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.d.ts +23 -0
  147. package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.js +64 -0
  148. package/lib/chevre/service/transaction/deleteTransaction.js +15 -152
  149. package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts +28 -2
  150. package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.js +11 -12
  151. package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.d.ts +4 -2
  152. package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js +6 -7
  153. package/lib/chevre/service/transaction/placeOrder/confirm/prepareUnitPriceOfferConditions.d.ts +35 -2
  154. package/lib/chevre/service/transaction/placeOrder/confirm/prepareUnitPriceOfferConditions.js +16 -12
  155. package/lib/chevre/service/transaction/placeOrder/confirm/validation/factory.d.ts +5 -1
  156. package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts +11 -2
  157. package/lib/chevre/service/transaction/placeOrder/confirm/validation.js +112 -91
  158. package/lib/chevre/service/transaction/placeOrder/confirm.d.ts +6 -5
  159. package/lib/chevre/service/transaction/placeOrder/confirm.js +33 -78
  160. package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.d.ts +4 -7
  161. package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.js +33 -15
  162. package/lib/chevre/service/transaction/placeOrder/start.d.ts +1 -1
  163. package/lib/chevre/service/transaction/placeOrder/updateAgent/fixCustomer.d.ts +20 -0
  164. package/lib/chevre/service/transaction/placeOrder/updateAgent/fixCustomer.js +63 -0
  165. package/lib/chevre/service/transaction/placeOrder/updateAgent.d.ts +0 -1
  166. package/lib/chevre/service/transaction/placeOrder/updateAgent.js +17 -86
  167. package/lib/chevre/taskSettings.d.ts +1 -3
  168. package/package.json +8 -11
  169. package/lib/chevre/service/order/findConfirmedPlaceOrder.d.ts +0 -13
  170. package/lib/chevre/service/order/findConfirmedPlaceOrder.js +0 -32
  171. package/lib/chevre/service/reserve/findReservations.d.ts +0 -33
  172. package/lib/chevre/service/reserve/findReservations.js +0 -61
@@ -1,6 +1,6 @@
1
- import type { IOperationExecute } from '../taskHandler';
1
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
2
2
  import { factory } from '../../factory';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(data: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.ITask<factory.taskName.OnOrderPaymentCompleted>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.call = call;
4
4
  const acceptedOffer_1 = require("../../repo/acceptedOffer");
5
+ const message_1 = require("../../repo/message");
5
6
  const order_1 = require("../../repo/order");
6
7
  const setting_1 = require("../../repo/setting");
7
8
  const integration_1 = require("../../repo/setting/integration");
@@ -11,11 +12,13 @@ const payOrder_1 = require("../order/payOrder");
11
12
  /**
12
13
  * タスク実行関数
13
14
  */
14
- function call(data) {
15
+ function call(params) {
15
16
  return async ({ connection }) => {
17
+ const { data } = params;
16
18
  const settings = new integration_1.IntegrationSettingRepo({ connection });
17
19
  await (0, payOrder_1.payOrder)(data)({
18
20
  acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
21
+ message: new message_1.MessageRepo(connection),
19
22
  order: new order_1.OrderRepo(connection),
20
23
  setting: new setting_1.SettingRepo(connection),
21
24
  task: new task_1.TaskRepo(connection),
@@ -1,6 +1,6 @@
1
1
  import { factory } from '../../factory';
2
- import type { IOperationExecute } from '../taskHandler';
2
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(data: factory.task.onResourceUpdated.IData): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.onResourceUpdated.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
@@ -29,8 +29,9 @@ const onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdat
29
29
  /**
30
30
  * タスク実行関数
31
31
  */
32
- function call(data) {
32
+ function call(params) {
33
33
  return async ({ connection }) => {
34
+ const { data } = params;
34
35
  await onResourceUpdated(data)({
35
36
  accountTitle: new accountTitle_1.AccountTitleRepo(connection),
36
37
  action: new action_1.ActionRepo(connection),
@@ -1,6 +1,6 @@
1
- import type { IOperationExecute } from '../taskHandler';
1
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
2
2
  import { factory } from '../../factory';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(data: factory.task.IData<factory.taskName.PlaceOrder>): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.ITask<factory.taskName.PlaceOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
@@ -1,27 +1,30 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.call = call;
4
+ const factory_1 = require("../../factory");
4
5
  const acceptedOffer_1 = require("../../repo/acceptedOffer");
5
6
  const accountingReport_1 = require("../../repo/accountingReport");
6
7
  const action_1 = require("../../repo/action");
7
8
  const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
8
9
  const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
10
+ const message_1 = require("../../repo/message");
9
11
  const order_1 = require("../../repo/order");
10
12
  const orderInTransaction_1 = require("../../repo/orderInTransaction");
11
13
  const setting_1 = require("../../repo/setting");
12
14
  const integration_1 = require("../../repo/setting/integration");
13
15
  const task_1 = require("../../repo/task");
14
- // import { TransactionRepo } from '../../repo/transaction';
15
16
  const placeOrder_1 = require("../../repo/transaction/placeOrder");
16
17
  const placeOrder_2 = require("../order/placeOrder");
17
18
  /**
18
19
  * タスク実行関数
19
20
  */
20
- function call(data) {
21
+ function call(params) {
21
22
  return async ({ connection }) => {
23
+ const { data } = params;
22
24
  const settings = new integration_1.IntegrationSettingRepo({ connection });
23
25
  await (0, placeOrder_2.placeOrder)({
24
26
  ...data,
27
+ agent: { id: data.project.id, typeOf: factory_1.factory.organizationType.Project },
25
28
  useOnOrderStatusChanged: true
26
29
  })({
27
30
  acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
@@ -29,11 +32,11 @@ function call(data) {
29
32
  action: new action_1.ActionRepo(connection),
30
33
  authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
31
34
  authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
35
+ message: new message_1.MessageRepo(connection),
32
36
  order: new order_1.OrderRepo(connection),
33
37
  orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
34
38
  setting: new setting_1.SettingRepo(connection),
35
39
  task: new task_1.TaskRepo(connection),
36
- // transaction: new TransactionRepo(connection),
37
40
  placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
38
41
  }, settings);
39
42
  };
@@ -9,7 +9,7 @@ const authorization_1 = require("../../repo/authorization");
9
9
  const event_1 = require("../../repo/event");
10
10
  const eventSeries_1 = require("../../repo/eventSeries");
11
11
  const issuer_1 = require("../../repo/issuer");
12
- // import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
12
+ const orderInTransaction_1 = require("../../repo/orderInTransaction");
13
13
  // import { OrderNumberRepo } from '../../repo/orderNumber';
14
14
  const paymentService_1 = require("../../repo/paymentService");
15
15
  const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -36,10 +36,14 @@ function call(params) {
36
36
  const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
37
37
  // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
38
38
  try {
39
+ const { savePaymentMethodIdInTransaction, project: _project, ...publishPaymentUrlParams } = params.data;
39
40
  await (0, any_1.publishPaymentUrl)({
40
- ...params.data,
41
+ ...publishPaymentUrlParams,
42
+ project: { id: params.project.id },
41
43
  instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
42
44
  sameAs: { id: params.id }
45
+ }, {
46
+ savePaymentMethodIdInTransaction: savePaymentMethodIdInTransaction === true
43
47
  })({
44
48
  acceptPayAction: actionRepo,
45
49
  authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
@@ -48,7 +52,7 @@ function call(params) {
48
52
  event: new event_1.EventRepo(connection),
49
53
  eventSeries: new eventSeries_1.EventSeriesRepo(connection),
50
54
  issuer: new issuer_1.IssuerRepo(connection),
51
- // orderInTransaction: new OrderInTransactionRepo(connection),
55
+ orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
52
56
  // orderNumber: new OrderNumberRepo({ connection }),
53
57
  paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
54
58
  paymentService: new paymentService_1.PaymentServiceRepo(connection),
@@ -1,6 +1,6 @@
1
- import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
1
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
2
2
  import { factory } from '../../factory';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(params: factory.task.refund.IData | Pick<factory.task.refund.ITask, IExecutableTaskKeys>): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.refund.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
@@ -26,16 +26,10 @@ function call(params) {
26
26
  throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
27
27
  }
28
28
  const settings = new integration_1.IntegrationSettingRepo({ connection });
29
- let data;
30
- if (params.name === factory_1.factory.taskName.Refund) {
31
- data = {
32
- ...params.data,
33
- sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
34
- };
35
- }
36
- else {
37
- data = params;
38
- }
29
+ const data = {
30
+ ...params.data,
31
+ sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
32
+ };
39
33
  const paymentServiceId = data.object.at(0)?.id;
40
34
  const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
41
35
  const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
@@ -1,6 +1,6 @@
1
1
  import { factory } from '../../factory';
2
- import type { IOperationExecute } from '../taskHandler';
2
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(data: factory.task.reserve.IData): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.reserve.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
@@ -11,8 +11,9 @@ const confirmReservation_1 = require("../reserve/confirmReservation");
11
11
  /**
12
12
  * タスク実行関数
13
13
  */
14
- function call(data) {
14
+ function call(params) {
15
15
  return async ({ connection }) => {
16
+ const { data } = params;
16
17
  await (0, confirmReservation_1.confirmReservation)({
17
18
  // actionAttributesList: data.actionAttributes,
18
19
  potentialReserveAction: data, // optimize(2024-07-01~)
@@ -1,6 +1,6 @@
1
- import type { IOperationExecute } from '../taskHandler';
1
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
2
2
  import { factory } from '../../factory';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(data: factory.task.IData<factory.taskName.ReturnOrder>): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.ITask<factory.taskName.ReturnOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
@@ -12,8 +12,9 @@ const returnOrder_2 = require("../order/returnOrder");
12
12
  /**
13
13
  * タスク実行関数
14
14
  */
15
- function call(data) {
15
+ function call(params) {
16
16
  return async ({ connection }) => {
17
+ const { data } = params;
17
18
  await (0, returnOrder_2.returnOrder)({
18
19
  ...data,
19
20
  useOnOrderStatusChanged: true
@@ -1,6 +1,6 @@
1
- import type { IOperationExecute } from '../taskHandler';
1
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
2
2
  import { factory } from '../../factory';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(data: factory.task.IData<factory.taskName.SendOrder>): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.ITask<factory.taskName.SendOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
@@ -13,8 +13,9 @@ const sendOrder_1 = require("../order/sendOrder");
13
13
  /**
14
14
  * タスク実行関数
15
15
  */
16
- function call(data) {
16
+ function call(params) {
17
17
  return async ({ connection }) => {
18
+ const { data } = params;
18
19
  await (0, sendOrder_1.sendOrder)({
19
20
  ...data,
20
21
  object: {
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.call = call;
4
4
  const accountingReport_1 = require("../../repo/accountingReport");
5
- // import { ActionRepo } from '../../repo/action';
6
5
  const acceptPay_1 = require("../../repo/action/acceptPay");
7
6
  const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
8
7
  const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -10,8 +9,8 @@ const paymentService_1 = require("../../repo/paymentService");
10
9
  const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
11
10
  const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
12
11
  const task_1 = require("../../repo/task");
12
+ const orderInTransaction_1 = require("../../repo/orderInTransaction");
13
13
  const placeOrder_1 = require("../../repo/transaction/placeOrder");
14
- // import { TransactionRepo } from '../../repo/transaction';
15
14
  const any_1 = require("../payment/any");
16
15
  /**
17
16
  * タスク実行関数
@@ -24,7 +23,6 @@ function call(params) {
24
23
  sameAs: { id: params.id }
25
24
  })({
26
25
  accountingReport: new accountingReport_1.AccountingReportRepo(connection),
27
- // action: new ActionRepo(connection),
28
26
  acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
29
27
  authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
30
28
  assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -32,10 +30,8 @@ function call(params) {
32
30
  paymentService: new paymentService_1.PaymentServiceRepo(connection),
33
31
  paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
34
32
  task: new task_1.TaskRepo(connection),
33
+ orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
35
34
  placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
36
- // transaction: new TransactionRepo(connection)
37
- }
38
- // settings
39
- );
35
+ });
40
36
  };
41
37
  }
@@ -1,6 +1,6 @@
1
- import type { IOperationExecute } from '../taskHandler';
1
+ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
2
2
  import { factory } from '../../factory';
3
3
  /**
4
4
  * タスク実行関数
5
5
  */
6
- export declare function call(data: factory.task.voidPayment.IData): IOperationExecute<void>;
6
+ export declare function call(params: Pick<factory.task.voidPayment.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
@@ -19,8 +19,9 @@ const voidPaymentByTask_1 = require("./payment/voidPaymentByTask");
19
19
  /**
20
20
  * タスク実行関数
21
21
  */
22
- function call(data) {
22
+ function call(params) {
23
23
  return async ({ connection, redisClient }) => {
24
+ const { data } = params;
24
25
  if (redisClient === undefined) {
25
26
  throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
26
27
  }
@@ -1,9 +1,9 @@
1
1
  import type { INextFunction } from '../eventEmitter/task';
2
2
  import { factory } from '../factory';
3
- import type { ICallResult, ICallableTaskOperation, ICallableTaskOperationSimple, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
3
+ import type { ICallResult, ICallableTaskOperation, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
4
4
  export declare const taskLoader: {
5
5
  load: (taskName: string) => Promise<{
6
- call: ICallableTaskOperationSimple | ICallableTaskOperation;
6
+ call: ICallableTaskOperation;
7
7
  }>;
8
8
  };
9
9
  /**
@@ -41,44 +41,43 @@ function executeTask(task, next) {
41
41
  throw new factory_1.factory.errors.Internal(`task remainingNumberOfTries < 0 [remainingNumberOfTries:${remainingNumberOfTries}]`);
42
42
  }
43
43
  // タスク名の関数が定義されていなければ、TypeErrorとなる
44
- let callResult;
45
- // const { call } = await import(`./task/${task.name}.js`) as {
46
- // call: ICallableTaskOperationSimple | ICallableTaskOperation;
47
- // };
48
44
  const { call } = await exports.taskLoader.load(task.name); // testが書きづらいのでtaskLoader経由で呼ぶ
49
- switch (task.name) {
50
- case factory_1.factory.taskName.AcceptCOAOffer:
51
- case factory_1.factory.taskName.AggregateOnSystem:
52
- case factory_1.factory.taskName.AuthorizePayment:
53
- case factory_1.factory.taskName.CancelPendingReservation:
54
- case factory_1.factory.taskName.CheckMovieTicket:
55
- case factory_1.factory.taskName.CheckResource:
56
- case factory_1.factory.taskName.CreateAccountingReport:
57
- case factory_1.factory.taskName.HandleNotification:
58
- case factory_1.factory.taskName.ImportEventCapacitiesFromCOA:
59
- case factory_1.factory.taskName.ImportEventsFromCOA:
60
- case factory_1.factory.taskName.ImportOffersFromCOA:
61
- case factory_1.factory.taskName.InvalidatePaymentUrl:
62
- case factory_1.factory.taskName.OnAuthorizationCreated:
63
- case factory_1.factory.taskName.OnResourceDeleted:
64
- case factory_1.factory.taskName.Pay:
65
- case factory_1.factory.taskName.PublishPaymentUrl:
66
- case factory_1.factory.taskName.Refund:
67
- case factory_1.factory.taskName.VoidPayTransaction:
68
- case factory_1.factory.taskName.VoidReserveTransaction:
69
- case factory_1.factory.taskName.ConfirmPayTransaction:
70
- case factory_1.factory.taskName.ConfirmReserveTransaction:
71
- case factory_1.factory.taskName.ReturnPayTransaction:
72
- case factory_1.factory.taskName.ReturnReserveTransaction:
73
- case factory_1.factory.taskName.SendEmailMessage:
74
- case factory_1.factory.taskName.SyncResourcesFromCOA:
75
- case factory_1.factory.taskName.TriggerWebhook:
76
- case factory_1.factory.taskName.UseReservation:
77
- callResult = await call(task)(settings, options);
78
- break;
79
- default:
80
- await call(task.data)(settings);
81
- }
45
+ const callResult = await call(task)(settings, options);
46
+ // ICallableTaskOperationSimpleを廃止(2026-07-22~)
47
+ // let callResult: ICallResult | undefined;
48
+ // switch (task.name) {
49
+ // case factory.taskName.AcceptCOAOffer:
50
+ // case factory.taskName.AggregateOnSystem:
51
+ // case factory.taskName.AuthorizePayment:
52
+ // case factory.taskName.CancelPendingReservation:
53
+ // case factory.taskName.CheckMovieTicket:
54
+ // case factory.taskName.CheckResource:
55
+ // case factory.taskName.CreateAccountingReport:
56
+ // case factory.taskName.HandleNotification:
57
+ // case factory.taskName.ImportEventCapacitiesFromCOA:
58
+ // case factory.taskName.ImportEventsFromCOA:
59
+ // case factory.taskName.ImportOffersFromCOA:
60
+ // case factory.taskName.InvalidatePaymentUrl:
61
+ // case factory.taskName.OnAuthorizationCreated:
62
+ // case factory.taskName.OnResourceDeleted:
63
+ // case factory.taskName.Pay:
64
+ // case factory.taskName.PublishPaymentUrl:
65
+ // case factory.taskName.Refund:
66
+ // case factory.taskName.VoidPayTransaction:
67
+ // case factory.taskName.VoidReserveTransaction:
68
+ // case factory.taskName.ConfirmPayTransaction:
69
+ // case factory.taskName.ConfirmReserveTransaction:
70
+ // case factory.taskName.ReturnPayTransaction:
71
+ // case factory.taskName.ReturnReserveTransaction:
72
+ // case factory.taskName.SendEmailMessage:
73
+ // case factory.taskName.SyncResourcesFromCOA:
74
+ // case factory.taskName.TriggerWebhook:
75
+ // case factory.taskName.UseReservation:
76
+ // callResult = await (call as ICallableTaskOperation)(task)(settings, options);
77
+ // break;
78
+ // default:
79
+ // await (call as ICallableTaskOperationSimple)(task.data)(settings); // TODO discontinue
80
+ // }
82
81
  const result = {
83
82
  executedAt: now,
84
83
  endDate: new Date(),
@@ -0,0 +1,15 @@
1
+ import { factory } from '../../../factory';
2
+ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
3
+ type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
4
+ type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
5
+ export declare function deletePayTransactionsByPlaceOrder(params: {
6
+ authorizeActions: (IAuthorizeOfferAction | IAuthorizePaymentAction)[];
7
+ transaction: Pick<factory.transaction.placeOrder.ITransaction, 'project'>;
8
+ }): (repos: {
9
+ assetTransaction: AssetTransactionRepo;
10
+ }) => Promise<{
11
+ deletePayTransactionResult: any;
12
+ deleteRefundResult: any;
13
+ payTransactionNumbers: string[];
14
+ }>;
15
+ export {};
@@ -0,0 +1,51 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.deletePayTransactionsByPlaceOrder = deletePayTransactionsByPlaceOrder;
4
+ /* eslint-disable @typescript-eslint/no-explicit-any */
5
+ const factory_1 = require("../../../factory");
6
+ function deletePayTransactionsByPlaceOrder(params) {
7
+ return async (repos) => {
8
+ let deletePayTransactionResult;
9
+ let deleteRefundResult;
10
+ const authorizeActions = params.authorizeActions;
11
+ // 決済取引番号を抽出
12
+ const authorizePaymentActions = authorizeActions
13
+ .filter((a) => {
14
+ return a.object.typeOf === factory_1.factory.action.authorize.paymentMethod.any.ResultType.Payment
15
+ && typeof a.object?.paymentMethodId === 'string'
16
+ && a.object.paymentMethodId.length > 0;
17
+ });
18
+ const payTransactionNumbers = authorizePaymentActions.map((a) => String(a.object.paymentMethodId));
19
+ if (payTransactionNumbers.length > 0) {
20
+ // 決済取引を削除(プロジェクトでも絞ること)(2022-06-07~)
21
+ const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
22
+ project: { id: params.transaction.project.id },
23
+ transactionNumbers: payTransactionNumbers,
24
+ typeOf: factory_1.factory.assetTransactionType.Pay
25
+ });
26
+ deletePayTransactionResult = {
27
+ n: deleteAssetTransactionsResult?.n,
28
+ ok: deleteAssetTransactionsResult?.ok,
29
+ deletedCount: deleteAssetTransactionsResult?.deletedCount
30
+ };
31
+ // 返金取引も削除(2023-05-19~)
32
+ const refundTransactions = await repos.assetTransaction.search({
33
+ typeOf: factory_1.factory.assetTransactionType.Refund,
34
+ object: { paymentMethodId: { $in: payTransactionNumbers } }
35
+ }, ['transactionNumber'], []);
36
+ if (refundTransactions.length > 0) {
37
+ const deleteRefundAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
38
+ project: { id: params.transaction.project.id },
39
+ transactionNumbers: refundTransactions.map(({ transactionNumber }) => transactionNumber),
40
+ typeOf: factory_1.factory.assetTransactionType.Refund
41
+ });
42
+ deleteRefundResult = {
43
+ n: deleteRefundAssetTransactionsResult?.n,
44
+ ok: deleteRefundAssetTransactionsResult?.ok,
45
+ deletedCount: deleteRefundAssetTransactionsResult?.deletedCount
46
+ };
47
+ }
48
+ }
49
+ return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
50
+ };
51
+ }
@@ -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
+ }