@chevre/domain 24.0.0-alpha.9 → 24.0.0

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

@@ -0,0 +1,25 @@
+import { factory } from '../../factory';
+import type { ReserveTransactionRepo } from '../../repo/assetTransaction/reserve';
+import type { IDeprecatedField, IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
+/**
+ * 予約検索レスポンスとしての予約
+ * 予約ドキュメントに予約取引の情報を補完する
+ */
+type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor'> & {
+    price?: factory.reservation.eventReservation.IPrice;
+    underName?: factory.assetTransaction.reserve.IUnderName;
+    reservedTicket?: factory.assetTransaction.reserve.IObjectSubReservation['reservedTicket'];
+    reservationFor?: factory.assetTransaction.reserve.IReservationFor;
+};
+/**
+ * 予約を検索する
+ */
+export declare function findReservations(params: factory.reservation.eventReservation.ISearchConditions, options: {
+    inclusion: Partial<Record<IKeyOfProjection | IDeprecatedField, 1>>;
+}): (repos: {
+    assetTransaction: {
+        reserve: ReserveTransactionRepo;
+    };
+    reservation: ReservationRepo;
+}) => Promise<IReservationAsFindResult[]>;
+export {};

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

@@ -0,0 +1,71 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findReservations = findReservations;
+const debug_1 = __importDefault(require("debug"));
+const debug = (0, debug_1.default)('chevre-domain:service:reserve:findReservations');
+/**
+ * 予約を検索する
+ */
+function findReservations(params, options) {
+    return async (repos) => {
+        const { inclusion } = options;
+        const rawReservations = await repos.reservation.findReservations(params, inclusion);
+        if (rawReservations.length === 0) {
+            return [];
+        }
+        else {
+            const requirePrice = Object.keys(inclusion).includes('price');
+            const requireUnderName = Object.keys(inclusion).includes('underName');
+            const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
+            const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
+            const reservationIds = rawReservations.map(({ id }) => id);
+            const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
+                ids: reservationIds
+            });
+            // 予約取引から参照した予約数と同じはず
+            debug('useReserveTransaction: true. reservations.length === subReservations.length?', rawReservations.length === subReservations.length);
+            return rawReservations.map((reservation) => {
+                const subReservationByTransaction = subReservations.find((s) => s.id === reservation.id);
+                const priceByTransaction = subReservationByTransaction?.price;
+                const underNameByTransaction = subReservationByTransaction?.underName;
+                const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
+                const reservationForByTransaction = subReservationByTransaction?.reservationFor;
+                // 予約ドキュメントを最適化し始めたため、もう等しくない(2026-04-06~)
+                // // 予約取引から参照した属性と全く等しいはず
+                // if (requirePrice) {
+                // }
+                // if (requireUnderName) {
+                // }
+                // if (requireReservedTicket) {
+                // }
+                // if (requireReservationFor) {
+                //     const reservationForMatched = isDeepStrictEqual(reservation.reservationFor, reservationForByTransaction);
+                //     debug('requireReservationFor. reservationForMatched?', reservationForMatched);
+                //     if (!reservationForMatched) {
+                //         console.error('reservationForMatched: false!!!', reservation.id);
+                //     }
+                // }
+                const { reservationFor, reservedTicket, ...rawReservation4result } = reservation; // eslint-disable-line @typescript-eslint/no-unused-vars
+                return {
+                    ...rawReservation4result, // 予約ドキュメントはそのまま返す
+                    ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
+                    ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
+                    ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
+                        ? {
+                            reservedTicket: {
+                                ...reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
+                                ticketType: ticketTypeByTransaction
+                            }
+                        }
+                        : undefined,
+                    ...(requireReservationFor && reservationForByTransaction !== undefined)
+                        ? { reservationFor: reservationForByTransaction }
+                        : undefined, // reservationForがあれば上書き(2026-04-06~)
+                };
+            });
+        }
+    };
+}

package/lib/chevre/service/reserve/potentialActions/onPendingReservationCanceled.d.ts

@@ -3,7 +3,7 @@
  */
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 export declare function onPendingReservationCanceled(params: {
     project: {
         id: string;

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

@@ -1,32 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPendingReservationCanceled = onPendingReservationCanceled;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 // import { Settings } from '../../../settings';
-const factory_1 = require("../factory");
+const factory_2 = require("../factory");
 function onPendingReservationCanceled(params) {
     return async (repos
     // settings: Settings
@@ -40,18 +17,18 @@ function onPendingReservationCanceled(params) {
         const now = new Date();
         const taskAttributes = [];
         const informObject = {
-            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             reservationFor: { id: reservationFor.id },
             reservationNumber,
-            reservationStatus: factory.reservationStatusType.ReservationCancelled,
-            typeOf: factory.reservationType.ReservationPackage
+            reservationStatus: factory_1.factory.reservationStatusType.ReservationCancelled,
+            typeOf: factory_1.factory.reservationType.ReservationPackage
         };
-        const informIdentifier = `${factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;
+        const informIdentifier = `${factory_1.factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;
         let placeOrderAsAbout;
         if (Array.isArray(params.cancelAction?.instrument)) {
             for (const eachInstrument of params.cancelAction.instrument) {
-                if (eachInstrument.typeOf === factory.transactionType.PlaceOrder && typeof eachInstrument.id === 'string') {
-                    placeOrderAsAbout = { id: eachInstrument.id, typeOf: factory.transactionType.PlaceOrder };
+                if (eachInstrument.typeOf === factory_1.factory.transactionType.PlaceOrder && typeof eachInstrument.id === 'string') {
+                    placeOrderAsAbout = { id: eachInstrument.id, typeOf: factory_1.factory.transactionType.PlaceOrder };
                     break;
                 }
             }
@@ -66,12 +43,12 @@ function onPendingReservationCanceled(params) {
                     recipient: {
                         id: '',
                         name: (typeof recipientName === 'string') ? recipientName : 'unknown', // redefine name(2025-02-17~)
-                        typeOf: factory.creativeWorkType.WebApplication
+                        typeOf: factory_1.factory.creativeWorkType.WebApplication
                         // url: informUrl // discontinue(2025-02-13~)
                     },
                     target: {
                         httpMethod: 'POST',
-                        encodingType: factory.encodingFormat.Application.json,
+                        encodingType: factory_1.factory.encodingFormat.Application.json,
                         typeOf: 'EntryPoint',
                         urlTemplate: informUrl
                     },
@@ -79,11 +56,11 @@ function onPendingReservationCanceled(params) {
                     ...(placeOrderAsAbout !== undefined) ? { about: placeOrderAsAbout } : undefined // add about(2025-02-19~)
                 };
                 return {
-                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
+                    project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+                    name: factory_1.factory.taskName.TriggerWebhook,
+                    status: factory_1.factory.taskStatus.Ready,
                     runsAt: now,
-                    remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
+                    remainingNumberOfTries: factory_2.NUM_TRY_INFORM_RESERVATION,
                     numberOfTried: 0,
                     executionResults: [],
                     data: informReservationAttributes

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -1,16 +1,15 @@
 /**
  * 予約取消時アクション
  */
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-export type ICanceledEventReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
-export type ICanceledBusReservation = Pick<factory.reservation.IReservation<factory.reservationType.BusReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
+export type ICanceledEventReservation = Pick<factory.reservation.eventReservation.IReservation, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
 export declare function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
-canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[], 
+canceledReservations: ICanceledEventReservation[], 
 /**
  * 集計対象イベント
  */

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

@@ -1,39 +1,17 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationCanceled = onReservationCanceled;
 /**
  * 予約取消時アクション
  */
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 // import { Settings } from '../../../settings';
-const factory_1 = require("../factory");
+const factory_2 = require("../factory");
 function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
+// canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[],
 canceledReservations, 
 // useInformReservation: boolean,
 /**
@@ -49,8 +27,8 @@ reservationFor, cancelAction) {
         let orderAsAbout;
         if (Array.isArray(cancelAction.instrument)) {
             for (const eachInstrument of cancelAction.instrument) {
-                if (eachInstrument.typeOf === factory.order.OrderType.Order && typeof eachInstrument.orderNumber === 'string') {
-                    orderAsAbout = { orderNumber: eachInstrument.orderNumber, typeOf: factory.order.OrderType.Order };
+                if (eachInstrument.typeOf === factory_1.factory.order.OrderType.Order && typeof eachInstrument.orderNumber === 'string') {
+                    orderAsAbout = { orderNumber: eachInstrument.orderNumber, typeOf: factory_1.factory.order.OrderType.Order };
                     break;
                 }
             }
@@ -66,7 +44,7 @@ reservationFor, cancelAction) {
                     typeOf: r.typeOf,
                     project: r.project,
                     id: r.id,
-                    reservationStatus: factory.reservationStatusType.ReservationCancelled,
+                    reservationStatus: factory_1.factory.reservationStatusType.ReservationCancelled,
                     modifiedTime: r.modifiedTime
                 };
             });
@@ -79,12 +57,12 @@ reservationFor, cancelAction) {
                         recipient: {
                             id: '',
                             name: (typeof recipientName === 'string') ? recipientName : 'unknown', // redefine name(2025-02-17~)
-                            typeOf: factory.creativeWorkType.WebApplication
+                            typeOf: factory_1.factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
                         },
                         target: {
                             httpMethod: 'POST',
-                            encodingType: factory.encodingFormat.Application.json,
+                            encodingType: factory_1.factory.encodingFormat.Application.json,
                             typeOf: 'EntryPoint',
                             urlTemplate: informUrl
                         },
@@ -92,10 +70,10 @@ reservationFor, cancelAction) {
                     };
                     return {
                         project,
-                        name: factory.taskName.TriggerWebhook,
-                        status: factory.taskStatus.Ready,
+                        name: factory_1.factory.taskName.TriggerWebhook,
+                        status: factory_1.factory.taskStatus.Ready,
                         runsAt: informTaskRunsAt,
-                        remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
+                        remainingNumberOfTries: factory_2.NUM_TRY_INFORM_RESERVATION,
                         numberOfTried: 0,
                         executionResults: [],
                         data: informReservationAttributes

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

@@ -1,47 +1,24 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationCheckedIn = onReservationCheckedIn;
 /**
  * 予約発券時アクション
  */
-const factory = __importStar(require("../../../factory"));
-const factory_1 = require("../factory");
+const factory_1 = require("../../../factory");
+const factory_2 = require("../factory");
 function onReservationCheckedIn(params) {
     return async (repos) => {
         const { dateIssued } = params.object.reservedTicket;
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         const tasks = [];
-        const project = { id: params.project.id, typeOf: factory.organizationType.Project };
+        const project = { id: params.project.id, typeOf: factory_1.factory.organizationType.Project };
         const informReservations = setting?.onReservationStatusChanged?.informReservation;
         let reservations4inform = [];
         const ticketToken = params.purpose?.code;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             reservations4inform = params.object.ids.map((reservationId, index) => {
                 return {
-                    typeOf: factory.reservationType.EventReservation,
+                    typeOf: factory_1.factory.reservationType.EventReservation,
                     project,
                     id: reservationId,
                     checkedIn: true,
@@ -58,7 +35,7 @@ function onReservationCheckedIn(params) {
                     reservationNumber: { $in: [reservationNumber] }
                 });
                 return {
-                    typeOf: factory.reservationType.ReservationPackage,
+                    typeOf: factory_1.factory.reservationType.ReservationPackage,
                     project,
                     reservationNumber,
                     checkedIn: true,
@@ -75,7 +52,7 @@ function onReservationCheckedIn(params) {
             if (Array.isArray(informReservations)) {
                 let orderAsAbout;
                 if (typeof params.instrument.orderNumber === 'string') {
-                    orderAsAbout = { orderNumber: params.instrument.orderNumber, typeOf: factory.order.OrderType.Order };
+                    orderAsAbout = { orderNumber: params.instrument.orderNumber, typeOf: factory_1.factory.order.OrderType.Order };
                 }
                 informReservations.forEach((informReservation) => {
                     const informUrl = String(informReservation.recipient?.url);
@@ -85,12 +62,12 @@ function onReservationCheckedIn(params) {
                         recipient: {
                             id: '',
                             name: (typeof recipientName === 'string') ? recipientName : 'unknown', // redefine name(2025-02-17~)
-                            typeOf: factory.creativeWorkType.WebApplication
+                            typeOf: factory_1.factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
                         },
                         target: {
                             httpMethod: 'POST',
-                            encodingType: factory.encodingFormat.Application.json,
+                            encodingType: factory_1.factory.encodingFormat.Application.json,
                             typeOf: 'EntryPoint',
                             urlTemplate: informUrl
                         },
@@ -98,10 +75,10 @@ function onReservationCheckedIn(params) {
                     };
                     const informReservationTask = {
                         project,
-                        name: factory.taskName.TriggerWebhook,
-                        status: factory.taskStatus.Ready,
+                        name: factory_1.factory.taskName.TriggerWebhook,
+                        status: factory_1.factory.taskStatus.Ready,
                         runsAt: informTaskRunsAt,
-                        remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
+                        remainingNumberOfTries: factory_2.NUM_TRY_INFORM_RESERVATION,
                         numberOfTried: 0,
                         executionResults: [],
                         data: informReservationAttributes

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.d.ts

@@ -1,20 +1,26 @@
 /**
  * 予約確定時アクション
  */
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { AuthorizationRepo } from '../../../repo/authorization';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
+export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor'> & {
+    price?: factory.reservation.eventReservation.IPrice;
+    underName?: Pick<factory.reservation.IUnderName, 'id' | 'typeOf'>;
+    reservedTicket: Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
+        ticketType: factory.reservation.eventReservation.ITicketType;
+    };
+    reservationFor: factory.assetTransaction.reserve.IReservationFor;
+};
 /**
  * 予約確定後のアクション
  */
 export declare function onReservationConfirmedByAction(actionAttributes: Pick<factory.action.reserve.IAttributes, 'potentialActions'>): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
-export declare function onReservationConfirmed(confirmedReservations: IEventReservation[], reserveAction: Pick<factory.action.reserve.IAttributes, 'instrument'>): (repos: {
+export declare function onReservationConfirmed(confirmedReservations: IConfirmedReservation[], reserveAction: Pick<factory.action.reserve.IAttributes, 'instrument'>): (repos: {
     code: AuthorizationRepo;
     setting: SettingRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export {};

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

@@ -1,60 +1,38 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationConfirmedByAction = onReservationConfirmedByAction;
 exports.onReservationConfirmed = onReservationConfirmed;
 /**
  * 予約確定時アクション
  */
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 // import { Settings } from '../../../settings';
-const factory_1 = require("../factory");
+const factory_2 = require("../factory");
 /**
  * 予約確定後のアクション
  */
 function onReservationConfirmedByAction(actionAttributes) {
     return async (repos) => {
         const potentialActions = actionAttributes.potentialActions;
-        const now = new Date();
+        // const now = new Date();
         const taskAttributes = [];
         /* istanbul ignore else */
         if (potentialActions !== undefined) {
-            if (Array.isArray(potentialActions.moneyTransfer)) {
-                taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
-                    return {
-                        project: a.project,
-                        name: factory.taskName.MoneyTransfer,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: a
-                    };
-                }));
-            }
+            // discontinue(2026-04-18~)
+            // if (Array.isArray(potentialActions.moneyTransfer)) {
+            //     taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
+            //         return {
+            //             project: a.project,
+            //             name: factory.taskName.MoneyTransfer as factory.taskName.MoneyTransfer,
+            //             status: factory.taskStatus.Ready,
+            //             runsAt: now,
+            //             remainingNumberOfTries: 10,
+            //             numberOfTried: 0,
+            //             executionResults: [],
+            //             data: a
+            //         };
+            //     }));
+            // }
         }
         // タスク保管
         if (taskAttributes.length > 0) {
@@ -72,8 +50,8 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
         let orderAsAbout;
         if (Array.isArray(reserveAction.instrument)) {
             for (const eachInstrument of reserveAction.instrument) {
-                if (eachInstrument.typeOf === factory.order.OrderType.Order && typeof eachInstrument.orderNumber === 'string') {
-                    orderAsAbout = { orderNumber: eachInstrument.orderNumber, typeOf: factory.order.OrderType.Order };
+                if (eachInstrument.typeOf === factory_1.factory.order.OrderType.Order && typeof eachInstrument.orderNumber === 'string') {
+                    orderAsAbout = { orderNumber: eachInstrument.orderNumber, typeOf: factory_1.factory.order.OrderType.Order };
                     break;
                 }
             }
@@ -92,7 +70,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     page: 1,
                     object: {
                         orderNumber: { $eq: orderAsAbout.orderNumber },
-                        typeOfs: [factory.order.OrderType.Order]
+                        typeOfs: [factory_1.factory.order.OrderType.Order]
                     }
                 }, ['code'])).shift();
                 if (existingAuthorization !== undefined) {
@@ -100,12 +78,12 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     //     'onReservationConfirmed: existingAuthorization found.',
                     //     orderAsAbout.orderNumber, reservationNumber, JSON.stringify(existingAuthorization)
                     // );
-                    const taskIdentifier = `${project.id}:${factory.taskName.OnAuthorizationCreated}:${factory.assetTransactionType.Reserve}:${reservationNumber}:onReservationConfirmed`;
+                    const taskIdentifier = `${project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.assetTransactionType.Reserve}:${reservationNumber}:onReservationConfirmed`;
                     onAuthorizationCreatedTask = {
                         alternateName: taskIdentifier,
                         identifier: taskIdentifier,
-                        name: factory.taskName.OnAuthorizationCreated,
-                        status: factory.taskStatus.Ready,
+                        name: factory_1.factory.taskName.OnAuthorizationCreated,
+                        status: factory_1.factory.taskStatus.Ready,
                         runsAt: now,
                         remainingNumberOfTries: 3,
                         numberOfTried: 0,
@@ -143,7 +121,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
             });
             if (typeof issuedThrough.id !== 'string') {
                 // COA予約では予約アクションを想定していないので、興行idは必ず存在するはず
-                throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
+                throw new factory_1.factory.errors.Internal('reservation.issuedThrough.id must be string');
             }
             const informObject = {
                 bookingTime,
@@ -152,14 +130,14 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 provider, // subReservationから移行(2024-03-20~)
                 reservationFor,
                 reservationNumber,
-                reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+                reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed,
                 subReservation: subReservations4inform,
-                typeOf: factory.reservationType.ReservationPackage,
+                typeOf: factory_1.factory.reservationType.ReservationPackage,
                 ...(typeof underName?.typeOf === 'string')
-                    ? { underName: (0, factory_1.optimizeUnderName4inform)({ underName }) }
+                    ? { underName: (0, factory_2.optimizeUnderName4inform)({ underName }) }
                     : undefined
             };
-            const informIdentifier = `${factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;
+            const informIdentifier = `${factory_1.factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;
             // inform galobally
             if (Array.isArray(informReservations)) {
                 taskAttributes.push(...informReservations.map((informReservation) => {
@@ -170,12 +148,12 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                         recipient: {
                             id: '',
                             name: (typeof recipientName === 'string') ? recipientName : 'unknown', // redefine name(2025-02-17~)
-                            typeOf: factory.creativeWorkType.WebApplication
+                            typeOf: factory_1.factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
                         },
                         target: {
                             httpMethod: 'POST',
-                            encodingType: factory.encodingFormat.Application.json,
+                            encodingType: factory_1.factory.encodingFormat.Application.json,
                             typeOf: 'EntryPoint',
                             urlTemplate: informUrl
                         },
@@ -184,10 +162,10 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     };
                     return {
                         project,
-                        name: factory.taskName.TriggerWebhook,
-                        status: factory.taskStatus.Ready,
+                        name: factory_1.factory.taskName.TriggerWebhook,
+                        status: factory_1.factory.taskStatus.Ready,
                         runsAt: now,
-                        remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
+                        remainingNumberOfTries: factory_2.NUM_TRY_INFORM_RESERVATION,
                         numberOfTried: 0,
                         executionResults: [],
                         data: informReservationAttributes

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import type { IAttendedReservation } from '../../../repo/reservation';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';