@chevre/domain 21.34.0-alpha.16 → 21.34.0-alpha.18

package/example/src/chevre/migrateCheckMovieTicketRecipes.ts

@@ -15,9 +15,9 @@ async function main() {
             typeOf: { $eq: chevre.factory.actionType.CheckAction },
             actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
             startDate: {
-                $lte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-178, 'days'),
+                // $lte: moment()
+                //     // tslint:disable-next-line:no-magic-numbers
+                //     .add(-178, 'days'),
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
                     .add(-365, 'days')
@@ -50,7 +50,7 @@ async function main() {
         if (actionRecipe !== null) {
             console.log(
                 'actionRecipe already exists. step:',
-                actionRecipe.step.length, checkAction.project.id, checkAction.id, checkAction.startDate, i);
+                actionRecipe.step.length, checkAction.project.id, checkAction.id, checkAction.startDate, i, updateCount, saveRecipeCount);
 
             // optimize action.result
             if (purchaseNumberAuthInByCheckAction !== undefined || purchaseNumberAuthResultByCheckAction !== undefined) {

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

@@ -19,6 +19,7 @@ function createStartParams(params) {
         throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
     }
     let totalPaymentDue;
+    let accountId = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.accountId;
     switch (params.paymentServiceType) {
         case factory.service.paymentService.PaymentServiceType.FaceToFace:
             // 対面決済ではとりあえず問答無用にJPY
@@ -34,22 +35,27 @@ function createStartParams(params) {
                 currency: factory.priceCurrency.JPY,
                 value: params.amount
             };
+            accountId = ''; // 強制的に空文字化(2024-06-14~)
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const specifiedMovieTickets = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.movieTickets;
+            const specifiedMovieTickets = (_d = params.object.paymentMethod) === null || _d === void 0 ? void 0 : _d.movieTickets;
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.unitCode.C62,
                 value: (Array.isArray(specifiedMovieTickets)) ? specifiedMovieTickets.length : 0
             };
             // MovieTicketIFの決済取引において最大同時着券数を設定可能にする(2023-03-27~)
-            const totalPaymentDueMaxValue = (_f = (_e = (_d = params.paymentService) === null || _d === void 0 ? void 0 : _d.availableChannel) === null || _e === void 0 ? void 0 : _e.totalPaymentDue) === null || _f === void 0 ? void 0 : _f.maxValue;
+            const totalPaymentDueMaxValue = (_g = (_f = (_e = params.paymentService) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.totalPaymentDue) === null || _g === void 0 ? void 0 : _g.maxValue;
             const totalPaymentDueValue = totalPaymentDue.value;
             if (typeof totalPaymentDueValue === 'number' && typeof totalPaymentDueMaxValue === 'number') {
                 if (totalPaymentDueValue > totalPaymentDueMaxValue) {
                     throw new factory.errors.Argument('paymentMethod.movieTickets', `Number of movieTickets must be less than or equal to ${totalPaymentDueMaxValue}`);
                 }
             }
+            // 強制的にidentifierで上書き(2024-06-14~)
+            accountId = (Array.isArray(specifiedMovieTickets) && specifiedMovieTickets.length > 0)
+                ? specifiedMovieTickets[0].identifier // 決済カードidentifierは1つのみ許可の前提
+                : '';
             break;
         default:
         // no op
@@ -57,7 +63,6 @@ function createStartParams(params) {
     const informPaymentParams = createInformPaymentParams({
         paymentService: params.paymentService
     });
-    const accountId = (_g = params.object.paymentMethod) === null || _g === void 0 ? void 0 : _g.accountId;
     // currencyはデフォルトでJPY
     let paymentMethodCurrency = factory.priceCurrency.JPY;
     if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.PaymentCard) {
@@ -84,7 +89,7 @@ function createStartParams(params) {
         currency: paymentMethodCurrency,
         value: params.amount
     };
-    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.additionalProperty))
+    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.additionalProperty))
             ? (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty
             : [], name: (typeof ((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.name) === 'string')
             ? params.object.paymentMethod.name
@@ -98,6 +103,8 @@ function createStartParams(params) {
         ? { creditCard: (_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard }
         : undefined), (Array.isArray((_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.movieTickets))
         ? { movieTickets: (_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets }
+        : undefined), (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard)
+        ? { paymentMethodId: params.transactionNumber } // 必要ないはずだが互換性維持対応(2024-06-14~)
         : undefined);
     const object = {
         // パラメータから必要なもののみ取り込む

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -16,7 +16,6 @@ import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPa
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
 import * as MovieTicketPayment from '../payment/movieTicket';
-import { IAcceptedOfferMovieTicketUsed } from './pay/potentialActions';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
@@ -130,21 +129,6 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
 export declare function confirm(params: factory.assetTransaction.pay.IConfirmParams & {
     options: {};
 }): IConfirmOperation<void>;
-export declare function fixOrderAsPurpose(params: {
-    potentialActions: {
-        pay: {
-            purpose: {
-                confirmationNumber: string;
-                orderNumber: string;
-            };
-        };
-    };
-}, transaction: factory.assetTransaction.pay.ITransaction): (repos: {
-    acceptedOffer: AcceptedOfferRepo;
-    order: OrderRepo;
-}) => Promise<Pick<factory.order.IOrder, "typeOf" | "confirmationNumber" | "orderNumber"> & {
-    acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
-}>;
 /**
  * 取引中止
  */

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

@@ -9,8 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.fixOrderAsPurpose = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
-const createDebug = require("debug");
+exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
 const CreditCardPayment = require("../payment/creditCard");
@@ -18,7 +17,6 @@ const MovieTicketPayment = require("../payment/movieTicket");
 const PaymentCardPayment = require("../payment/paymentCard");
 const validation_1 = require("./pay/account/validation");
 const factory_1 = require("./pay/factory");
-const debug = createDebug('chevre-domain:service:assetTransaction');
 function publishPaymentUrlResult2recipe(params) {
     const { project, result } = params;
     return {
@@ -217,10 +215,10 @@ function start(params, options) {
                 transaction = yield processAuthorizeAccount(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                transaction =
-                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({ executor: (typeof ((_c = options.executor) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
-                        ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
-                        : undefined))(repos);
+                // transaction =
+                yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({ executor: (typeof ((_c = options.executor) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
+                    ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
+                    : undefined))(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 transaction =
@@ -379,31 +377,42 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const authorizeResult = yield CreditCardPayment.authorize(Object.assign(Object.assign({}, params), { id: transaction.id }), paymentServiceId, Object.assign({ processPublishPaymentUrl: false, executor: (typeof ((_a = options.executor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
+        yield CreditCardPayment.authorize(Object.assign(Object.assign({}, params), { id: transaction.id }), paymentServiceId, Object.assign({ processPublishPaymentUrl: false, executor: (typeof ((_a = options.executor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
-        return saveAuthorizeResult({
-            id: transaction.id,
-            update: Object.assign({ 'object.accountId': authorizeResult.accountId, 'object.paymentMethod.accountId': authorizeResult.accountId, 'object.paymentMethod.paymentMethodId': authorizeResult.paymentMethodId, 'object.entryTranArgs': authorizeResult.entryTranArgs, 'object.entryTranResult': authorizeResult.entryTranResult, 'object.execTranArgs': authorizeResult.execTranArgs, 'object.execTranResult': authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined)
-                ? { 'object.secureTran2Result': authorizeResult.secureTran2Result }
-                : undefined)
-        })(repos);
+        // ↓discontinue(2024-06-14~)
+        // return saveAuthorizeResult({
+        //     id: transaction.id,
+        //     update: {
+        //         'object.accountId': authorizeResult.accountId,
+        //         'object.paymentMethod.accountId': authorizeResult.accountId,
+        //         'object.paymentMethod.paymentMethodId': authorizeResult.paymentMethodId,
+        //         'object.entryTranArgs': authorizeResult.entryTranArgs,
+        //         'object.entryTranResult': authorizeResult.entryTranResult,
+        //         'object.execTranArgs': authorizeResult.execTranArgs,
+        //         'object.execTranResult': authorizeResult.execTranResult,
+        //         ...(authorizeResult.secureTran2Result !== undefined)
+        //             ? { 'object.secureTran2Result': authorizeResult.secureTran2Result }
+        //             : undefined
+        //     }
+        // })(repos);
     });
 }
 function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options)(repos);
-        const payActionInObject = {
-            actionStatus: payAction.actionStatus,
-            id: payAction.id,
-            typeOf: payAction.typeOf
-        };
+        const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options)(repos);
+        // const payActionInObject: factory.assetTransaction.pay.IPayActionInObject = {
+        //     actionStatus: payAction.actionStatus,
+        //     id: payAction.id,
+        //     typeOf: payAction.typeOf
+        // };
         return saveAuthorizeResult({
             id: transaction.id,
             update: {
-                'object.accountId': accountId,
-                'object.paymentMethod.accountId': accountId,
-                'object.payAction': payActionInObject,
+                // ↓discontinue(2024-06-14~)
+                // 'object.accountId': accountId,
+                // 'object.paymentMethod.accountId': accountId,
+                // 'object.payAction': payActionInObject, // 最適化(2024-04-09~)
                 // 認証レスポンスより計上金額を保管(2023-05-15~)
                 'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType
             }
@@ -475,47 +484,6 @@ function confirm(params) {
     });
 }
 exports.confirm = confirm;
-function fixOrderAsPurpose(params, transaction) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const payPurposeConfirmationNumber = params.potentialActions.pay.purpose.confirmationNumber;
-        const payPurposeOrderNumber = (_a = params.potentialActions.pay.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
-        const ordersWithoutAcceptedOffers = yield repos.order.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: transaction.project.id } },
-            confirmationNumbers: [payPurposeConfirmationNumber],
-            orderNumbers: [payPurposeOrderNumber]
-        }, { typeOf: 1, confirmationNumber: 1, orderNumber: 1 });
-        const orderWithoutAcceptedOffers = ordersWithoutAcceptedOffers.shift();
-        if (orderWithoutAcceptedOffers === undefined) {
-            throw new factory.errors.NotFound('Order as purpose');
-        }
-        // 必要なオファー検索のみ実行する(2024-01-18~)
-        let acceptedOffersMovieTicketUsed = [];
-        const movieTickets = transaction.object.paymentMethod.movieTickets;
-        if (Array.isArray(movieTickets) && movieTickets.length > 0) {
-            const reservationForId = movieTickets[0].serviceOutput.reservationFor.id; // イベントIDは決済取引ごとにひとつのみ許可なので、これで問題ない
-            const seatNumbers = movieTickets.map(({ serviceOutput }) => serviceOutput.reservedTicket.ticketedSeat.seatNumber);
-            debug('fixOrderAsPurpose at confirming payTransaction: searching acceptedOffersMovieTicketUsed...', reservationForId, seatNumbers);
-            acceptedOffersMovieTicketUsed = (yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                orderNumber: { $eq: orderWithoutAcceptedOffers.orderNumber },
-                project: { id: { $eq: transaction.project.id } },
-                acceptedOffers: {
-                    itemOffered: {
-                        typeOf: { $in: [factory.reservationType.EventReservation] },
-                        // movieTicketsに結合されたイベントID,座席コードで絞る
-                        reservationFor: { id: { $in: [reservationForId] } },
-                        reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
-                    }
-                }
-            }, ['itemOffered', 'priceSpecification']));
-            debug('fixOrderAsPurpose at confirming payTransaction:', acceptedOffersMovieTicketUsed.length, 'acceptedOffersMovieTicketUsed found', acceptedOffersMovieTicketUsed);
-        }
-        return Object.assign(Object.assign({}, orderWithoutAcceptedOffers), { acceptedOffersMovieTicketUsed });
-    });
-}
-exports.fixOrderAsPurpose = fixOrderAsPurpose;
 /**
  * 取引中止
  */

package/lib/chevre/service/assetTransaction/refund/potentialActions.d.ts

@@ -4,5 +4,6 @@ import * as factory from '../../../factory';
  */
 export declare function createPotentialActions(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Refund>;
+    seller: factory.assetTransaction.pay.IRecipient;
     potentialActions?: factory.assetTransaction.refund.IPotentialActionsParams;
 }): Promise<factory.assetTransaction.IPotentialActions<factory.assetTransactionType.Refund>>;

package/lib/chevre/service/assetTransaction/refund/potentialActions.js

@@ -13,18 +13,20 @@ exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
 function createReundActions(params) {
     var _a, _b, _c, _d;
-    const transaction = params.transaction;
+    const { transaction, seller } = params;
     const refundActions = [];
     const informPaymentActions = createInformPaymentActions(params);
-    const agent = {
-        id: params.transaction.agent.id,
-        name: String(params.transaction.agent.name),
-        typeOf: params.transaction.agent.typeOf
-    };
-    refundActions.push(Object.assign({ project: params.transaction.project, typeOf: factory.actionType.RefundAction, object: [transaction.object], agent, potentialActions: {
+    // 決済取引より取得した販売者情報によって、IParticipantAsSellerに統一(2024-06-13~)
+    // const agent: factory.action.trade.refund.IAgent = {
+    //     id: params.transaction.agent.id,
+    //     name: String(params.transaction.agent.name),
+    //     typeOf: params.transaction.agent.typeOf
+    // };
+    const agent = Object.assign({ id: seller.id, typeOf: seller.typeOf }, (typeof seller.name === 'string') ? { name: seller.name } : undefined);
+    refundActions.push(Object.assign({ project: transaction.project, typeOf: factory.actionType.RefundAction, object: [transaction.object], agent, potentialActions: {
             add2report: true,
             informPayment: informPaymentActions
-        }, recipient: params.transaction.recipient }, (((_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.refund) === null || _b === void 0 ? void 0 : _b.purpose) !== undefined)
+        }, recipient: transaction.recipient }, (((_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.refund) === null || _b === void 0 ? void 0 : _b.purpose) !== undefined)
         ? { purpose: (_d = (_c = params.potentialActions) === null || _c === void 0 ? void 0 : _c.refund) === null || _d === void 0 ? void 0 : _d.purpose }
         : { purpose: { typeOf: transaction.typeOf, transactionNumber: transaction.transactionNumber, id: transaction.id } }));
     return refundActions;

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

@@ -134,8 +134,18 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
+        const payTransaction = (yield repos.assetTransaction.search({
+            limit: 1,
+            page: 1,
+            typeOf: factory.assetTransactionType.Pay,
+            transactionNumber: { $eq: transaction.object.paymentMethodId }
+        }, ['recipient'], [])).shift();
+        if (payTransaction === undefined) {
+            throw new factory.errors.NotFound(factory.assetTransactionType.Pay);
+        }
         const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
             transaction: transaction,
+            seller: payTransaction.recipient,
             potentialActions: params.potentialActions
         });
         yield repos.assetTransaction.confirm({

package/lib/chevre/service/payment/any/onRefund.js

@@ -42,8 +42,10 @@ function onRefund(refundAction) {
                 const refundFee = (_b = refundAction.object[0]) === null || _b === void 0 ? void 0 : _b.refundFee;
                 if (typeof refundFee === 'number' && refundFee > 0) {
                     // purpose.typeOf:PlaceOrderは外部決済URL無効化における返金アクションのみなので、手数料決済から除外してよい(2024-03-19~)
-                    if (refundAction.purpose.typeOf !== factory.transactionType.PlaceOrder) {
-                        const payObject = refundAction.object.map((o) => {
+                    // purpose.typeOf:Orderは決済カード承認時着券の取消なので、手数料決済から除外してよい
+                    // 手数料決済は注文返品による返金アクションからしか発生しないはず(2024-06-13~)
+                    if (refundAction.purpose.typeOf === factory.actionType.ReturnAction) {
+                        const payReturnFeeObject = refundAction.object.map((o) => {
                             return {
                                 typeOf: o.typeOf,
                                 id: o.id,
@@ -61,12 +63,12 @@ function onRefund(refundAction) {
                                 }
                             };
                         });
-                        const payAction = {
-                            project: refundAction.project,
+                        const payReturnFeeAction = {
+                            // project: refundAction.project,
                             typeOf: factory.actionType.PayAction,
-                            object: payObject,
-                            agent: refundAction.project,
-                            recipient: refundAction.agent,
+                            object: payReturnFeeObject,
+                            // agent: refundAction.project,
+                            // recipient: refundAction.agent, // 返金者は販売者のはず
                             purpose: refundAction.purpose,
                             potentialActions: {
                                 add2report: true,
@@ -81,7 +83,7 @@ function onRefund(refundAction) {
                             remainingNumberOfTries: 10,
                             numberOfTried: 0,
                             executionResults: [],
-                            data: payAction
+                            data: payReturnFeeAction
                         };
                         taskAttributes.push(payTask);
                     }

package/lib/chevre/service/payment/creditCard/authorize.d.ts

@@ -7,7 +7,7 @@ import { ICreditCardPaymentAgencyTransaction } from './authorize/processAuthoriz
 import { ICreditCardPaymentAgencyTransaction3ds } from './authorize/processAuthorizeCreditCard3ds';
 type IPaymentAgencyTransaction = ICreditCardPaymentAgencyTransaction | ICreditCardPaymentAgencyTransaction3ds;
 type IAuthorizeResult = IPaymentAgencyTransaction & {
-    accountId: string;
+    accountId: '';
     paymentMethodId: string;
 };
 type IPayTransactionAsAuthorizeInvoiceAction = Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object' | 'project' | 'recipient' | 'transactionNumber'> & {

package/lib/chevre/service/{assetTransaction/pay/potentialActions → payment/factory}/createPayObjectServiceOutput.d.ts

@@ -1,10 +1,10 @@
-import * as factory from '../../../../factory';
+import * as factory from '../../../factory';
 /**
  * PayAction.object.serviceOutputを作成する
  * 決済カード決済の場合のみ、対象予約情報をserviceOutputに持つ決済カード情報として存在する
  */
 declare function createPayObjectServiceOutput(params: {
-    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>;
+    transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>, 'object' | 'transactionNumber'>;
     order: {
         acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
     };

package/lib/chevre/service/{assetTransaction/pay/potentialActions → payment/factory}/createPayObjectServiceOutput.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPayObjectServiceOutput = void 0;
-const factory = require("../../../../factory");
-const settings_1 = require("../../../../settings");
+const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 /**
  * PayAction.object.serviceOutputを作成する
  * 決済カード決済の場合のみ、対象予約情報をserviceOutputに持つ決済カード情報として存在する

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

@@ -0,0 +1,13 @@
+import * as factory from '../../factory';
+import { IAcceptedOfferMovieTicketUsed } from './factory/createPayObjectServiceOutput';
+/**
+ * 注文に対する決済アクションを生成する
+ */
+declare function createPayOrderAction(params: {
+    transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>, 'id' | 'object' | 'transactionNumber' | 'typeOf' | 'agent' | 'project' | 'recipient' | 'location'>;
+    potentialActions?: factory.assetTransaction.pay.IPotentialActionsParams;
+    order: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderNumber'> & {
+        acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
+    };
+}): Pick<factory.action.trade.pay.IAttributes, 'agent' | 'instrument' | 'location' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'recipient' | 'typeOf'>;
+export { createPayOrderAction, IAcceptedOfferMovieTicketUsed };

package/lib/chevre/service/{assetTransaction/pay/potentialActions.js → payment/factory.js}

@@ -1,34 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPayActions = void 0;
-const factory = require("../../../factory");
-const createPayObjectServiceOutput_1 = require("./potentialActions/createPayObjectServiceOutput");
-function createPayActions(params) {
+exports.createPayOrderAction = void 0;
+const factory = require("../../factory");
+const createPayObjectServiceOutput_1 = require("./factory/createPayObjectServiceOutput");
+/**
+ * 注文に対する決済アクションを生成する
+ */
+function createPayOrderAction(params) {
     var _a;
-    const payActions = [];
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
-    if (payObject !== undefined) {
-        const payPurpose = {
-            typeOf: params.order.typeOf,
-            confirmationNumber: params.order.confirmationNumber,
-            orderNumber: params.order.orderNumber
-        };
-        const payAction = Object.assign({ project: params.transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: params.transaction.project, potentialActions: {
-                add2report: true,
-                informPayment: informPaymentActions
-            }, purpose: payPurpose, recipient: {
-                id: params.transaction.recipient.id,
-                name: params.transaction.recipient.name,
-                typeOf: params.transaction.recipient.typeOf
-            } }, (typeof ((_a = params.transaction.location) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-            ? { location: params.transaction.location }
-            : undefined);
-        payActions.push(payAction);
-    }
-    return payActions;
+    const payPurpose = {
+        typeOf: params.order.typeOf,
+        confirmationNumber: params.order.confirmationNumber,
+        orderNumber: params.order.orderNumber
+    };
+    const instrument = {
+        id: params.transaction.id,
+        transactionNumber: params.transaction.transactionNumber,
+        typeOf: params.transaction.typeOf
+    };
+    const recipient = {
+        id: params.transaction.recipient.id,
+        name: params.transaction.recipient.name,
+        typeOf: params.transaction.recipient.typeOf
+    };
+    return Object.assign({ project: params.transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: params.transaction.project, potentialActions: {
+            add2report: true,
+            informPayment: informPaymentActions
+        }, purpose: payPurpose, recipient,
+        instrument }, (typeof ((_a = params.transaction.location) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+        ? { location: params.transaction.location }
+        : undefined);
 }
-exports.createPayActions = createPayActions;
+exports.createPayOrderAction = createPayOrderAction;
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPayObject(params) {
     var _a;

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

@@ -47,7 +47,18 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };
-            const payActionAttributes = Object.assign(Object.assign({ project: transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: transaction.project, recipient: transaction.recipient }, (params.purpose !== undefined)
+            const instrument = {
+                id: transaction.id,
+                transactionNumber: transaction.transactionNumber,
+                typeOf: transaction.typeOf
+            };
+            const recipient = {
+                id: transaction.recipient.id,
+                name: transaction.recipient.name,
+                typeOf: transaction.recipient.typeOf
+            };
+            const payActionAttributes = Object.assign(Object.assign({ project: transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: transaction.project, recipient,
+                instrument }, (params.purpose !== undefined)
                 ? { purpose: params.purpose }
                 : { purpose: { typeOf: transaction.typeOf, transactionNumber: transaction.transactionNumber, id: transaction.id } }), (typeof ((_b = options.executor) === null || _b === void 0 ? void 0 : _b.id) === 'string')
                 ? { sameAs: { id: options.executor.id, typeOf: 'Task' } } // link sameAs(2024-06-04~)

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

@@ -12,7 +12,7 @@ declare function createSeatInfoSyncIn(params: {
         stCd: string;
     };
 }): surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn;
-declare function createStartingPayAction(params: factory.task.pay.IPayActionData): factory.action.trade.pay.IAttributes;
+declare function createStartingPayAction(params: factory.action.trade.pay.IAttributes): factory.action.trade.pay.IAttributes;
 interface IProcessPurchaseNumberAuthResult {
     purchaseNumberAuthIn?: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
     purchaseNumberAuthResult?: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;

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

@@ -76,10 +76,10 @@ exports.createSeatInfoSyncIn = createSeatInfoSyncIn;
 function createStartingPayAction(params
 // seatInfoSyncIn: surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn
 ) {
-    const instrument = {
-        typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket
-        // seatInfoSyncIn // discontinue(2024-06-10~)
-    };
+    // const instrument: factory.action.trade.pay.IInstrument = {
+    //     typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket
+    //     // seatInfoSyncIn // discontinue(2024-06-10~)
+    // };
     return Object.assign(Object.assign({}, params), { object: params.object.map((o) => {
             const movieTicketsWithMaskedAccessCode = (Array.isArray(o.movieTickets))
                 ? o.movieTickets.map((movieTicket) => {
@@ -88,7 +88,7 @@ function createStartingPayAction(params
                 })
                 : [];
             return Object.assign(Object.assign({}, o), { movieTickets: movieTicketsWithMaskedAccessCode });
-        }), instrument });
+        }) });
 }
 exports.createStartingPayAction = createStartingPayAction;
 function processPurchaseNumberAuthResult2checkRecipe(params) {

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

@@ -15,6 +15,22 @@ import type { MongoRepository as PaymentAcceptedRepo } from '../repo/sellerPayme
 import type { MongoRepository as TaskRepo } from '../repo/task';
 import type { RedisRepository as TransactionNumberRepo } from '../repo/transactionNumber';
 import * as factory from '../factory';
+import { IAcceptedOfferMovieTicketUsed } from './payment/factory';
+export declare function fixOrderAsPurpose(params: {
+    potentialActions: {
+        pay: {
+            purpose: {
+                confirmationNumber: string;
+                orderNumber: string;
+            };
+        };
+    };
+}, transaction: factory.assetTransaction.pay.ITransaction): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    order: OrderRepo;
+}) => Promise<Pick<factory.order.IOrder, "typeOf" | "confirmationNumber" | "orderNumber"> & {
+    acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
+}>;
 /**
  * 決済確定
  */

package/lib/chevre/service/payment.js

@@ -9,37 +9,91 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refund = exports.voidPayment = exports.pay = void 0;
+exports.refund = exports.voidPayment = exports.pay = exports.fixOrderAsPurpose = void 0;
 const factory = require("../factory");
-const pay_1 = require("./assetTransaction/pay");
-const potentialActions_1 = require("./assetTransaction/pay/potentialActions");
 const CreditCardPaymentService = require("./payment/creditCard");
 const FaceToFacePaymentService = require("./payment/faceToFace");
+const factory_1 = require("./payment/factory");
 const MovieTicketPaymentService = require("./payment/movieTicket");
 const PaymentCardPaymentService = require("./payment/paymentCard");
-function payTask2payActionAttributes(params) {
+function fixOrderAsPurpose(params, transaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        let transaction;
-        if (typeof params.object.paymentMethod.paymentMethodId === 'string') {
-            transaction = yield repos.assetTransaction.findByTransactionNumber({
-                typeOf: factory.assetTransactionType.Pay,
-                transactionNumber: params.object.paymentMethod.paymentMethodId
-            });
-            if (transaction.status !== factory.transactionStatusType.Confirmed) {
-                throw new factory.errors.Argument('object.paymentMethod.paymentMethodId', `invalid transaction status: ${transaction.transactionNumber} ${transaction.status}`);
+        const payPurposeConfirmationNumber = params.potentialActions.pay.purpose.confirmationNumber;
+        const payPurposeOrderNumber = (_a = params.potentialActions.pay.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
+        const ordersWithoutAcceptedOffers = yield repos.order.search({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: transaction.project.id } },
+            confirmationNumbers: [payPurposeConfirmationNumber],
+            orderNumbers: [payPurposeOrderNumber]
+        }, { typeOf: 1, confirmationNumber: 1, orderNumber: 1 });
+        const orderWithoutAcceptedOffers = ordersWithoutAcceptedOffers.shift();
+        if (orderWithoutAcceptedOffers === undefined) {
+            throw new factory.errors.NotFound('Order as purpose');
+        }
+        // 必要なオファー検索のみ実行する(2024-01-18~)
+        let acceptedOffersMovieTicketUsed = [];
+        const movieTickets = transaction.object.paymentMethod.movieTickets;
+        if (Array.isArray(movieTickets) && movieTickets.length > 0) {
+            const reservationForId = movieTickets[0].serviceOutput.reservationFor.id; // イベントIDは決済取引ごとにひとつのみ許可なので、これで問題ない
+            const seatNumbers = movieTickets.map(({ serviceOutput }) => serviceOutput.reservedTicket.ticketedSeat.seatNumber);
+            acceptedOffersMovieTicketUsed = (yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                orderNumber: { $eq: orderWithoutAcceptedOffers.orderNumber },
+                project: { id: { $eq: transaction.project.id } },
+                acceptedOffers: {
+                    itemOffered: {
+                        typeOf: { $in: [factory.reservationType.EventReservation] },
+                        // movieTicketsに結合されたイベントID,座席コードで絞る
+                        reservationFor: { id: { $in: [reservationForId] } },
+                        reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
+                    }
+                }
+            }, ['itemOffered', 'priceSpecification']));
+        }
+        return Object.assign(Object.assign({}, orderWithoutAcceptedOffers), { acceptedOffersMovieTicketUsed });
+    });
+}
+exports.fixOrderAsPurpose = fixOrderAsPurpose;
+function payTask2payActionAttributes(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { object, potentialActions, purpose, typeOf } = params;
+        if (typeOf === factory.actionType.PayAction) {
+            // 返金手数料決済の場合
+            const order = (yield repos.order.search({
+                limit: 1,
+                page: 1,
+                orderNumbers: [params.purpose.object.orderNumber]
+            }, { seller: 1, project: 1 })).shift();
+            if (order === undefined) {
+                throw new factory.errors.NotFound(factory.order.OrderType.Order);
             }
+            return Object.assign(Object.assign({ object, purpose, typeOf: factory.actionType.PayAction, agent: { id: order.project.id, typeOf: factory.organizationType.Project }, project: { id: order.project.id, typeOf: factory.organizationType.Project }, recipient: Object.assign({ id: order.seller.id, typeOf: order.seller.typeOf }, (typeof order.seller.name === 'string') ? { name: order.seller.name } : undefined) }, (potentialActions !== undefined) ? { potentialActions } : undefined), (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: params.sameAs } : undefined);
         }
         else {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+            // 最適化されたタスクに対応(2024-01-19~)
+            let transaction;
+            if (typeof params.object.paymentMethod.paymentMethodId === 'string') {
+                transaction = yield repos.assetTransaction.findByTransactionNumber({
+                    typeOf: factory.assetTransactionType.Pay,
+                    transactionNumber: params.object.paymentMethod.paymentMethodId
+                });
+                if (transaction.status !== factory.transactionStatusType.Confirmed) {
+                    throw new factory.errors.Argument('object.paymentMethod.paymentMethodId', `invalid transaction status: ${transaction.transactionNumber} ${transaction.status}`);
+                }
+            }
+            else {
+                throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+            }
+            const order = yield fixOrderAsPurpose({ potentialActions: { pay: { purpose: params.purpose } } }, transaction)(repos);
+            const payOrderAction = (0, factory_1.createPayOrderAction)({
+                transaction: transaction,
+                potentialActions: { pay: { purpose: params.purpose } },
+                order
+            });
+            return Object.assign(Object.assign({}, payOrderAction), (typeof ((_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? { sameAs: params.sameAs } : undefined);
         }
-        const order = yield (0, pay_1.fixOrderAsPurpose)({ potentialActions: { pay: { purpose: params.purpose } } }, transaction)(repos);
-        const payActions = (0, potentialActions_1.createPayActions)({
-            transaction: transaction,
-            potentialActions: { pay: { purpose: params.purpose } },
-            order
-        });
-        return Object.assign(Object.assign({}, payActions[0]), (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: params.sameAs } : undefined);
     });
 }
 /**
@@ -49,14 +103,14 @@ function pay(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         let payActionAttributes;
-        if (params.typeOf === factory.actionType.PayAction) {
-            // タスクにPayActionそのものが指定されていればそのまま処理
-            payActionAttributes = params;
-        }
-        else {
-            // 最適化されたタスクに対応(2024-01-19~)
-            payActionAttributes = yield payTask2payActionAttributes(params)(repos);
-        }
+        // if (params.purpose.typeOf === factory.actionType.ReturnAction) {
+        //     // タスクにPayActionそのものが指定されていればそのまま処理
+        //     payActionAttributes = params;
+        // } else {
+        //     // 最適化されたタスクに対応(2024-01-19~)
+        //     payActionAttributes = await payTask2payActionAttributes(params)(repos);
+        // }
+        payActionAttributes = yield payTask2payActionAttributes(params)(repos);
         const paymentServiceType = (_a = payActionAttributes.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.23",
-    "@cinerino/sdk": "7.1.0",
+    "@chevre/factory": "4.374.0-alpha.25",
+    "@cinerino/sdk": "7.2.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.34.0-alpha.16"
+  "version": "21.34.0-alpha.18"
 }

package/lib/chevre/service/assetTransaction/pay/potentialActions.d.ts

@@ -1,10 +0,0 @@
-import * as factory from '../../../factory';
-import { IAcceptedOfferMovieTicketUsed } from './potentialActions/createPayObjectServiceOutput';
-declare function createPayActions(params: {
-    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>;
-    potentialActions?: factory.assetTransaction.pay.IPotentialActionsParams;
-    order: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderNumber'> & {
-        acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
-    };
-}): factory.action.trade.pay.IAttributes[];
-export { createPayActions, IAcceptedOfferMovieTicketUsed };