@chevre/domain 24.0.0-alpha.1 → 24.0.0-alpha.11

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 (184) hide show
  1. package/lib/chevre/repo/acceptedPaymentMethod.js +1 -1
  2. package/lib/chevre/repo/additionalProperty.js +1 -1
  3. package/lib/chevre/repo/aggregateOffer.js +1 -1
  4. package/lib/chevre/repo/confirmationNumber.js +2 -4
  5. package/lib/chevre/repo/creativeWork.js +1 -1
  6. package/lib/chevre/repo/eventOffer.js +1 -1
  7. package/lib/chevre/repo/eventSeries.js +1 -1
  8. package/lib/chevre/repo/identity.js +1 -2
  9. package/lib/chevre/repo/issuer.js +2 -4
  10. package/lib/chevre/repo/message.js +1 -1
  11. package/lib/chevre/repo/mongoose/schemas/transaction.js +31 -0
  12. package/lib/chevre/repo/note.js +1 -1
  13. package/lib/chevre/repo/noteAboutOrder.js +1 -1
  14. package/lib/chevre/repo/offer/unitPriceInCatalog.js +1 -1
  15. package/lib/chevre/repo/offerItemCondition.js +1 -1
  16. package/lib/chevre/repo/order.js +1 -1
  17. package/lib/chevre/repo/orderInTransaction.d.ts +8 -0
  18. package/lib/chevre/repo/orderInTransaction.js +17 -4
  19. package/lib/chevre/repo/orderNumber.d.ts +3 -2
  20. package/lib/chevre/repo/orderNumber.js +25 -32
  21. package/lib/chevre/repo/place/movieTheater.js +1 -1
  22. package/lib/chevre/repo/place/seat.js +1 -1
  23. package/lib/chevre/repo/product.js +1 -1
  24. package/lib/chevre/repo/productOffer.js +1 -1
  25. package/lib/chevre/repo/project.js +1 -1
  26. package/lib/chevre/repo/reservation.js +1 -1
  27. package/lib/chevre/repo/role.js +1 -2
  28. package/lib/chevre/repo/seller.js +1 -1
  29. package/lib/chevre/repo/serviceOutputIdentifier.js +2 -4
  30. package/lib/chevre/repo/transaction/placeOrder.d.ts +140 -0
  31. package/lib/chevre/repo/transaction/placeOrder.js +528 -0
  32. package/lib/chevre/repo/transaction/returnOrder.d.ts +23 -0
  33. package/lib/chevre/repo/transaction/returnOrder.js +213 -0
  34. package/lib/chevre/repo/transaction.d.ts +11 -84
  35. package/lib/chevre/repo/transaction.js +331 -270
  36. package/lib/chevre/repo/transactionNumber.js +2 -4
  37. package/lib/chevre/repo/trip.js +1 -2
  38. package/lib/chevre/repository.d.ts +12 -0
  39. package/lib/chevre/repository.js +26 -1
  40. package/lib/chevre/service/account.js +14 -21
  41. package/lib/chevre/service/accountTransaction/deposit.js +2 -8
  42. package/lib/chevre/service/accountTransaction/transfer.js +2 -8
  43. package/lib/chevre/service/accountTransaction/withdraw.js +2 -8
  44. package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js +24 -32
  45. package/lib/chevre/service/assetTransaction/cancelReservationCOA.js +2 -4
  46. package/lib/chevre/service/assetTransaction/moneyTransfer.js +2 -23
  47. package/lib/chevre/service/assetTransaction/pay/check.js +6 -11
  48. package/lib/chevre/service/assetTransaction/pay/confirm.js +1 -2
  49. package/lib/chevre/service/assetTransaction/pay/searchGMOTrade.d.ts +1 -1
  50. package/lib/chevre/service/assetTransaction/pay/start/factory.d.ts +51 -3
  51. package/lib/chevre/service/assetTransaction/pay/start/factory.js +58 -21
  52. package/lib/chevre/service/assetTransaction/pay/start/preStart/fixPaymentService.d.ts +10 -0
  53. package/lib/chevre/service/assetTransaction/pay/start/preStart/fixPaymentService.js +88 -0
  54. package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.d.ts +53 -0
  55. package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.js +56 -0
  56. package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.d.ts +1 -1
  57. package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.js +1 -11
  58. package/lib/chevre/service/assetTransaction/pay/start.js +8 -132
  59. package/lib/chevre/service/assetTransaction/refund.js +13 -20
  60. package/lib/chevre/service/assetTransaction/registerService.js +1 -7
  61. package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/validateIssuedOfferIfExists.js +2 -4
  62. package/lib/chevre/service/assetTransaction/reserveCOA.js +2 -4
  63. package/lib/chevre/service/delivery/product/factory.js +1 -2
  64. package/lib/chevre/service/delivery/reservation/factory.js +1 -2
  65. package/lib/chevre/service/event/saveScreeningEvents.js +1 -0
  66. package/lib/chevre/service/event.js +0 -1
  67. package/lib/chevre/service/moneyTransfer.js +2 -2
  68. package/lib/chevre/service/notification/factory.js +1 -1
  69. package/lib/chevre/service/notification/notifyByEmail.js +50 -56
  70. package/lib/chevre/service/notification/sendEmailMessage.js +2 -3
  71. package/lib/chevre/service/notification/triggerWebhook.js +32 -37
  72. package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.js +1 -2
  73. package/lib/chevre/service/offer/event/authorize.d.ts +2 -2
  74. package/lib/chevre/service/offer/event/authorize.js +4 -4
  75. package/lib/chevre/service/offer/event/issueEventOfferTicket.d.ts +2 -2
  76. package/lib/chevre/service/offer/event/issueEventOfferTicket.js +1 -1
  77. package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts +0 -2
  78. package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js +1 -0
  79. package/lib/chevre/service/offer/event/voidTransaction.d.ts +2 -2
  80. package/lib/chevre/service/offer/event/voidTransaction.js +2 -2
  81. package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts +2 -2
  82. package/lib/chevre/service/offer/event/voidTransactionByActionId.js +2 -2
  83. package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/authorize.js +1 -2
  84. package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts +2 -2
  85. package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js +6 -6
  86. package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts +2 -2
  87. package/lib/chevre/service/offer/eventServiceByCOA/authorize.js +3 -10
  88. package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js +2 -2
  89. package/lib/chevre/service/offer/moneyTransfer/authorize.d.ts +2 -2
  90. package/lib/chevre/service/offer/moneyTransfer/authorize.js +53 -57
  91. package/lib/chevre/service/offer/moneyTransfer/voidTransaction.d.ts +2 -2
  92. package/lib/chevre/service/offer/moneyTransfer/voidTransaction.js +4 -1
  93. package/lib/chevre/service/offer/product.d.ts +3 -3
  94. package/lib/chevre/service/offer/product.js +4 -4
  95. package/lib/chevre/service/order/confirmPayTransaction.d.ts +0 -2
  96. package/lib/chevre/service/order/confirmPayTransaction.js +1 -0
  97. package/lib/chevre/service/order/findPlaceOrderTransaction.d.ts +2 -2
  98. package/lib/chevre/service/order/findPlaceOrderTransaction.js +1 -1
  99. package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts +4 -4
  100. package/lib/chevre/service/order/onAssetTransactionStatusChanged.js +10 -19
  101. package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled.js +1 -1
  102. package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.js +1 -1
  103. package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially.js +1 -1
  104. package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.d.ts +2 -2
  105. package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +1 -1
  106. package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js +1 -1
  107. package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +1 -1
  108. package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +1 -1
  109. package/lib/chevre/service/order/onOrderUpdated.js +1 -2
  110. package/lib/chevre/service/order/payOrder.d.ts +2 -2
  111. package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts +2 -2
  112. package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js +2 -3
  113. package/lib/chevre/service/order/placeOrder.d.ts +2 -2
  114. package/lib/chevre/service/order/returnOrder.d.ts +2 -2
  115. package/lib/chevre/service/order/returnOrder.js +2 -2
  116. package/lib/chevre/service/order/sendOrder.d.ts +2 -2
  117. package/lib/chevre/service/order/sendOrder.js +1 -1
  118. package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts +3 -3
  119. package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts +3 -3
  120. package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js +1 -1
  121. package/lib/chevre/service/payment/any/fixOrderAsNeeded.d.ts +2 -2
  122. package/lib/chevre/service/payment/any/fixOrderAsNeeded.js +4 -8
  123. package/lib/chevre/service/payment/any/publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl.d.ts +2 -2
  124. package/lib/chevre/service/payment/any.d.ts +6 -6
  125. package/lib/chevre/service/payment/any.js +10 -11
  126. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js +1 -2
  127. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.d.ts +1 -1
  128. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.js +1 -2
  129. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3dsResult2recipe.d.ts +1 -1
  130. package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCardResult2recipe.d.ts +1 -1
  131. package/lib/chevre/service/payment/creditCard/factory.d.ts +1 -1
  132. package/lib/chevre/service/payment/movieTicket/authorize.js +1 -1
  133. package/lib/chevre/service/payment/movieTicket/processPurchaseNumberAuth.js +2 -4
  134. package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js +4 -6
  135. package/lib/chevre/service/payment/movieTicket/voidTransaction.js +1 -2
  136. package/lib/chevre/service/payment/paymentCard.js +2 -4
  137. package/lib/chevre/service/report/telemetry.d.ts +4 -0
  138. package/lib/chevre/service/report/telemetry.js +7 -12
  139. package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js +2 -6
  140. package/lib/chevre/service/task/acceptCOAOffer.js +6 -4
  141. package/lib/chevre/service/task/authorizePayment.js +4 -2
  142. package/lib/chevre/service/task/confirmPayTransaction.js +2 -2
  143. package/lib/chevre/service/task/confirmReserveTransaction.js +1 -2
  144. package/lib/chevre/service/task/deleteTransaction.js +5 -1
  145. package/lib/chevre/service/task/onAssetTransactionStatusChanged.js +4 -2
  146. package/lib/chevre/service/task/onOrderPaymentCompleted.js +2 -2
  147. package/lib/chevre/service/task/onResourceDeleted/deleteResourcesByProduct.js +3 -6
  148. package/lib/chevre/service/task/onResourceUpdated/onOfferCatalogUpdated.js +1 -1
  149. package/lib/chevre/service/task/onResourceUpdated/syncOfferCatalog.js +1 -1
  150. package/lib/chevre/service/task/pay.js +1 -2
  151. package/lib/chevre/service/task/placeOrder.js +6 -4
  152. package/lib/chevre/service/task/publishPaymentUrl.js +4 -2
  153. package/lib/chevre/service/task/returnOrder.js +4 -4
  154. package/lib/chevre/service/task/returnPayTransaction.js +4 -3
  155. package/lib/chevre/service/task/sendOrder.js +2 -2
  156. package/lib/chevre/service/task/voidMoneyTransferTransaction.js +6 -3
  157. package/lib/chevre/service/task/voidPayTransaction.js +4 -2
  158. package/lib/chevre/service/task/voidRegisterServiceTransaction.js +3 -3
  159. package/lib/chevre/service/task/voidReserveTransaction.js +5 -4
  160. package/lib/chevre/service/transaction/deleteTransaction.d.ts +4 -0
  161. package/lib/chevre/service/transaction/deleteTransaction.js +57 -15
  162. package/lib/chevre/service/transaction/moneyTransfer.js +15 -23
  163. package/lib/chevre/service/transaction/placeOrder/confirm/publishCode.js +1 -1
  164. package/lib/chevre/service/transaction/placeOrder/confirm.d.ts +2 -2
  165. package/lib/chevre/service/transaction/placeOrder/confirm.js +12 -13
  166. package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts +2 -2
  167. package/lib/chevre/service/transaction/placeOrder/exportTasksById.js +1 -1
  168. package/lib/chevre/service/transaction/placeOrder/{publishOrderNumberIfNotExist.d.ts → issueOrderNumberIfNotExist.d.ts} +4 -4
  169. package/lib/chevre/service/transaction/placeOrder/{publishOrderNumberIfNotExist.js → issueOrderNumberIfNotExist.js} +21 -13
  170. package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.d.ts +2 -2
  171. package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.js +3 -3
  172. package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js +1 -2
  173. package/lib/chevre/service/transaction/placeOrder/start.d.ts +3 -3
  174. package/lib/chevre/service/transaction/placeOrder/start.js +2 -2
  175. package/lib/chevre/service/transaction/placeOrder/updateAgent.d.ts +23 -0
  176. package/lib/chevre/service/transaction/placeOrder/updateAgent.js +126 -0
  177. package/lib/chevre/service/transaction/placeOrder.d.ts +2 -1
  178. package/lib/chevre/service/transaction/placeOrder.js +3 -1
  179. package/lib/chevre/service/transaction/returnOrder/potentialActions.js +1 -2
  180. package/lib/chevre/service/transaction/returnOrder/preStart/getReturnPolicyByProject.js +1 -1
  181. package/lib/chevre/service/transaction/returnOrder.js +4 -4
  182. package/lib/chevre/service/transaction.d.ts +5 -21
  183. package/lib/chevre/service/transaction.js +5 -111
  184. package/package.json +6 -18
@@ -40,19 +40,20 @@ const potentialActions_1 = require("./confirm/potentialActions");
40
40
  const publishCode_1 = require("./confirm/publishCode");
41
41
  const validation_1 = require("./confirm/validation");
42
42
  const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
43
- const publishOrderNumberIfNotExist_1 = require("./publishOrderNumberIfNotExist");
43
+ const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
44
44
  const debug = (0, debug_1.default)('chevre-domain:service:transaction');
45
+ /**
46
+ * 進行中でない取引を処理する
47
+ */
45
48
  function processTransactionNotInProgress(transaction) {
46
49
  return async (repos) => {
47
50
  if (transaction.status === factory.transactionStatusType.Confirmed) {
48
- // retrieve customer from orderInTransaction(2024-06-24~)
49
- // let resultCustomer: factory.order.ICustomer | undefined = createCustomer({ transaction });
50
51
  const resultCustomer = await repos.orderInTransaction.findCustomerByOrderNumber({
51
52
  orderNumber: { $eq: String(transaction.object.orderNumber) }
52
53
  });
53
- if (resultCustomer === undefined) {
54
- throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
55
- }
54
+ // if (resultCustomer === undefined) {
55
+ // throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
56
+ // }
56
57
  // すでに確定済の場合
57
58
  return {
58
59
  ...transaction.result,
@@ -80,7 +81,7 @@ function confirm(params, options) {
80
81
  status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
81
82
  object: { orderDate: params.result.order.orderDate }
82
83
  })(repos);
83
- const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
84
+ const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
84
85
  const confirmResult = await processTransactionNotInProgress(transaction)(repos);
85
86
  if (confirmResult !== undefined) {
86
87
  return confirmResult;
@@ -95,7 +96,7 @@ function confirm(params, options) {
95
96
  acceptPayActions = await searchAcceptPayActions(params)(repos);
96
97
  }
97
98
  // 注文番号を発行
98
- const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
99
+ const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
99
100
  project: { id: transaction.project.id },
100
101
  id: transaction.id,
101
102
  object: { orderDate: params.result.order.orderDate }
@@ -115,12 +116,11 @@ function confirm(params, options) {
115
116
  author: { id: transaction.agent.id, typeOf: transaction.agent.typeOf }
116
117
  })(repos);
117
118
  }
118
- let acceptedOffers;
119
119
  const {
120
120
  // acceptedOffersFromAuthorizeAction, // discontinue(2024-06-17~)
121
121
  authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
122
122
  // orderInTransactionから検索する(2024-03-04~)
123
- acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
123
+ const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
124
124
  .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
125
125
  // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
126
126
  let payTransactions = [];
@@ -180,7 +180,7 @@ function confirm(params, options) {
180
180
  })(repos);
181
181
  // ステータス変更
182
182
  try {
183
- await repos.transaction.confirm({
183
+ await repos.placeOrder.confirmPlaceOrder({
184
184
  typeOf: transaction.typeOf,
185
185
  id: transaction.id,
186
186
  result: result,
@@ -446,7 +446,6 @@ function searchAuthorizeActions(params) {
446
446
  function createConfirmationNumber(params) {
447
447
  const confirmationNumber = params.transaction.object.confirmationNumber;
448
448
  let url = '';
449
- let identifier = [];
450
449
  // 取引に確認番号が保管されていなければ、確認番号を発行
451
450
  if (typeof confirmationNumber !== 'string') {
452
451
  // 事前に発行済なはずなので、ありえないフロー
@@ -462,7 +461,7 @@ function createConfirmationNumber(params) {
462
461
  url = params.result.order.url(params.order);
463
462
  }
464
463
  // 識別子の指定があれば上書き
465
- identifier = [
464
+ const identifier = [
466
465
  ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
467
466
  // 取引に指定があれば追加
468
467
  ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
@@ -1,10 +1,10 @@
1
1
  import type { SettingRepo } from '../../../repo/setting';
2
2
  import type { TaskRepo } from '../../../repo/task';
3
- import type { TransactionRepo } from '../../../repo/transaction';
3
+ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
4
4
  type ITaskAndTransactionOperation<T> = (repos: {
5
5
  setting: SettingRepo;
6
6
  task: TaskRepo;
7
- transaction: TransactionRepo;
7
+ placeOrder: PlaceOrderRepo;
8
8
  }) => Promise<T>;
9
9
  /**
10
10
  * 取引のタスクを出力します
@@ -38,7 +38,7 @@ function exportTasksById(params) {
38
38
  return async (repos
39
39
  // settings: Settings
40
40
  ) => {
41
- const transaction = await repos.transaction.projectFieldsById({
41
+ const transaction = await repos.placeOrder.findPlaceOrderById({
42
42
  typeOf: factory.transactionType.PlaceOrder,
43
43
  id: params.id
44
44
  }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);
@@ -1,10 +1,10 @@
1
1
  import type { OrderNumberRepo } from '../../../repo/orderNumber';
2
2
  import type { ProjectRepo } from '../../../repo/project';
3
- import type { TransactionRepo } from '../../../repo/transaction';
3
+ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
4
4
  /**
5
5
  * 未発行であれば、注文番号を発行して取引に保管する
6
6
  */
7
- declare function publishOrderNumberIfNotExist(params: {
7
+ declare function issueOrderNumberIfNotExist(params: {
8
8
  project: {
9
9
  id: string;
10
10
  };
@@ -17,7 +17,7 @@ declare function publishOrderNumberIfNotExist(params: {
17
17
  };
18
18
  }): (repos: {
19
19
  project: ProjectRepo;
20
- transaction: TransactionRepo;
20
+ placeOrder: PlaceOrderRepo;
21
21
  orderNumber: OrderNumberRepo;
22
22
  }) => Promise<string>;
23
- export { publishOrderNumberIfNotExist };
23
+ export { issueOrderNumberIfNotExist };
@@ -23,36 +23,44 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;
26
+ exports.issueOrderNumberIfNotExist = issueOrderNumberIfNotExist;
27
27
  const factory = __importStar(require("../../../factory"));
28
28
  /**
29
29
  * 未発行であれば、注文番号を発行して取引に保管する
30
30
  */
31
- function publishOrderNumberIfNotExist(params) {
31
+ function issueOrderNumberIfNotExist(params) {
32
32
  return async (repos) => {
33
- // 最適化(2023-02-03~)
34
- let orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.id });
33
+ // 1. 最初のチェック
34
+ let orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
35
35
  // すでに発行済であれば何もしない
36
36
  if (typeof orderNumber === 'string') {
37
37
  return orderNumber;
38
38
  }
39
- // 注文番号を発行
39
+ // 2. 発行準備
40
40
  const { alternateName } = await repos.project.findAlternateNameById({ id: params.project.id });
41
41
  if (typeof alternateName !== 'string') {
42
42
  throw new factory.errors.NotFound('project.alternateName');
43
43
  }
44
- orderNumber = await repos.orderNumber.publishByTimestamp({
44
+ // 3. 番号発行
45
+ const issuedOrderNumber = await repos.orderNumber.issueOrderNumber({
45
46
  project: { alternateName },
46
47
  orderDate: params.object.orderDate
47
48
  });
48
- // 取引に存在しなければ保管
49
- await repos.transaction.saveOrderNumberIfNotExist({ id: params.id, orderNumber });
50
- // 注文番号を取引から再取得
51
- // 最適化(2023-02-03~)
52
- orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.id });
53
- // 万が一処理が想定通りでない場合orderNumberが存在しない
49
+ // 4. 保管を試みる
50
+ const { modifiedCount } = await repos.placeOrder.saveOrderNumberIfNotExist({
51
+ id: params.id,
52
+ orderNumber: issuedOrderNumber
53
+ });
54
+ // 5. 書き込めたなら、自分が発行した番号が「真実」
55
+ if (modifiedCount === 1) {
56
+ return issuedOrderNumber;
57
+ }
58
+ // 6. 競合が発生した場合(他者が先に書き込んだ場合)
59
+ // DBにある「正解」を再取得して返す
60
+ orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
54
61
  if (typeof orderNumber !== 'string') {
55
- throw new factory.errors.Internal('transaction.object.orderNumber not found');
62
+ // ここを通るのは、他者が保存した直後に取引がキャンセル/削除された等の極めて稀なケース
63
+ throw new factory.errors.Internal('OrderNumber conflict: failed to retrieve existing number');
56
64
  }
57
65
  return orderNumber;
58
66
  };
@@ -1,5 +1,5 @@
1
1
  import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
2
- import type { TransactionRepo } from '../../../repo/transaction';
2
+ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
3
3
  import * as factory from '../../../factory';
4
4
  /**
5
5
  * 未発行であれば、注文の確認番号を発行して取引に保管する
@@ -16,7 +16,7 @@ declare function publishConfirmationNumberIfNotExist(params: {
16
16
  orderDate: Date;
17
17
  };
18
18
  }): (repos: {
19
- transaction: TransactionRepo;
19
+ placeOrder: PlaceOrderRepo;
20
20
  confirmationNumber: ConfirmationNumberRepo;
21
21
  }) => Promise<string>;
22
22
  export { publishConfirmationNumberIfNotExist };
@@ -30,7 +30,7 @@ const factory = __importStar(require("../../../factory"));
30
30
  */
31
31
  function publishConfirmationNumberIfNotExist(params) {
32
32
  return async (repos) => {
33
- let confirmationNumber = await repos.transaction.findInProgressConfirmationNumberById({
33
+ let confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
34
34
  id: params.id,
35
35
  status: { $in: params.status.$in }
36
36
  });
@@ -41,13 +41,13 @@ function publishConfirmationNumberIfNotExist(params) {
41
41
  // 確認番号を発行
42
42
  confirmationNumber = await repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
43
43
  // 取引に存在しなければ保管
44
- await repos.transaction.saveConfirmationNumberIfNotExist({
44
+ await repos.placeOrder.saveConfirmationNumberIfNotExist({
45
45
  id: params.id,
46
46
  status: { $in: params.status.$in },
47
47
  confirmationNumber
48
48
  });
49
49
  // 確認番号を取引から再取得
50
- confirmationNumber = await repos.transaction.findInProgressConfirmationNumberById({
50
+ confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
51
51
  id: params.id,
52
52
  status: { $in: params.status.$in }
53
53
  });
@@ -67,8 +67,7 @@ function validateStartRequest(params) {
67
67
  if (typeof clientId !== 'string' || clientId.length === 0) {
68
68
  throw new factory.errors.ArgumentNull('client_id');
69
69
  }
70
- let projectMakesOffer;
71
- projectMakesOffer = (await repos.projectMakesOffer.search({
70
+ const projectMakesOffer = (await repos.projectMakesOffer.search({
72
71
  limit: 1,
73
72
  page: 1,
74
73
  offeredBy: { id: { $eq: params.project.id } },
@@ -4,7 +4,7 @@ import type { MemberProgramRepo } from '../../../repo/memberProgram';
4
4
  import type { PassportRepo } from '../../../repo/passport';
5
5
  import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
6
6
  import type { SellerRepo } from '../../../repo/seller';
7
- import type { IStartedTransaction, TransactionRepo } from '../../../repo/transaction';
7
+ import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
8
8
  import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
9
9
  interface IStartOperationRepos {
10
10
  issuer: IssuerRepo;
@@ -13,7 +13,7 @@ interface IStartOperationRepos {
13
13
  passport: PassportRepo;
14
14
  projectMakesOffer: ProjectMakesOfferRepo;
15
15
  seller: SellerRepo;
16
- transaction: TransactionRepo;
16
+ placeOrder: PlaceOrderRepo;
17
17
  }
18
18
  type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
19
19
  type IStartParams = PlaceOrderFactory.IStartParams;
@@ -23,5 +23,5 @@ interface IStartOptions {
23
23
  /**
24
24
  * 取引開始
25
25
  */
26
- declare function start(params: IStartParams, options: IStartOptions): IStartOperation<IStartedTransaction>;
26
+ declare function start(params: IStartParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
27
27
  export { start };
@@ -54,7 +54,7 @@ function start(params, options) {
54
54
  }
55
55
  catch (error) {
56
56
  // in case already locked
57
- const alreadyStartedTransaction = (await repos.transaction.projectFields({
57
+ const alreadyStartedTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
58
58
  limit: 1, page: 1,
59
59
  typeOf: factory.transactionType.PlaceOrder,
60
60
  project: { id: { $eq: startParams.project.id } },
@@ -72,7 +72,7 @@ function start(params, options) {
72
72
  }
73
73
  }
74
74
  if (transaction === undefined) {
75
- transaction = await repos.transaction.start(startParams);
75
+ transaction = await repos.placeOrder.startPlaceOrder(startParams);
76
76
  }
77
77
  return transaction;
78
78
  };
@@ -0,0 +1,23 @@
1
+ import * as factory from '../../../factory';
2
+ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
3
+ import type { OrderNumberRepo } from '../../../repo/orderNumber';
4
+ import type { ProjectRepo } from '../../../repo/project';
5
+ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
6
+ /**
7
+ * 取引人プロフィール更新
8
+ */
9
+ export declare function updateAgent(params: {
10
+ typeOf: factory.transactionType.PlaceOrder;
11
+ /**
12
+ * 取引ID
13
+ */
14
+ id: string;
15
+ agent: factory.order.ICustomer & {
16
+ telephoneRegion?: string;
17
+ };
18
+ }): (repos: {
19
+ orderInTransaction: OrderInTransactionRepo;
20
+ orderNumber: OrderNumberRepo;
21
+ project: ProjectRepo;
22
+ placeOrder: PlaceOrderRepo;
23
+ }) => Promise<void>;
@@ -0,0 +1,126 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.updateAgent = updateAgent;
27
+ const google_libphonenumber_1 = require("google-libphonenumber");
28
+ const factory = __importStar(require("../../../factory"));
29
+ const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
30
+ // import { Settings } from '../settings';
31
+ // export type ITransactionOperation<T> = (repos: { transaction: TransactionRepo }) => Promise<T>;
32
+ function fixCustomer(params) {
33
+ return async (repos) => {
34
+ let formattedTelephone;
35
+ try {
36
+ const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
37
+ const phoneNumber = phoneUtil.parse(params.agent.telephone, params.agent.telephoneRegion);
38
+ if (!phoneUtil.isValidNumber(phoneNumber)) {
39
+ throw new factory.errors.Argument('telephone', 'Invalid phone number');
40
+ }
41
+ formattedTelephone = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
42
+ }
43
+ catch (error) {
44
+ throw new factory.errors.Argument('telephone', error.message);
45
+ }
46
+ const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
47
+ typeOf: params.typeOf,
48
+ id: params.id
49
+ }, ['agent', 'object', 'typeOf', 'project']);
50
+ if (transaction.agent.id !== params.agent.id) {
51
+ throw new factory.errors.Forbidden('Transaction not yours');
52
+ }
53
+ // 注文取引の場合、object.customerにも適用
54
+ let customer;
55
+ if (transaction.typeOf === factory.transactionType.PlaceOrder) {
56
+ // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
57
+ const trasactionObject = transaction.object;
58
+ if (typeof trasactionObject.customer?.typeOf === 'string') {
59
+ customer = {
60
+ typeOf: trasactionObject.customer.typeOf,
61
+ id: trasactionObject.customer.id,
62
+ ...(Array.isArray(trasactionObject.customer.identifier))
63
+ ? { identifier: trasactionObject.customer.identifier }
64
+ : /* istanbul ignore next */ undefined,
65
+ // discontinue(2024-05-16~)
66
+ // ...(transaction.object.customer.typeOf === factory.personType.Person
67
+ // && typeof transaction.object.customer.memberOf?.typeOf === 'string')
68
+ // ? { memberOf: transaction.object.customer.memberOf }
69
+ // : undefined,
70
+ ...(Array.isArray(params.agent.additionalProperty))
71
+ ? { additionalProperty: params.agent.additionalProperty }
72
+ : /* istanbul ignore next */ undefined,
73
+ ...(typeof params.agent.age === 'string') ? { age: params.agent.age }
74
+ : /* istanbul ignore next */ undefined,
75
+ ...(typeof params.agent.address === 'string') ? { address: params.agent.address }
76
+ : /* istanbul ignore next */ undefined,
77
+ ...(typeof params.agent.email === 'string') ? { email: params.agent.email }
78
+ : /* istanbul ignore next */ undefined,
79
+ ...(typeof params.agent.familyName === 'string') ? { familyName: params.agent.familyName }
80
+ : /* istanbul ignore next */ undefined,
81
+ ...(typeof params.agent.gender === 'string') ? { gender: params.agent.gender }
82
+ : /* istanbul ignore next */ undefined,
83
+ ...(typeof params.agent.givenName === 'string') ? { givenName: params.agent.givenName }
84
+ : /* istanbul ignore next */ undefined,
85
+ ...(typeof params.agent.name === 'string') ? { name: params.agent.name } : /* istanbul ignore next */ undefined,
86
+ ...(typeof formattedTelephone === 'string') ? { telephone: formattedTelephone } : /* istanbul ignore next */ undefined,
87
+ ...(typeof params.agent.url === 'string') ? { url: params.agent.url } : /* istanbul ignore next */ undefined
88
+ };
89
+ }
90
+ }
91
+ return { customer, transaction };
92
+ };
93
+ }
94
+ /**
95
+ * 取引人プロフィール更新
96
+ */
97
+ function updateAgent(params) {
98
+ return async (repos) => {
99
+ const { customer, transaction } = await fixCustomer(params)(repos);
100
+ // also save in orderInTransaction(2024-06-20~)
101
+ if (customer !== undefined) {
102
+ const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
103
+ project: { id: transaction.project.id },
104
+ id: params.id,
105
+ object: { orderDate: new Date() }
106
+ })(repos);
107
+ const customerName = (typeof customer.name === 'string' && customer.name !== '')
108
+ ? customer.name
109
+ : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'
110
+ && customer.givenName !== '' && customer.familyName !== '')
111
+ ? `${customer.givenName} ${customer.familyName}`
112
+ : undefined;
113
+ const customerInOrder = {
114
+ ...customer,
115
+ identifier: (Array.isArray(customer.identifier)) ? customer.identifier : [],
116
+ ...(typeof customerName === 'string') ? { name: customerName } : undefined
117
+ };
118
+ await repos.orderInTransaction.setCustomer({
119
+ orderNumber,
120
+ project: transaction.project,
121
+ customer: customerInOrder
122
+ });
123
+ }
124
+ // return newAgent;
125
+ };
126
+ }
@@ -5,4 +5,5 @@ import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
5
5
  import { confirm } from './placeOrder/confirm';
6
6
  import { exportTasksById } from './placeOrder/exportTasksById';
7
7
  import { start } from './placeOrder/start';
8
- export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, exportTasksById };
8
+ import { updateAgent } from './placeOrder/updateAgent';
9
+ export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, exportTasksById, updateAgent };
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.exportTasksById = exports.start = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = void 0;
3
+ exports.updateAgent = exports.exportTasksById = exports.start = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = void 0;
4
4
  /**
5
5
  * 注文取引サービス
6
6
  */
@@ -12,3 +12,5 @@ const exportTasksById_1 = require("./placeOrder/exportTasksById");
12
12
  Object.defineProperty(exports, "exportTasksById", { enumerable: true, get: function () { return exportTasksById_1.exportTasksById; } });
13
13
  const start_1 = require("./placeOrder/start");
14
14
  Object.defineProperty(exports, "start", { enumerable: true, get: function () { return start_1.start; } });
15
+ const updateAgent_1 = require("./placeOrder/updateAgent");
16
+ Object.defineProperty(exports, "updateAgent", { enumerable: true, get: function () { return updateAgent_1.updateAgent; } });
@@ -32,9 +32,8 @@ const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
32
32
  async function createPotentialActions(params,
33
33
  // settings: Settings
34
34
  setting) {
35
- let returnOrderActions = [];
36
35
  const emailMessages = [];
37
- returnOrderActions = await Promise.all(params.orders.map(async (order) => {
36
+ const returnOrderActions = await Promise.all(params.orders.map(async (order) => {
38
37
  let returnOrderParams = params.potentialActions?.returnOrder;
39
38
  // 互換性維持対応
40
39
  if (!Array.isArray(returnOrderParams)) {
@@ -72,7 +72,7 @@ const TIMEOUT = 5000;
72
72
  */
73
73
  async function getReturnPolicyByProject(params) {
74
74
  // implement with fetch(2024-01-20~)
75
- try {
75
+ try { // eslint-disable-line no-useless-catch
76
76
  const { identifier, sameAs } = params;
77
77
  const res = await fetch(sameAs, {
78
78
  method: 'POST',
@@ -60,7 +60,7 @@ function start(params) {
60
60
  };
61
61
  let returnOrderTransaction;
62
62
  try {
63
- returnOrderTransaction = await repos.transaction.start(returnOrderAttributes);
63
+ returnOrderTransaction = await repos.transaction.startNoPlaceOrder(returnOrderAttributes);
64
64
  }
65
65
  catch (error) {
66
66
  if (await (0, errorHandler_1.isMongoError)(error)) {
@@ -108,7 +108,7 @@ function confirm(params) {
108
108
  return async (repos
109
109
  // settings: Settings
110
110
  ) => {
111
- const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
111
+ const transaction = await repos.transaction.projectFieldsByIdNoPlaceOrder({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
112
112
  if (transaction.status === factory.transactionStatusType.Confirmed) {
113
113
  // すでに確定済の場合
114
114
  return transaction.result;
@@ -169,7 +169,7 @@ function confirm(params) {
169
169
  order: { orderNumber: returningOrders[0].orderNumber }, seller: { id: returningOrders[0].seller.id }, emailMessages
170
170
  })(repos);
171
171
  // ステータス変更
172
- await repos.transaction.confirm({
172
+ await repos.transaction.confirmNoPlaceOrder({
173
173
  typeOf: transaction.typeOf,
174
174
  id: transaction.id,
175
175
  result, potentialActions
@@ -186,7 +186,7 @@ function exportTasksById(params) {
186
186
  return async (repos
187
187
  // settings: Settings
188
188
  ) => {
189
- const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
189
+ const transaction = await repos.transaction.projectFieldsByIdNoPlaceOrder({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
190
190
  // タスク実行日時バッファの指定があれば調整
191
191
  let taskRunsAt = new Date();
192
192
  if (typeof params.runsTasksAfterInSeconds === 'number') {
@@ -1,10 +1,11 @@
1
+ /**
2
+ * 取引サービス
3
+ */
1
4
  import * as factory from '../factory';
2
- import type { OrderInTransactionRepo } from '../repo/orderInTransaction';
3
- import type { OrderNumberRepo } from '../repo/orderNumber';
4
- import type { ProjectRepo } from '../repo/project';
5
5
  import type { SettingRepo } from '../repo/setting';
6
6
  import type { TaskRepo } from '../repo/task';
7
7
  import type { TransactionRepo } from '../repo/transaction';
8
+ import type { PlaceOrderRepo } from '../repo/transaction/placeOrder';
8
9
  import { deleteTransaction } from './transaction/deleteTransaction';
9
10
  import * as MoneyTransferTransactionService from './transaction/moneyTransfer';
10
11
  import * as PlaceOrderTransactionService from './transaction/placeOrder';
@@ -16,27 +17,10 @@ export import moneyTransfer = MoneyTransferTransactionService;
16
17
  export import placeOrder = PlaceOrderTransactionService;
17
18
  export import returnOrder = ReturnOrderTransactionService;
18
19
  export { deleteTransaction };
19
- /**
20
- * 取引人プロフィール更新
21
- */
22
- export declare function updateAgent(params: {
23
- typeOf: factory.transactionType;
24
- /**
25
- * 取引ID
26
- */
27
- id: string;
28
- agent: factory.order.ICustomer & {
29
- telephoneRegion?: string;
30
- };
31
- }): (repos: {
32
- orderInTransaction: OrderInTransactionRepo;
33
- orderNumber: OrderNumberRepo;
34
- project: ProjectRepo;
35
- transaction: TransactionRepo;
36
- }) => Promise<void>;
37
20
  export type IExportTasksOperation<T> = (repos: {
38
21
  setting: SettingRepo;
39
22
  task: TaskRepo;
23
+ placeOrder: PlaceOrderRepo;
40
24
  transaction: TransactionRepo;
41
25
  }) => Promise<T>;
42
26
  export declare function exportOneTransactionTasksIfExists(params: {