@chevre/domain 21.2.0-alpha.13 → 21.2.0-alpha.130

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

@@ -10,78 +10,153 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReservation = void 0;
-/**
- * 予約サービス
- */
+const createDebug = require("debug");
 const factory = require("../../factory");
 const onReservationConfirmed_1 = require("./potentialActions/onReservationConfirmed");
+const debug = createDebug('chevre-domain:service:reserve:confirmReservation');
 /**
  * 予約を確定する
  */
-function confirmReservation(actionAttributesList) {
+function confirmReservation(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.actionAttributesList.length > 0) {
+            yield Promise.all(params.actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
+                yield reserveIfNotYet(actionAttributes, { byTask: params.byTask })(repos);
+                if (params.useOnReservationConfirmed) {
+                    yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
+                }
+            })));
+            if (params.useOnReservationConfirmed) {
+                let confirmedReservations = [];
+                // 確定予約通知タスクを予約番号単位で作成する(2022-12-21~)
+                const reservationNumber = params.actionAttributesList[0].object.reservationNumber;
+                if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
+                    // 最新のconfirmedReservationsを検索
+                    confirmedReservations = yield repos.reservation.search({
+                        reservationNumber: { $eq: reservationNumber },
+                        typeOf: factory.reservationType.EventReservation
+                    });
+                    confirmedReservations = confirmedReservations.map((r) => {
+                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                        delete r._id;
+                        return r;
+                    });
+                }
+                yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+            }
+        }
+    });
+}
+exports.confirmReservation = confirmReservation;
+function reserveIfNotYet(params, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let confirmedReservations = [];
-        if (actionAttributesList.length > 0) {
-            yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                const reservation = actionAttributes.object;
-                const action = yield repos.action.start(actionAttributes);
-                try {
-                    // ReservationPackageに対応(2022-12-22~)
-                    if (reservation.typeOf === factory.reservationType.ReservationPackage) {
-                        // 予約を確定状態に変更する
-                        yield repos.reservation.confirmByReservationNumber({
-                            reservationNumber: reservation.reservationNumber,
-                            previousReservationStatus: reservation.reservationStatus,
-                            underName: reservation.underName
-                        });
+        var _a;
+        const reservationPackage = params.object;
+        // 冪等性を担保(2023-05-31~)
+        debug('searching completed reserveAction... byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
+        const completedActions = yield repos.action.search({
+            limit: 1,
+            page: 1,
+            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            typeOf: { $eq: params.typeOf },
+            object: {
+                typeOf: { $eq: params.object.typeOf }
+                // reservationNumber: { $eq: params.object.reservationNumber }
+            },
+            purpose: {
+                id: { $in: [params.purpose.id] },
+                typeOf: { $in: [params.purpose.typeOf] }
+            }
+        }, ['_id'], []);
+        debug(completedActions.length, 'completed reserveAction found. byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
+        if (completedActions.length === 0) {
+            const action = yield repos.action.start(params);
+            try {
+                const reserveTransactions = yield repos.assetTransaction.search({
+                    limit: 1,
+                    page: 1,
+                    typeOf: factory.assetTransactionType.Reserve,
+                    transactionNumber: { $eq: reservationPackage.reservationNumber }
+                });
+                const reserveTransaction = reserveTransactions.shift();
+                if (reserveTransaction === undefined) {
+                    throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+                }
+                let underName;
+                // 予約取引に保管されたunderNameを使用する(2023-05-30~)
+                if (typeof ((_a = reserveTransaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                    underName = reserveTransaction.object.underName;
+                    // 廃止(2023-05-31~)→予約取引から取得に変更
+                    // } else if (typeof reservationPackage.underName?.typeOf === 'string') {
+                    //     underName = reservationPackage.underName;
+                }
+                // ReservationPackageに対応(2022-12-22~)
+                if (reservationPackage.typeOf === factory.reservationType.ReservationPackage) {
+                    // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
+                    if (reserveTransaction.object.disablePendingReservations === true) {
+                        const reservationFor = reserveTransaction.object.reservationFor;
+                        const subReservations = reserveTransaction.object.subReservation;
+                        if (Array.isArray(subReservations) && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
+                            // confirmManyに変更(2023-06-13~)
+                            const confirmManyIfNotExistResult = yield repos.reservation.confirmManyIfNotExist({
+                                subReservation: subReservations,
+                                reservationFor,
+                                underName,
+                                broker: reserveTransaction.object.broker,
+                                issuedThrough: reserveTransaction.object.issuedThrough
+                            });
+                            debug('confirmManyIfNotExistResult:', confirmManyIfNotExistResult, 'reservationNumber:', reservationPackage.reservationNumber);
+                            // await Promise.all(subReservations.map(async (subReservation) => {
+                            //     await repos.reservation.confirmByIdIfNotExist({
+                            //         reservation: subReservation,
+                            //         reservationFor,
+                            //         underName,
+                            //         broker: reserveTransaction.object.broker,
+                            //         issuedThrough: reserveTransaction.object.issuedThrough
+                            //     });
+                            // }));
+                        }
                     }
                     else {
-                        // 廃止(2023-01-18)
-                        throw new factory.errors.Forbidden(`${reservation.typeOf} not acceptable`);
                         // 予約を確定状態に変更する
-                        // await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                        //     id: reservation.id,
-                        //     previousReservationStatus: reservation.reservationStatus,
-                        //     underName: reservation.underName
-                        // });
-                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                        // delete (<any>reservation)._id;
-                        // confirmedReservations.push(reservation);
-                    }
-                }
-                catch (error) {
-                    // actionにエラー結果を追加
-                    try {
-                        const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
-                    }
-                    catch (__) {
-                        // 失敗したら仕方ない
+                        yield repos.reservation.confirmByReservationNumber({
+                            reservationNumber: reservationPackage.reservationNumber,
+                            previousReservationStatus: reservationPackage.reservationStatus,
+                            underName,
+                            broker: reserveTransaction.object.broker,
+                            issuedThrough: reserveTransaction.object.issuedThrough
+                        });
                     }
-                    throw error;
                 }
-                // アクション完了
-                const actionResult = {};
-                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
-            })));
-            // 確定予約通知タスクを予約番号単位で作成する(2022-12-21~)
-            const reservationNumber = actionAttributesList[0].object.reservationNumber;
-            if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
-                // 最新のconfirmedReservationsを検索
-                confirmedReservations = yield repos.reservation.search({
-                    reservationNumber: { $eq: reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
-                });
-                confirmedReservations = confirmedReservations.map((r) => {
+                else {
+                    // 廃止(2023-01-18)
+                    throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
+                    // 予約を確定状態に変更する
+                    // await repos.reservation.confirm<factory.reservationType.EventReservation>({
+                    //     id: reservation.id,
+                    //     previousReservationStatus: reservation.reservationStatus,
+                    //     underName: reservation.underName
+                    // });
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete r._id;
-                    return r;
-                });
+                    // delete (<any>reservation)._id;
+                    // confirmedReservations.push(reservation);
+                }
+            }
+            catch (error) {
+                // actionにエラー結果を追加
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                }
+                catch (__) {
+                    // 失敗したら仕方ない
+                }
+                throw error;
             }
-            yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+            // アクション完了
+            const actionResult = {};
+            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
     });
 }
-exports.confirmReservation = confirmReservation;

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

@@ -25,7 +25,7 @@ export interface IReservationPackage4informConfirmed {
  * 予約取消通知
  */
 export interface IReservation4informCanceled {
-    typeOf: factory.reservationType.EventReservation;
+    typeOf: factory.reservationType.BusReservation | factory.reservationType.EventReservation;
     project: IProject;
     id: string;
     reservationStatus: factory.reservationStatusType.ReservationCancelled;

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

@@ -1,13 +1,25 @@
 import * as factory from '../../../factory';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
+type IBusReservation = factory.reservation.IReservation<factory.reservationType.BusReservation>;
+export declare function onReservationCanceled(
 /**
- * 予約取消後のアクション
+ * ステータス変更された予約リスト
  */
-export declare function onReservationCanceledByAction(actionAttributes: factory.action.cancel.reservation.IAttributes): (repos: {
-    task: TaskRepo;
-}) => Promise<void>;
-export declare function onReservationCanceled(canceledReservations: IEventReservation[], useInformReservation: boolean): (repos: {
+canceledReservations: IEventReservation[] | IBusReservation[], 
+/**
+ * 予約通知有無
+ */
+useInformReservation: boolean, 
+/**
+ * 集計対象イベント
+ */
+reservationFor: {
+    project: {
+        id: string;
+    };
+    id: string;
+}): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
 export {};

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onReservationCanceled = exports.onReservationCanceledByAction = void 0;
+exports.onReservationCanceled = void 0;
 /**
  * 予約取消時アクション
  */
@@ -19,27 +19,19 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
+function onReservationCanceled(
 /**
- * 予約取消後のアクション
+ * ステータス変更された予約リスト
  */
-function onReservationCanceledByAction(actionAttributes) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const potentialActions = actionAttributes.potentialActions;
-        const taskAttributes = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (potentialActions !== undefined) {
-            // no op
-        }
-        // タスク保管
-        if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes);
-        }
-    });
-}
-exports.onReservationCanceledByAction = onReservationCanceledByAction;
-function onReservationCanceled(canceledReservations, useInformReservation) {
+canceledReservations, 
+/**
+ * 予約通知有無
+ */
+useInformReservation, 
+/**
+ * 集計対象イベント
+ */
+reservationFor) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {
             const now = new Date();
@@ -50,7 +42,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
                 if (Array.isArray(informReservations)) {
                     // やや遅延させる(確定通知が未達の可能性を考慮して)
                     const informTaskRunsAt = moment(now)
-                        .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                        .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                         .toDate();
                     const reservations4inform = canceledReservations.map((r) => {
                         return {
@@ -91,12 +83,22 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes);
+                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
+            // const reservationForId = canceledReservations[0].reservationFor.id;
+            // if (typeof reservationForId === 'string') {
+            //     await createAggregateScreeningEventIfNotExist({
+            //         project,
+            //         reservationFor: [{ id: reservationForId }],
+            //         force: false
+            //     })({ task: repos.task });
+            // }
+        }
+        if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.id) === 'string') {
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
-                project,
-                reservationFor: [{ id: canceledReservations[0].reservationFor.id }],
+                project: { id: reservationFor.project.id },
+                reservationFor: [{ id: reservationFor.id }],
                 force: false
             })({ task: repos.task });
         }

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

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 // tslint:disable-next-line:max-func-body-length
 function onReservationCheckedIn(params) {
     // tslint:disable-next-line:max-func-body-length
@@ -31,7 +30,7 @@ function onReservationCheckedIn(params) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(params.now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             informReservations.forEach((informReservation) => {
                 var _a;
@@ -107,7 +106,7 @@ function onReservationCheckedIn(params) {
             });
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks);
+            yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
         const reservationForIds = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.ids;

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

@@ -57,38 +57,9 @@ function onReservationConfirmedByAction(actionAttributes
                 }));
             }
         }
-        // inform galobally
-        // if (Array.isArray(informReservations)) {
-        //     const reservation4inform: IReservation4informConfirmed = maskUnderName(confirmedReservation);
-        //     taskAttributes.push(...informReservations.map<ITriggerWebhookTaskAttributes>((informReservation) => {
-        //         const informUrl: string = String(informReservation.recipient?.url);
-        //         const informReservationAttributes: InformReservationActionattributes = {
-        //             agent: confirmedReservation.project,
-        //             object: [reservation4inform],
-        //             project: confirmedReservation.project,
-        //             recipient: {
-        //                 id: '',
-        //                 name: informUrl,
-        //                 typeOf: factory.creativeWorkType.WebApplication,
-        //                 url: informUrl
-        //             },
-        //             typeOf: factory.actionType.InformAction
-        //         };
-        //         return {
-        //             project: actionAttributes.project,
-        //             name: factory.taskName.TriggerWebhook,
-        //             status: factory.taskStatus.Ready,
-        //             runsAt: now,
-        //             remainingNumberOfTries: NUM_TRY_INFORM_RESERVATION,
-        //             numberOfTried: 0,
-        //             executionResults: [],
-        //             data: informReservationAttributes
-        //         };
-        //     }));
-        // }
         // タスク保管
         if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes);
+            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
     });
 }
@@ -142,7 +113,7 @@ function onReservationConfirmed(confirmedReservations) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes);
+                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
         }
     });

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

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約使用
  */
@@ -32,7 +31,7 @@ function onReservationUsed(action, attendedReservation) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             const reservation4inform = {
                 typeOf: attendedReservation.typeOf,
@@ -97,7 +96,7 @@ function onReservationUsed(action, attendedReservation) {
             }
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks);
+            yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({

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

@@ -1,8 +1,6 @@
-/**
- * 予約サービス
- */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
@@ -11,6 +9,9 @@ import { IUseReservationAction } from './potentialActions/onReservationUsed';
  * 予約使用
  */
 export declare function useReservation(params: {
+    project: {
+        id: string;
+    };
     agent: factory.action.consume.use.reservation.IAgent;
     object: {
         /**
@@ -24,8 +25,11 @@ export declare function useReservation(params: {
     location?: {
         identifier?: string;
     };
+    verifyToken: boolean;
+    reserveIfNotYet: boolean;
 }): (repos: {
     action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -10,58 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useReservation = void 0;
-/**
- * 予約サービス
- */
+const createDebug = require("debug");
 const factory = require("../../factory");
-const code_1 = require("../code");
-// import { maskUnderName } from './factory';
+const confirmReservation_1 = require("./confirmReservation");
 const onReservationUsed_1 = require("./potentialActions/onReservationUsed");
-function verifyToken4reservation(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const payload = yield (0, code_1.verifyToken)({
-            project: params.project,
-            agent: params.agent,
-            token: params.token
-        })({});
-        switch (payload.typeOf) {
-            case factory.order.OrderType.Order:
-                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
-                const order = yield repos.order.findByOrderNumberAndReservationId({
-                    orderNumber: payload.orderNumber,
-                    reservationId: params.reservationId
-                });
-                // 注文検索
-                // const order: Pick<factory.order.IOrder, 'orderStatus' | 'acceptedOffers'> =
-                //     await repos.order.findByOrderNumber({
-                //         orderNumber: payload.orderNumber,
-                //         inclusion: ['orderStatus', 'acceptedOffers'],
-                //         exclusion: []
-                //     });
-                // ステータス検証
-                switch (order.orderStatus) {
-                    case factory.orderStatus.OrderDelivered:
-                        break;
-                    default:
-                        throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
-                }
-                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                //     return (
-                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
-                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
-                //     )
-                //         && offer.itemOffered.id === params.reservationId;
-                // });
-                // if (!reservationExistsInOrder) {
-                //     throw new factory.errors.NotFound('AcceptedOffer');
-                // }
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
-        }
-    });
-}
+const verifyToken4reservation_1 = require("./verifyToken4reservation");
+const debug = createDebug('chevre-domain:service:reserve:useReservation');
 /**
  * 予約使用
  */
@@ -71,22 +25,29 @@ function useReservation(params) {
         var _a, _b;
         const now = new Date();
         const reservationId = params.object.id;
+        const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;
+        if (params.verifyToken === true) {
+            // instrument?.tokenを検証
+            if (typeof token === 'string') {
+                yield (0, verifyToken4reservation_1.verifyToken4reservation)({
+                    project: { id: params.project.id },
+                    agent: params.agent,
+                    reservationId,
+                    token
+                })({ order: repos.order });
+            }
+        }
+        // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
+        debug('reserveIfNotYet?', params.reserveIfNotYet, 'id:', params.object.id);
+        if (params.reserveIfNotYet === true) {
+            yield reserveIfNotYet({ object: params.object })(repos);
+        }
         // 予約検索
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
             id: reservationId,
-            inclusion: ['id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            inclusion: ['_id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
-        // instrument?.tokenを検証
-        const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;
-        if (typeof token === 'string') {
-            yield verifyToken4reservation({
-                project: { id: reservation.project.id },
-                agent: params.agent,
-                reservationId,
-                token
-            })({ order: repos.order });
-        }
         // UseActionを作成する
         const reservationAsObject = {
             id: reservation.id,
@@ -99,8 +60,6 @@ function useReservation(params) {
         const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), 
             // object最適化(2023-01-30~)
             // どの予約を
-            // mask
-            // object: [maskUnderName(reservation)],
             object: [reservationAsObject] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? {
                 location: {
@@ -118,14 +77,6 @@ function useReservation(params) {
         try {
             // 使用日時と同時更新(2023-01-30~)
             attendedReservation = (yield repos.reservation.attendIfNotAttended({ id: reservationId, now }));
-            // attendedReservation = <IEventReservation>await repos.reservation.attend({ id: reservationId, now });
-            // // 使用日時がなければ追加
-            // if (attendedReservation.reservedTicket?.dateUsed === undefined) {
-            //     attendedReservation = await repos.reservation.updatePartiallyById({
-            //         id: attendedReservation.id,
-            //         update: { 'reservedTicket.dateUsed': now }
-            //     });
-            // }
         }
         catch (error) {
             // actionにエラー結果を追加
@@ -145,3 +96,42 @@ function useReservation(params) {
     });
 }
 exports.useReservation = useReservation;
+function reserveIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let reserveTransactions = [];
+        if (typeof params.object.id === 'string' && params.object.id.length > 0) {
+            reserveTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Reserve,
+                object: {
+                    reservations: { id: { $in: [params.object.id] } }
+                },
+                statuses: [factory.transactionStatusType.Confirmed]
+            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. id:', params.object.id);
+        }
+        yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (typeof ((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                yield (0, confirmReservation_1.confirmReservation)({
+                    actionAttributesList: [{
+                            project: reserveTransaction.project,
+                            typeOf: factory.actionType.ReserveAction,
+                            object: {
+                                typeOf: reserveTransaction.object.typeOf,
+                                reservationNumber: reserveTransaction.object.reservationNumber,
+                                reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
+                                    ? reserveTransaction.object.reservationStatus
+                                    : factory.reservationStatusType.ReservationPending,
+                                reservationFor: reserveTransaction.object.reservationFor
+                            },
+                            agent: reserveTransaction.project,
+                            purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
+                        }],
+                    useOnReservationConfirmed: false,
+                    byTask: false
+                })(repos);
+                debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.object.reservationNumber);
+            }
+        })));
+    });
+}