@chevre/domain 25.2.0-alpha.39 → 25.2.0-alpha.40

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionCanceled.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPayTransactionCanceled = onPayTransactionCanceled;
-const findConfirmedPlaceOrder_1 = require("../findConfirmedPlaceOrder");
 const onOrderStatusChanged_1 = require("../onOrderStatusChanged");
 const factory_1 = require("../../../factory");
 function onPayTransactionCanceled(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
-        // 注文が存在すればキャンセル(2023-08-30~)
+        // 中止された決済取引に依存した注文ドキュメントがもし存在すればキャンセル(2023-08-30~)
         await cancelOrderIfExist({
             project: { id: params.project.id },
             paymentMethodId: params.object.transactionNumber,
@@ -32,14 +29,25 @@ function cancelOrderIfExist(params) {
                 paymentMethodIds: [params.paymentMethodId]
             },
             project: { id: { $eq: params.project.id } }
-        }, { inclusion: ['confirmationNumber', 'orderNumber'] });
+        }, { inclusion: ['orderNumber'] });
         const orderByPaymentMethodId = ordersByPaymentMethodId.shift();
         if (orderByPaymentMethodId !== undefined) {
-            const placeOrderTransaction = await (0, findConfirmedPlaceOrder_1.findConfirmedPlaceOrder)({
-                project: { id: params.project.id },
-                confirmationNumber: orderByPaymentMethodId.confirmationNumber,
-                orderNumber: orderByPaymentMethodId.orderNumber
-            })(repos);
+            const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.project.id } },
+                typeOf: factory_1.factory.transactionType.PlaceOrder,
+                statuses: [factory_1.factory.transactionStatusType.Confirmed],
+                // resultではなくobjectで参照するように変更(2026-06-16~)
+                object: {
+                    orderNumber: { $eq: orderByPaymentMethodId.orderNumber },
+                },
+                inclusion: ['project', 'typeOf']
+            });
+            const placeOrderTransaction = placeOrderTransactions.shift();
+            if (placeOrderTransaction === undefined) {
+                throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
+            }
             const order = await repos.order.changeStatus({
                 project: { id: params.project.id },
                 orderNumber: orderByPaymentMethodId.orderNumber,

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.d.ts

@@ -3,7 +3,6 @@ import type { MessageRepo } from '../../../repo/message';
 import type { OrderRepo } from '../../../repo/order';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPaymentDue2ProcessingRepos {
     acceptedOffer: AcceptedOfferRepo;
@@ -11,7 +10,6 @@ interface IPaymentDue2ProcessingRepos {
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    placeOrder: PlaceOrderRepo;
 }
 /**
  * 全決済取引確定を完了した注文に関して、アイテムを処理する

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.paymentDue2Processing = paymentDue2Processing;
 const debug_1 = __importDefault(require("debug"));
-const findConfirmedPlaceOrder_1 = require("../findConfirmedPlaceOrder");
 const onOrderStatusChanged_1 = require("../onOrderStatusChanged");
 const factory_1 = require("../../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
@@ -14,11 +13,6 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
  */
 function paymentDue2Processing(params) {
     return async (repos, settings) => {
-        const placeOrderTransaction = await (0, findConfirmedPlaceOrder_1.findConfirmedPlaceOrder)({
-            project: { id: params.project.id },
-            confirmationNumber: params.confirmationNumber,
-            orderNumber: params.orderNumber
-        })(repos);
         let order;
         try {
             order = await repos.order.changeStatus({
@@ -74,7 +68,7 @@ function paymentDue2Processing(params) {
                     offeredThroughIdentifier,
                     orderStatus: factory_1.factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                 },
-                placeOrderTransaction
+                // placeOrderTransaction
             })(repos, settings);
         }
     };

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

@@ -12,7 +12,9 @@ Object.defineProperty(exports, "processing2inTransit", { enumerable: true, get:
 const factory_1 = require("../../factory");
 function onAssetTransactionStatusChanged(params) {
     return async (repos, settings) => {
+        /* istanbul ignore else -- @preserve */
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            /* istanbul ignore next -- @preserve */
             throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         switch (params.object.status) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.d.ts

@@ -5,14 +5,12 @@ import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
 import { processOrder } from './onOrderProcessing/processOrder';
-type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderProcessing(params: {
     order: IProcessingOrder & {
         itemOfferedTypeOf: factory.order.IItemOffered['typeOf'];
         serialNumbers: string[];
         offeredThroughIdentifier?: factory.service.webAPI.Identifier;
     };
-    placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
     message: MessageRepo;
     setting: SettingRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -15,6 +15,7 @@ const factory_2 = require("./onOrderProcessing/factory");
 const processOrder_1 = require("./onOrderProcessing/processOrder");
 Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return processOrder_1.processOrder; } });
 const debug = (0, debug_1.default)('chevre-domain:service:order');
+// type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'>;
 function onOrderProcessing(params) {
     return async (repos, settings) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);

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/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/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

@@ -13,8 +13,9 @@ const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionSt
 /**
  * タスク実行関数
  */
-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),

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

@@ -12,8 +12,9 @@ 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),

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),

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

@@ -18,8 +18,9 @@ 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,

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 !== ''

package/lib/chevre/service/task/reserve.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.reserve.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.reserve.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -11,8 +11,9 @@ const confirmReservation_1 = require("../reserve/confirmReservation");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await (0, confirmReservation_1.confirmReservation)({
             // actionAttributesList: data.actionAttributes,
             potentialReserveAction: data, // optimize(2024-07-01~)

package/lib/chevre/service/task/returnOrder.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.ReturnOrder>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.ReturnOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -12,8 +12,9 @@ const returnOrder_2 = require("../order/returnOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await (0, returnOrder_2.returnOrder)({
             ...data,
             useOnOrderStatusChanged: true

package/lib/chevre/service/task/sendOrder.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.SendOrder>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.SendOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -13,8 +13,9 @@ const sendOrder_1 = require("../order/sendOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await (0, sendOrder_1.sendOrder)({
             ...data,
             object: {

package/lib/chevre/service/task/voidPayment.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.voidPayment.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.voidPayment.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -19,8 +19,9 @@ const voidPaymentByTask_1 = require("./payment/voidPaymentByTask");
 /**
  * タスク実行関数
  */
-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/taskHandler.d.ts

@@ -1,9 +1,9 @@
 import type { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
-import type { ICallResult, ICallableTaskOperation, ICallableTaskOperationSimple, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
+import type { ICallResult, ICallableTaskOperation, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
 export declare const taskLoader: {
     load: (taskName: string) => Promise<{
-        call: ICallableTaskOperationSimple | ICallableTaskOperation;
+        call: ICallableTaskOperation;
     }>;
 };
 /**

package/lib/chevre/service/taskHandler.js

@@ -41,44 +41,43 @@ function executeTask(task, next) {
                 throw new factory_1.factory.errors.Internal(`task remainingNumberOfTries < 0 [remainingNumberOfTries:${remainingNumberOfTries}]`);
             }
             // タスク名の関数が定義されていなければ、TypeErrorとなる
-            let callResult;
-            // const { call } = await import(`./task/${task.name}.js`) as {
-            //     call: ICallableTaskOperationSimple | ICallableTaskOperation;
-            // };
             const { call } = await exports.taskLoader.load(task.name); // testが書きづらいのでtaskLoader経由で呼ぶ
-            switch (task.name) {
-                case factory_1.factory.taskName.AcceptCOAOffer:
-                case factory_1.factory.taskName.AggregateOnSystem:
-                case factory_1.factory.taskName.AuthorizePayment:
-                case factory_1.factory.taskName.CancelPendingReservation:
-                case factory_1.factory.taskName.CheckMovieTicket:
-                case factory_1.factory.taskName.CheckResource:
-                case factory_1.factory.taskName.CreateAccountingReport:
-                case factory_1.factory.taskName.HandleNotification:
-                case factory_1.factory.taskName.ImportEventCapacitiesFromCOA:
-                case factory_1.factory.taskName.ImportEventsFromCOA:
-                case factory_1.factory.taskName.ImportOffersFromCOA:
-                case factory_1.factory.taskName.InvalidatePaymentUrl:
-                case factory_1.factory.taskName.OnAuthorizationCreated:
-                case factory_1.factory.taskName.OnResourceDeleted:
-                case factory_1.factory.taskName.Pay:
-                case factory_1.factory.taskName.PublishPaymentUrl:
-                case factory_1.factory.taskName.Refund:
-                case factory_1.factory.taskName.VoidPayTransaction:
-                case factory_1.factory.taskName.VoidReserveTransaction:
-                case factory_1.factory.taskName.ConfirmPayTransaction:
-                case factory_1.factory.taskName.ConfirmReserveTransaction:
-                case factory_1.factory.taskName.ReturnPayTransaction:
-                case factory_1.factory.taskName.ReturnReserveTransaction:
-                case factory_1.factory.taskName.SendEmailMessage:
-                case factory_1.factory.taskName.SyncResourcesFromCOA:
-                case factory_1.factory.taskName.TriggerWebhook:
-                case factory_1.factory.taskName.UseReservation:
-                    callResult = await call(task)(settings, options);
-                    break;
-                default:
-                    await call(task.data)(settings);
-            }
+            const callResult = await call(task)(settings, options);
+            // ICallableTaskOperationSimpleを廃止(2026-07-22~)
+            // let callResult: ICallResult | undefined;
+            // switch (task.name) {
+            //     case factory.taskName.AcceptCOAOffer:
+            //     case factory.taskName.AggregateOnSystem:
+            //     case factory.taskName.AuthorizePayment:
+            //     case factory.taskName.CancelPendingReservation:
+            //     case factory.taskName.CheckMovieTicket:
+            //     case factory.taskName.CheckResource:
+            //     case factory.taskName.CreateAccountingReport:
+            //     case factory.taskName.HandleNotification:
+            //     case factory.taskName.ImportEventCapacitiesFromCOA:
+            //     case factory.taskName.ImportEventsFromCOA:
+            //     case factory.taskName.ImportOffersFromCOA:
+            //     case factory.taskName.InvalidatePaymentUrl:
+            //     case factory.taskName.OnAuthorizationCreated:
+            //     case factory.taskName.OnResourceDeleted:
+            //     case factory.taskName.Pay:
+            //     case factory.taskName.PublishPaymentUrl:
+            //     case factory.taskName.Refund:
+            //     case factory.taskName.VoidPayTransaction:
+            //     case factory.taskName.VoidReserveTransaction:
+            //     case factory.taskName.ConfirmPayTransaction:
+            //     case factory.taskName.ConfirmReserveTransaction:
+            //     case factory.taskName.ReturnPayTransaction:
+            //     case factory.taskName.ReturnReserveTransaction:
+            //     case factory.taskName.SendEmailMessage:
+            //     case factory.taskName.SyncResourcesFromCOA:
+            //     case factory.taskName.TriggerWebhook:
+            //     case factory.taskName.UseReservation:
+            //         callResult = await (call as ICallableTaskOperation)(task)(settings, options);
+            //         break;
+            //     default:
+            //         await (call as ICallableTaskOperationSimple)(task.data)(settings); // TODO discontinue
+            // }
             const result = {
                 executedAt: now,
                 endDate: new Date(),

package/lib/chevre/taskSettings.d.ts

@@ -24,13 +24,11 @@ interface IExecuteOptions {
     executeById: boolean;
     executeByName: boolean;
 }
-type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
-type ICallableTaskOperationSimple = (taskData: factory.task.IData<factory.taskName>) => IOperation<void>;
 type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
 type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'expires';
 type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys> & {
     status: factory.taskStatus.Running;
 };
-export { ICallableTaskOperation, ICallableTaskOperationSimple, ICallResult, IExecutableTask, IExecutableTaskKeys, IExecuteSettings, IExecuteOptions, IOperationExecute, AggregationSettings };
+export { ICallableTaskOperation, ICallResult, IExecutableTask, IExecutableTaskKeys, IExecuteSettings, IExecuteOptions, IOperationExecute, AggregationSettings };

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.39"
+  "version": "25.2.0-alpha.40"
 }

package/lib/chevre/service/order/findConfirmedPlaceOrder.d.ts

@@ -1,13 +0,0 @@
-import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
-import { factory } from '../../factory';
-type ITransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'potentialActions' | 'project' | 'typeOf'>;
-export declare function findConfirmedPlaceOrder(params: {
-    project: {
-        id: string;
-    };
-    confirmationNumber: string;
-    orderNumber: string;
-}): (repos: {
-    placeOrder: PlaceOrderRepo;
-}) => Promise<ITransaction>;
-export {};

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

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfirmedPlaceOrder = findConfirmedPlaceOrder;
-const factory_1 = require("../../factory");
-function findConfirmedPlaceOrder(params) {
-    return async (repos) => {
-        const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            statuses: [factory_1.factory.transactionStatusType.Confirmed],
-            // resultではなくobjectで参照するように変更(2026-06-16~)
-            object: {
-                confirmationNumber: { $eq: params.confirmationNumber },
-                orderNumber: { $eq: params.orderNumber },
-            },
-            // result: {
-            //     order: {
-            //         confirmationNumber: { $eq: params.confirmationNumber },
-            //         orderNumbers: [params.orderNumber]
-            //     }
-            // },
-            inclusion: ['potentialActions', 'project', 'typeOf']
-        });
-        const placeOrderTransaction = placeOrderTransactions.shift();
-        if (placeOrderTransaction === undefined) {
-            throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
-        }
-        return placeOrderTransaction;
-    };
-}