@chevre/domain 21.34.0-alpha.13 → 21.34.0-alpha.15

package/example/src/chevre/migratePayTransactionRecipes.ts

@@ -0,0 +1,251 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
+    const cursor = assetTransactionRepo.getCursor(
+        {
+            // transactionNumber: { $eq: '792921546706869' },
+            typeOf: { $eq: chevre.factory.assetTransactionType.Pay },
+            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
+            startDate: {
+                // $lte: moment()
+                //     // tslint:disable-next-line:no-magic-numbers
+                //     .add(-28, 'days'),
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-180, 'days')
+            },
+            'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard }
+        },
+        {
+            __id: 1, startDate: 1, object: 1, project: 1, typeOf: 1, status: 1, transactionNumber: 1
+        }
+    );
+    console.log('transactions found');
+
+    let i = 0;
+    let updateCount = 0;
+    let saveRecipeCount = 0;
+    let saveActionCount = 0;
+    // tslint:disable-next-line:max-func-body-length
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const payTransaction = <Pick<
+            chevre.factory.assetTransaction.pay.ITransaction,
+            'id' | 'startDate' | 'object' | 'project' | 'typeOf' | 'status' | 'transactionNumber'
+        >>doc.toObject();
+        let authorizeInvoiceAction: chevre.factory.action.authorize.invoice.IAction | undefined;
+        authorizeInvoiceAction = (<chevre.factory.action.authorize.invoice.IAction[]>await actionRepo.search(
+            {
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: payTransaction.project.id } },
+                agent: {
+                    id: { $in: [payTransaction.project.id] },
+                    typeOf: { $in: [chevre.factory.organizationType.Project] }
+                },
+                object: {
+                    typeOf: { $eq: 'Invoice' },
+                    paymentMethodId: { $eq: payTransaction.transactionNumber }
+                },
+                typeOf: { $eq: chevre.factory.actionType.AuthorizeAction }
+            },
+            [],
+            []
+        )).shift();
+        // authorizeInvoiceAction = undefined;
+
+        const entryTranArgs: chevre.factory.action.authorize.invoice.IEntryTranArgs = (<any>payTransaction.object).entryTranArgs;
+        const entryTranResult: chevre.factory.action.authorize.invoice.IEntryTranResult = (<any>payTransaction.object).entryTranResult;
+        const execTranArgs: chevre.factory.action.authorize.invoice.IExecTranArgs = (<any>payTransaction.object).execTranArgs;
+        const execTranResult: chevre.factory.action.authorize.invoice.IExecTranResult = (<any>payTransaction.object).execTranResult;
+        const secureTran2Result: chevre.factory.action.authorize.invoice.ISecureTran2Result =
+            (<any>payTransaction.object).secureTran2Result;
+
+        if (authorizeInvoiceAction !== undefined) {
+            console.log(
+                'authorizeInvoiceAction already exists. step:',
+                authorizeInvoiceAction.object.paymentMethodId,
+                payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+            );
+
+            const actionRecipe = await actionRepo.findRecipeByAction<chevre.factory.recipe.RecipeCategory.checkMovieTicket>({
+                project: { id: authorizeInvoiceAction.project.id },
+                recipeFor: { id: authorizeInvoiceAction.id }
+            });
+
+            if (actionRecipe !== null) {
+                console.log(
+                    'actionRecipe already exists. step:',
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+                );
+
+                // optimize payTransaction.object
+                let unsetResult: any;
+                if (secureTran2Result !== undefined) {
+                    unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
+                        filter: { _id: { $eq: payTransaction.id } },
+                        $unset: {
+                            'object.secureTran2Result': 1
+                        }
+                    });
+                    updateCount += 1;
+                } else if (entryTranArgs !== undefined && execTranResult !== undefined) {
+                    if (typeof (<any>execTranResult).redirectUrl !== 'string') {
+                        unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
+                            filter: { _id: { $eq: payTransaction.id } },
+                            $unset: {
+                                'object.entryTranArgs': 1,
+                                'object.entryTranResult': 1,
+                                'object.execTranArgs': 1,
+                                'object.execTranResult': 1
+                            }
+                        });
+                        updateCount += 1;
+                    }
+                }
+                console.log(
+                    'result unset. unsetResult:', unsetResult,
+                    actionRecipe.step.length,
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+                );
+            } else {
+                console.log(
+                    'creating recipe...',
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+                );
+                if (entryTranArgs === undefined) {
+                    throw new Error('entryTranArgs undefined');
+                }
+                if (entryTranResult === undefined) {
+                    throw new Error('entryTranResult undefined');
+                }
+                if (execTranArgs === undefined) {
+                    throw new Error('execTranArgs undefined');
+                }
+                if (execTranResult === undefined) {
+                    throw new Error('execTranResult undefined');
+                }
+
+                let recipe: (chevre.factory.action.authorize.invoice.IAuthorizeInvoiceRecipe
+                    | chevre.factory.action.authorize.invoice.IAuthorizeInvoice3dsRecipe) & {
+                        recipeFor: { id: string; typeOf: chevre.factory.actionType };
+                        dateCreated: Date;
+                        dateModified: Date;
+                    };
+                if (secureTran2Result !== undefined) {
+                    recipe = {
+                        project: { id: payTransaction.project.id, typeOf: chevre.factory.organizationType.Project },
+                        typeOf: 'Recipe',
+                        recipeCategory: chevre.factory.recipe.RecipeCategory.authorizeInvoice3ds,
+                        recipeFor: { id: authorizeInvoiceAction.id, typeOf: authorizeInvoiceAction.typeOf },
+                        step: [{
+                            typeOf: 'HowToSection',
+                            itemListElement: [
+                                {
+                                    typeOf: 'HowToStep',
+                                    identifier: chevre.factory.recipe.StepIdentifier.secureTran2,
+                                    itemListElement: [{
+                                        typeOf: 'HowToDirection',
+                                        afterMedia: secureTran2Result
+                                    }]
+                                }
+                            ]
+                        }],
+                        dateCreated: moment(authorizeInvoiceAction.endDate)
+                            .toDate(),
+                        dateModified: moment(authorizeInvoiceAction.endDate)
+                            .toDate()
+                    };
+                } else {
+                    recipe = {
+                        project: { id: payTransaction.project.id, typeOf: chevre.factory.organizationType.Project },
+                        typeOf: 'Recipe',
+                        recipeCategory: chevre.factory.recipe.RecipeCategory.authorizeInvoice,
+                        recipeFor: { id: authorizeInvoiceAction.id, typeOf: authorizeInvoiceAction.typeOf },
+                        step: [{
+                            typeOf: 'HowToSection',
+                            itemListElement: [
+                                {
+                                    typeOf: 'HowToStep',
+                                    identifier: chevre.factory.recipe.StepIdentifier.entryTran,
+                                    itemListElement: [{
+                                        typeOf: 'HowToDirection',
+                                        beforeMedia: entryTranArgs,
+                                        afterMedia: entryTranResult
+                                    }]
+                                },
+                                {
+                                    typeOf: 'HowToStep',
+                                    identifier: chevre.factory.recipe.StepIdentifier.execTran,
+                                    itemListElement: [{
+                                        typeOf: 'HowToDirection',
+                                        beforeMedia: execTranArgs,
+                                        afterMedia: execTranResult
+                                    }]
+                                }
+                            ]
+                        }],
+                        dateCreated: moment(authorizeInvoiceAction.endDate)
+                            .toDate(),
+                        dateModified: moment(authorizeInvoiceAction.endDate)
+                            .toDate()
+                    };
+                }
+                console.log(
+                    'saving recipe...',
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i);
+                // tslint:disable-next-line:no-null-keyword
+                console.dir(recipe, { depth: null });
+                await actionRepo.saveRecipeWithDateCreated(recipe);
+                saveRecipeCount += 1;
+                console.log('recipe saved.', payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i);
+            }
+        } else {
+            const creatingAction: Omit<chevre.factory.action.authorize.invoice.IAction, 'id'> = {
+                project: { id: payTransaction.project.id, typeOf: chevre.factory.organizationType.Project },
+                typeOf: chevre.factory.actionType.AuthorizeAction,
+                agent: { id: payTransaction.project.id, typeOf: chevre.factory.organizationType.Project },
+                object: {
+                    typeOf: 'Invoice',
+                    paymentMethodId: payTransaction.transactionNumber
+                },
+                startDate: moment(payTransaction.startDate)
+                    .toDate(),
+                endDate: moment(payTransaction.startDate)
+                    .toDate(),
+                actionStatus: chevre.factory.actionStatusType.CompletedActionStatus,
+                result: {},
+                sameAs: { id: payTransaction.id, typeOf: payTransaction.typeOf }
+            };
+            console.log(
+                'creating action...',
+                payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+            );
+            // tslint:disable-next-line:no-null-keyword
+            console.dir(creatingAction, { depth: null });
+            const saveActionResult = await actionRepo.saveActionWithEndDate(creatingAction);
+            saveActionCount += 1;
+            console.log(
+                'action saved.', saveActionResult,
+                payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i);
+        }
+    });
+
+    console.log(i, 'transactions checked');
+    console.log(updateCount, 'transactions updated');
+    console.log(saveRecipeCount, 'recipe saved');
+    console.log(saveActionCount, 'action saved');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -303,6 +303,7 @@ export declare class MongoRepository {
     saveRecipeWithDateCreated(savingRecipe: IRecipeAsDocument & {
         dateModified: Date;
     }): Promise<import("mongodb").UpdateResult>;
+    saveActionWithEndDate(savingAction: Omit<factory.action.authorize.invoice.IAction, 'id'>): Promise<import("mongodb").UpdateResult>;
     findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
         project: {
             id: string;

package/lib/chevre/repo/action.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
@@ -1115,6 +1126,31 @@ class MongoRepository {
                 .exec();
         });
     }
+    saveActionWithEndDate(savingAction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { typeOf, project, agent, object } = savingAction, updateFields = __rest(savingAction, ["typeOf", "project", "agent", "object"]);
+            const filter = {
+                'project.id': { $eq: project.id },
+                'agent.id': { $exists: true, $eq: agent.id },
+                'object.typeOf': { $exists: true, $eq: object.typeOf },
+                'object.paymentMethodId': { $exists: true, $eq: object.paymentMethodId },
+                typeOf: { $eq: typeOf }
+                // 'sameAs.id': { $exists: true, $eq: sameAs.id }
+            };
+            const setOnInsert = { typeOf, project, agent, object };
+            const setKeys = updateFields;
+            const update = {
+                $setOnInsert: setOnInsert,
+                $set: setKeys
+            };
+            const options = {
+                upsert: true,
+                rawResult: true
+            };
+            return this.actionModel.updateOne(filter, update, options)
+                .exec();
+        });
+    }
     findRecipeByAction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.actionRecipeModel.findOne({

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

@@ -88,7 +88,8 @@ function publishPaymentUrl(params, options) {
         try {
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
-                    const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, {
+                    const authorizeResult = yield CreditCardPayment.authorize(Object.assign(Object.assign({}, params), { id: '' // 決済URL発行プロセスにおいては決済取引IDは使用しないので空文字でok
+                     }), paymentServiceId, {
                         processPublishPaymentUrl: true,
                         executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {} // タスク関連付け(2024-05-22~)
                     })(repos);
@@ -378,7 +379,7 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false, executor: (typeof ((_a = options.executor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
+        const authorizeResult = yield CreditCardPayment.authorize(Object.assign(Object.assign({}, params), { id: transaction.id }), paymentServiceId, Object.assign({ processPublishPaymentUrl: false, executor: (typeof ((_a = options.executor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
         return saveAuthorizeResult({

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

@@ -12,6 +12,9 @@ declare function processAuthorizeCreditCard(params: {
     project: {
         id: string;
     };
+    payTransaction: {
+        id: string;
+    };
     shopId: string;
     shopPass: string;
     returnUrls3ds: string[];

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAuthorizeCreditCard = void 0;
 const GMO = require("@motionpicture/gmo-service");
 const factory = require("../../../../factory");
-const settings_1 = require("../../../../settings");
 const processAuthorizeCreditCardResult2recipe_1 = require("./processAuthorizeCreditCardResult2recipe");
 function processAuthorizeCreditCard(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
@@ -82,39 +81,34 @@ function processAuthorizeCreditCard(params) {
                 object: {
                     paymentMethodId: orderId,
                     typeOf: 'Invoice'
-                }
+                },
+                sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
             };
             // add action(2024-06-12~)
-            if (settings_1.USE_EXPERIMENTAL_FEATURE) {
-                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);
                 execTranResult = yield repos.creditCardService.execTran(execTranArgs);
             }
             catch (error) {
-                if (action !== undefined) {
-                    try {
-                        yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
-                    }
-                    catch (__) {
-                        // 失敗したら仕方ない
-                    }
+                try {
+                    yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                }
+                catch (__) {
+                    // 失敗したら仕方ない
                 }
                 throw error;
             }
-            if (action !== undefined) {
-                recipe = (0, processAuthorizeCreditCardResult2recipe_1.processAuthorizeCreditCardResult2recipe)({
-                    project: { id: params.project.id },
-                    result: {
-                        entryTranArgs, entryTranResult, execTranArgs,
-                        execTranResult: execTranResult
-                    }
-                });
-                const actionResult = {};
-                yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
-            }
+            recipe = (0, processAuthorizeCreditCardResult2recipe_1.processAuthorizeCreditCardResult2recipe)({
+                project: { id: params.project.id },
+                result: {
+                    entryTranArgs, entryTranResult, execTranArgs,
+                    execTranResult: execTranResult
+                }
+            });
+            const actionResult = {};
+            yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         }
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
     });

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

@@ -12,6 +12,9 @@ declare function processAuthorizeCreditCard3ds(params: {
     project: {
         id: string;
     };
+    payTransaction: {
+        id: string;
+    };
     availableChannel: factory.product.IAvailableChannel;
     pendingPaymentAgencyTransaction: Pick<ICreditCardPaymentAgencyTransaction3ds, 'entryTranArgs' | 'entryTranResult' | 'execTranArgs' | 'execTranResult'>;
 }): (repos: {

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

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAuthorizeCreditCard3ds = void 0;
 const factory = require("../../../../factory");
-const settings_1 = require("../../../../settings");
 const processAuthorizeCreditCard3dsResult2recipe_1 = require("./processAuthorizeCreditCard3dsResult2recipe");
 function processAuthorizeCreditCard3ds(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -31,34 +30,29 @@ function processAuthorizeCreditCard3ds(params) {
             object: {
                 paymentMethodId: entryTranArgs.orderId,
                 typeOf: 'Invoice'
-            }
+            },
+            sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
         };
         // add action(2024-06-12~)
-        if (settings_1.USE_EXPERIMENTAL_FEATURE) {
-            action = (yield repos.action.start(actionAttributes, { recipe }));
-        }
+        action = (yield repos.action.start(actionAttributes, { recipe }));
         try {
             secureTran2Result = yield repos.creditCardService.secureTran2(secureTran2Args);
         }
         catch (error) {
-            if (action !== undefined) {
-                try {
-                    yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
-                }
-                catch (__) {
-                    // 失敗したら仕方ない
-                }
+            try {
+                yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
             }
             throw error;
         }
-        if (action !== undefined) {
-            recipe = (0, processAuthorizeCreditCard3dsResult2recipe_1.processAuthorizeCreditCard3dsResult2recipe)({
-                project: { id: params.project.id },
-                result: { secureTran2Args, secureTran2Result }
-            });
-            const actionResult = {};
-            yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
-        }
+        recipe = (0, processAuthorizeCreditCard3dsResult2recipe_1.processAuthorizeCreditCard3dsResult2recipe)({
+            project: { id: params.project.id },
+            result: { secureTran2Args, secureTran2Result }
+        });
+        const actionResult = {};
+        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult, secureTran2Result };
     });
 }

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

@@ -10,10 +10,20 @@ type IAuthorizeResult = IPaymentAgencyTransaction & {
     accountId: string;
     paymentMethodId: string;
 };
+type IPayTransactionAsAuthorizeInvoiceAction = Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object' | 'project' | 'recipient' | 'transactionNumber'> & {
+    /**
+     * 決済取引ID
+     */
+    id: string;
+};
 /**
  * クレジットカード決済承認
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, options: {
+declare function authorize(
+/**
+ * 承認開始元の決済取引
+ */
+payTransaction: IPayTransactionAsAuthorizeInvoiceAction, paymentServiceId: string, options: {
     pendingPaymentAgencyTransaction?: Pick<IPaymentAgencyTransaction, 'entryTranArgs' | 'entryTranResult' | 'execTranArgs' | 'execTranResult'>;
     /**
      * 決済URL発行処理かどうか

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

@@ -22,26 +22,30 @@ const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
  */
-function authorize(params, paymentServiceId, options) {
+function authorize(
+/**
+ * 承認開始元の決済取引
+ */
+payTransaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+        const paymentMethodType = (_a = payTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const availableChannel = yield repos.paymentService.findAvailableChannel({
-            project: params.project,
+            project: payTransaction.project,
             typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
-        const sellerId = (_b = params.recipient) === null || _b === void 0 ? void 0 : _b.id;
+        const sellerId = (_b = payTransaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
         const { shopId, shopPass, returnUrls3ds, callbackType3ds } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
         // GMOオーダーIDはカスタム指定可能
-        const orderId = params.transactionNumber;
+        const orderId = payTransaction.transactionNumber;
         if (typeof orderId !== 'string') {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
@@ -63,16 +67,18 @@ function authorize(params, paymentServiceId, options) {
             if (pendingPaymentAgencyTransaction !== undefined
                 && typeof redirectUrl === 'string' && redirectUrl.length > 0) {
                 authorizeResult = yield (0, processAuthorizeCreditCard3ds_1.processAuthorizeCreditCard3ds)({
-                    project: { id: params.project.id },
+                    project: { id: payTransaction.project.id },
+                    payTransaction: { id: payTransaction.id },
                     availableChannel,
                     pendingPaymentAgencyTransaction
                 })({ action: repos.action, creditCardService });
             }
             else {
                 authorizeResult = yield (0, processAuthorizeCreditCard_1.processAuthorizeCreditCard)({
-                    project: { id: params.project.id },
+                    project: { id: payTransaction.project.id },
+                    payTransaction: { id: payTransaction.id },
                     shopId, shopPass, returnUrls3ds, callbackType3ds, orderId, availableChannel,
-                    object: params.object.paymentMethod,
+                    object: payTransaction.object.paymentMethod,
                     processPublishPaymentUrl: options.processPublishPaymentUrl
                 })({ action: repos.action, creditCardService });
             }

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

@@ -1,4 +1,5 @@
 import * as factory from '../../../factory';
+import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
@@ -6,6 +7,7 @@ import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/selle
  * クレジットカード決済中止
  */
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
+    action: ActionRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

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

@@ -18,6 +18,7 @@ const gmoError_1 = require("./gmoError");
 /**
  * クレジットカード決済中止
  */
+// tslint:disable-next-line:max-func-body-length
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
@@ -42,6 +43,22 @@ function voidTransaction(params) {
             throw new factory.errors.ArgumentNull('object.recipient.id');
         }
         const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
+        // authorizeInvoiceActionが存在すれば取消(2024-06-13~)
+        const authorizeInvoiceAction = (yield repos.action.search({
+            limit: 1,
+            page: 1,
+            typeOf: { $eq: factory.actionType.AuthorizeAction },
+            object: { paymentMethodId: { $eq: paymentMethodId } },
+            sameAs: { id: { $eq: transaction.id } }
+        }, ['_id', 'typeOf', 'project'], [])).shift();
+        if (authorizeInvoiceAction !== undefined) {
+            const cancelAction = {
+                startTime: new Date(),
+                agent: { id: authorizeInvoiceAction.project.id, typeOf: factory.organizationType.Project }
+                // ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
+            };
+            yield repos.action.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
+        }
         const creditCardService = new GMO.service.Credit({
             endpoint: String(availableChannel.serviceUrl),
             useFetch: credentials_1.credentials.gmo.useFetch

package/package.json

@@ -10,12 +10,12 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.21",
+    "@chevre/factory": "4.374.0-alpha.23",
     "@cinerino/sdk": "7.1.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.3.0-alpha.2",
+    "@surfrock/sdk": "1.3.0",
     "cdigit": "2.6.7",
     "debug": "^3.2.7",
     "google-libphonenumber": "^3.2.18",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.34.0-alpha.13"
+  "version": "21.34.0-alpha.15"
 }