@chevre/domain 21.35.0-alpha.18 → 21.35.0-alpha.19

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.d.ts

@@ -1,4 +1,5 @@
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
+import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/code';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as EmailMessageRepo } from '../../../repo/emailMessage';
@@ -11,6 +12,7 @@ import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
     action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     emailMessage?: EmailMessageRepo;
     message: MessageRepo;

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js

@@ -83,11 +83,22 @@ function confirm(params) {
         // orderInTransactionから検索する(2024-03-04~)
         acceptedOffers = (yield repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
+        // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
+        let payTransactions = [];
+        const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
+        if (payTransactionNumbers.length > 0) {
+            payTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Pay,
+                transactionNumber: { $in: payTransactionNumbers }
+            }, ['object']);
+            debug('confirming placeOrder...', transaction.id, 'payTransactions found.', JSON.stringify(payTransactions));
+        }
         const { paymentMethods, result, eventId, reservationIds } = createResult(Object.assign(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizePaymentActions,
             authorizeEventServiceOfferActions,
             authorizeMoneyTansferActions,
             authorizeProductOfferActions,
-            acceptedOffers }), (typeof code === 'string') ? { code } : undefined));
+            acceptedOffers,
+            payTransactions }), (typeof code === 'string') ? { code } : undefined));
         const customer = (0, result_1.createCustomer)({ transaction });
         const seller = (0, result_1.createSeller)({ transaction });
         // デフォルトEメールメッセージを検索
@@ -278,7 +289,7 @@ function createResult(params) {
         }
     });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers);
+    (0, validation_1.validateTransaction)(transaction, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers, params.payTransactions);
     const { paymentMethods, price } = (0, result_1.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -3,11 +3,12 @@ import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
 export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
-export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'object' | 'result' | 'endDate'>;
+export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'object' | 'result' | 'endDate' | 'instrument'>;
+export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[], payTransactions: IPayTransaction[]): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -13,7 +13,7 @@ const debug = createDebug('chevre-domain:service:transaction');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers) {
+function validateTransaction(transaction, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions) {
     validateProfile(transaction);
     validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
     // 利用可能な通貨単位に対して取引検証
@@ -33,10 +33,22 @@ function validateTransaction(transaction, authorizePaymentActions, authorizeEven
                         // 決済方法区分は必ず存在するはず(2023-08-15~)
                         && ((_a = resultAsInvoice.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.typeOf) === paymentMethodType;
                 });
+                // 決済承認アクションobject.movieTicketsではなく、payTransaction.object参照で再実装(2024-06-20~)
                 const authorizedMovieTickets = [];
-                authorizeMovieTicketActions.forEach((a) => {
-                    authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
-                });
+                if (settings_1.USE_EXPERIMENTAL_FEATURE) {
+                    const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
+                    payTransactions.filter(({ object }) => payTransactionNumbers.includes(object.paymentMethodId))
+                        .forEach(({ object }) => {
+                        if (Array.isArray(object.paymentMethod.movieTickets)) {
+                            authorizedMovieTickets.push(...object.paymentMethod.movieTickets);
+                        }
+                    });
+                }
+                else {
+                    authorizeMovieTicketActions.forEach((a) => {
+                        authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
+                    });
+                }
                 debug(authorizedMovieTickets.length, 'movie tickets authorized', 'transaction:', transaction.id);
                 // validateMovieTicket(paymentMethodType, { id: transaction.id }, authorizePaymentActions, eventReservationAcceptedOffers);
                 (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, { id: transaction.id }, authorizedMovieTickets, eventReservationAcceptedOffers);

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.35.0-alpha.18"
+  "version": "21.35.0-alpha.19"
 }