@chevre/domain 21.29.0 → 21.30.0-alpha.1

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -5,6 +5,7 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 // const project = { id: String(process.env.PROJECT_ID) };
+const STORAGE_PERIOD_IN_DAYS = 30;
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -16,18 +17,18 @@ async function main() {
     const cursor = taskRepo.getCursor(
         {
             name: { $eq: chevre.factory.taskName.DeleteTransaction },
-            status: { $eq: chevre.factory.taskStatus.Ready },
-            runsAt: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(329, 'days')
-                    .toDate(),
-                $lte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(365, 'days')
-                    .toDate()
-            }
-            // _id: { $eq: '64aba5f37b8b8ef9eca60be5' }
+            status: { $eq: chevre.factory.taskStatus.Ready }
+            // runsAt: {
+            //     $gte: moment()
+            //         // tslint:disable-next-line:no-magic-numbers
+            //         .add(29, 'days')
+            //         .toDate(),
+            //     $lte: moment()
+            //         // tslint:disable-next-line:no-magic-numbers
+            //         .add(365, 'days')
+            //         .toDate()
+            // },
+            // _id: { $eq: '6440d8cf9e4983c32ade65de' }
         },
         {
             _id: 1,
@@ -51,7 +52,10 @@ async function main() {
 
         let placeOrderTransactionId: string | undefined;
         if (deleteTransactionTask.data.object.typeOf === chevre.factory.transactionType.PlaceOrder) {
-            if (deleteTransactionTask.data.object.specifyingMethod === chevre.factory.task.deleteTransaction.SpecifyingMethod.Id) {
+            if (
+                (typeof deleteTransactionTask.data.object.specifyingMethod !== 'string')
+                || (deleteTransactionTask.data.object.specifyingMethod === chevre.factory.task.deleteTransaction.SpecifyingMethod.Id)
+            ) {
                 placeOrderTransactionId = deleteTransactionTask.data.object.id;
             }
         }
@@ -59,17 +63,26 @@ async function main() {
         let alreadyMigrated = true;
         let runsAtExpected: moment.Moment | undefined;
         if (typeof placeOrderTransactionId === 'string') {
-            const { endDate, status } = await transactionRepo.findById({
+            console.log(
+                'checking transaction...',
+                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
+                placeOrderTransactionId
+            );
+            const placeOrderTransaction = (await transactionRepo.search({
+                limit: 1,
+                page: 1,
                 typeOf: chevre.factory.transactionType.PlaceOrder,
-                id: placeOrderTransactionId,
+                ids: [placeOrderTransactionId],
                 inclusion: ['endDate', 'status'],
                 exclusion: []
-            });
-            runsAtExpected = moment(endDate)
-                // tslint:disable-next-line:no-magic-numbers
-                .add(180, 'days');
+            })).shift();
+            if (placeOrderTransaction !== undefined) {
+                const { endDate, status } = placeOrderTransaction;
+                runsAtExpected = moment(endDate)
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(STORAGE_PERIOD_IN_DAYS, 'days');
 
-            if (status !== chevre.factory.transactionStatusType.Confirmed) {
+                // if (status !== chevre.factory.transactionStatusType.Confirmed) {
                 const taskRunsTooLate = moment(deleteTransactionTask.runsAt)
                     .isAfter(runsAtExpected);
                 const diff = moment(deleteTransactionTask.runsAt)
@@ -78,12 +91,13 @@ async function main() {
                 if (taskRunsTooLate) {
                     alreadyMigrated = false;
                 }
+                // }
             }
         }
 
         if (alreadyMigrated) {
             console.log(
-                'already exist.',
+                'already migrated.',
                 deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
                 i, updateCount);
         } else {

package/example/src/chevre/optimizeDeleteTransactionTasks.ts

@@ -0,0 +1,119 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    const cursor = taskRepo.getCursor(
+        {
+            name: { $eq: chevre.factory.taskName.DeleteTransaction },
+            status: { $eq: chevre.factory.taskStatus.Ready }
+            // runsAt: {
+            //     $gte: moment()
+            //         // tslint:disable-next-line:no-magic-numbers
+            //         .add(29, 'days')
+            //         .toDate(),
+            //     $lte: moment()
+            //         // tslint:disable-next-line:no-magic-numbers
+            //         .add(365, 'days')
+            //         .toDate()
+            // },
+            // _id: { $eq: '6441bcf04014af2c7d39f6aa' }
+        },
+        {
+            _id: 1,
+            project: 1,
+            data: 1,
+            status: 1,
+            name: 1,
+            runsAt: 1
+        }
+    );
+    console.log('tasks found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const deleteTransactionTask: Pick<
+            chevre.factory.task.deleteTransaction.ITask,
+            'id' | 'project' | 'data' | 'status' | 'name' | 'runsAt'
+        > = doc.toObject();
+
+        let dataObject: chevre.factory.task.deleteTransaction.IObjectAsPlaceOrder | undefined;
+        if (deleteTransactionTask.data.object.typeOf === chevre.factory.transactionType.PlaceOrder) {
+            if (
+                (typeof deleteTransactionTask.data.object.specifyingMethod !== 'string')
+                || (deleteTransactionTask.data.object.specifyingMethod === chevre.factory.task.deleteTransaction.SpecifyingMethod.Id)
+            ) {
+                const existingDataObject = deleteTransactionTask.data.object;
+                if ((<any>existingDataObject).agent !== undefined) {
+                    dataObject = {
+                        specifyingMethod: chevre.factory.task.deleteTransaction.SpecifyingMethod.Id,
+                        id: existingDataObject.id,
+                        object: {
+                            ...(typeof existingDataObject.object.confirmationNumber === 'string')
+                                ? { confirmationNumber: existingDataObject.object.confirmationNumber }
+                                : undefined,
+                            ...(typeof existingDataObject.object.orderNumber === 'string')
+                                ? { orderNumber: existingDataObject.object.orderNumber }
+                                : undefined
+                        },
+                        project: existingDataObject.project,
+                        startDate: existingDataObject.startDate,
+                        typeOf: existingDataObject.typeOf,
+                        ...(existingDataObject.endDate !== undefined) ? { endDate: existingDataObject.endDate } : undefined
+                    };
+                }
+            }
+        }
+
+        let alreadyMigrated = true;
+        if (typeof dataObject?.id === 'string') {
+            alreadyMigrated = false;
+        }
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.',
+                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
+                i, updateCount);
+        } else {
+            console.log(
+                'updating...',
+                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
+                i, updateCount, dataObject);
+            if (dataObject !== undefined) {
+                await taskRepo.taskModel.findByIdAndUpdate(
+                    deleteTransactionTask.id,
+                    {
+                        $set: {
+                            'data.object': dataObject
+                        }
+                    },
+                    { timestamps: false }
+                )
+                    .exec();
+            }
+            updateCount += 1;
+            console.log(
+                'updated.',
+                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
+                i, updateCount);
+        }
+    });
+
+    console.log(i, 'tasks checked');
+    console.log(updateCount, 'tasks updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -115,7 +115,8 @@ async function main() {
                                 options: {
                                     useCancelPayTransactionOnFailed: false,
                                     useCheckMovieTicketBeforePay: false,
-                                    useCheckByIdentifierIfNotYet: false
+                                    useCheckByIdentifierIfNotYet: false,
+                                    useUnlockTransactionProcess: false
                                 }
                             })({
                                 accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
@@ -128,6 +129,8 @@ async function main() {
                                 product: await chevre.repository.Product.createInstance(mongoose.connection),
                                 task: await chevre.repository.Task.createInstance(mongoose.connection),
                                 transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
+                                transactionProcess:
+                                    await chevre.repository.TransactionProcess.createInstance(client, { lockExpiresInSeconds: 120 }),
                                 transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
                             });
                             console.log('payment authorized.', authorizeResult.id);

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -26,7 +26,8 @@ const schemaDefinition = {
     instrument: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
     replacer: mongoose_1.SchemaTypes.Mixed,
-    targetCollection: mongoose_1.SchemaTypes.Mixed // add targetCollection(2024-03-19~)
+    targetCollection: mongoose_1.SchemaTypes.Mixed,
+    sameAs: mongoose_1.SchemaTypes.Mixed // タスク関連付けのために追加(2024-04-20~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -35,7 +36,6 @@ const schemaOptions = {
     id: true,
     read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
-    // true化(2022-11-12~)
     strict: true,
     strictQuery: false,
     timestamps: {

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

@@ -0,0 +1,24 @@
+import type { RedisClientType } from 'redis';
+import * as factory from '../factory';
+interface IProcessKey {
+    typeOf: factory.transactionType;
+    /**
+     * 取引ID
+     */
+    id: string;
+}
+interface IOptions {
+    lockExpiresInSeconds: number;
+}
+/**
+ * 取引プロセスリポジトリ
+ */
+export declare class TransactionProcessRepository {
+    private readonly options;
+    private readonly redisClient;
+    constructor(redisClient: RedisClientType, options: IOptions);
+    static CREATE_REDIS_KEY(params: IProcessKey): string;
+    lock(params: IProcessKey): Promise<boolean>;
+    unlock(params: IProcessKey): Promise<void>;
+}
+export {};

package/lib/chevre/repo/transactionProcess.js

@@ -0,0 +1,55 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionProcessRepository = void 0;
+const createDebug = require("debug");
+const factory = require("../factory");
+const debug = createDebug('chevre-domain:repo:transactionProcess');
+const DEFAULT_LOCK_EXPIRES = 120;
+/**
+ * 取引プロセスリポジトリ
+ */
+class TransactionProcessRepository {
+    constructor(redisClient, options) {
+        this.redisClient = redisClient;
+        this.options = options;
+    }
+    static CREATE_REDIS_KEY(params) {
+        // 最適化(2024-03-21~)
+        // return `chevre-api:${params.project.id}:transactionProcess:${params.typeOf}:${params.id}`;
+        return `chvrapi:lockTxn:${params.id}`;
+    }
+    lock(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const key = TransactionProcessRepository.CREATE_REDIS_KEY(params);
+            // const ttl = TRANSACTION_RROCESS_LOCK_EXPIRES;
+            const ttl = (typeof this.options.lockExpiresInSeconds === 'number') ? this.options.lockExpiresInSeconds : DEFAULT_LOCK_EXPIRES;
+            const results = yield this.redisClient.multi()
+                .setNX(key, '1')
+                .expire(key, ttl)
+                .exec();
+            debug('locked,', params.id, results);
+            if (Array.isArray(results) && (results[0] === 1 || results[0] === true)) {
+                return true;
+            }
+            else {
+                throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
+            }
+        });
+    }
+    unlock(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const key = TransactionProcessRepository.CREATE_REDIS_KEY(params);
+            yield this.redisClient.del([key]);
+        });
+    }
+}
+exports.TransactionProcessRepository = TransactionProcessRepository;

package/lib/chevre/repository.d.ts

@@ -57,6 +57,7 @@ import type { MongoRepository as TaskRepo } from './repo/task';
 import type { MongoRepository as TelemetryRepo } from './repo/telemetry';
 import type { MongoRepository as TransactionRepo } from './repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from './repo/transactionNumber';
+import type { TransactionProcessRepository } from './repo/transactionProcess';
 import type { MongoRepository as TripRepo } from './repo/trip';
 import type { RedisRepository as ConfirmationNumberRepo } from './repo/confirmationNumber';
 import type { RedisRepository as OrderNumberRepo } from './repo/orderNumber';
@@ -323,6 +324,10 @@ export type TransactionNumber = TransactionNumberRepo;
 export declare namespace TransactionNumber {
     function createInstance(...params: ConstructorParameters<typeof TransactionNumberRepo>): Promise<TransactionNumberRepo>;
 }
+export type TransactionProcess = TransactionProcessRepository;
+export declare namespace TransactionProcess {
+    function createInstance(...params: ConstructorParameters<typeof TransactionProcessRepository>): Promise<TransactionProcessRepository>;
+}
 export type Trip = TripRepo;
 export declare namespace Trip {
     function createInstance(...params: ConstructorParameters<typeof TripRepo>): Promise<TripRepo>;

package/lib/chevre/repository.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -802,6 +802,19 @@ var TransactionNumber;
     }
     TransactionNumber.createInstance = createInstance;
 })(TransactionNumber = exports.TransactionNumber || (exports.TransactionNumber = {}));
+var TransactionProcess;
+(function (TransactionProcess) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/transactionProcess'))).TransactionProcessRepository;
+            }
+            return new repo(...params);
+        });
+    }
+    TransactionProcess.createInstance = createInstance;
+})(TransactionProcess = exports.TransactionProcess || (exports.TransactionProcess = {}));
 var Trip;
 (function (Trip) {
     let repo;

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

@@ -13,6 +13,7 @@ import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPa
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
+import type { TransactionProcessRepository } from '../../repo/transactionProcess';
 import * as PayTransactionService from '../assetTransaction/pay';
 import { onPaymentStatusChanged } from './any/onPaymentStatusChanged';
 import { person2username } from './any/person2username';
@@ -63,6 +64,7 @@ interface IAuthorizeRepos {
     task: TaskRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
+    transactionProcess: TransactionProcessRepository;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 interface IPublishPaymentUrlRepos {
@@ -112,6 +114,7 @@ declare function authorize(params: {
         useCancelPayTransactionOnFailed: boolean;
         useCheckMovieTicketBeforePay: boolean;
         useCheckByIdentifierIfNotYet: boolean;
+        useUnlockTransactionProcess: boolean;
     };
 }): IAuthorizeOperation<{
     /**

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

@@ -278,7 +278,7 @@ exports.publishPaymentUrl = publishPaymentUrl;
  * 決済承認
  */
 function authorize(params) {
-    // tslint:disable-next-line:max-func-body-length
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
@@ -406,12 +406,16 @@ function authorize(params) {
         }
         const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObject });
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        // 取引プロセスロック解除(2024-04-20~)
+        if (params.options.useUnlockTransactionProcess) {
+            yield repos.transactionProcess.unlock({ typeOf: transaction.typeOf, id: transaction.id });
+        }
         return { id: action.id };
     });
 }
 exports.authorize = authorize;
 /**
- * 注文取引に保管された決済情報を承認しようとしている決済の整合性をを検証する
+ * 注文取引に保管された決済情報を承認しようとしている決済の整合性を検証する
  */
 function validatePaymentMethodByTransaction(params) {
     var _a, _b;

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

@@ -56,7 +56,11 @@ declare function payCreditCard(params: factory.task.pay.IPayActionData): (repos:
 /**
  * クレジットカード返金
  */
-declare function refundCreditCard(params: factory.task.refund.IData, options: {
+declare function refundCreditCard(params: factory.task.refund.IData & {
+    sameAs?: {
+        id: string;
+    };
+}, options: {
     requirePayAction: boolean;
 }): (repos: {
     action: ActionRepo;

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

@@ -421,7 +421,7 @@ function processAlterTran(params) {
  */
 function refundCreditCard(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const paymentMethodType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.typeOf;
         const paymentMethodId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.paymentMethod.paymentMethodId;
         const paymentServiceId = (_c = params.object[0]) === null || _c === void 0 ? void 0 : _c.id;
@@ -443,7 +443,14 @@ function refundCreditCard(params, options) {
             typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
-        let action = yield repos.action.start(params);
+        let action = yield repos.action.start(Object.assign(Object.assign({}, params), (typeof ((_e = params.sameAs) === null || _e === void 0 ? void 0 : _e.id) === 'string')
+            ? {
+                sameAs: {
+                    id: params.sameAs.id,
+                    typeOf: 'Task'
+                }
+            }
+            : undefined));
         let alterTranResult = [];
         try {
             alterTranResult = yield processChangeTransaction({
@@ -452,7 +459,7 @@ function refundCreditCard(params, options) {
                 paymentMethodId: paymentMethodId,
                 shopId: shopId,
                 shopPass: shopPass,
-                refundFee: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.refundFee
+                refundFee: (_f = params.object[0]) === null || _f === void 0 ? void 0 : _f.refundFee
             });
         }
         catch (error) {
@@ -499,6 +506,12 @@ function processChangeTransaction(params) {
             if (searchTradeResult.tranId !== creditCardSalesBefore.tranId) {
                 alreadyRefunded = true;
             }
+            // tranIdが空文字のケース(SPSwrapperで発生)に対応(Voidに対してVoidを実行してしまうので)(2024-04-20~)
+            if (searchTradeResult.tranId === '' && creditCardSalesBefore.tranId === '') {
+                if (searchTradeResult.status === GMO.utils.util.Status.Void) {
+                    alreadyRefunded = true;
+                }
+            }
         }
         if (alreadyRefunded) {
             alterTranResult.push({

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

@@ -70,5 +70,9 @@ declare function payMovieTicket(params: factory.task.pay.IPayActionData): IPayOp
 /**
  * MovieTicket着券取消
  */
-declare function refundMovieTicket(params: factory.task.refund.IData): IRefundOperation<void>;
+declare function refundMovieTicket(params: factory.task.refund.IData & {
+    sameAs?: {
+        id: string;
+    };
+}): IRefundOperation<void>;
 export { ICheckResult, authorize, checkMovieTicket, payMovieTicket, refundMovieTicket, voidTransaction };

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

@@ -352,7 +352,7 @@ function payActionParams2seatInfoSyncIn(params) {
 function refundMovieTicket(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
         const availableChannel = yield repos.paymentService.findAvailableChannel({
@@ -369,7 +369,14 @@ function refundMovieTicket(params) {
         });
         const movieTicketSeatService = new surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
         // アクション開始
-        let action = yield repos.action.start(params);
+        let action = yield repos.action.start(Object.assign(Object.assign({}, params), (typeof ((_f = params.sameAs) === null || _f === void 0 ? void 0 : _f.id) === 'string')
+            ? {
+                sameAs: {
+                    id: params.sameAs.id,
+                    typeOf: 'Task'
+                }
+            }
+            : undefined));
         let seatInfoSyncIn;
         let seatInfoSyncResult;
         let seatInfoSyncResultAsError;

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

@@ -45,7 +45,11 @@ export declare function voidPayment(params: factory.task.voidPayment.IData): (re
 /**
  * 返金
  */
-export declare function refund(params: factory.task.refund.IData): (repos: {
+export declare function refund(params: factory.task.refund.IData & {
+    sameAs?: {
+        id: string;
+    };
+}): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     paymentAccepted: PaymentAcceptedRepo;

package/lib/chevre/service/task/refund.d.ts

@@ -3,4 +3,4 @@ import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.refund.IData): IOperation<void>;
+export declare function call(params: factory.task.refund.IData | factory.task.refund.ITask): IOperation<void>;

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

@@ -25,11 +25,19 @@ const PaymentService = require("../payment");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
+        let data;
+        if (params.name === factory.taskName.Refund) {
+            data = Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
+             });
+        }
+        else {
+            data = params;
+        }
         yield PaymentService.refund(data)({
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),

package/lib/chevre/service/task.js

@@ -87,7 +87,13 @@ function execute(task) {
         try {
             // タスク名の関数が定義されていなければ、TypeErrorとなる
             const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
-            yield call(task.data)(settings);
+            switch (task.name) {
+                case factory.taskName.Refund:
+                    yield call(task)(settings);
+                    break;
+                default:
+                    yield call(task.data)(settings);
+            }
             const result = {
                 executedAt: now,
                 endDate: new Date(),

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.29.0"
+  "version": "21.30.0-alpha.1"
 }