@chevre/domain 21.2.0-alpha.47 → 21.2.0-alpha.49

package/lib/chevre/service/assetTransaction/pay.js

@@ -272,10 +272,16 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
 }
 function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { accountId, checkResult, payAction } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
-            update: Object.assign({ 'object.accountId': accountId, 'object.paymentMethod.accountId': accountId, 'object.payAction': payAction }, (checkResult !== undefined) ? { 'object.checkResult': checkResult } : undefined)
+            update: {
+                'object.accountId': accountId,
+                'object.paymentMethod.accountId': accountId,
+                'object.payAction': payAction,
+                // 認証レスポンスより計上金額を保管(2023-05-15~)
+                'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType
+            }
         })(repos);
     });
 }

package/lib/chevre/service/notification/factory.js

@@ -12,7 +12,7 @@ function task2lineNotify(params) {
     const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
     let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
     if (typeof lastError === 'string') {
-        lastError = { message: lastError };
+        lastError = { message: lastError, name: 'Error' };
     }
     const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
     const content = `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}
@@ -38,7 +38,7 @@ function tasks2lineNotify(params) {
         const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
         let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
         if (typeof lastError === 'string') {
-            lastError = { message: lastError };
+            lastError = { message: lastError, name: 'Error' };
         }
         const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
         return `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -6,10 +6,14 @@ import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
 import { MongoRepository as SellerRepo } from '../../../repo/seller';
-import { ICheckResult } from './checkByIdentifier';
 export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean): (repos: {
     event: EventRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
-}) => Promise<ICheckResult | undefined>;
+}) => Promise<{
+    accountsReceivablesByServiceType: {
+        serviceType: string;
+        accountsReceivable?: number;
+    }[];
+}>;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -15,8 +15,8 @@ exports.validateMovieTicket = void 0;
  */
 const factory = require("../../../factory");
 const checkByIdentifier_1 = require("./checkByIdentifier");
-// tslint:disable-next-line:max-func-body-length
 function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const movieTickets = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.movieTickets;
@@ -54,7 +54,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         }
         // オプション追加(2023-03-06~)
         if (!useCheckMovieTicketBeforePay) {
-            return;
+            return { accountsReceivablesByServiceType: [] };
         }
         const checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({
             movieTickets: movieTickets,
@@ -62,24 +62,16 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
             screeningEvent: screeningEvent,
             paymentServiceId
         })(repos);
-        // checkResult.movieTicketsへの依存排除(2023-03-24~)
-        // 要求に対して十分かどうか検証する
-        // const availableMovieTickets = checkResult.movieTickets.filter((t) => t.amount?.validThrough === undefined);
-        // 総数が足りているか(券種ごとに枚数検証を実行するので不要)
-        // if (availableMovieTickets.length < movieTickets.length) {
-        //     throw new factory.errors.Argument(
-        //         'movieTickets',
-        //         `${movieTickets.length - availableMovieTickets.length} movie tickets short`
-        //     );
-        // }
+        const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
         const serviceTypes = [...new Set(movieTickets.map((t) => t.serviceType))];
         serviceTypes.forEach((serviceType) => {
-            var _a, _b, _c;
+            var _a, _b;
             const requiredMovieTicketsCountByServiceType = movieTickets.filter((t) => t.serviceType === serviceType).length;
             let availableMovieTicketsCountByServiceType = 0;
             const ykknInfos = (_b = (_a = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifiers[0])) === null || _b === void 0 ? void 0 : _b.ykknInfo;
-            const ykknKnshbtsmiNum = (_c = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType)) === null || _c === void 0 ? void 0 : _c.ykknKnshbtsmiNum;
+            const ykknInfoOfServiceType = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType);
+            const ykknKnshbtsmiNum = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.ykknKnshbtsmiNum;
             if (typeof ykknKnshbtsmiNum === 'string') {
                 availableMovieTicketsCountByServiceType = Number(ykknKnshbtsmiNum);
             }
@@ -87,18 +79,13 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
                 const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsCountByServiceType;
                 throw new factory.errors.Argument('movieTickets', `${shortNumber} movie tickets by service type ${serviceType} short`);
             }
-            // const availableMovieTicketsByServiceType = availableMovieTickets.filter((t) => t.serviceType === serviceType);
-            // if (availableMovieTicketsByServiceType.length < requiredMovieTicketsCountByServiceType) {
-            //     const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsByServiceType.length;
-            //     throw new factory.errors.Argument(
-            //         'movieTickets',
-            //         `${shortNumber} movie tickets by service type ${serviceType} short`
-            //     );
-            // }
+            // checkResultから計上金額を取得
+            const accountsReceivableByResponse = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
+            accountsReceivablesByServiceType.push(Object.assign({ serviceType }, (typeof accountsReceivableByResponse === 'string')
+                ? { accountsReceivable: Number(accountsReceivableByResponse) }
+                : undefined));
         });
-        // checkはするが保管は保留(2023-03-09~)
-        return;
-        // return checkResult;
+        return { accountsReceivablesByServiceType };
     });
 }
 exports.validateMovieTicket = validateMovieTicket;

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -42,7 +42,10 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
 }>;
 interface IAuthorizeResult {
     accountId: string;
-    checkResult?: ICheckResult;
+    accountsReceivablesByServiceType: {
+        serviceType: string;
+        accountsReceivable?: number;
+    }[];
     payAction: factory.action.trade.pay.IAction;
 }
 /**

package/lib/chevre/service/payment/movieTicket.js

@@ -106,11 +106,12 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
-        let checkResult;
         let payAction;
+        let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+            accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
             const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
@@ -141,7 +142,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
         catch (error) {
             throw (0, errorHandler_1.handleMvtkReserveError)(error);
         }
-        return { accountId, checkResult, payAction };
+        return { accountId, payAction, accountsReceivablesByServiceType };
     });
 }
 exports.authorize = authorize;

package/lib/chevre/service/report/telemetry.d.ts

@@ -148,19 +148,15 @@ export interface ISellerFlowTransactionResult {
     /**
      * イベントまでの合計残り時間(ミリ秒)
      */
-    totalTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの最大残り時間(ミリ秒)
      */
-    maxTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの最小残り時間(ミリ秒)
      */
-    minTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの平均残り時間(ミリ秒)
      */
-    averageTimeLeftUntilEventInMilliseconds: number;
     /**
      * 取引の合計金額(yen)
      */
@@ -180,15 +176,12 @@ export interface ISellerFlowTransactionResult {
     /**
      * アクション数合計値(成立取引)
      */
-    totalNumberOfActionsOnConfirmed: number;
     /**
      * 最大アクション数(成立取引)
      */
-    maxNumberOfActionsOnConfirmed: number;
     /**
      * 最小アクション数(成立取引)
      */
-    minNumberOfActionsOnConfirmed: number;
     /**
      * 注文アイテム数合計値
      */
@@ -205,10 +198,6 @@ export interface ISellerFlowTransactionResult {
      * 平均注文アイテム数
      */
     averageNumberOfOrderItems: number;
-    /**
-     * 平均アクション数(成立取引)
-     */
-    averageNumberOfActionsOnConfirmed: number;
 }
 /**
  * 販売者が対象のフローデータ

package/lib/chevre/service/report/telemetry.js

@@ -247,17 +247,12 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         const maxRequiredTimeInMilliseconds = requiredTimesConfirmed.reduce((a, b) => Math.max(a, b), 0);
         const minRequiredTimeInMilliseconds = requiredTimesConfirmed.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? requiredTimesConfirmed[0] : 0);
         const averageRequiredTimeInMilliseconds = (numberOfTransactionsConfirmed > 0) ? totalRequiredTimeInMilliseconds / numberOfTransactionsConfirmed : 0;
-        // イベントまでの残り時間算出(イベント開始日時と成立日時の差)
-        const timesLeftUntilEvent = confirmedTransactions.map((transaction) => {
-            // 座席予約は必ず存在する
-            const seatReservation = transaction.object.authorizeActions.find((action) => action.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
-            return moment(seatReservation.object.event.startDate)
-                .diff(moment(transaction.endDate), 'milliseconds');
-        });
-        const totalTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => a + b, 0);
-        const maxTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.max(a, b), 0);
-        const minTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? timesLeftUntilEvent[0] : 0);
-        const averageTimeLeftUntilEventInMilliseconds = (numberOfTransactionsConfirmed > 0) ? totalTimeLeftUntilEventInMilliseconds / numberOfTransactionsConfirmed : 0;
+        // const totalTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => a + b, 0);
+        // const maxTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.max(a, b), 0);
+        // const minTimeLeftUntilEventInMilliseconds =
+        //     timesLeftUntilEvent.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? timesLeftUntilEvent[0] : 0);
+        // const averageTimeLeftUntilEventInMilliseconds =
+        //     (numberOfTransactionsConfirmed > 0) ? totalTimeLeftUntilEventInMilliseconds / numberOfTransactionsConfirmed : 0;
         // 金額算出
         const amounts = confirmedTransactions.map((transaction) => transaction.result.order.price);
         const totalAmount = amounts.reduce((a, b) => a + b, 0);
@@ -265,11 +260,13 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         const minAmount = amounts.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? amounts[0] : 0);
         const averageAmount = (numberOfTransactionsConfirmed > 0) ? totalAmount / numberOfTransactionsConfirmed : 0;
         // アクション数集計
-        const numbersOfActions = confirmedTransactions.map((t) => t.object.authorizeActions.length);
-        const totalNumberOfActions = numbersOfActions.reduce((a, b) => a + b, 0);
-        const maxNumberOfActions = numbersOfActions.reduce((a, b) => Math.max(a, b), 0);
-        const minNumberOfActions = numbersOfActions.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? numbersOfActions[0] : 0);
-        const averageNumberOfActions = (numberOfTransactionsConfirmed > 0) ? totalNumberOfActions / numberOfTransactionsConfirmed : 0;
+        // const numbersOfActions = confirmedTransactions.map((t) => t.object.authorizeActions.length);
+        // const totalNumberOfActions = numbersOfActions.reduce((a, b) => a + b, 0);
+        // const maxNumberOfActions = numbersOfActions.reduce((a, b) => Math.max(a, b), 0);
+        // const minNumberOfActions = numbersOfActions.reduce(
+        //     (a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? numbersOfActions[0] : 0
+        // );
+        // const averageNumberOfActions = (numberOfTransactionsConfirmed > 0) ? totalNumberOfActions / numberOfTransactionsConfirmed : 0;
         // 期限切れ取引数
         const numberOfTransactionsExpired = expiredTransactions.length;
         const expiredTransactionIds = expiredTransactions.map((transaction) => transaction.id);
@@ -284,18 +281,18 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
                 maxRequiredTimeInMilliseconds: maxRequiredTimeInMilliseconds,
                 minRequiredTimeInMilliseconds: minRequiredTimeInMilliseconds,
                 averageRequiredTimeInMilliseconds: parseFloat(averageRequiredTimeInMilliseconds.toFixed(1)),
-                totalTimeLeftUntilEventInMilliseconds: totalTimeLeftUntilEventInMilliseconds,
-                maxTimeLeftUntilEventInMilliseconds: maxTimeLeftUntilEventInMilliseconds,
-                minTimeLeftUntilEventInMilliseconds: minTimeLeftUntilEventInMilliseconds,
-                averageTimeLeftUntilEventInMilliseconds: averageTimeLeftUntilEventInMilliseconds,
+                // totalTimeLeftUntilEventInMilliseconds: totalTimeLeftUntilEventInMilliseconds,
+                // maxTimeLeftUntilEventInMilliseconds: maxTimeLeftUntilEventInMilliseconds,
+                // minTimeLeftUntilEventInMilliseconds: minTimeLeftUntilEventInMilliseconds,
+                // averageTimeLeftUntilEventInMilliseconds: averageTimeLeftUntilEventInMilliseconds,
                 totalAmount: totalAmount,
                 maxAmount: maxAmount,
                 minAmount: minAmount,
                 averageAmount: parseFloat(averageAmount.toFixed(1)),
-                totalNumberOfActionsOnConfirmed: totalNumberOfActions,
-                maxNumberOfActionsOnConfirmed: maxNumberOfActions,
-                minNumberOfActionsOnConfirmed: minNumberOfActions,
-                averageNumberOfActionsOnConfirmed: parseFloat(averageNumberOfActions.toFixed(1)),
+                // totalNumberOfActionsOnConfirmed: totalNumberOfActions,
+                // maxNumberOfActionsOnConfirmed: maxNumberOfActions,
+                // minNumberOfActionsOnConfirmed: minNumberOfActions,
+                // averageNumberOfActionsOnConfirmed: parseFloat(averageNumberOfActions.toFixed(1)),
                 // tslint:disable-next-line:no-suspicious-comment
                 totalNumberOfOrderItems: 0,
                 // tslint:disable-next-line:no-suspicious-comment

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -545,7 +545,9 @@ function searchAuthorizeActions(params) {
             purpose: {
                 typeOf: params.transaction.typeOf,
                 id: params.transaction.id
-            }
+            },
+            // Completedに絞る(2023-05-16~)
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => {

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.d.ts

@@ -3,4 +3,5 @@ export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyT
 export declare function createMoneyTransferActions(params: {
     order: factory.order.IOrder;
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.moneyTransfer.IAttributes[]>;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.js

@@ -15,7 +15,7 @@ const order_1 = require("../../../../factory/order");
 function createMoneyTransferActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const moneyTransferActions = [];
-        const authorizeMoneyTransferActions = params.transaction.object.authorizeActions
+        const authorizeMoneyTransferActions = params.authorizeActions
             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => a.object.typeOf === factory.offerType.Offer)
             .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.d.ts

@@ -2,4 +2,5 @@ import * as factory from '../../../../factory';
 export declare function createRegisterServiceActions(params: {
     order: factory.order.IOrder;
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.registerService.IAttributes[]>;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js

@@ -17,7 +17,7 @@ const order_1 = require("../../../../factory/order");
 function createRegisterServiceActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const registerServiceActions = [];
-        const authorizeProductOfferActions = params.transaction.object.authorizeActions
+        const authorizeProductOfferActions = params.authorizeActions
             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => Array.isArray(a.object)
             && a.object.length > 0

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

@@ -7,4 +7,5 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     transaction: factory.transaction.placeOrder.ITransaction;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.transaction.placeOrder.IPotentialActions>;

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.d.ts

@@ -3,12 +3,14 @@ export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyT
 export type IAuthorizeSeatReservationOffer = factory.action.authorize.offer.seatReservation.IAction<factory.service.webAPI.Identifier>;
 export declare function createReservationAcceptedOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     reservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
     reservationOrderItems: factory.order.IOrderedItem[];
 };
 export declare function createProductItems(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
     productOrderItems: factory.order.IOrderedItem[];
@@ -16,6 +18,7 @@ export declare function createProductItems(params: {
 export declare function createMoneyTransferAcceptedOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     seller: factory.order.ISeller;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
     moneyTransferOrderItems: factory.order.IOrderedItem[];

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -7,7 +7,7 @@ function createReservationAcceptedOffers(params) {
     const acceptedOffers = [];
     const orderedItems = [];
     // 座席予約に対する承認アクション取り出す
-    const seatReservationAuthorizeActions = params.transaction.object.authorizeActions
+    const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
         && a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     const eventIds = [];
@@ -85,7 +85,7 @@ function reservationOffers2orderedItem(params) {
 function createProductItems(params) {
     const acceptedOffers = [];
     const orderedItems = [];
-    const authorizePaymentCardOfferActions = params.transaction.object.authorizeActions
+    const authorizePaymentCardOfferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => Array.isArray(a.object)
         && a.object.length > 0
@@ -117,7 +117,11 @@ function createProductItems(params) {
 exports.createProductItems = createProductItems;
 function createMoneyTransferAcceptedOffers(params) {
     // 通貨転送承認アクション
-    const authorizeMoneyTansferActions = params.transaction.object.authorizeActions
+    // const authorizeMoneyTansferActions = (<IAuthorizeMoneyTransferOffer[]>params.transaction.object.authorizeActions)
+    //     .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
+    //     .filter((a) => a.object.typeOf === factory.offerType.Offer)
+    //     .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
+    const authorizeMoneyTansferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)
         .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });

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

@@ -9,4 +9,5 @@ export declare function createOrder(params: {
     orderDate: Date;
     orderStatus: factory.orderStatus;
     isGift: boolean;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): factory.order.IOrder;

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

@@ -23,7 +23,7 @@ function createOrder(params) {
     ];
     const orderedItems = [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
     // 決済方法をセット
-    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction });
+    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction, authorizeActions: params.authorizeActions });
     const discounts = [];
     const name = (typeof params.transaction.object.name === 'string') ? params.transaction.object.name : undefined;
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
@@ -62,7 +62,7 @@ function createCustomer(params) {
 function createPaymentMethods(params) {
     const paymentMethods = [];
     let price = 0;
-    const authorizePaymentActions = params.transaction.object.authorizeActions
+    const authorizePaymentActions = params.authorizeActions
         .filter((a) => {
         var _a;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus

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

@@ -2,4 +2,4 @@ import * as factory from '../../../../factory';
 /**
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
-export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction): void;
+export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;

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

@@ -10,8 +10,8 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
 /**
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
-function validateMovieTicket(paymentMethodType, transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
         var _a, _b, _c;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus

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

@@ -7,7 +7,7 @@ export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecifica
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction): void;
+export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;
 export type IConfirmationNumberGenerator = (order: factory.order.IOrder) => string;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderParams & {
@@ -46,4 +46,5 @@ export declare function validatePaymentMethods(params: {
 export declare function validateEventOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     order: factory.order.IOrder;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): void;

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

@@ -13,18 +13,18 @@ const debug = createDebug('cinerino-domain:service');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction) {
+function validateTransaction(transaction, authorizeActions) {
     validateProfile(transaction);
-    validatePrice(transaction);
+    validatePrice(transaction, authorizeActions);
     // 利用可能な通貨単位に対して取引検証
-    validateMonetaryAmount(transaction);
+    validateMonetaryAmount(authorizeActions);
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
     // 検証すべきMovieTicketIF決済方法タイプのリストは、決済承認アクションのresult.issuedThrough.typeOf: MovieTicketで抽出できるのでは？
-    const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(transaction);
+    const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions);
     if (Array.isArray(movieTicketPaymentMethodTypes) && movieTicketPaymentMethodTypes.length > 0) {
         movieTicketPaymentMethodTypes.forEach((paymentMethodType) => {
             try {
-                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, transaction);
+                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, transaction, authorizeActions);
             }
             catch (error) {
                 // 検証結果をlog(2022-06-04~)
@@ -35,11 +35,13 @@ function validateTransaction(transaction) {
         });
     }
     // 決済URLが発行されている場合、検証
-    validatePaymentUrl(transaction);
+    validatePaymentUrl(transaction, authorizeActions);
 }
 exports.validateTransaction = validateTransaction;
-function findMovieTicketPaymentMethodTypesFromTransaction(transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function findMovieTicketPaymentMethodTypesFromTransaction(
+// transaction: factory.transaction.placeOrder.ITransaction,
+authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketPaymentActions = authorizeActions.filter((a) => {
         var _a, _b;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
@@ -86,8 +88,8 @@ function validateProfile(transaction) {
         throw new factory.errors.Argument('Transaction', 'Customer Profile Required');
     }
 }
-function validatePrice(transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validatePrice(transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     let priceByAgent = 0;
     let priceBySeller = 0;
     // 決済承認を確認
@@ -110,9 +112,9 @@ function validatePrice(transaction) {
         throw new factory.errors.Argument('Transaction', 'Transaction cannot be confirmed because prices are not matched');
     }
 }
-function validatePaymentUrl(transaction) {
+function validatePaymentUrl(transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     var _a, _b;
-    const authorizeActions = transaction.object.authorizeActions;
     // 決済URLが発行されている場合、検証
     const paymentMethodId = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
     const paymentUrl = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.paymentUrl;
@@ -135,10 +137,10 @@ function validatePaymentUrl(transaction) {
 /**
  * JPY以外の通貨について取引を検証する
  */
-function validateMonetaryAmount(transaction
-// currencies: string[]
-) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validateMonetaryAmount(
+// transaction: factory.transaction.placeOrder.ITransaction,
+authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMonetaryAmountActions = authorizeActions
         .filter((a) => {
         var _a, _b;
@@ -216,7 +218,11 @@ exports.validatePaymentMethods = validatePaymentMethods;
  * イベントオファー適用条件確認
  */
 function validateEventOffers(params) {
-    const seatReservationAuthorizeActions = params.transaction.object.authorizeActions
+    // const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>
+    //     params.transaction.object.authorizeActions
+    //         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
+    //         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
+    const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     seatReservationAuthorizeActions.forEach((a) => {

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

@@ -95,14 +95,15 @@ function confirm(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // 取引に対する全ての承認アクションをマージ
-        transaction.object.authorizeActions = yield searchAuthorizeActions(params)(repos);
+        const authorizeActions = yield searchAuthorizeActions(params)(repos);
+        // transaction.object.authorizeActions = authorizeActions;
         // 注文番号を発行
         const orderNumber = yield publishOrderNumberIfNotExist({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction }));
+        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -119,14 +120,16 @@ function confirm(params) {
             order: result.order,
             potentialActions: params.potentialActions,
             transaction: transaction,
-            emailMessage: emailMessageOnOrderSent
+            emailMessage: emailMessageOnOrderSent,
+            authorizeActions
         });
         // ステータス変更
         try {
             yield repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
-                authorizeActions: transaction.object.authorizeActions,
+                // authorizeActions: transaction.object.authorizeActions,
+                authorizeActions,
                 result: result,
                 potentialActions: potentialActions
             });
@@ -214,18 +217,20 @@ exports.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;
 function createResult(params) {
     const transaction = params.transaction;
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction);
+    (0, validation_1.validateTransaction)(transaction, params.authorizeActions);
     // 注文作成
     const order = (0, result_1.createOrder)({
         orderNumber: params.orderNumber,
         transaction: transaction,
         orderDate: params.result.order.orderDate,
         orderStatus: factory.orderStatus.OrderProcessing,
-        isGift: false
+        isGift: false,
+        authorizeActions: params.authorizeActions
     });
     (0, validation_1.validateEventOffers)({
         transaction: transaction,
-        order: order
+        order: order,
+        authorizeActions: params.authorizeActions
     });
     // 注文アイテム数制限確認
     (0, validation_1.validateNumItems)({
@@ -252,7 +257,9 @@ function searchAuthorizeActions(params) {
             purpose: {
                 typeOf: factory.transactionType.PlaceOrder,
                 id: params.id
-            }
+            },
+            // Completedに絞る(2023-05-16~)
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => (a.endDate !== undefined && a.endDate < params.result.order.orderDate));

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.311.0",
-    "@cinerino/sdk": "3.154.0",
+    "@chevre/factory": "4.312.0",
+    "@cinerino/sdk": "3.156.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.47"
+  "version": "21.2.0-alpha.49"
 }