@chevre/domain 21.20.0-alpha.1 → 21.20.0-alpha.10

package/example/src/chevre/retryTasks.ts

@@ -0,0 +1,39 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+
+import * as  moment from 'moment';
+import * as  mongoose from 'mongoose';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+    const result = await taskRepo.taskModel.updateMany(
+        {
+            status: { $eq: chevre.factory.taskStatus.Aborted },
+            lastTriedAt: {
+                $gt: moment()
+                    .add(-1, 'day')
+                    .toDate()
+            },
+            name: { $eq: chevre.factory.taskName.TriggerWebhook },
+            'project.id': { $eq: project.id }
+        },
+        {
+            $set: {
+                status: chevre.factory.taskStatus.Ready,
+                remainingNumberOfTries: 20
+            }
+        }
+    )
+        .exec();
+    console.log('result:', result);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -1,11 +1,23 @@
 // tslint:disable:no-console
 import * as mongoose from 'mongoose';
+import * as readline from 'readline';
 import * as redis from 'redis';
 
 import { chevre } from '../../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 const CLIENT_ID = '51qbjcfr72h62m06vtv5kkhgje';
+const paymentMethodType = 'CreditCard';
+const paymentServiceId = '5f9a4fed4f3709000abe6415';
+// const paymentMethodType = 'PayPay';
+// const paymentServiceId = '60e9560176a391000b23e20b';
+const AMOUNT: number = 1;
+const creditCard: chevre.factory.paymentMethod.paymentCard.creditCard.IUncheckedCardRaw = {
+    cardNo: '4100000000000100',
+    expire: '2812',
+    cardPass: '123',
+    holderName: 'AA AA'
+};
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -37,21 +49,14 @@ async function main() {
         project: { id: project.id },
         agent: { id: CLIENT_ID },
         object: {
-            // accountId?: string;
-            // additionalProperty?: IPropertyValue<string>[];
-            amount: 1,
-            // description?: string;
-            // name?: string;
-            paymentMethod: 'PayPay',
-            // paymentMethodId?: string;
             typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
-            issuedThrough: { id: '60e9560176a391000b23e20b' },
+            amount: AMOUNT,
+            paymentMethod: paymentMethodType,
+            issuedThrough: { id: paymentServiceId },
             method: '1',
             creditCard: {
-                cardNo: '4100000000000100',
-                expire: '2812',
-                cardPass: '123',
-                holderName: 'AA AA'
+                ...creditCard,
+                retUrl: String(process.env.SECURE_TRAN_RET_URL)
             }
         },
         purpose: { id: transaction.id, typeOf: transaction.typeOf },
@@ -60,70 +65,107 @@ async function main() {
             typeOf: chevre.factory.creativeWorkType.WebApplication,
             id: CLIENT_ID
         }
-        // options: {
-        //     use3DS: true
-        // }
     })({
         assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
         paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
         paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
         paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
         person: await chevre.repository.Person.createInstance({ userPoolId: '' }),
-        project: await chevre.repository.Project.createInstance(mongoose.connection),
         transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
         transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
     });
     console.log(publishPaymentUrlResult);
 
-    const authorizeResult = await (await chevre.service.payment.any.createService()).authorize({
-        project: { id: project.id },
-        agent: { id: CLIENT_ID },
-        object: {
-            // accountId?: string;
-            // additionalProperty?: IPropertyValue<string>[];
-            amount: 1,
-            // description?: string;
-            // name?: string;
-            paymentMethod: 'PayPay',
-            paymentMethodId: publishPaymentUrlResult.paymentMethodId,
-            typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
-            issuedThrough: { id: '60e9560176a391000b23e20b' },
-            method: '1',
-            creditCard: {
-                cardNo: '4100000000000100',
-                expire: '2812',
-                cardPass: '123',
-                holderName: 'AA AA'
+    // wait callback...
+    // tslint:disable-next-line:max-func-body-length
+    await new Promise<void>((resolve, reject) => {
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout
+        });
+
+        // tslint:disable-next-line:max-func-body-length
+        rl.question('callback received?:\n', async () => {
+            try {
+                await new Promise<void>(async (resolve2, reject2) => {
+                    const rl2 = readline.createInterface({
+                        input: process.stdin,
+                        output: process.stdout
+                    });
+
+                    rl2.question('VOID or AUTH?:\n', async (jobCd) => {
+                        if (jobCd === 'AUTH') {
+                            const authorizeResult = await (await chevre.service.payment.any.createService()).authorize({
+                                project: { id: project.id },
+                                agent: { id: CLIENT_ID },
+                                object: {
+                                    typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
+                                    amount: AMOUNT,
+                                    paymentMethodId: publishPaymentUrlResult.paymentMethodId,
+                                    paymentMethod: paymentMethodType,
+                                    issuedThrough: { id: paymentServiceId },
+                                    method: '1',
+                                    creditCard
+                                },
+                                purpose: { id: transaction.id, typeOf: transaction.typeOf },
+                                paymentServiceType: chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
+                                location: {
+                                    typeOf: chevre.factory.creativeWorkType.WebApplication,
+                                    id: CLIENT_ID
+                                },
+                                options: {
+                                    useCancelPayTransactionOnFailed: false,
+                                    useCheckMovieTicketBeforePay: false,
+                                    useCheckByIdentifierIfNotYet: false,
+                                    useSearchTrade4accountId: false
+                                }
+                            })({
+                                accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
+                                action: await chevre.repository.Action.createInstance(mongoose.connection),
+                                assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
+                                event: await chevre.repository.Event.createInstance(mongoose.connection),
+                                paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
+                                paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
+                                paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
+                                person: await chevre.repository.Person.createInstance({ userPoolId: '' }),
+                                product: await chevre.repository.Product.createInstance(mongoose.connection),
+                                task: await chevre.repository.Task.createInstance(mongoose.connection),
+                                transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
+                                transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
+                            });
+                            console.log('payment authorized.', authorizeResult.result);
+                        } else if (jobCd === 'VOID') {
+                            await (await chevre.service.payment.any.createService()).invalidatePaymentUrl({
+                                project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+                                purpose: { id: transaction.id, typeOf: transaction.typeOf }
+                            })({
+                                accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
+                                action: await chevre.repository.Action.createInstance(mongoose.connection),
+                                assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
+                                paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
+                                paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
+                                paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
+                                task: await chevre.repository.Task.createInstance(mongoose.connection),
+                                transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
+                            });
+                            console.log('payment voided.');
+                        } else {
+                            reject2(`jobCd ${jobCd} not implemented`);
+
+                            return;
+                        }
+
+                        // rl.close();
+                        resolve2();
+                    });
+                });
+
+                resolve();
+            } catch (error) {
+                reject(error);
             }
-        },
-        purpose: { id: transaction.id, typeOf: transaction.typeOf },
-        paymentServiceType: chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
-        location: {
-            typeOf: chevre.factory.creativeWorkType.WebApplication,
-            id: CLIENT_ID
-        },
-        options: {
-            useCancelPayTransactionOnFailed: false,
-            useCheckMovieTicketBeforePay: false,
-            useCheckByIdentifierIfNotYet: false,
-            useSearchTrade4accountId: false
-        }
-    })({
-        accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
-        action: await chevre.repository.Action.createInstance(mongoose.connection),
-        assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
-        event: await chevre.repository.Event.createInstance(mongoose.connection),
-        paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
-        paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
-        paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
-        person: await chevre.repository.Person.createInstance({ userPoolId: '' }),
-        product: await chevre.repository.Product.createInstance(mongoose.connection),
-        project: await chevre.repository.Project.createInstance(mongoose.connection),
-        task: await chevre.repository.Task.createInstance(mongoose.connection),
-        transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
-        transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
+        });
     });
-    console.log(authorizeResult);
 }
 
 main()

package/lib/chevre/repo/action.d.ts

@@ -78,10 +78,10 @@ export declare class MongoRepository {
     /**
      * アクション取消
      */
-    cancel<T extends factory.actionType>(params: {
-        typeOf: T;
+    cancelWithVoid(params: {
+        typeOf: factory.actionType;
         id: string;
-    }): Promise<IAction<T>>;
+    }): Promise<void>;
     /**
      * アクション失敗
      */

package/lib/chevre/repo/action.js

@@ -511,18 +511,16 @@ class MongoRepository {
     /**
      * アクション取消
      */
-    cancel(params) {
+    cancelWithVoid(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.actionModel.findOneAndUpdate({
-                typeOf: params.typeOf,
-                _id: params.id
-            }, { actionStatus: factory.actionStatusType.CanceledActionStatus }, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf }
+            }, { actionStatus: factory.actionStatusType.CanceledActionStatus }, { new: false, projection: { _id: 1 } })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
             }
-            return doc.toObject();
         });
     }
     /**

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

@@ -13,7 +13,6 @@ import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentSe
 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 ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
@@ -27,17 +26,12 @@ export interface IStartOperationRepos {
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
 }
 export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 export interface ICancelRepos {
-    action: ActionRepo;
-    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
-    project: ProjectRepo;
-    task: TaskRepo;
 }
 export type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
 export interface IConfirmRepos {
@@ -47,7 +41,6 @@ export interface IConfirmRepos {
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;
     order: OrderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }
 export type IConfirmOperation<T> = (repos: IConfirmRepos) => Promise<T>;
@@ -61,14 +54,12 @@ export type ICheckOperation<T> = (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
-    project: ProjectRepo;
 }) => Promise<T>;
 export type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;
@@ -76,7 +67,6 @@ export type IInvalidatePaymentUrlOperation<T> = (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;

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

@@ -23,7 +23,7 @@ const potentialActions_1 = require("./pay/potentialActions");
  */
 function publishPaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
         // 金額をfix
         const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
@@ -40,14 +40,22 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false })(repos);
-                const acsUrl = authorizeResult.execTranResult.acsUrl;
-                if (typeof acsUrl !== 'string' || acsUrl.length === 0) {
-                    throw new factory.errors.ServiceUnavailable('Payment URL unable to publish');
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false, processPublishPaymentUrl: true })(repos);
+                let paymentUrl;
+                // 3DS拡張(2024-01-02~)
+                const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
+                if (typeof retUrl === 'string' && retUrl.length > 0) {
+                    paymentUrl = authorizeResult.execTranResult.redirectUrl;
+                }
+                else {
+                    paymentUrl = authorizeResult.execTranResult.acsUrl;
+                }
+                if (typeof paymentUrl !== 'string' || paymentUrl.length === 0) {
+                    throw new factory.errors.ServiceUnavailable(`Payment URL unable to publish. [retUrl: ${retUrl}]`);
                 }
                 result = {
                     paymentMethodId: transactionNumber,
-                    paymentUrl: acsUrl,
+                    paymentUrl,
                     entryTranArgs: authorizeResult.entryTranArgs,
                     entryTranResult: authorizeResult.entryTranResult,
                     execTranArgs: authorizeResult.execTranArgs,
@@ -71,7 +79,7 @@ function invalidatePaymentUrl(params) {
         const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPayment.refundCreditCard(params, false)(repos);
+                yield CreditCardPayment.refundCreditCard(params, { requirePayAction: false })(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
@@ -296,20 +304,14 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 }
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false, searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
         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
-            }
+            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);
     });
 }

package/lib/chevre/service/code.js

@@ -103,7 +103,7 @@ function verifyToken(params) {
             throw error;
         }
         if (repos.action !== undefined && action !== undefined) {
-            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 result;
     });

package/lib/chevre/service/delivery.js

@@ -63,7 +63,7 @@ function givePointAward(params) {
         }
         // アクション完了
         const actionResult = {};
-        yield repos.action.complete({ typeOf: params.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: params.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.givePointAward = givePointAward;
@@ -140,7 +140,7 @@ function returnPointAward(params) {
         const actionResult = {
             moneyTransferTransaction: moneyTransferTransactions
         };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.returnPointAward = returnPointAward;

package/lib/chevre/service/event/createEvent.js

@@ -80,7 +80,7 @@ function createEvent(params) {
             }
             throw error;
         }
-        yield repos.action.complete({
+        yield repos.action.completeWithVoid({
             typeOf: action.typeOf,
             id: action.id,
             result: (Array.isArray(eventIds))

package/lib/chevre/service/event.js

@@ -193,7 +193,7 @@ function importFromCOA(params) {
         }
         // アクション完了
         const actionResult = { savedScreeningEventsCount, savedScreeningEventSeriesCount };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.importFromCOA = importFromCOA;
@@ -807,7 +807,7 @@ function updateEvent4ttts(params) {
             throw error;
         }
         // アクション完了
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
         yield (0, offer_1.onEventChanged)({
             id: [event.id],
             project: { id: event.project.id },

package/lib/chevre/service/moneyTransfer.js

@@ -439,7 +439,7 @@ function moneyTransfer(params) {
             throw error;
         }
         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 });
     });
 }
 exports.moneyTransfer = moneyTransfer;

package/lib/chevre/service/notification.js

@@ -11,14 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = exports.report2developers = exports.sendEmailMessage = void 0;
 const sgMail = require("@sendgrid/mail");
-const createDebug = require("debug");
 const http_status_1 = require("http-status");
 const request = require("request");
 const util = require("util");
 const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const factory = require("../factory");
-const debug = createDebug('chevre-domain:service');
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
@@ -110,8 +108,7 @@ function sendEmailMessage(params) {
             throw error;
         }
         // アクション完了
-        debug('ending action...');
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
 exports.sendEmailMessage = sendEmailMessage;
@@ -365,6 +362,6 @@ function processInformAction(params) {
                 throw error;
             }
         }
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }

package/lib/chevre/service/offer/event/cancel.js

@@ -28,7 +28,8 @@ function cancel(params) {
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        const action = yield repos.action.cancel({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         switch (action.instrument.identifier) {
             case factory.service.webAPI.Identifier.COA:
                 // 実質使用する予定なしなので廃止(2022-05-12~)

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -60,7 +60,7 @@ function voidTransaction(params) {
             // no op
         }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             switch (action.instrument.identifier) {
                 case exports.WebAPIIdentifier.COA:
                     yield processVoidTransaction4coa({

package/lib/chevre/service/offer/eventServiceByCOA.js

@@ -143,13 +143,13 @@ function cancel(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // 取引内のアクションかどうか確認
-        let action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         // MongoDBでcompleteステータスであるにも関わらず、COAでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        action = yield repos.action.cancel({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         let cancelResult;
         const actionResult = action.result;
         if ((actionResult === null || actionResult === void 0 ? void 0 : actionResult.requestBody) !== undefined && actionResult.responseBody !== undefined) {

package/lib/chevre/service/offer/moneyTransfer/authorize.d.ts

@@ -24,5 +24,10 @@ export declare function authorize(params: {
     };
     object: factory.action.authorize.offer.moneyTransfer.IObject;
     purpose: factory.action.authorize.offer.moneyTransfer.IPurpose;
-}): IAuthorizeOperation<factory.action.authorize.offer.moneyTransfer.IAction>;
+}): IAuthorizeOperation<{
+    /**
+     * 承認アクションID
+     */
+    id: string;
+}>;
 export {};

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -64,7 +64,8 @@ function authorize(params) {
             requestBody: requestBody,
             responseBody: responseBody
         };
-        return 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/offer/moneyTransfer/returnMoneyTransfer.js

@@ -74,7 +74,7 @@ function returnMoneyTransfer(params) {
             throw error;
         }
         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 });
     });
 }
 exports.returnMoneyTransfer = returnMoneyTransfer;

package/lib/chevre/service/offer/moneyTransfer/settleTransaction.js

@@ -27,7 +27,7 @@ function settleTransaction(params) {
             throw error;
         }
         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 });
     });
 }
 exports.settleTransaction = settleTransaction;

package/lib/chevre/service/offer/moneyTransfer/voidTransaction.js

@@ -45,7 +45,7 @@ function voidTransaction(params) {
         }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             const pendingTransactionTransactionNumber = (_b = (_a = action.object.itemOffered.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber;
             if (typeof pendingTransactionTransactionNumber === 'string') {
                 // 取引が存在すれば中止

package/lib/chevre/service/offer/product.js

@@ -247,7 +247,7 @@ function voidTransaction(params) {
                 //     purpose: params.purpose
                 // })(repos);
             }
-            yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             yield processVoidRegisterServiceTransaction({
                 action,
                 project: params.project

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

@@ -36,7 +36,7 @@ function confirmPayTransaction(data) {
                     assetTransaction: repos.assetTransaction,
                     event: repos.event,
                     order: repos.order,
-                    project: repos.project,
+                    // project: repos.project,
                     task: repos.task
                 });
             }
@@ -52,7 +52,7 @@ function confirmPayTransaction(data) {
         }
         // アクション完了
         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 });
         // processOrder連携(2023-08-23~)
         yield onConfirmed(data)({
             task: repos.task