@chevre/domain 23.2.0-alpha.8 → 23.2.0

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

@@ -1,12 +1,29 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancelPendingReservation = cancelPendingReservation;
@@ -15,8 +32,8 @@ exports.processUnlockOfferRateLimit = processUnlockOfferRateLimit;
 /**
  * 予約サービス
  */
-const moment = require("moment");
-const factory = require("../../factory");
+const moment_1 = __importDefault(require("moment"));
+const factory = __importStar(require("../../factory"));
 const factory_1 = require("./factory");
 const onPendingReservationCanceled_1 = require("./potentialActions/onPendingReservationCanceled");
 const onReservationCanceled_1 = require("./potentialActions/onReservationCanceled");
@@ -24,23 +41,28 @@ const onReservationCanceled_1 = require("./potentialActions/onReservationCancele
  * 保留予約取消
  */
 function cancelPendingReservation(actionAttributes) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const { cancelAction, reserveTransaction } = yield cancelPengindIfNotYet(actionAttributes)(repos);
-        yield (0, onPendingReservationCanceled_1.onPendingReservationCanceled)(Object.assign({ project: { id: reserveTransaction.project.id }, reservationFor: {
-                id: String((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id)
-            }, reservationNumber: reserveTransaction.object.reservationNumber }, (cancelAction !== undefined) ? { cancelAction } : undefined))(repos);
-    });
+    ) => {
+        const { cancelAction, reserveTransaction } = await cancelPengindIfNotYet(actionAttributes)(repos);
+        await (0, onPendingReservationCanceled_1.onPendingReservationCanceled)(
+        // [], // PendingReservationはドキュメントとして存在しないので空でok
+        // false,
+        {
+            project: { id: reserveTransaction.project.id },
+            reservationFor: {
+                id: String(reserveTransaction.object.reservationFor?.id)
+            },
+            reservationNumber: reserveTransaction.object.reservationNumber,
+            ...(cancelAction !== undefined) ? { cancelAction } : undefined
+        })(repos);
+    };
 }
 function cancelPengindIfNotYet(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const reserveTransactionId = params.purpose.id;
         // 予約取引を検索
-        const reserveTransactions = yield repos.assetTransaction.search({
+        const reserveTransactions = await repos.assetTransaction.search({
             limit: 1,
             page: 1,
             typeOf: factory.assetTransactionType.Reserve,
@@ -53,7 +75,7 @@ function cancelPengindIfNotYet(params) {
         let actionId;
         const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
         // 冪等性を担保(2023-06-05~)
-        const completedActions = yield repos.action.search({
+        const completedActions = await repos.action.search({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
@@ -70,7 +92,7 @@ function cancelPengindIfNotYet(params) {
         if (completedActions.length === 0) {
             if (actionAttributes !== undefined) {
                 // アクション開始
-                const action = yield repos.action.start(actionAttributes);
+                const action = await repos.action.start(actionAttributes);
                 actionId = action.id;
                 const actionObject = actionAttributes.object;
                 // let cancelResult: ICancelResult | undefined;
@@ -84,8 +106,8 @@ function cancelPengindIfNotYet(params) {
                         if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
                             const subReservation = reserveTransaction.object.subReservation;
                             if (Array.isArray(subReservation) && subReservation.length > 0) {
-                                yield Promise.all(subReservation.map((cancelingSubReservation) => __awaiter(this, void 0, void 0, function* () {
-                                    yield processUnlockSeat({
+                                await Promise.all(subReservation.map(async (cancelingSubReservation) => {
+                                    await processUnlockSeat({
                                         reservation: {
                                             id: cancelingSubReservation.id,
                                             project: { id: reserveTransaction.project.id },
@@ -103,7 +125,7 @@ function cancelPengindIfNotYet(params) {
                                             ? reserveTransaction.transactionNumber
                                             : reserveTransactionId
                                     })(repos);
-                                    yield processUnlockOfferRateLimit({
+                                    await processUnlockOfferRateLimit({
                                         project: { id: reserveTransaction.project.id },
                                         reservation: {
                                             reservationNumber: reserveTransaction.object.reservationNumber,
@@ -111,7 +133,7 @@ function cancelPengindIfNotYet(params) {
                                         },
                                         reservationFor
                                     })(repos);
-                                })));
+                                }));
                             }
                             if (reserveTransaction.object.disablePendingReservations === true) {
                                 // disablePendingReservationsの場合は処理不要(2023-06-05~)
@@ -129,7 +151,7 @@ function cancelPengindIfNotYet(params) {
                 }
                 catch (error) {
                     try {
-                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                        await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
                     }
                     catch (__) {
                         // 失敗したら仕方ない
@@ -137,38 +159,42 @@ function cancelPengindIfNotYet(params) {
                     throw error;
                 }
                 const actionResult = {};
-                yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
             }
         }
         else {
-            actionId = (_a = completedActions.at(0)) === null || _a === void 0 ? void 0 : _a.id;
+            actionId = completedActions.at(0)?.id;
         }
-        return Object.assign({ reserveTransaction }, (actionAttributes !== undefined && typeof actionId === 'string')
-            ? {
-                cancelAction: Object.assign(Object.assign({}, actionAttributes), { id: actionId })
-            }
-            : undefined);
-    });
+        return {
+            reserveTransaction,
+            ...(actionAttributes !== undefined && typeof actionId === 'string')
+                ? {
+                    cancelAction: {
+                        ...actionAttributes,
+                        id: actionId
+                    }
+                }
+                : undefined
+        };
+    };
 }
 /**
  * 予約をキャンセルする
  */
 function cancelReservation(actionAttributesList) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         const now = new Date();
         if (actionAttributesList.length > 0) {
-            // tslint:disable-next-line:max-func-body-length
-            yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                const action = yield repos.action.start(actionAttributes);
+            await Promise.all(actionAttributesList.map(async (actionAttributes) => {
+                const action = await repos.action.start(actionAttributes);
                 let cancelResult;
                 let canceledReservationForId;
                 try {
                     if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                         // 予約取引を検索
-                        const reserveTransactions = yield repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.search({
                             limit: 1,
                             page: 1,
                             typeOf: factory.assetTransactionType.Reserve,
@@ -185,8 +211,8 @@ function cancelReservation(actionAttributesList) {
                         canceledReservationForId = String(reservationFor.id);
                         const subReservation = reserveTransaction.object.subReservation;
                         if (Array.isArray(subReservation) && subReservation.length > 0) {
-                            yield Promise.all(subReservation.map((cancelingSubReservation) => __awaiter(this, void 0, void 0, function* () {
-                                yield processUnlockSeat({
+                            await Promise.all(subReservation.map(async (cancelingSubReservation) => {
+                                await processUnlockSeat({
                                     reservation: {
                                         id: cancelingSubReservation.id,
                                         project: { id: reserveTransaction.project.id },
@@ -204,7 +230,7 @@ function cancelReservation(actionAttributesList) {
                                         ? reserveTransaction.transactionNumber
                                         : reserveTransaction.id
                                 })(repos);
-                                yield processUnlockOfferRateLimit({
+                                await processUnlockOfferRateLimit({
                                     project: { id: reserveTransaction.project.id },
                                     reservation: {
                                         reservationNumber: reserveTransaction.object.reservationNumber,
@@ -212,22 +238,22 @@ function cancelReservation(actionAttributesList) {
                                     },
                                     reservationFor
                                 })(repos);
-                            })));
+                            }));
                         }
                         // 予約番号単位でキャンセル状態に変更する
-                        cancelResult = yield repos.reservation.cancelByReservationNumber({
+                        cancelResult = await repos.reservation.cancelByReservationNumber({
                             reservationNumber: actionAttributes.object.reservationNumber,
                             previousReservationStatus: actionAttributes.object.reservationStatus,
                             modifiedTime: now
                         });
                     }
                     else {
-                        const reservation = yield repos.reservation.projectFieldsById({
+                        const reservation = await repos.reservation.projectFieldsById({
                             id: actionAttributes.object.id,
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
                         // 予約取引を検索
-                        const reserveTransactions = yield repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.search({
                             limit: 1,
                             page: 1,
                             typeOf: factory.assetTransactionType.Reserve,
@@ -236,11 +262,11 @@ function cancelReservation(actionAttributesList) {
                         const reserveTransaction = reserveTransactions.shift();
                         canceledReservationForId = reservation.reservationFor.id;
                         // holder:取引番号に対応(2023-06-05~)
-                        const expectedHolder = ((reserveTransaction === null || reserveTransaction === void 0 ? void 0 : reserveTransaction.object.useHoldStockByTransactionNumber) === true)
+                        const expectedHolder = (reserveTransaction?.object.useHoldStockByTransactionNumber === true)
                             ? reserveTransaction.transactionNumber
-                            : reserveTransaction === null || reserveTransaction === void 0 ? void 0 : reserveTransaction.id;
+                            : reserveTransaction?.id;
                         if (typeof expectedHolder === 'string') {
-                            yield processUnlockSeat({
+                            await processUnlockSeat({
                                 reservation: {
                                     id: reservation.id,
                                     project: { id: reservation.project.id },
@@ -254,7 +280,7 @@ function cancelReservation(actionAttributesList) {
                                 expectedHolder
                             })(repos);
                         }
-                        yield processUnlockOfferRateLimit({
+                        await processUnlockOfferRateLimit({
                             project: { id: reservation.project.id },
                             reservation: {
                                 reservationNumber: reservation.reservationNumber,
@@ -263,7 +289,7 @@ function cancelReservation(actionAttributesList) {
                             reservationFor: reservation.reservationFor
                         })(repos);
                         // 予約をキャンセル状態に変更する
-                        yield repos.reservation.cancelById({
+                        await repos.reservation.cancelById({
                             id: reservation.id,
                             previousReservationStatus: actionAttributes.object.reservationStatus,
                             modifiedTime: now
@@ -272,31 +298,32 @@ function cancelReservation(actionAttributesList) {
                 }
                 catch (error) {
                     try {
-                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                        await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
                     }
                     catch (__) {
                         // 失敗したら仕方ない
                     }
                     throw error;
                 }
-                const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
-                    cancelResult: {
-                        // n: cancelResult.n,
-                        // nModified: cancelResult.nModified,
-                        // ok: cancelResult.ok
-                        matchedCount: cancelResult.matchedCount,
-                        modifiedCount: cancelResult.modifiedCount
-                    }
-                } : undefined
-                // canceledReservationId: canceledReservation?.id
-                );
-                yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                const actionResult = {
+                    ...(cancelResult !== undefined) ? {
+                        cancelResult: {
+                            // n: cancelResult.n,
+                            // nModified: cancelResult.nModified,
+                            // ok: cancelResult.ok
+                            matchedCount: cancelResult.matchedCount,
+                            modifiedCount: cancelResult.modifiedCount
+                        }
+                    } : undefined
+                    // canceledReservationId: canceledReservation?.id
+                };
+                await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;
                     if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                         // 最新のconfirmedReservationsを検索
-                        canceledReservations = yield repos.reservation.projectFields({
+                        canceledReservations = await repos.reservation.projectFields({
                             reservationNumber: { $eq: reservationNumber },
                             typeOf: factory.reservationType.EventReservation
                         }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 });
@@ -308,29 +335,29 @@ function cancelReservation(actionAttributesList) {
                     }
                 }
                 else {
-                    const canceledReservation = yield repos.reservation.projectFieldsById({
+                    const canceledReservation = await repos.reservation.projectFieldsById({
                         id: actionAttributes.object.id,
                         inclusion: ['project', 'typeOf', 'modifiedTime', 'reservationNumber']
                     });
                     canceledReservations = [canceledReservation];
                 }
-                yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, 
+                await (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, 
                 // true,
                 {
                     project: { id: actionAttributes.project.id },
                     id: canceledReservationForId
                 }, actionAttributes)(repos);
-            })));
+            }));
         }
-    });
+    };
 }
 /**
  * 座席ロック解除プロセス
  */
 function processUnlockSeat(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const reservation = params.reservation;
-        const eventStartDate = moment(reservation.reservationFor.startDate)
+        const eventStartDate = (0, moment_1.default)(reservation.reservationFor.startDate)
             .toDate();
         // 予約IDでロックされていれば解除
         let lockKey = {
@@ -345,9 +372,9 @@ function processUnlockSeat(params) {
             },
             holder: params.expectedHolder
         };
-        let holder = yield repos.stockHolder.getHolder(lockKey);
+        let holder = await repos.stockHolder.getHolder(lockKey);
         if (holder === params.expectedHolder) {
-            yield repos.stockHolder.unlock(lockKey);
+            await repos.stockHolder.unlock(lockKey);
         }
         // 予約取引がまだ座席を保持していれば座席ロック解除
         const ticketedSeat = reservation.reservedTicket.ticketedSeat;
@@ -363,18 +390,17 @@ function processUnlockSeat(params) {
                 },
                 holder: params.expectedHolder
             };
-            holder = yield repos.stockHolder.getHolder(lockKey);
+            holder = await repos.stockHolder.getHolder(lockKey);
             if (holder === params.expectedHolder) {
-                yield repos.stockHolder.unlock(lockKey);
+                await repos.stockHolder.unlock(lockKey);
             }
         }
         // subReservationがあれば、そちらも解除(順不同)
         const subReservations = reservation.subReservation;
         if (Array.isArray(subReservations)) {
-            yield Promise.all(subReservations.map((subReservation) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d;
-                const seatSection4sub = (_b = (_a = subReservation.reservedTicket) === null || _a === void 0 ? void 0 : _a.ticketedSeat) === null || _b === void 0 ? void 0 : _b.seatSection;
-                const seatNumber4sub = (_d = (_c = subReservation.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber;
+            await Promise.all(subReservations.map(async (subReservation) => {
+                const seatSection4sub = subReservation.reservedTicket?.ticketedSeat?.seatSection;
+                const seatNumber4sub = subReservation.reservedTicket?.ticketedSeat?.seatNumber;
                 if (typeof seatSection4sub === 'string' && typeof seatNumber4sub === 'string') {
                     const lockKey4sub = {
                         project: reservation.project,
@@ -387,21 +413,20 @@ function processUnlockSeat(params) {
                         },
                         holder: params.expectedHolder
                     };
-                    const holder4sub = yield repos.stockHolder.getHolder(lockKey4sub);
+                    const holder4sub = await repos.stockHolder.getHolder(lockKey4sub);
                     if (holder4sub === params.expectedHolder) {
-                        yield repos.stockHolder.unlock(lockKey4sub);
+                        await repos.stockHolder.unlock(lockKey4sub);
                     }
                 }
-            })));
+            }));
         }
-    });
+    };
 }
 function processUnlockOfferRateLimit(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const reservation = params.reservation;
-        const scope = (_a = reservation.reservedTicket.ticketType.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope;
-        const unitInSeconds = (_b = reservation.reservedTicket.ticketType.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
+        const scope = reservation.reservedTicket.ticketType.validRateLimit?.scope;
+        const unitInSeconds = reservation.reservedTicket.ticketType.validRateLimit?.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
                 project: { id: params.project.id },
@@ -415,17 +440,17 @@ function processUnlockOfferRateLimit(params) {
                 },
                 reservationFor: {
                     startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                        ? moment(params.reservationFor.startDate)
+                        ? (0, moment_1.default)(params.reservationFor.startDate)
                             .toDate()
-                        : moment(params.reservationFor.departureTime)
+                        : (0, moment_1.default)(params.reservationFor.departureTime)
                             .toDate()
                 },
                 reservationNumber: reservation.reservationNumber
             };
-            const holder = yield repos.offerRateLimit.getHolder(rateLimitKey);
+            const holder = await repos.offerRateLimit.getHolder(rateLimitKey);
             if (holder === rateLimitKey.reservationNumber) {
-                yield repos.offerRateLimit.unlock(rateLimitKey);
+                await repos.offerRateLimit.unlock(rateLimitKey);
             }
         }
-    });
+    };
 }

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

@@ -1,30 +1,47 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkInReservation = checkInReservation;
-const createDebug = require("debug");
-const factory = require("../../factory");
+const debug_1 = __importDefault(require("debug"));
+const factory = __importStar(require("../../factory"));
 const confirmReservation_1 = require("./confirmReservation");
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
-const debug = createDebug('chevre-domain:service:reserve:checkInReservation');
+const debug = (0, debug_1.default)('chevre-domain:service:reserve:checkInReservation');
 function checkInReservation(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        yield reserveIfNotYet(params)(repos);
+        await reserveIfNotYet(params)(repos);
         // 発券処理(Array対応)
         let checkedInReservationIds;
         let checkedInResult;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            const existingReservationCount = yield repos.reservation.count({
+            const existingReservationCount = await repos.reservation.count({
                 id: { $in: params.object.ids },
                 typeOf: factory.reservationType.EventReservation
             });
@@ -34,14 +51,14 @@ function checkInReservation(params) {
                 }
             }
             if (existingReservationCount > 0) {
-                checkedInResult = yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
+                checkedInResult = await repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
                 checkedInReservationIds = params.object.ids;
             }
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
             let reservationExists = false;
             for (const reservationNumber of params.object.reservationNumbers) {
-                const existingReservationCount = yield repos.reservation.count({
+                const existingReservationCount = await repos.reservation.count({
                     reservationNumber: { $eq: reservationNumber },
                     typeOf: factory.reservationType.EventReservation
                 });
@@ -56,43 +73,47 @@ function checkInReservation(params) {
             }
             if (reservationExists) {
                 checkedInResult =
-                    yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
+                    await repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
             }
         }
-        const checkedInForTheFirstTime = typeof (checkedInResult === null || checkedInResult === void 0 ? void 0 : checkedInResult.modifiedCount) === 'number' && checkedInResult.modifiedCount > 0;
+        const checkedInForTheFirstTime = typeof checkedInResult?.modifiedCount === 'number' && checkedInResult.modifiedCount > 0;
         if (checkedInResult !== undefined) {
             if (Array.isArray(checkedInReservationIds)) {
-                yield (0, onReservationCheckedIn_1.onReservationCheckedIn)({
+                await (0, onReservationCheckedIn_1.onReservationCheckedIn)({
                     project: params.project,
                     object: {
                         ids: checkedInReservationIds,
-                        reservedTicket: Object.assign({}, (checkedInForTheFirstTime) ? { dateIssued: now } : undefined)
+                        reservedTicket: {
+                            ...(checkedInForTheFirstTime) ? { dateIssued: now } : undefined
+                        }
                     },
                     purpose: params.purpose,
                     instrument: params.instrument
                 })(repos);
             }
             else if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-                yield (0, onReservationCheckedIn_1.onReservationCheckedIn)({
+                await (0, onReservationCheckedIn_1.onReservationCheckedIn)({
                     project: params.project,
                     object: {
                         reservationNumbers: params.object.reservationNumbers,
-                        reservedTicket: Object.assign({}, (checkedInForTheFirstTime) ? { dateIssued: now } : undefined)
+                        reservedTicket: {
+                            ...(checkedInForTheFirstTime) ? { dateIssued: now } : undefined
+                        }
                     },
                     purpose: params.purpose,
                     instrument: params.instrument
                 })(repos);
             }
         }
-    });
+    };
 }
 function reserveIfNotYet(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         let reserveTransactions = [];
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            reserveTransactions = yield repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.search({
                 typeOf: factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: params.object.ids } }
@@ -102,7 +123,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 = yield repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.search({
                 typeOf: factory.assetTransactionType.Reserve,
                 object: {
                     reservationNumber: { $in: params.object.reservationNumbers }
@@ -111,14 +132,14 @@ function reserveIfNotYet(params) {
             }, ['transactionNumber']);
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. reservationNumbers:', params.object.reservationNumbers, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
-        yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
-            yield (0, confirmReservation_1.confirmReservation)({
+        await Promise.all(reserveTransactions.map(async (reserveTransaction) => {
+            await (0, confirmReservation_1.confirmReservation)({
                 // optimize(2024-07-01~)
                 potentialReserveAction: { object: { reservationNumber: reserveTransaction.transactionNumber } },
                 useOnReservationConfirmed: false, // ここでは確定予約の存在を担保すればよいだけ
                 byTask: false
             })(repos);
             debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.transactionNumber);
-        })));
-    });
+        }));
+    };
 }