@chevre/domain 26.0.0-alpha.4 → 26.0.0-alpha.41

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

@@ -2,7 +2,6 @@
  * プロジェクトサービス
  */
 import type { AccountTitleRepo } from '../repo/accountTitle';
-import type { ActionRepo } from '../repo/action';
 import type { AssetTransactionRepo } from '../repo/assetTransaction';
 import type { CategoryCodeRepo } from '../repo/categoryCode';
 import type { CreativeWorkRepo } from '../repo/creativeWork';
@@ -18,12 +17,10 @@ import type { ProductRepo } from '../repo/product';
 import type { ProjectRepo } from '../repo/project';
 import type { ReservationRepo } from '../repo/reservation';
 import type { SellerRepo } from '../repo/seller';
-import type { TaskRepo } from '../repo/task';
 export declare function deleteProject(params: {
     id: string;
 }): (repos: {
     accountTitle: AccountTitleRepo;
-    action: ActionRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     event: EventRepo;
@@ -38,14 +35,12 @@ export declare function deleteProject(params: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
-    task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<void>;
 export declare function cleanUpDatabaseByProject(params: {
     id: string;
 }): (repos: {
     accountTitle: AccountTitleRepo;
-    action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
@@ -59,5 +54,4 @@ export declare function cleanUpDatabaseByProject(params: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
-    task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/project.js

@@ -13,7 +13,6 @@ function cleanUpDatabaseByProject(params) {
     return async (repos) => {
         // プロジェクトに所属する全データをリポジトリから削除する
         await repos.accountTitle.deleteByProject({ project: { id: params.id } });
-        await repos.action.deleteByProject({ project: { id: params.id } });
         await repos.assetTransaction.deleteByProject({ project: { id: params.id } });
         await repos.categoryCode.deleteCategoryCodesByProject({ project: { id: params.id } });
         await repos.movieTicketType.deleteMovieTicketTypesByProject({ project: { id: params.id } });
@@ -26,6 +25,5 @@ function cleanUpDatabaseByProject(params) {
         await repos.product.deleteByProject({ project: { id: params.id } });
         await repos.reservation.deleteByProject({ project: { id: params.id } });
         await repos.seller.deleteByProject({ project: { id: params.id } });
-        await repos.task.deleteByProject({ project: { id: params.id } });
     };
 }

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

@@ -39,7 +39,7 @@ function cancelPengindIfNotYet(params) {
     return async (repos) => {
         const reserveTransactionId = params.purpose.id;
         // 予約取引を検索
-        const reserveTransactions = await repos.assetTransaction.search({
+        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -169,7 +169,7 @@ function cancelReservation(actionAttributesList) {
                 try {
                     if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                         // 予約取引を検索
-                        const reserveTransactions = await repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                             limit: 1,
                             page: 1,
                             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -226,7 +226,7 @@ function cancelReservation(actionAttributesList) {
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
                         // 予約取引を検索
-                        const reserveTransactions = await repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                             limit: 1,
                             page: 1,
                             typeOf: factory_1.factory.assetTransactionType.Reserve,

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

@@ -90,7 +90,7 @@ function reserveIfNotYet(params) {
     ) => {
         let reserveTransactions = [];
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: params.object.ids } }
@@ -100,7 +100,7 @@ function reserveIfNotYet(params) {
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservationNumber: { $in: params.object.reservationNumbers }

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

@@ -140,7 +140,7 @@ function reserveIfNotYet(
 params, options) {
     return async (repos) => {
         const reservationPackage = params.object;
-        const reserveTransaction = (await repos.assetTransaction.search({
+        const reserveTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -42,7 +42,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     // );
                     const taskIdentifier = `${project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.assetTransactionType.Reserve}:${reservationNumber}:onReservationConfirmed`;
                     onAuthorizationCreatedTask = {
-                        alternateName: taskIdentifier,
+                        // alternateName: taskIdentifier,
                         identifier: taskIdentifier,
                         name: factory_1.factory.taskName.OnAuthorizationCreated,
                         status: factory_1.factory.taskStatus.Ready,
@@ -137,7 +137,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 await repos.task.saveMany(taskAttributes);
             }
             if (onAuthorizationCreatedTask !== undefined) {
-                await repos.task.createIfNotExistByAlternateName(onAuthorizationCreatedTask);
+                await repos.task.runTaskByIdentifier(onAuthorizationCreatedTask);
             }
         }
     };

package/lib/chevre/service/reserve/useReservation.d.ts

@@ -1,5 +1,6 @@
 import { factory } from '../../factory';
 import type { ActionRepo } from '../../repo/action';
+import type { UseActionRepo } from '../../repo/action/use';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
@@ -26,6 +27,9 @@ export declare function useReservation(params: {
     };
 }): (repos: {
     action: ActionRepo;
+    actions: {
+        use: UseActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;
     order: OrderRepo;

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

@@ -23,8 +23,6 @@ function useReservation(params) {
                     break;
                 }
             }
-            // } else {
-            //     ticketToken = params?.instrument?.ticketToken;
         }
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
@@ -33,29 +31,15 @@ function useReservation(params) {
         const reservation = await repos.reservation.findReservationById({
             id: reservationId,
             inclusion: [
-                // 'issuedThrough',
-                // 'reservedTicket',
                 'project', 'reservationFor', 'reservationNumber', 'typeOf'
             ]
         });
-        // if (typeof reservation.issuedThrough.id !== 'string') {
-        //     // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
-        //     throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
-        // }
-        // const { reservedTicket } = reservation;
         // optimize(2026-05-06~)
         const reservationAsObject = {
             id: reservation.id,
             reservationNumber: reservation.reservationNumber,
             typeOf: reservation.typeOf,
-            reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            // discontinue issuedThrough,reservedTicket(2026-05-06~)
-            // issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
-            // reservedTicket: {
-            //     typeOf: reservedTicket.typeOf,
-            //     ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-            //     ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
-            // }
+            reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf }
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
@@ -79,7 +63,7 @@ function useReservation(params) {
                 ? { location: { typeOf: factory_1.factory.placeType.Place, identifier: params.location.identifier } }
                 : undefined
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.use.startUseAction(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory_1.factory.errors.Argument('object', 'number of using reservations must be 1');
@@ -91,14 +75,14 @@ function useReservation(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.use.giveUpUseAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+        await repos.actions.use.completeUseAction({ typeOf: action.typeOf, id: action.id });
         await (0, onReservationUsed_1.onReservationUsed)(attendedReservation, {
             ...actionAttributes,
             id: action.id,
@@ -107,12 +91,10 @@ function useReservation(params) {
     };
 }
 function reserveIfNotYet(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         let reserveTransactions = [];
         if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: [params.object.id] } }

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

@@ -1,8 +1,5 @@
 import type { IExecuteSettings as IMinimumExecuteSettings, IRunningTask } from '../eventEmitter/task';
-import type { AggregationSettings } from '../taskSettings';
-interface IExecuteSettings extends IMinimumExecuteSettings {
-    aggregationSettings?: AggregationSettings;
-}
+type IExecuteSettings = IMinimumExecuteSettings;
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 /**
  * Runningの予定タスクを実行する

package/lib/chevre/service/scheduledTask.js

@@ -19,22 +19,15 @@ function executeScheduledTaskById(params) {
         const { id } = params;
         let task = null;
         try {
-            task = await scheduledTaskRepo.findRunningScheduledTaskById({
-                id,
-                // status,
-                // executor: { name: executor.name }
-            });
+            task = await scheduledTaskRepo.findRunningScheduledTaskById({ id });
         }
         catch (error) {
             /* istanbul ignore next */
-            debug('service.task.executeById error:', error);
+            debug('scheduledTaskRepo.findRunningScheduledTaskById error:', error);
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {
-                executeById: true,
-                executeByName: false
-            });
+            await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {});
         }
     };
 }

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

@@ -13,7 +13,7 @@ function onOperationFailed(params) {
             error = { message: String(error) };
         }
         const endDate = new Date();
-        // remainingNumberOfTries<=0ならAborted(2025-08-04~)
+        // remainingNumberOfTries<=0ならAborted
         const isRetryable = task.remainingNumberOfTries > 0;
         if (isRetryable) {
             const result = {
@@ -35,7 +35,6 @@ function onOperationFailed(params) {
         }
         else {
             // 予定タスクは分析連携不要
-            // await informTaskIfNeeded({ task, executionEndDate: endDate })(repos);
             const result = {
                 executedAt: now,
                 endDate,

package/lib/chevre/service/scheduledTaskHandler.js

@@ -1,14 +1,9 @@
 "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`);
@@ -19,18 +14,10 @@ exports.taskLoader = {
  */
 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;

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

@@ -7,9 +7,6 @@ const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
-// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
-// import { OrderNumberRepo } from '../../repo/orderNumber';
-// import { ProjectRepo } from '../../repo/project';
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const integration_1 = require("../../repo/setting/integration");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -19,14 +16,10 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
         const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
@@ -57,7 +50,6 @@ function call(params) {
             });
         }
         const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const coaIntegrationSettings = await settings.getByKey('coa');
             const reserveService = new coa_service_1.COA.service.Reserve({
@@ -86,8 +78,6 @@ function call(params) {
                     action: actionRepo,
                     authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService
@@ -104,9 +94,6 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    // orderInTransaction: new OrderInTransactionRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService

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

@@ -34,19 +34,13 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         let callResult;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
-        // const actionRepo = new ActionRepo(connection);
         const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

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

@@ -9,23 +9,17 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const pay_1 = require("../assetTransaction/pay");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

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

@@ -3,72 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const checkThing_1 = require("../../repo/action/checkThing");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
-const setting_1 = require("../../repo/setting");
-const stockHolder_1 = require("../../repo/stockHolder");
-const task_1 = require("../../repo/task");
-const validateEvent_1 = require("../validation/validateEvent");
 const validateOrder_1 = require("../validation/validateOrder");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }) => {
-        if (redisClient === undefined) {
-            throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new checkThing_1.CheckThingActionRepo(connection);
+    return async ({ connection }) => {
         const { data } = params;
-        const actionAttributes = {
-            agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-            object: data.object,
-            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-            typeOf: factory_1.factory.actionType.CheckAction,
-            sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-22~)
-        };
-        const action = await actionRepo.start(actionAttributes);
         const objectTypeOf = data.object.typeOf;
-        try {
-            switch (objectTypeOf) {
-                case factory_1.factory.order.OrderType.Order:
-                    await (0, validateOrder_1.validateOrder)({
-                        orderNumber: data.object.orderNumber,
-                        project: { id: params.project.id }
-                    })({
-                        acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-                        assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
-                        order: new order_1.OrderRepo(connection),
-                        setting: new setting_1.SettingRepo(connection),
-                        task: new task_1.TaskRepo(connection)
-                    });
-                    break;
-                // support ScreeningEvent(2025-05-01~)
-                case factory_1.factory.eventType.ScreeningEvent:
-                    await (0, validateEvent_1.validateEvent)({
-                        id: data.object.id,
-                        project: { id: params.project.id }
-                    })({
-                        event: new event_1.EventRepo(connection),
-                        stockHolder: new stockHolder_1.StockHolderRepo({ connection })
-                    });
-                    break;
-                default:
-                    throw new factory_1.factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
-            }
-        }
-        catch (error) {
-            try {
-                await actionRepo.giveUp({ typeOf: action.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
+        switch (objectTypeOf) {
+            case factory_1.factory.order.OrderType.Order:
+                await (0, validateOrder_1.validateOrder)({
+                    orderNumber: data.object.orderNumber,
+                    project: { id: params.project.id }
+                })({
+                    acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+                    assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+                    order: new order_1.OrderRepo(connection),
+                });
+                break;
+            default:
+                throw new factory_1.factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
         }
-        const actionResult = {}; // eslint-disable-line @typescript-eslint/no-explicit-any
-        await actionRepo.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
 }

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

@@ -247,7 +247,9 @@ function onConfirmed(params, options) {
                 },
                 useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
             };
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', params.project.id, factory_1.factory.taskName.OnAssetTransactionStatusChanged, onAssetTransactionStatusChangedTaskData.purpose.orderNumber, onAssetTransactionStatusChangedTaskData.object.transactionNumber);
             const onAssetTransactionStatusChangedTask = {
+                identifier: taskIdentifier,
                 project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
                 status: factory_1.factory.taskStatus.Ready,
@@ -257,7 +259,7 @@ function onConfirmed(params, options) {
                 executionResults: [],
                 data: onAssetTransactionStatusChangedTaskData
             };
-            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
+            await repos.task.runTaskByIdentifier(onAssetTransactionStatusChangedTask);
         }
     };
 }

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

@@ -2,9 +2,8 @@
 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 create_1 = require("../../repo/action/create");
 const order_1 = require("../../repo/order");
 const createAccountingReportIfNotExist_1 = require("../order/createAccountingReportIfNotExist");
 /**
@@ -13,9 +12,10 @@ const createAccountingReportIfNotExist_1 = require("../order/createAccountingRep
 function call(params) {
     return async ({ connection }) => {
         await createAccountingReport(params)({
-            acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            actions: {
+                create: new create_1.CreateActionRepo(connection)
+            },
             order: new order_1.OrderRepo(connection)
         });
     };
@@ -28,10 +28,6 @@ function createAccountingReport(params) {
             project: { id: params.project.id },
             inclusion: [
                 'orderNumber', 'project', 'paymentMethods', 'seller', 'typeOf', 'orderDate'
-                // 'customer', 'confirmationNumber',
-                // 'orderedItem',
-                // 'broker',
-                // 'price', 'priceCurrency',
             ]
         });
         const simpleOrder = {
@@ -51,16 +47,13 @@ function createAccountingReport(params) {
             purpose: simpleOrder,
             sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-21~)
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.create.start(actionAttributes);
         try {
-            await (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)({
-                ...order,
-                // acceptedOffers
-            })(repos);
+            await (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)(repos);
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.create.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -68,6 +61,6 @@ function createAccountingReport(params) {
             throw error;
         }
         const result = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.actions.create.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
     };
 }