@chevre/domain 22.2.0-alpha.3 → 22.2.0-alpha.30

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.d.ts

@@ -8,5 +8,5 @@ declare function createInformTasks(order: IReturnedOrder, settings: Settings): f
 declare function createOnOrderReturnedTasksByTransaction(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'customer' | 'price' | 'priceCurrency' | 'orderDate'>;
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction };

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -19,7 +19,7 @@ function createPlacingOrderFromExistingTransaction(params) {
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
         let order;
-        const placeOrderTransactions = yield repos.transaction.search({
+        const placeOrderTransactions = yield repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -43,7 +43,7 @@ function createPlacingOrderFromExistingTransaction(params) {
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = yield repos.action.search({
+                authorizePaymentActions = (yield repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {
                         typeOf: { $in: [factory.transactionType.PlaceOrder] },
@@ -51,7 +51,7 @@ function createPlacingOrderFromExistingTransaction(params) {
                     },
                     object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['result'], []);
+                }, ['result'], []));
                 authorizeOfferActionsWithInstrument = (yield repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {

package/lib/chevre/service/order/placeOrder.js

@@ -70,7 +70,7 @@ function placeOrder(params) {
                 id: { $in: [orderActionPurpose.id] },
                 typeOf: { $in: [orderActionPurpose.typeOf] }
             }
-        }, ['_id'], []);
+        }, ['id'], []);
         if (completedActions.length === 0) {
             const action = yield repos.action.start(orderActionAttributes);
             try {

package/lib/chevre/service/order/returnOrder.js

@@ -44,7 +44,7 @@ function returnOrder(params) {
                 throw new factory.errors.Argument('object.orderNumber', `orderStatus not returnable: ${order.orderStatus}`);
         }
         // 返品取引検索
-        const returnOrderTransactions = yield repos.transaction.search({
+        const returnOrderTransactions = yield repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: order.project.id } },

package/lib/chevre/service/order/sendOrder.js

@@ -86,7 +86,8 @@ function sendOrder(params) {
                 typeOf: factory.actionType.SendAction
             };
             const action = yield repos.action.start(sendOrderActionAttributes);
-            let ownershipInfos = [];
+            let creatingOwnershipInfos = [];
+            let createdOwnershipInfos = [];
             let allOffersDelivered = false;
             let acceptedOffers;
             // 所有権生成を最小化(2024-03-01~)
@@ -111,12 +112,15 @@ function sendOrder(params) {
                 debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権作成
                 if (createOwnerships) {
-                    ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                    creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
                         order: Object.assign(Object.assign({}, order), { acceptedOffers }),
                         offerIndexBase
                     });
-                    ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
-                        return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
+                    createdOwnershipInfos = yield Promise.all(creatingOwnershipInfos.map((creatingOwnershipInfo) => __awaiter(this, void 0, void 0, function* () {
+                        const { id } = yield repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
+                        return Object.assign({ id }, (typeof creatingOwnershipInfo.identifier === 'string')
+                            ? { identifier: creatingOwnershipInfo.identifier }
+                            : undefined);
                     })));
                 }
                 // const deliveredCount = limit * page;
@@ -140,7 +144,7 @@ function sendOrder(params) {
                 }
                 throw error;
             }
-            const result = ownershipInfos;
+            const result = createdOwnershipInfos;
             yield repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {

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

@@ -33,4 +33,4 @@ export declare function createAuthorizeResult(params: {
 /**
  * 通知対象としてのアクションを最適化
  */
-export declare function optimizeAction4inform(action: factory.action.trade.pay.IAction | factory.action.trade.refund.IAction): IOnPaymentStatusChangedParams;
+export declare function optimizeAction4inform(action: Pick<factory.action.trade.pay.IAction, 'id' | 'object' | 'project' | 'typeOf'> | Pick<factory.action.trade.refund.IAction, 'id' | 'object' | 'project' | 'typeOf'>): IOnPaymentStatusChangedParams;

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

@@ -8,7 +8,7 @@ import type { TaskRepo } from '../../../repo/task';
 /**
  * 決済後のアクション
  */
-declare function onPaid(payAction: factory.action.trade.pay.IAction): (repos: {
+declare function onPaid(payAction: Pick<factory.action.trade.pay.IAction, 'actionStatus' | 'id' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'typeOf'>): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     task: TaskRepo;

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

@@ -8,7 +8,7 @@ import type { TaskRepo } from '../../../repo/task';
 /**
  * 返金後のアクション
  */
-declare function onRefund(refundAction: factory.action.trade.refund.IAction): (repos: {
+declare function onRefund(refundAction: Pick<factory.action.trade.refund.IAction, 'actionStatus' | 'id' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'typeOf'>): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     task: TaskRepo;

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

@@ -1,20 +1,15 @@
 import * as factory from '../../../factory';
 import type { AuthorizationRepo } from '../../../repo/authorization';
-import type { OwnershipInfoRepo } from '../../../repo/ownershipInfo';
 import type { TicketRepo } from '../../../repo/ticket';
-type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
-    ticketToken?: string;
-};
 declare function verifyTicketTokenAsNeeded(params: {
     project: {
         id: string;
     };
-    object: IObjectWithoutDetail;
+    object: Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'ticketToken'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
 }): (repos: {
     authorization: AuthorizationRepo;
-    ownershipInfo: OwnershipInfoRepo;
     ticket: TicketRepo;
 }) => Promise<{
     permit: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'> | undefined;

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

@@ -13,22 +13,21 @@ exports.verifyTicketTokenAsNeeded = void 0;
 const factory = require("../../../factory");
 function verifyTicketTokenAsNeeded(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { paymentServiceType, object, project } = params;
-        const { ticketToken } = object;
+        const { issuedThrough, ticketToken } = object;
         let permit;
-        switch (paymentServiceType) {
-            case factory.service.paymentService.PaymentServiceType.CreditCard:
-            case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-                if (typeof ticketToken === 'string' && ticketToken !== '') {
-                    let authorizedObject;
-                    const ticket = (yield repos.ticket.search({
+        // メンバーシップチケットが指定された場合、メンバーシップコードへ変換する
+        if (typeof ticketToken === 'string' && ticketToken !== '') {
+            switch (paymentServiceType) {
+                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                    const ticket = (yield repos.ticket.projectFields({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: project.id } },
                         ticketToken: { $eq: ticketToken }
-                    })).shift();
+                    }, ['ticketToken'])).shift();
                     if (ticket === undefined) {
                         throw new factory.errors.NotFound('Ticket');
                     }
@@ -37,41 +36,34 @@ function verifyTicketTokenAsNeeded(params) {
                         project: { id: params.project.id },
                         code: ticket.ticketToken
                     });
-                    authorizedObject = validAuthorization.object;
+                    const authorizedObject = validAuthorization.object;
                     if (authorizedObject.typeOf !== 'OwnershipInfo') {
                         throw new factory.errors.Argument('ticketToken', 'must be OwnershipInfo');
                     }
-                    const ownershipInfoId = authorizedObject.id;
-                    const permitOwnershipInfo = (yield repos.ownershipInfo.search({
-                        limit: 1,
-                        page: 1,
-                        project: { id: { $eq: params.project.id } },
-                        ids: [ownershipInfoId]
-                    })).shift();
-                    if (permitOwnershipInfo === undefined) {
-                        throw new factory.errors.NotFound('OwnershipInfo');
+                    // audience検証
+                    if (((_a = validAuthorization.audience) === null || _a === void 0 ? void 0 : _a.typeOf) !== factory.transactionType.PlaceOrder
+                        || validAuthorization.audience.id !== params.purpose.id) {
+                        throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
                     }
-                    const { ownedBy, typeOfGood } = permitOwnershipInfo;
+                    const { typeOfGood } = authorizedObject;
                     if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                         throw new factory.errors.Argument('ticketToken', 'must be Permit');
                     }
-                    if (((_a = typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) !== paymentServiceType) {
+                    if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
                         throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
                     }
-                    if (!Array.isArray(ownedBy)) {
-                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy must be Array');
-                    }
-                    if (ownedBy[0].typeOf !== factory.transactionType.PlaceOrder) {
-                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy.typeOf must be PlaceOrder');
-                    }
-                    if (ownedBy[0].id !== params.purpose.id) {
-                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy.id not matched');
+                    // CreditCardの場合、発行サービスIDを検証
+                    if (typeOfGood.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                        if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                            throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                        }
                     }
                     permit = { identifier: typeOfGood.identifier };
-                }
-                break;
-            default:
-            // no op
+                    break;
+                default:
+                    // no op
+                    throw new factory.errors.NotImplemented(`ticketToken issued through ${paymentServiceType} not implemented`);
+            }
         }
         return { permit };
     });

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

@@ -10,7 +10,6 @@ import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../repo/confirmationNumber';
 import type { EventRepo } from '../../repo/event';
-import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { ProductRepo } from '../../repo/product';
@@ -80,7 +79,6 @@ interface IAuthorizeRepos {
     authorization: AuthorizationRepo;
     confirmationNumber: ConfirmationNumberRepo;
     event: EventRepo;
-    ownershipInfo: OwnershipInfoRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -97,9 +95,11 @@ type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings, crede
 interface IPublishPaymentUrlRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    authorization: AuthorizationRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -117,7 +117,7 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'ticketToken'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;

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

@@ -62,7 +62,7 @@ function invalidatePaymentUrl(params) {
         if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.Argument('purpose.typeOf', `must be ${factory.transactionType.PlaceOrder}`);
         }
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['typeOf', 'status', 'object', 'project', 'seller', 'agent']);
@@ -129,10 +129,10 @@ function processVoidPayTransaction(params) {
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
-            transaction = (yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status']));
+            transaction = (yield repos.transaction.projectFieldsInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status']));
         }
         else {
-            transaction = (yield repos.transaction.findById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'result']));
+            transaction = (yield repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'result']));
         }
         // 承認アクションを取得
         let authorizeActions;
@@ -228,16 +228,24 @@ exports.processVoidPayTransaction = processVoidPayTransaction;
 function publishPaymentUrl(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
-            throw new factory.errors.NotImplemented(`purpose.typeOf '${params.purpose.typeOf} not implemented'`);
+        const { paymentServiceType, purpose, project } = params;
+        if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
         try {
-            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['expires', 'seller', 'project']);
-            const paymentServiceType = params.paymentServiceType;
+            const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
             // 取引番号生成
-            const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
-                startDate: new Date()
-            });
+            let transactionNumber;
+            // support ticketToken(2024-08-21~)
+            const { permit } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
+            const paymentMethodIdByPermit = permit === null || permit === void 0 ? void 0 : permit.identifier;
+            if (typeof paymentMethodIdByPermit === 'string') {
+                transactionNumber = paymentMethodIdByPermit;
+            }
+            if (typeof transactionNumber !== 'string') {
+                const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+                transactionNumber = publishTransactionNumberResult.transactionNumber;
+            }
             let result;
             // URL発行
             const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
@@ -310,7 +318,7 @@ function authorize(params) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
         const confirmationNumber = yield (0, fixConfirmationNumberAsNeeded_1.fixConfirmationNumberAsNeeded)({ purpose, paymentServiceType })(repos);
-        const transaction = yield repos.transaction.findInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
+        const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
         // 取引番号生成
         let transactionNumber;
         let pendingPaymentAgencyTransaction;
@@ -407,9 +415,9 @@ function authorize(params) {
                 const rawError = Array.isArray(error) ? error[1] : undefined;
                 if (rawError !== undefined && rawError.name !== 'AbortError') {
                     yield processVoidPayTransaction({
-                        project: action.project,
+                        project: actionAttributes.project,
                         id: action.id,
-                        purpose: action.purpose
+                        purpose: actionAttributes.purpose
                     })(repos);
                 }
             }

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

@@ -85,7 +85,7 @@ function processAuthorizeCreditCard(params) {
                 sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
             };
             // add action(2024-06-12~)
-            action = (yield repos.action.start(actionAttributes, { recipe }));
+            action = yield repos.action.start(actionAttributes, { recipe });
             try {
                 entryTranResult = yield repos.creditCardService.entryTran(entryTranArgs);
                 execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, 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);

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

@@ -34,7 +34,7 @@ function processAuthorizeCreditCard3ds(params) {
             sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
         };
         // add action(2024-06-12~)
-        action = (yield repos.action.start(actionAttributes, { recipe }));
+        action = yield repos.action.start(actionAttributes, { recipe });
         try {
             secureTran2Result = yield repos.creditCardService.secureTran2(secureTran2Args);
         }

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

@@ -6,7 +6,6 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-type IPayAction = factory.action.trade.pay.IAction;
 /**
  * クレジットカード決済
  */
@@ -17,5 +16,5 @@ declare function payCreditCard(params: factory.action.trade.pay.IAttributes): (r
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<IPayAction>;
+}, settings: Settings) => Promise<void>;
 export { payCreditCard };

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

@@ -38,8 +38,7 @@ function payCreditCard(params) {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
         const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
-        // アクション開始
-        let action = yield repos.action.start(params);
+        const action = yield repos.action.start(params);
         const alterTranResults = [];
         const processAlterTranResults = [];
         let recipe;
@@ -80,9 +79,17 @@ function payCreditCard(params) {
         const actionResult = {
         // creditCardSales: alterTranResults // discontinue(2024-06-10~)
         };
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe }));
-        yield (0, onPaid_1.onPaid)(action)(repos);
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        yield (0, onPaid_1.onPaid)({
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            id: action.id,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
+            typeOf: action.typeOf
+        })(repos);
+        // return action;
     });
 }
 exports.payCreditCard = payCreditCard;

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

@@ -29,6 +29,7 @@ const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
 /**
  * クレジットカード返金
  */
+// tslint:disable-next-line:max-func-body-length
 function refundCreditCard(params, options) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -59,7 +60,7 @@ function refundCreditCard(params, options) {
             id: paymentServiceId
         });
         const { sameAs } = params, startingActionParams = __rest(params, ["sameAs"]);
-        let action = yield repos.action.start(Object.assign(Object.assign({}, startingActionParams), (typeof ((_g = params.sameAs) === null || _g === void 0 ? void 0 : _g.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined));
+        const action = yield repos.action.start(Object.assign(Object.assign({}, startingActionParams), (typeof ((_g = params.sameAs) === null || _g === void 0 ? void 0 : _g.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined));
         const alterTranResult = [];
         let processAlterTranResult;
         let recipe;
@@ -97,8 +98,17 @@ function refundCreditCard(params, options) {
             throw error;
         }
         const actionResult = {}; // optimize(2024-06-10~)
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe })); // add recipe(2024-06-04~)
-        yield (0, onRefund_1.onRefund)(action)(repos);
+        // add recipe(2024-06-04~)
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        yield (0, onRefund_1.onRefund)({
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            id: action.id,
+            object: startingActionParams.object,
+            potentialActions: startingActionParams.potentialActions,
+            project: startingActionParams.project,
+            purpose: startingActionParams.purpose,
+            typeOf: action.typeOf
+        })(repos);
         // return action;
     });
 }

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

@@ -49,7 +49,7 @@ function voidTransaction(params) {
             typeOf: { $eq: factory.actionType.AuthorizeAction },
             object: { paymentMethodId: { $eq: paymentMethodId } },
             sameAs: { id: { $eq: transaction.id } }
-        }, ['_id', 'typeOf', 'project'], [])).shift();
+        }, ['id', 'typeOf', 'project'], [])).shift();
         if (authorizeInvoiceAction !== undefined) {
             const cancelAction = {
                 startTime: new Date(),

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

@@ -14,11 +14,11 @@ declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (r
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
+}) => Promise<void>;
 declare function refundFaceToFace(params: factory.task.refund.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
+}) => Promise<void>;
 export { payFaceToFace, refundFaceToFace, voidTransaction };

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

@@ -10,6 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.voidTransaction = exports.refundFaceToFace = exports.payFaceToFace = void 0;
+/**
+ * 対面決済サービス
+ */
+const factory = require("../../factory");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
 function voidTransaction(__) {
@@ -20,8 +24,7 @@ function voidTransaction(__) {
 exports.voidTransaction = voidTransaction;
 function payFaceToFace(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // アクション開始
-        let action = yield repos.action.start(params);
+        const action = yield repos.action.start(params);
         try {
             // no op
         }
@@ -34,17 +37,24 @@ function payFaceToFace(params) {
             }
             throw error;
         }
-        // アクション完了
         const actionResult = {};
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
-        yield (0, onPaid_1.onPaid)(action)(repos);
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield (0, onPaid_1.onPaid)({
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            id: action.id,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
+            typeOf: action.typeOf
+        })(repos);
+        // return action;
     });
 }
 exports.payFaceToFace = payFaceToFace;
 function refundFaceToFace(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let action = yield repos.action.start(params);
+        const action = yield repos.action.start(params);
         try {
             // no op
         }
@@ -58,9 +68,17 @@ function refundFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
-        yield (0, onRefund_1.onRefund)(action)(repos);
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield (0, onRefund_1.onRefund)({
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            id: action.id,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
+            typeOf: action.typeOf
+        })(repos);
+        // return action;
     });
 }
 exports.refundFaceToFace = refundFaceToFace;

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

@@ -10,7 +10,6 @@ import { Settings } from '../../../settings';
 interface IAuthorizeResult {
     accountId: string;
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
-    payAction: factory.action.trade.pay.IAction;
 }
 /**
  * 決済カード承認

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

@@ -22,7 +22,7 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
-        let payAction;
+        // let payAction: factory.action.trade.pay.IAction;
         let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
@@ -64,7 +64,8 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
                 ? { sameAs: { id: options.executor.id, typeOf: 'Task' } } // link sameAs(2024-06-04~)
                 : undefined);
             // 着券させざるをえないが、informPaymentはしない(注文がまだ存在しないため)
-            payAction = yield (0, payMovieTicket_1.payMovieTicket)(payActionAttributes)(repos, settings);
+            // payAction = await payMovieTicket(payActionAttributes)(repos, settings);
+            yield (0, payMovieTicket_1.payMovieTicket)(payActionAttributes)(repos, settings);
         }
         catch (error) {
             // アクション保管用のエラーと両方throw(2024-05-22~)
@@ -76,7 +77,11 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
             }
             // throw handleMvtkReserveError(error);
         }
-        return { accountId, payAction, accountsReceivablesByServiceType };
+        return {
+            accountId,
+            // payAction, // discontinue(2024-08-28~)
+            accountsReceivablesByServiceType
+        };
     });
 }
 exports.authorize = authorize;

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

@@ -17,9 +17,8 @@ interface IPayOperationRepos {
     task: TaskRepo;
 }
 type IPayOperation<T> = (repos: IPayOperationRepos, settings: Settings) => Promise<T>;
-type IPayAction = factory.action.trade.pay.IAction;
 /**
  * 決済カード決済
  */
-declare function payMovieTicket(params: factory.action.trade.pay.IAttributes): IPayOperation<IPayAction>;
+declare function payMovieTicket(params: factory.action.trade.pay.IAttributes): IPayOperation<void>;
 export { payMovieTicket };