@chevre/domain 25.2.0-alpha.8 → 26.0.0-alpha.0

package/lib/chevre/service/scheduledTaskHandler/onOperationFailed.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onOperationFailed = onOperationFailed;
+const factory_1 = require("../../factory");
+/**
+ * タスク実行失敗時処理
+ */
+function onOperationFailed(params) {
+    return async (repos) => {
+        let error = params.error;
+        const { task, now } = params;
+        if (error === null || typeof error !== 'object') {
+            error = { message: String(error) };
+        }
+        const endDate = new Date();
+        // remainingNumberOfTries<=0ならAborted(2025-08-04~)
+        const isRetryable = task.remainingNumberOfTries > 0;
+        if (isRetryable) {
+            const result = {
+                executedAt: now,
+                endDate,
+                error: {
+                    ...error,
+                    code: error.code,
+                    message: error.message,
+                    name: error.name,
+                    stack: error.stack
+                }
+            };
+            // 失敗してもここではステータスを戻さない(Runningのまま待機)
+            await repos.scheduledTask.setExecutionResultAndStatus({ id: task.id }, {
+                status: task.status,
+                executionResult: result
+            });
+        }
+        else {
+            // 予定タスクは分析連携不要
+            // await informTaskIfNeeded({ task, executionEndDate: endDate })(repos);
+            const result = {
+                executedAt: now,
+                endDate,
+                error: {
+                    ...error,
+                    code: error.code,
+                    message: error.message,
+                    name: error.name,
+                    stack: error.stack
+                }
+            };
+            await repos.scheduledTask.setExecutionResultAndStatus({ id: task.id }, {
+                status: factory_1.factory.taskStatus.Aborted,
+                executionResult: result
+            });
+        }
+    };
+}

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

@@ -0,0 +1,12 @@
+import { factory } from '../factory';
+import type { ICallResult, ICallableTaskOperation, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
+export declare const taskLoader: {
+    load: (taskName: string) => Promise<{
+        call: ICallableTaskOperation;
+    }>;
+};
+/**
+ * 予定タスクを実行する
+ */
+declare function executeScheduledTask(task: IExecutableTask<factory.taskName>): IOperationExecute<void>;
+export { ICallableTaskOperation, ICallResult, IExecutableTaskKeys, IOperationExecute, executeScheduledTask };

package/lib/chevre/service/scheduledTaskHandler.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskLoader = void 0;
+exports.executeScheduledTask = executeScheduledTask;
+const debug_1 = __importDefault(require("debug"));
+const factory_1 = require("../factory");
+const onOperationFailed_1 = require("./scheduledTaskHandler/onOperationFailed");
+const debug = (0, debug_1.default)('chevre-domain:service:scheduledTaskHandler');
+exports.taskLoader = {
+    load: (taskName) => {
+        return import(`./task/${taskName}.js`);
+    }
+};
+/**
+ * 予定タスクを実行する
+ */
+function executeScheduledTask(task) {
+    const now = new Date();
+    debug('executing an executableTask...', task, now);
+    return async (settings, options) => {
+        const scheduledTaskRepo = new (await import('../repo/scheduledTask.js')).ScheduledTaskRepo(settings.connection);
+        try {
+            // 予定タスクのexpiresはDBのttl基準なので期限検証はしない
+            // if (task.expires instanceof Date) {
+            //     const taskExpired: boolean = moment(now)
+            //         .isAfter(task.expires);
+            //     if (taskExpired) {
+            //         throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
+            //     }
+            // }
+            // remainingNumberOfTries<0ならcallを実行しない(2025-08-04~)
+            // リトライを繰り返した後、不明の原因でRunningのまま残ってしまったタスクがリトライされたケース
+            const { remainingNumberOfTries } = task;
+            const isCallable = remainingNumberOfTries >= 0;
+            if (!isCallable) {
+                throw new factory_1.factory.errors.Internal(`task remainingNumberOfTries < 0 [remainingNumberOfTries:${remainingNumberOfTries}]`);
+            }
+            // タスク名の関数が定義されていなければ、TypeErrorとなる
+            const { call } = await exports.taskLoader.load(task.name); // testが書きづらいのでtaskLoader経由で呼ぶ
+            const callResult = await call(task)(settings, options);
+            const result = {
+                executedAt: now,
+                endDate: new Date(),
+                // enable overwriting task.executionResults.error on Executed(2024-05-29~)
+                error: (callResult?.error instanceof Error)
+                    ? {
+                        ...callResult.error,
+                        message: callResult.error.message
+                    }
+                    : ''
+            };
+            await scheduledTaskRepo.setExecutionResultAndStatus({ id: task.id }, {
+                status: factory_1.factory.taskStatus.Executed,
+                executionResult: result
+            });
+        }
+        catch (error) {
+            await (0, onOperationFailed_1.onOperationFailed)({
+                task, now, error
+            })({ scheduledTask: scheduledTaskRepo });
+        }
+    };
+}

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

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.aggregateOffers.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.aggregateOffers.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -15,8 +15,9 @@ const aggregateOffers_1 = require("../aggregation/event/aggregateOffers");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ redisClient, connection }) => {
+        const { data } = params;
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }

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

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.aggregateScreeningEvent.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.aggregateScreeningEvent.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -49,8 +49,9 @@ const AggregationService = __importStar(require("../aggregation"));
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection, redisClient }) => {
+        const { data } = params;
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }

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

@@ -52,8 +52,10 @@ function call(params) {
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {
+            const { instrument: _instrument, project: _project, ...authorizeParams } = params.data;
             await (0, any_1.authorize)({
-                ...params.data,
+                ...authorizeParams,
+                project: { id: params.project.id },
                 instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
                 sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
             })({

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

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.cancelReservation.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.cancelReservation.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -13,8 +13,9 @@ const cancelReservation_1 = require("../reserve/cancelReservation");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection, redisClient }) => {
+        const { data } = params;
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }

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

@@ -15,7 +15,6 @@ const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
  * タスク実行関数
  */
 function call(params) {
-    // export function call(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): IOperationExecute<void> {
     return async ({ connection }) => {
         await (0, confirmPayTransaction_1.confirmPayTransaction)({
             ...params.data,

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 exports.confirmReserveTransaction = confirmReserveTransaction;
 const coa_service_1 = require("@motionpicture/coa-service");
-const google_libphonenumber_1 = require("google-libphonenumber");
 const util_1 = require("util");
+const customerTelephone2COATelNum_1 = require("../../factory/customerTelephone2COATelNum");
 const factory_1 = require("../../factory");
 const confirm_1 = require("../assetTransaction/reserve/confirm");
 const reserveCOA_1 = require("../assetTransaction/reserveCOA");
@@ -71,12 +71,7 @@ function createConfirmObject4COAByOrder(params) {
             && o.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA;
     });
     const customer = params.order.customer;
-    // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
-    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-    const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
-    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-    // COAでは数字のみ受け付けるので数字以外を除去
-    telNum = telNum.replace(/[^\d]/g, '');
+    const telNum = (0, customerTelephone2COATelNum_1.customerTelephone2COATelNum)({ telephone: String(customer.telephone) });
     const mailAddr = customer.email;
     if (mailAddr === undefined) {
         throw new factory_1.factory.errors.Argument('order', 'order.customer.email undefined');
@@ -262,7 +257,7 @@ function onConfirmed(params, options) {
                 executionResults: [],
                 data: onAssetTransactionStatusChangedTaskData
             };
-            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
         }
     };
 }

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

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.DeleteTransaction>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.deleteTransaction.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -49,8 +49,9 @@ const TransactionService = __importStar(require("../transaction"));
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await TransactionService.deleteTransaction(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),

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

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.onAssetTransactionStatusChanged.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -3,26 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionStatusChanged");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            // transaction: new TransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };

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

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.onEventChanged.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.onEventChanged.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -11,8 +11,9 @@ const onEventChanged_1 = require("../offer/onEventChanged");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await (0, onEventChanged_1.onEventChanged)(data)({
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),

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

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.OnOrderPaymentCompleted>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
@@ -11,11 +12,13 @@ const payOrder_1 = require("../order/payOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, payOrder_1.payOrder)(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),

package/lib/chevre/service/task/onResourceUpdated/onAggregateOfferUpdated.js

@@ -11,7 +11,7 @@ function createInformOfferTasks(params, setting) {
         }
         // const informResources = settings.onResourceUpdated.informResource;
         const informResources = setting?.onResourceUpdated?.informResource;
-        const offers = await repos.offer.search({
+        const offers = await repos.offer.findUnitPriceOffers({
             id: { $in: params.ids }
         }, { typeOf: 1, name: 1, priceSpecification: 1, additionalProperty: 1, identifier: 1, project: 1 });
         const offers4inform = offers.map(({ id, typeOf, name, priceSpecification, additionalProperty, identifier, project }) => {
@@ -51,7 +51,7 @@ function createInformOfferTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -69,7 +69,7 @@ function createInformHasPOSTasks(params) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };

package/lib/chevre/service/task/onResourceUpdated/onOfferCatalogUpdated.js

@@ -57,7 +57,7 @@ function createInformOfferCatalogTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };

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

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.onResourceUpdated.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.onResourceUpdated.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -29,8 +29,9 @@ const onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdat
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await onResourceUpdated(data)({
             accountTitle: new accountTitle_1.AccountTitleRepo(connection),
             action: new action_1.ActionRepo(connection),
@@ -222,7 +223,7 @@ function createInformNoteTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };
@@ -271,7 +272,7 @@ function createInformMovieTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };
@@ -322,7 +323,7 @@ function createInformProductTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };
@@ -371,7 +372,7 @@ function createInformCategoryCodeTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };
@@ -470,7 +471,7 @@ function createInformMovieTheaterTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };
@@ -532,7 +533,7 @@ function createInformRoomTasks(params, setting) {
                     });
                 });
                 if (informTasks.length > 0) {
-                    await repos.task.saveMany(informTasks, { emitImmediately: true });
+                    await repos.task.saveMany(informTasks);
                 }
             }
         }
@@ -590,7 +591,7 @@ function createInformEntranceGateTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };
@@ -663,7 +664,7 @@ function createInformAccountTitleTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };

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

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.PlaceOrder>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.PlaceOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -1,27 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
+const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const placeOrder_2 = require("../order/placeOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, placeOrder_2.placeOrder)({
             ...data,
+            agent: { id: data.project.id, typeOf: factory_1.factory.organizationType.Project },
             useOnOrderStatusChanged: true
         })({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
@@ -29,11 +32,11 @@ function call(data) {
             action: new action_1.ActionRepo(connection),
             authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
             authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            // transaction: new TransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };

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

@@ -9,7 +9,7 @@ const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
-// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 // import { OrderNumberRepo } from '../../repo/orderNumber';
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -36,10 +36,14 @@ function call(params) {
         const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
+            const { savePaymentMethodIdInTransaction, project: _project, ...publishPaymentUrlParams } = params.data;
             await (0, any_1.publishPaymentUrl)({
-                ...params.data,
+                ...publishPaymentUrlParams,
+                project: { id: params.project.id },
                 instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
                 sameAs: { id: params.id }
+            }, {
+                savePaymentMethodIdInTransaction: savePaymentMethodIdInTransaction === true
             })({
                 acceptPayAction: actionRepo,
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
@@ -48,7 +52,7 @@ function call(params) {
                 event: new event_1.EventRepo(connection),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
-                // orderInTransaction: new OrderInTransactionRepo(connection),
+                orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                 // orderNumber: new OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),

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

@@ -1,6 +1,6 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(params: factory.task.refund.IData | Pick<factory.task.refund.ITask, IExecutableTaskKeys>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.refund.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -26,16 +26,10 @@ function call(params) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
-        let data;
-        if (params.name === factory_1.factory.taskName.Refund) {
-            data = {
-                ...params.data,
-                sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
-            };
-        }
-        else {
-            data = params;
-        }
+        const data = {
+            ...params.data,
+            sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
+        };
         const paymentServiceId = data.object.at(0)?.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''