@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/service/account.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.open = open;
 exports.transferMoney = transferMoney;
@@ -21,7 +12,7 @@ const factory = require("../factory");
  * 口座を開設する
  */
 function open(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const openDate = new Date();
         return repos.account.open(params.map((p) => {
             return {
@@ -34,7 +25,7 @@ function open(params) {
                 openDate: openDate
             };
         }));
-    });
+    };
 }
 /**
  * 口座を解約する
@@ -59,7 +50,7 @@ function open(params) {
  * 確定取引結果から、実際の転送アクションを実行します。
  */
 function transferMoney(actionAttributes) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const action = actionAttributes;
         let fromAccountNumber;
         let toAccountNumber;
@@ -74,7 +65,7 @@ function transferMoney(actionAttributes) {
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore next */
                 : undefined;
-            yield repos.account.settleTransaction({
+            await repos.account.settleTransaction({
                 fromAccountNumber: fromAccountNumber,
                 toAccountNumber: toAccountNumber,
                 amount: (typeof action.amount === 'number') ? action.amount : Number(action.amount.value),
@@ -84,18 +75,18 @@ function transferMoney(actionAttributes) {
         catch (error) {
             throw error;
         }
-    });
+    };
 }
 /**
  * 転送取消
  * 期限切れ、あるいは、中止された取引から、転送をアクションを取り消します。
  */
 function cancelMoneyTransfer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let fromAccountNumber;
         let toAccountNumber;
         // 取引存在確認
-        const transaction = yield repos.accountTransaction.findById({ typeOf: params.transaction.typeOf, id: params.transaction.id });
+        const transaction = await repos.accountTransaction.findById({ typeOf: params.transaction.typeOf, id: params.transaction.id });
         switch (params.transaction.typeOf) {
             case factory.account.transactionType.Deposit:
                 toAccountNumber =
@@ -115,7 +106,7 @@ function cancelMoneyTransfer(params) {
             default:
                 throw new factory.errors.Argument('typeOf', `transaction type ${params.transaction.typeOf} unknown`);
         }
-        yield repos.account.voidTransaction({
+        await repos.account.voidTransaction({
             fromAccountNumber: fromAccountNumber,
             toAccountNumber: toAccountNumber,
             amount: (typeof transaction.object.amount === 'number')
@@ -123,5 +114,5 @@ function cancelMoneyTransfer(params) {
                 : transaction.object.amount.value,
             transactionId: transaction.id
         });
-    });
+    };
 }

package/lib/chevre/service/accountTransaction/deposit.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
 /**
@@ -18,13 +9,18 @@ const factory = require("../../factory");
  * 取引開始
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 口座存在確認
-        const account = yield repos.account.findByAccountNumber({
+        const account = await repos.account.findByAccountNumber({
             accountNumber: params.object.toLocation.accountNumber
         });
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Deposit, agent: params.agent, recipient: params.recipient, object: {
+        const startParams = {
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Deposit,
+            agent: params.agent,
+            recipient: params.recipient,
+            object: {
                 amount: params.object.amount,
                 toLocation: {
                     typeOf: account.typeOf,
@@ -34,14 +30,17 @@ function start(params) {
                     name: account.name
                 },
                 description: params.object.description
-            }, expires: params.expires, 
+            },
+            expires: params.expires,
             // 必須化(2022-09-26~)
-            transactionNumber: params.transactionNumber }, (typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined);
+            transactionNumber: params.transactionNumber,
+            ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
+        };
         // 取引作成
         let transaction;
         try {
             // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = yield repos.accountTransaction.startByIdentifier(startParams);
+            transaction = await repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
             throw error;
@@ -54,11 +53,11 @@ function start(params) {
                 : params.object.amount.value
         };
         // 入金先口座に進行中取引を追加
-        yield repos.account.startTransaction({
+        await repos.account.startTransaction({
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
         // 結果返却
         return transaction;
-    });
+    };
 }

package/lib/chevre/service/accountTransaction/transfer.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
 /**
@@ -19,12 +10,12 @@ const factory = require("../../factory");
  */
 function start(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 口座存在確認
-        const fromAccount = yield repos.account.findByAccountNumber({
+        const fromAccount = await repos.account.findByAccountNumber({
             accountNumber: params.object.fromLocation.accountNumber
         });
-        const toAccount = yield repos.account.findByAccountNumber({
+        const toAccount = await repos.account.findByAccountNumber({
             accountNumber: params.object.toLocation.accountNumber
         });
         // tslint:disable-next-line:no-single-line-block-comment
@@ -42,7 +33,12 @@ function start(params) {
             throw new factory.errors.Argument('fromLocation', 'Insufficient balance');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Transfer, agent: params.agent, recipient: params.recipient, object: {
+        const startParams = {
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Transfer,
+            agent: params.agent,
+            recipient: params.recipient,
+            object: {
                 amount: params.object.amount,
                 fromLocation: {
                     typeOf: fromAccount.typeOf,
@@ -59,14 +55,17 @@ function start(params) {
                     name: toAccount.name
                 },
                 description: params.object.description
-            }, expires: params.expires, 
+            },
+            expires: params.expires,
             // 必須化(2022-09-26~)
-            transactionNumber: params.transactionNumber }, (typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined);
+            transactionNumber: params.transactionNumber,
+            ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
+        };
         // 取引作成
         let transaction;
         try {
             // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = yield repos.accountTransaction.startByIdentifier(startParams);
+            transaction = await repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
             throw error;
@@ -79,7 +78,7 @@ function start(params) {
                 : params.object.amount.value
         };
         // 残高確認
-        yield repos.account.authorizeAmount({
+        await repos.account.authorizeAmount({
             accountNumber: params.object.fromLocation.accountNumber,
             amount: (typeof params.object.amount === 'number')
                 ? params.object.amount
@@ -87,11 +86,11 @@ function start(params) {
             transaction: pendingTransaction
         });
         // 転送先口座に進行中取引を追加
-        yield repos.account.startTransaction({
+        await repos.account.startTransaction({
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
         // 結果返却
         return transaction;
-    });
+    };
 }

package/lib/chevre/service/accountTransaction/withdraw.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
 /**
@@ -18,9 +9,9 @@ const factory = require("../../factory");
  * 取引開始
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 口座存在確認
-        const fromAccount = yield repos.account.findByAccountNumber({
+        const fromAccount = await repos.account.findByAccountNumber({
             accountNumber: params.object.fromLocation.accountNumber
         });
         const forcibly = (params.object.force === true);
@@ -31,7 +22,12 @@ function start(params) {
             }
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Withdraw, agent: params.agent, recipient: params.recipient, object: {
+        const startParams = {
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Withdraw,
+            agent: params.agent,
+            recipient: params.recipient,
+            object: {
                 amount: params.object.amount,
                 fromLocation: {
                     typeOf: fromAccount.typeOf,
@@ -41,14 +37,17 @@ function start(params) {
                     name: fromAccount.name
                 },
                 description: params.object.description
-            }, expires: params.expires, 
+            },
+            expires: params.expires,
             // 必須化(2022-09-26~)
-            transactionNumber: params.transactionNumber }, (typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined);
+            transactionNumber: params.transactionNumber,
+            ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
+        };
         // 取引作成
         let transaction;
         try {
             // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = yield repos.accountTransaction.startByIdentifier(startParams);
+            transaction = await repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
             throw error;
@@ -61,7 +60,7 @@ function start(params) {
                 : params.object.amount.value
         };
         // 残高確保
-        yield repos.account.authorizeAmount({
+        await repos.account.authorizeAmount({
             accountNumber: params.object.fromLocation.accountNumber,
             amount: (typeof params.object.amount === 'number')
                 ? params.object.amount
@@ -71,5 +70,5 @@ function start(params) {
         });
         // 結果返却
         return transaction;
-    });
+    };
 }

package/lib/chevre/service/accountTransaction.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdraw = exports.transfer = exports.deposit = void 0;
 exports.confirm = confirm;
@@ -23,18 +14,18 @@ const factory_1 = require("./accountTransaction/factory");
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let transaction;
         // 取引存在確認
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof params.id === 'string') {
-            transaction = yield repos.accountTransaction.findById({ typeOf: params.typeOf, id: params.id });
+            transaction = await repos.accountTransaction.findById({ typeOf: params.typeOf, id: params.id });
         }
         else if (typeof params.transactionNumber === 'string') {
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore next */
-            transaction = yield repos.accountTransaction.findByTransactionNumber({
+            transaction = await repos.accountTransaction.findByTransactionNumber({
                 typeOf: params.typeOf,
                 transactionNumber: params.transactionNumber
             });
@@ -56,5 +47,5 @@ function confirm(params) {
             // result: {},
             potentialActions
         });
-    });
+    };
 }

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregateOffers = aggregateOffers;
 const createDebug = require("debug");
@@ -19,30 +10,34 @@ const debug = createDebug('chevre-domain:service:aggregation');
  * イベントに対するオファー集計
  */
 function aggregateOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 集計対象イベント検索
-        const event = yield repos.event.projectEventFieldsById({ id: params.id }, [
+        const event = await repos.event.projectEventFieldsById({ id: params.id }, [
             'location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered'
         ] // projection(2024-07-21~)
         );
-        const eventCapacity = (yield repos.event.projectEventFields({
+        const eventCapacity = (await repos.event.projectEventFields({
             limit: 1,
             page: 1,
             id: { $eq: params.id },
             typeOf: params.typeOf
         }, ['maximumAttendeeCapacity', 'remainingAttendeeCapacity'])).shift();
         debug('processing aggregateOffersByEvent...', eventCapacity);
-        yield aggregateOffersByEvent({
-            event: Object.assign(Object.assign(Object.assign({}, event), (typeof (eventCapacity === null || eventCapacity === void 0 ? void 0 : eventCapacity.maximumAttendeeCapacity) === 'number')
-                ? { maximumAttendeeCapacity: eventCapacity.maximumAttendeeCapacity }
-                : undefined), (typeof (eventCapacity === null || eventCapacity === void 0 ? void 0 : eventCapacity.remainingAttendeeCapacity) === 'number')
-                ? { remainingAttendeeCapacity: eventCapacity.remainingAttendeeCapacity }
-                : undefined)
+        await aggregateOffersByEvent({
+            event: {
+                ...event,
+                ...(typeof eventCapacity?.maximumAttendeeCapacity === 'number')
+                    ? { maximumAttendeeCapacity: eventCapacity.maximumAttendeeCapacity }
+                    : undefined,
+                ...(typeof eventCapacity?.remainingAttendeeCapacity === 'number')
+                    ? { remainingAttendeeCapacity: eventCapacity.remainingAttendeeCapacity }
+                    : undefined
+            }
         })(repos);
-    });
+    };
 }
 function aggregateOffersByEvent(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
@@ -53,13 +48,13 @@ function aggregateOffersByEvent(params) {
         else {
             throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
-        const screeningRoom = yield repos.screeningRoom.findScreeningRoomsByBranchCode({
+        const screeningRoom = await repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
             branchCode: { $eq: event.location.branchCode },
             containedInPlace: { id: { $eq: movieTheaterId } }
         });
         // オファーごとの集計
-        const aggregateOffer = yield aggregateOfferByEvent({
+        const aggregateOffer = await aggregateOfferByEvent({
             aggregateDate: now,
             event,
             screeningRoom: screeningRoom
@@ -74,7 +69,7 @@ function aggregateOffersByEvent(params) {
         //     // }
         // };
         // aggregateReservationsに保管(2024-03-25~)
-        yield repos.aggregateReservation.save({
+        await repos.aggregateReservation.save({
             project: event.project,
             reservationFor: {
                 id: event.id,
@@ -85,29 +80,36 @@ function aggregateOffersByEvent(params) {
         }, {
             $set: { aggregateOffer }
         });
-    });
+    };
 }
 function reservedSeatsAvailable(params) {
-    var _a, _b, _c, _d;
-    return ((_d = (_c = (_b = (_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservedTicket) === null || _d === void 0 ? void 0 : _d.ticketedSeat) !== undefined;
+    return params.event.offers?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
 }
 function aggregateOfferByEvent(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
+    return async (repos) => {
+        const availableOffers = await (0, findEventOffers_1.findEventOffers)(params)(repos);
         // 集計対象のオファーにフィルター(2024-11-09~)
-        const offersIncludedInAggregateReservation = availableOffers.filter(({ settings }) => (settings === null || settings === void 0 ? void 0 : settings.includedInAggregateReservation) === true);
+        const offersIncludedInAggregateReservation = availableOffers.filter(({ settings }) => settings?.includedInAggregateReservation === true);
         // オファーごとの予約集計
         const offersWithAggregateReservation = [];
         for (const o of offersIncludedInAggregateReservation) {
-            const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
+            const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = await aggregateReservationByOffer({
                 aggregateDate: params.aggregateDate,
                 event: params.event,
                 screeningRoom: params.screeningRoom,
                 offer: o,
                 availableOffers
             })(repos);
-            offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_a = o.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: o.category } : undefined));
+            offersWithAggregateReservation.push({
+                typeOf: o.typeOf,
+                id: o.id,
+                identifier: o.identifier,
+                aggregateReservation: aggregateReservation,
+                ...(typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined,
+                ...(typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined,
+                // category情報を追加
+                ...(typeof o.category?.codeValue === 'string') ? { category: o.category } : undefined
+            });
         }
         return {
             typeOf: factory.offerType.AggregateOffer,
@@ -115,21 +117,20 @@ function aggregateOfferByEvent(params) {
             offerCount: offersIncludedInAggregateReservation.length,
             offers: offersWithAggregateReservation
         };
-    });
+    };
 }
 function aggregateReservationByOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let reservationCount4offer;
         // let attendeeCount4offer: number | undefined;
         // let checkInCount4offer: number | undefined;
         const reservationType = factory.reservationType.EventReservation;
         const offerIdsWithSameCategory = params.availableOffers.filter(({ category }) => {
-            var _a;
-            return typeof (category === null || category === void 0 ? void 0 : category.codeValue) === 'string' && category.codeValue === ((_a = params.offer.category) === null || _a === void 0 ? void 0 : _a.codeValue);
+            return typeof category?.codeValue === 'string' && category.codeValue === params.offer.category?.codeValue;
         })
             .map(({ id }) => id);
         if (offerIdsWithSameCategory.length > 0) {
-            reservationCount4offer = yield repos.reservation.count({
+            reservationCount4offer = await repos.reservation.count({
                 typeOf: reservationType,
                 reservationFor: { id: { $eq: params.event.id } },
                 reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
@@ -156,21 +157,24 @@ function aggregateReservationByOffer(params) {
             //     checkedIn: true
             // });
         }
-        const { maximumAttendeeCapacity, remainingAttendeeCapacity } = yield calculateCapacityByOffer(params)(repos);
-        return Object.assign(Object.assign({ aggregateReservation: {
+        const { maximumAttendeeCapacity, remainingAttendeeCapacity } = await calculateCapacityByOffer(params)(repos);
+        return {
+            aggregateReservation: {
                 typeOf: 'AggregateReservation',
                 reservationCount: reservationCount4offer
                 // attendeeCount: attendeeCount4offer, // discontinue(2024-11-10~)
                 // checkInCount: checkInCount4offer // discontinue(2024-11-10~)
-            } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined);
-    });
+            },
+            ...(typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined,
+            ...(typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined
+        };
+    };
 }
 /**
  * オファーごとのキャパシティを算出する
  */
 function calculateCapacityByOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         let maximumAttendeeCapacity;
         let remainingAttendeeCapacity;
         if (reservedSeatsAvailable({ event: params.event })) {
@@ -180,7 +184,7 @@ function calculateCapacityByOffer(params) {
             // 座席タイプ制約のあるオファーの場合
             const eligibleSeatingTypes = params.offer.eligibleSeatingType;
             if (Array.isArray(eligibleSeatingTypes)) {
-                const filterByEligibleSeatingTypeResult = yield filterByEligibleSeatingType({
+                const filterByEligibleSeatingTypeResult = await filterByEligibleSeatingType({
                     event: params.event,
                     screeningRoom: params.screeningRoom,
                     eligibleSeatingTypes: eligibleSeatingTypes.map((e) => e.codeValue)
@@ -192,10 +196,10 @@ function calculateCapacityByOffer(params) {
             const eligibleSubReservation = params.offer.eligibleSubReservation;
             if (Array.isArray(eligibleSubReservation)) {
                 // 適用サブ予約の座席タイプごとにキャパシティ算出
-                const capacities = yield Promise.all(eligibleSubReservation
+                const capacities = await Promise.all(eligibleSubReservation
                     .filter((subReservation) => typeof subReservation.amountOfThisGood === 'number' && subReservation.amountOfThisGood > 0)
-                    .map((subReservation) => __awaiter(this, void 0, void 0, function* () {
-                    const filterByEligibleSeatingTypeResult = yield filterByEligibleSeatingType({
+                    .map(async (subReservation) => {
+                    const filterByEligibleSeatingTypeResult = await filterByEligibleSeatingType({
                         event: params.event,
                         screeningRoom: params.screeningRoom,
                         eligibleSeatingTypes: [subReservation.typeOfGood.seatingType]
@@ -204,13 +208,13 @@ function calculateCapacityByOffer(params) {
                         maximumAttendeeCapacity: Math.floor(filterByEligibleSeatingTypeResult.maximumAttendeeCapacity / subReservation.amountOfThisGood),
                         remainingAttendeeCapacity: Math.floor(filterByEligibleSeatingTypeResult.remainingAttendeeCapacity / subReservation.amountOfThisGood)
                     };
-                })));
+                }));
                 // 座席タイプごとのキャパシティの中から、最小数を選択する
                 maximumAttendeeCapacity = Math.min(...(typeof maximumAttendeeCapacity === 'number') ? [maximumAttendeeCapacity] : [], ...capacities.map((c) => c.maximumAttendeeCapacity));
                 remainingAttendeeCapacity = Math.min(...(typeof remainingAttendeeCapacity === 'number') ? [remainingAttendeeCapacity] : [], ...capacities.map((c) => c.remainingAttendeeCapacity));
             }
             // 単価スペックの単位が1より大きい場合
-            const referenceQuantityValue = (_a = params.offer.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity.value;
+            const referenceQuantityValue = params.offer.priceSpecification?.referenceQuantity.value;
             if (typeof referenceQuantityValue === 'number' && referenceQuantityValue > 1) {
                 if (typeof maximumAttendeeCapacity === 'number') {
                     maximumAttendeeCapacity -= maximumAttendeeCapacity % referenceQuantityValue;
@@ -221,18 +225,17 @@ function calculateCapacityByOffer(params) {
             }
         }
         // レート制限がある場合、考慮する
-        if (yield isHoldByRateLimit(params)({ offerRateLimit: repos.offerRateLimit })) {
+        if (await isHoldByRateLimit(params)({ offerRateLimit: repos.offerRateLimit })) {
             remainingAttendeeCapacity = 0;
         }
         return { maximumAttendeeCapacity, remainingAttendeeCapacity };
-    });
+    };
 }
 function isHoldByRateLimit(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         let isHold = false;
-        const scope = (_a = params.offer.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope;
-        const unitInSeconds = (_b = params.offer.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
+        const scope = params.offer.validRateLimit?.scope;
+        const unitInSeconds = params.offer.validRateLimit?.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
                 project: { id: params.event.project.id },
@@ -247,17 +250,17 @@ function isHoldByRateLimit(params) {
                 },
                 reservationNumber: ''
             };
-            const holder = yield repos.offerRateLimit.getHolder(rateLimitKey);
+            const holder = await repos.offerRateLimit.getHolder(rateLimitKey);
             // ロックされていれば在庫0
             if (typeof holder === 'string' && holder.length > 0) {
                 isHold = true;
             }
         }
         return isHold;
-    });
+    };
 }
 function filterByEligibleSeatingType(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 適用座席タイプに絞る
         const eligibleSeatOffers = (Array.isArray(params.screeningRoom.containsPlace))
             ? params.screeningRoom.containsPlace.reduce((a, b) => {
@@ -283,7 +286,7 @@ function filterByEligibleSeatingType(params) {
         const maximumAttendeeCapacity = eligibleSeatOffers.length;
         let remainingAttendeeCapacity;
         if (maximumAttendeeCapacity > 0) {
-            const availabilities = yield repos.stockHolder.searchHolders({
+            const availabilities = await repos.stockHolder.searchHolders({
                 project: { id: params.event.project.id },
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
@@ -297,5 +300,5 @@ function filterByEligibleSeatingType(params) {
             remainingAttendeeCapacity = 0;
         }
         return { maximumAttendeeCapacity, remainingAttendeeCapacity };
-    });
+    };
 }