@chevre/domain 21.20.0-alpha.9 → 21.20.1

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onPaid.js

@@ -15,23 +15,23 @@ exports.onPaid = void 0;
  */
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
-function onPaid(params) {
+function onPaid(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         switch (params.purpose.typeOf) {
             // 返品手数料決済であれば
             case factory.actionType.ReturnAction:
-                yield onReturnFeePaid(params)(repos);
+                yield onReturnFeePaid(params, project)(repos);
                 break;
             // 注文決済であれば
             case factory.order.OrderType.Order:
-                yield onOrderPaid(params)(repos);
+                yield onOrderPaid(params, project)(repos);
                 break;
             default:
         }
     });
 }
 exports.onPaid = onPaid;
-function onReturnFeePaid(params) {
+function onReturnFeePaid(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const orderNumber = (_b = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.orderNumber;
@@ -47,11 +47,14 @@ function onReturnFeePaid(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            project: { id: project.id },
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }
-function onOrderPaid(params) {
+function onOrderPaid(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
@@ -67,7 +70,10 @@ function onOrderPaid(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            project: { id: project.id },
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onRefunded.d.ts

@@ -1,6 +1,8 @@
 import type { MongoRepository as AccountingReportRepo } from '../../../../repo/accountingReport';
 import * as factory from '../../../../factory';
 export type IOptimizedRefundAction = factory.report.accountingReport.IOptimizedRefundAction;
-export declare function onRefunded(params: IOptimizedRefundAction): (repos: {
+export declare function onRefunded(params: IOptimizedRefundAction, project: {
+    id: string;
+}): (repos: {
     accountingReport: AccountingReportRepo;
 }) => Promise<void>;

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onRefunded.js

@@ -15,19 +15,19 @@ exports.onRefunded = void 0;
  */
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
-function onRefunded(params) {
+function onRefunded(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         switch (params.purpose.typeOf) {
             // 返品手数料決済であれば
             case factory.actionType.ReturnAction:
-                yield onOrderRefunded(params)(repos);
+                yield onOrderRefunded(params, project)(repos);
                 break;
             default:
         }
     });
 }
 exports.onRefunded = onRefunded;
-function onOrderRefunded(params) {
+function onOrderRefunded(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const orderNumber = (_b = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.orderNumber;
@@ -43,7 +43,10 @@ function onOrderRefunded(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            project: { id: project.id },
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }

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

@@ -24,10 +24,10 @@ function onPaymentStatusChanged(params) {
         const optimizedAction = optimizeAction4report(action);
         switch (optimizedAction.typeOf) {
             case factory.actionType.PayAction:
-                yield (0, onPaid_1.onPaid)(optimizedAction)(repos);
+                yield (0, onPaid_1.onPaid)(optimizedAction, { id: action.project.id })(repos);
                 break;
             case factory.actionType.RefundAction:
-                yield (0, onRefunded_1.onRefunded)(optimizedAction)(repos);
+                yield (0, onRefunded_1.onRefunded)(optimizedAction, { id: action.project.id })(repos);
                 break;
             default:
             // no op

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

@@ -88,7 +88,7 @@ function onRefund(refundAction) {
                     name: factory.taskName.TriggerWebhook,
                     status: factory.taskStatus.Ready,
                     runsAt: now,
-                    remainingNumberOfTries: 10,
+                    remainingNumberOfTries: 30,
                     numberOfTried: 0,
                     executionResults: [],
                     data: Object.assign(Object.assign({}, a), { object: aciton4inform })

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

@@ -8,7 +8,6 @@ import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTr
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
-import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
@@ -17,7 +16,6 @@ import type { RedisRepository as TransactionNumberRepo } from '../../repo/transa
 import * as PayTransactionService from '../assetTransaction/pay';
 import { onPaymentStatusChanged } from './any/onPaymentStatusChanged';
 import { person2username } from './any/person2username';
-type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -61,7 +59,6 @@ interface IAuthorizeRepos {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
     product: ProductRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
@@ -73,7 +70,6 @@ interface IPublishPaymentUrlRepos {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -116,5 +112,10 @@ declare function authorize(params: {
         useCheckByIdentifierIfNotYet: boolean;
         useSearchTrade4accountId: boolean;
     };
-}): IAuthorizeOperation<IAuthorizePaymentAction>;
+}): IAuthorizeOperation<{
+    /**
+     * 承認アクションID
+     */
+    id: string;
+}>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

@@ -197,7 +197,7 @@ function processVoidPayTransaction(params) {
                         }
                     }
                 }
-                yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+                yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             }
             catch (error) {
                 errors.push(error);
@@ -378,7 +378,8 @@ function authorize(params) {
         }
         // アクションを完了
         const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObject });
-        return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        return { id: action.id };
     });
 }
 exports.authorize = authorize;

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

@@ -46,7 +46,7 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
 /**
  * クレジットカード決済
  */
-declare function payCreditCard(params: factory.task.pay.IData): (repos: {
+declare function payCreditCard(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     paymentAccepted: PaymentAcceptedRepo;

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

@@ -20,7 +20,6 @@ const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
-// import { person2username } from './any/person2username';
 const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
@@ -28,11 +27,6 @@ const debug = createDebug('chevre-domain:service:payment');
 function authorize(params, paymentServiceId, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // const project = <Pick<factory.project.IProject, 'settings'>>await repos.project.findById({
-        //     id: params.project.id,
-        //     inclusion: ['settings'],
-        //     exclusion: []
-        // });
         var _a, _b, _c, _d, _e;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
@@ -87,7 +81,10 @@ function authorize(params, paymentServiceId, options) {
         const searchTrade4accountId = (options === null || options === void 0 ? void 0 : options.searchTrade4accountId) === true;
         if (searchTrade4accountId) {
             try {
-                const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+                const creditCardService = new GMO.service.Credit({
+                    endpoint: String(availableChannel.serviceUrl),
+                    useFetch: credentials_1.credentials.gmo.useFetch
+                }, { timeout: credentials_1.credentials.gmo.timeout });
                 // ベストエフォートでクレジットカード詳細情報を取得
                 const startSearchTradeDate = Date.now();
                 debug('searchTrade processing...orderId:', orderId, startSearchTradeDate);
@@ -110,7 +107,7 @@ function authorize(params, paymentServiceId, options) {
 }
 exports.authorize = authorize;
 function processAuthorizeCreditCard(params) {
-    // tslint:disable-next-line:max-func-body-length
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return () => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
         // GMOオーソリ取得
@@ -118,24 +115,17 @@ function processAuthorizeCreditCard(params) {
         let entryTranResult;
         let execTranArgs;
         let execTranResult;
-        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(params.availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
         const creditCard = params.object.creditCard;
-        const memberId = creditCard.memberId;
-        const cardSeq = creditCard.cardSeq;
+        const { cardSeq, memberId } = creditCard;
         if (typeof memberId === 'string' && memberId.length > 0 && typeof cardSeq === 'number') {
             // 決済承認時のuseUsernameAsGMOMemberId判定を廃止(2024-01-04~)
-            // 特殊なプロジェクトのみユーザーネームに自動変換(新旧会員互換性維持対応)
-            // memberIdはPersonIDが指定されてくる想定
-            // const useUsernameAsGMOMemberId = params.projectSettings?.useUsernameAsGMOMemberId === true;
-            // if (useUsernameAsGMOMemberId) {
-            //     try {
-            //         const customer = await repos.person.findById({ userId: memberId });
-            //         memberId = await person2username(customer);
-            //     } catch (error) {
-            //         throw error;
-            //     }
-            // }
         }
+        const { cardNo, cardPass, expire } = creditCard;
+        const { token } = creditCard;
         const retUrl = creditCard === null || creditCard === void 0 ? void 0 : creditCard.retUrl;
         // 3DS拡張(2024-01-02~)
         if (params.processPublishPaymentUrl === true && typeof retUrl === 'string' && retUrl.length > 0) {
@@ -165,23 +155,7 @@ function processAuthorizeCreditCard(params) {
                 tds2Type: GMO.utils.util.Tds2Type.Error
             };
             entryTranResult = yield creditCardService.entryTran(entryTranArgs);
-            execTranArgs = {
-                accessId: entryTranResult.accessId,
-                accessPass: entryTranResult.accessPass,
-                orderId: params.orderId,
-                method: params.object.method,
-                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
-                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass,
-                cardNo: creditCard.cardNo,
-                cardPass: creditCard.cardPass,
-                expire: creditCard.expire,
-                token: creditCard.token,
-                memberId: memberId,
-                cardSeq: cardSeq,
-                seqMode: GMO.utils.util.SeqMode.Physics,
-                retUrl,
-                callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.util.CallbackType.Post
-            };
+            execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId: params.orderId, method: params.object.method, siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId, sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass, seqMode: GMO.utils.util.SeqMode.Physics, retUrl, callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.util.CallbackType.Post }, (typeof cardNo === 'string') ? { cardNo } : undefined), (typeof cardPass === 'string') ? { cardPass } : undefined), (typeof expire === 'string') ? { expire } : undefined), (typeof token === 'string') ? { token } : undefined), (typeof memberId === 'string') ? { memberId } : undefined), (typeof cardSeq === 'number') ? { cardSeq } : undefined);
             execTranResult = yield creditCardService.execTran3ds(execTranArgs);
         }
         else {
@@ -197,21 +171,7 @@ function processAuthorizeCreditCard(params) {
                 sitePass: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
             };
             entryTranResult = yield creditCardService.entryTran(entryTranArgs);
-            execTranArgs = {
-                accessId: entryTranResult.accessId,
-                accessPass: entryTranResult.accessPass,
-                orderId: params.orderId,
-                method: params.object.method,
-                siteId: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId,
-                sitePass: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass,
-                cardNo: creditCard.cardNo,
-                cardPass: creditCard.cardPass,
-                expire: creditCard.expire,
-                token: creditCard.token,
-                memberId: memberId,
-                cardSeq: cardSeq,
-                seqMode: GMO.utils.util.SeqMode.Physics
-            };
+            execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId: params.orderId, method: params.object.method, siteId: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId, sitePass: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass, seqMode: GMO.utils.util.SeqMode.Physics }, (typeof cardNo === 'string') ? { cardNo } : undefined), (typeof cardPass === 'string') ? { cardPass } : undefined), (typeof expire === 'string') ? { expire } : undefined), (typeof token === 'string') ? { token } : undefined), (typeof memberId === 'string') ? { memberId } : undefined), (typeof cardSeq === 'number') ? { cardSeq } : undefined);
             execTranResult = yield creditCardService.execTran(execTranArgs);
         }
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
@@ -219,7 +179,10 @@ function processAuthorizeCreditCard(params) {
 }
 function processAuthorizeCreditCard3ds(params) {
     return () => __awaiter(this, void 0, void 0, function* () {
-        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(params.availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
         const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = params.pendingPaymentAgencyTransaction;
         const { accessId, accessPass } = entryTranResult;
         const secureTran2Result = yield creditCardService.secureTran2({ accessId, accessPass });
@@ -291,23 +254,39 @@ function voidTransaction(params) {
             throw new factory.errors.ArgumentNull('object.recipient.id');
         }
         const { shopId, shopPass } = yield getGMOInfoFromSeller({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
-        const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
-        // オーソリ取消
-        // 現時点では、ここで失敗したらオーソリ取消をあきらめる
-        // GMO混雑エラーはここでも発生する(取消処理でも混雑エラーが発生することは確認済)
-        // try {
-        // } catch (error) {
-        //     // no op
-        // }
-        const searchTradeResult = yield creditCardService.searchTrade({
-            shopId: shopId,
-            shopPass: shopPass,
-            orderId: paymentMethodId,
-            siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-            sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
-        });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
+        let searchTradeResult;
+        try {
+            searchTradeResult = yield creditCardService.searchTrade({
+                shopId: shopId,
+                shopPass: shopPass,
+                orderId: paymentMethodId,
+                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+            });
+        }
+        catch (error) {
+            // searchTradeでのエラーをハンドリング(2024-01-27~)
+            let throwsError = true;
+            if (error.name === 'GMOServiceBadRequestError') {
+                if (Array.isArray(error.errors) && error.errors.length > 0) {
+                    const gmoErrors = error.errors;
+                    // 指定されたIDとパスワードの取引が存在しません。
+                    const notFoundErrorExists = gmoErrors.some(({ info }) => info === 'E01110002');
+                    if (notFoundErrorExists) {
+                        throwsError = false;
+                    }
+                }
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
         // 仮売上であれば取消
-        if (searchTradeResult.status === GMO.utils.util.JobCd.Auth) {
+        if ((searchTradeResult === null || searchTradeResult === void 0 ? void 0 : searchTradeResult.status) === GMO.utils.util.JobCd.Auth) {
             yield creditCardService.alterTran({
                 shopId: shopId,
                 shopPass: shopPass,
@@ -348,7 +327,10 @@ function payCreditCard(params) {
         let action = yield repos.action.start(params);
         const alterTranResults = [];
         try {
-            const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+            const creditCardService = new GMO.service.Credit({
+                endpoint: String(availableChannel.serviceUrl),
+                useFetch: credentials_1.credentials.gmo.useFetch
+            }, { timeout: credentials_1.credentials.gmo.timeout });
             yield Promise.all(payObject.map((paymentMethod) => __awaiter(this, void 0, void 0, function* () {
                 alterTranResults.push(...yield processAlterTran({ shopId, shopPass, availableChannel, paymentMethod })({ creditCardService }));
             })));
@@ -500,7 +482,10 @@ function processChangeTransaction(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     return __awaiter(this, void 0, void 0, function* () {
         const alterTranResult = [];
-        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(params.availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
         // 取引状態参照
         const searchTradeResult = yield creditCardService.searchTrade({
             shopId: params.shopId,
@@ -604,7 +589,10 @@ exports.getGMOInfoFromSeller = getGMOInfoFromSeller;
 function searchGMOTrade(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(params.availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
         // 取引状態参照
         debug('searching trade...', params.paymentMethodId);
         const searchTradeResult = yield creditCardService.searchTrade({

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

@@ -9,7 +9,7 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
 declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
 }) => Promise<void>;
-declare function payFaceToFace(params: factory.task.pay.IData): (repos: {
+declare function payFaceToFace(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;

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

@@ -66,7 +66,7 @@ type IPayAction = factory.action.trade.pay.IAction;
 /**
  * MovieTicket着券
  */
-declare function payMovieTicket(params: factory.task.pay.IData): IPayOperation<IPayAction>;
+declare function payMovieTicket(params: factory.task.pay.IPayActionData): IPayOperation<IPayAction>;
 /**
  * MovieTicket着券取消
  */

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

@@ -85,7 +85,7 @@ function checkMovieTicket(params) {
             // action.resultへの保管を廃止(2023-03-24~)
             // movieTickets: []
         };
-        yield repos.action.complete({ typeOf: actionAttributes.typeOf, id: action.id, result });
+        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result });
         return {
             result: checkResult
         };

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

@@ -16,7 +16,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     product: ProductRepo;
 }) => Promise<void>;
-declare function payPaymentCard(params: factory.task.pay.IData): (repos: {
+declare function payPaymentCard(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;

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

@@ -1,10 +1,12 @@
 /**
  * 決済サービス
  */
+import type { MongoRepository as AcceptedOfferRepo } from '../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../repo/event';
+import type { MongoRepository as OrderRepo } from '../repo/order';
 import type { MongoRepository as PaymentServiceRepo } from '../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../repo/paymentServiceProvider';
 import type { MongoRepository as ProductRepo } from '../repo/product';
@@ -17,9 +19,12 @@ import * as factory from '../factory';
  * 決済確定
  */
 export declare function pay(params: factory.task.pay.IData): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    assetTransaction: AssetTransactionRepo;
     event: EventRepo;
+    order: OrderRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/payment.js

@@ -11,29 +11,64 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refund = exports.voidPayment = exports.pay = 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 MovieTicketPaymentService = require("./payment/movieTicket");
 const PaymentCardPaymentService = require("./payment/paymentCard");
+function payTask2payActionAttributes(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        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 (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 payActions[0];
+    });
+}
 /**
  * 決済確定
  */
 function pay(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+        let payActionAttributes;
+        if (params.typeOf === factory.actionType.PayAction) {
+            // タスクにPayActionそのものが指定されていればそのまま処理
+            payActionAttributes = params;
+        }
+        else {
+            // 最適化されたタスクに対応(2024-01-19~)
+            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:
-                yield FaceToFacePaymentService.payFaceToFace(params)(repos);
+                yield FaceToFacePaymentService.payFaceToFace(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                yield PaymentCardPaymentService.payPaymentCard(params)(repos);
+                yield PaymentCardPaymentService.payPaymentCard(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPaymentService.payCreditCard(params)(repos);
+                yield CreditCardPaymentService.payCreditCard(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                yield MovieTicketPaymentService.payMovieTicket(params)(repos);
+                yield MovieTicketPaymentService.payMovieTicket(payActionAttributes)(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);

package/lib/chevre/service/product.js

@@ -42,7 +42,7 @@ function registerService(params) {
             }
             // アクション完了
             const actionResult = {};
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
             yield onRegistered(actionAttributes, serviceOutput)(repos);
         })));
     });

package/lib/chevre/service/reserve/cancelReservation.js

@@ -148,7 +148,7 @@ function cancelPengindIfNotYet(params, __) {
             // } : undefined
             // canceledReservationId: canceledReservation?.id
             };
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return { reserveTransaction };
     });
@@ -288,7 +288,7 @@ function cancelReservation(actionAttributesList) {
                 } : undefined
                 // canceledReservationId: canceledReservation?.id
                 );
-                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;

package/lib/chevre/service/reserve/checkInReservation.d.ts

@@ -30,9 +30,7 @@ interface ICheckInReservationParams {
         code: string;
     };
 }
-export declare function checkInReservation(params: ICheckInReservationParams & {
-    reserveIfNotYet: boolean;
-}): (repos: {
+export declare function checkInReservation(params: ICheckInReservationParams): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;

package/lib/chevre/service/reserve/checkInReservation.js

@@ -19,10 +19,7 @@ function checkInReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        debug('reserveIfNotYet?', params.reserveIfNotYet, 'ids:', params.object.ids, 'reservationNumbers:', params.object.reservationNumbers);
-        if (params.reserveIfNotYet === true) {
-            yield reserveIfNotYet(params)(repos);
-        }
+        yield reserveIfNotYet(params)(repos);
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
@@ -100,7 +97,11 @@ function reserveIfNotYet(params) {
                                 reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
                                     ? reserveTransaction.object.reservationStatus
                                     : factory.reservationStatusType.ReservationPending,
-                                reservationFor: reserveTransaction.object.reservationFor
+                                reservationFor: {
+                                    id: String(reserveTransaction.object.reservationFor.id),
+                                    typeOf: reserveTransaction.object.reservationFor.typeOf,
+                                    optimized: true
+                                } // optimize(2024-01-24~)
                             },
                             agent: reserveTransaction.project,
                             purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }

package/lib/chevre/service/reserve/confirmReservation.js

@@ -138,7 +138,7 @@ function reserveIfNotYet(params, options) {
             }
             // アクション完了
             const actionResult = {};
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
     });
 }