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

package/lib/chevre/service/offer/product.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.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
 exports.search = search;
@@ -26,10 +17,9 @@ exports.ERROR_MESSAGE_ALREADY_REGISTERED = 'Already registered';
  * プロダクトオファーを検索する
  */
 function search(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // const now = moment();
-        var _a;
-        const searchProductsResult = yield repos.product.projectFields({
+        const searchProductsResult = await repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -44,7 +34,7 @@ function search(params) {
         // 販売者指定の場合、検証
         if (product.typeOf === factory.product.ProductType.MembershipService
             || product.typeOf === factory.product.ProductType.PaymentCard) {
-            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            const sellerId = params.seller?.id;
             if (typeof sellerId === 'string') {
                 // productsドキュメント参照のoffers検証は廃止(2025-09-22~)
                 // const productOffers = await repos.productOffer.search({
@@ -66,7 +56,7 @@ function search(params) {
                 // }
             }
         }
-        const offers = yield (0, searchProductOffers_1.searchProductOffers)({
+        const offers = await (0, searchProductOffers_1.searchProductOffers)({
             ids: params.ids,
             itemOffered: { id: params.itemOffered.id },
             availableAt: params.availableAt,
@@ -78,7 +68,7 @@ function search(params) {
             page: params.page
         })(repos);
         return { offers, product };
-    });
+    };
 }
 /**
  * サービス(Chevreプロダクト)オファー承認
@@ -86,19 +76,19 @@ function search(params) {
 // tslint:disable-next-line:max-func-body-length
 function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
-        const transaction = yield repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'expires']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const { product, availableOffers } = yield fixProductAndOffers(params)(repos);
+        const { product, availableOffers } = await fixProductAndOffers(params)(repos);
         // 会員の場合のみ既登録か確認
         if (params.agent.typeOf === factory.personType.Person) {
-            yield checkIfRegistered({
+            await checkIfRegistered({
                 agent: { id: params.agent.id },
                 product: { id: String(product.id), typeOf: product.typeOf },
                 now: now
@@ -106,24 +96,24 @@ function authorize(params) {
             })(repos);
         }
         // ポイント特典の識別子に利用するため注文番号を先に発行
-        const orderNumber = yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
         })(repos);
-        let acceptedOffer = yield validateAcceptedOffers({
+        let acceptedOffer = await validateAcceptedOffers({
             object: params.object,
             product,
             availableOffers,
             seller: transaction.seller,
             orderNumber
         })(repos);
-        acceptedOffer = yield createServiceOutputIdentifier({ acceptedOffer, product })(repos);
+        acceptedOffer = await createServiceOutputIdentifier({ acceptedOffer, product })(repos);
         let requestBody;
         let responseBody;
         let result;
         // まず取引番号発行
-        const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
+        const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({
             startDate: new Date()
         });
         const actionAttributes = (0, factory_1.createActionAttributes)({
@@ -131,7 +121,7 @@ function authorize(params) {
             transaction: transaction,
             transactionNumber: transactionNumber
         });
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         try {
             // 会員の場合のみ排他ロック
             // if (params.agent.typeOf === factory.personType.Person) {
@@ -144,12 +134,12 @@ function authorize(params) {
                 transactionNumber
             });
             requestBody = startParams;
-            responseBody = yield RegisterServiceTransaction.start(startParams)(repos);
+            responseBody = await RegisterServiceTransaction.start(startParams)(repos);
             const acceptedOffers4result = (0, factory_1.responseBody2resultAcceptedOffer)({
                 project: actionAttributes.project, responseBody, acceptedOffer
             });
             result = (0, factory_1.createResult)({ project: actionAttributes.project, requestBody, responseBody, acceptedOffer });
-            yield (0, any_1.acceptOffer)({
+            await (0, any_1.acceptOffer)({
                 orderNumber,
                 project: transaction.project,
                 acceptedOffers: acceptedOffers4result
@@ -157,22 +147,21 @@ function authorize(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 (__) {
                 // no op
             }
             throw error;
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id, result };
-    });
+    };
 }
 function fixProductAndOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const productId = String((_b = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id);
-        const searchProductsResult = yield repos.product.projectFields({
+    return async (repos) => {
+        const productId = String(params.object[0]?.itemOffered?.id);
+        const searchProductsResult = await repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -188,14 +177,23 @@ function fixProductAndOffers(params) {
             && product.typeOf !== factory.product.ProductType.PaymentCard) {
             throw new factory.errors.Argument('object.itemOffered.id', `invalid product type: ${product.typeOf}`);
         }
-        const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, includedInDataCatalog: { id: '' }, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
+        const { offers } = await search({
+            ids: params.object.map((o) => String(o.id)),
+            project: { id: params.project.id },
+            itemOffered: { id: String(product.id) },
+            onlyValid: true,
+            includedInDataCatalog: { id: '' }, // 承認時はカタログ指定の必要なし
+            addSortIndex: false,
+            useIncludeInDataCatalog: false,
+            // 利用アプリケーションを指定
+            ...(typeof params.location?.id === 'string') ? { availableAt: { id: params.location.id } } : undefined
+        })(repos);
         return { product, availableOffers: offers };
-    });
+    };
 }
 function voidTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.transaction.projectFieldsById({
+    return async (repos) => {
+        const transaction = await repos.transaction.projectFieldsById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['agent', 'status', 'typeOf']);
@@ -204,21 +202,21 @@ function voidTransaction(params) {
             && transaction.status !== factory.transactionStatusType.InProgress) {
             throw new factory.errors.Argument('purpose', `invalid transaction status: ${transaction.status}`);
         }
-        if (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        if (typeof params.agent?.id === 'string') {
             if (transaction.agent.id !== params.agent.id) {
                 throw new factory.errors.Forbidden('Transaction not yours');
             }
         }
         let authorizeActions;
         if (typeof params.id === 'string') {
-            const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+            const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
             if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
                 throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
             }
             authorizeActions = [action];
         }
         else {
-            authorizeActions = (yield repos.action.searchByPurpose({
+            authorizeActions = await repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
                     typeOf: params.purpose.typeOf,
@@ -229,11 +227,10 @@ function voidTransaction(params) {
                 .filter((a) => Array.isArray(a.object)
                 && a.object.length > 0
                 && a.object[0].typeOf === factory.offerType.Offer
-                && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0)));
+                && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0));
         }
-        yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const productId = (_b = (_a = action.object[0]) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id;
+        await Promise.all(authorizeActions.map(async (action) => {
+            const productId = action.object[0]?.itemOffered?.id;
             if (typeof productId === 'string') {
                 // 廃止(2023-12-07~)
                 // await processUnlockRegisterMembershipService({
@@ -242,24 +239,23 @@ function voidTransaction(params) {
                 //     purpose: params.purpose
                 // })(repos);
             }
-            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
-            yield processVoidRegisterServiceTransaction({
+            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
+            await processVoidRegisterServiceTransaction({
                 action,
                 project: params.project
             })(repos);
-        })));
-    });
+        }));
+    };
 }
 /**
  * Chevre進行中取引を中止する
  */
 function processVoidRegisterServiceTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transactionNumber = (_a = params.action.instrument) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+    return async (repos) => {
+        const transactionNumber = params.action.instrument?.transactionNumber;
         if (typeof transactionNumber === 'string') {
             // 取引が存在すれば中止
-            const searchAssetTransactionsResult = yield repos.assetTransaction.search({
+            const searchAssetTransactionsResult = await repos.assetTransaction.search({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
@@ -267,17 +263,17 @@ function processVoidRegisterServiceTransaction(params) {
                 transactionNumber: { $eq: transactionNumber }
             });
             if (searchAssetTransactionsResult.length > 0) {
-                yield RegisterServiceTransaction.cancel({ transactionNumber })(repos);
+                await RegisterServiceTransaction.cancel({ transactionNumber })(repos);
                 // await repos.registerServiceTransaction.cancel({ transactionNumber: transactionNumber });
             }
         }
-    });
+    };
 }
 /**
  * 受け入れらたオファーの内容を検証
  */
 function validateAcceptedOffers(params) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
+    return async (__) => {
         let acceptedOfferWithoutDetail = params.object;
         if (!Array.isArray(acceptedOfferWithoutDetail)) {
             acceptedOfferWithoutDetail = [acceptedOfferWithoutDetail];
@@ -306,15 +302,14 @@ function validateAcceptedOffers(params) {
         // }
         // 利用可能なチケットオファーであれば受け入れる
         return Promise.all(acceptedOfferWithoutDetail.map((offerWithoutDetail) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             const offer = params.availableOffers.find((o) => o.id === offerWithoutDetail.id);
             if (offer === undefined) {
                 throw new factory.errors.NotFound('Offer', `Offer ${offerWithoutDetail.id} not found`);
             }
             // ポイント特典入金先の指定があれば入金識別子を発行
             let pointAward;
-            const pointAwardToLocationIdentifier = (_c = (_b = (_a = offerWithoutDetail.itemOffered) === null || _a === void 0 ? void 0 : _a.pointAward) === null || _b === void 0 ? void 0 : _b.toLocation) === null || _c === void 0 ? void 0 : _c.identifier;
-            const pointAwardToLocationIssuedThroughId = (_f = (_e = (_d = offerWithoutDetail.itemOffered) === null || _d === void 0 ? void 0 : _d.pointAward) === null || _e === void 0 ? void 0 : _e.toLocation) === null || _f === void 0 ? void 0 : _f.issuedThrough.id;
+            const pointAwardToLocationIdentifier = offerWithoutDetail.itemOffered?.pointAward?.toLocation?.identifier;
+            const pointAwardToLocationIssuedThroughId = offerWithoutDetail.itemOffered?.pointAward?.toLocation?.issuedThrough.id;
             if (typeof pointAwardToLocationIdentifier === 'string' && pointAwardToLocationIdentifier.length > 0
                 && typeof pointAwardToLocationIssuedThroughId === 'string' && pointAwardToLocationIssuedThroughId.length > 0) {
                 const pointAwardPurposeIdentifier = (0, accountTransactionIdentifier_1.createPointAwardIdentifier)({
@@ -322,30 +317,51 @@ function validateAcceptedOffers(params) {
                     purpose: { orderNumber: params.orderNumber },
                     toLocation: { identifier: pointAwardToLocationIdentifier }
                 });
-                pointAward = Object.assign({ recipient: (_g = offerWithoutDetail.itemOffered.pointAward) === null || _g === void 0 ? void 0 : _g.recipient, toLocation: {
+                pointAward = {
+                    recipient: offerWithoutDetail.itemOffered.pointAward?.recipient,
+                    toLocation: {
                         identifier: pointAwardToLocationIdentifier,
                         // toLocation.issuedThroughを保証する
                         issuedThrough: { id: pointAwardToLocationIssuedThroughId },
                         typeOf: factory.permit.PermitType.Permit
-                    }, typeOf: factory.actionType.MoneyTransfer, purpose: { identifier: pointAwardPurposeIdentifier } }, (typeof ((_h = offerWithoutDetail.itemOffered.pointAward) === null || _h === void 0 ? void 0 : _h.description) === 'string')
-                    ? { description: offerWithoutDetail.itemOffered.pointAward.description }
-                    : undefined);
+                    },
+                    typeOf: factory.actionType.MoneyTransfer,
+                    purpose: { identifier: pointAwardPurposeIdentifier },
+                    ...(typeof offerWithoutDetail.itemOffered.pointAward?.description === 'string')
+                        ? { description: offerWithoutDetail.itemOffered.pointAward.description }
+                        : undefined
+                };
             }
-            const itemOffered = Object.assign({ 
+            const itemOffered = {
                 // project: project,
-                typeOf: params.product.typeOf, id: params.product.id, name: params.product.name, serviceOutput: Object.assign(Object.assign(Object.assign({}, (_j = params.product) === null || _j === void 0 ? void 0 : _j.serviceOutput), (_k = offerWithoutDetail.itemOffered) === null || _k === void 0 ? void 0 : _k.serviceOutput), { project: project, 
+                typeOf: params.product.typeOf,
+                id: params.product.id,
+                name: params.product.name,
+                serviceOutput: {
+                    ...params.product?.serviceOutput,
+                    ...offerWithoutDetail.itemOffered?.serviceOutput,
+                    project: project,
                     // 発行者は販売者でいったん固定
-                    issuedBy: issuedBy, typeOf: factory.permit.PermitType.Permit }) }, (pointAward !== undefined) ? { pointAward } : undefined);
-            return Object.assign(Object.assign(Object.assign({}, offerWithoutDetail), offer), { itemOffered, seller: { project: project, typeOf: params.seller.typeOf, id: params.seller.id, name: params.seller.name } });
+                    issuedBy: issuedBy,
+                    typeOf: factory.permit.PermitType.Permit
+                },
+                ...(pointAward !== undefined) ? { pointAward } : undefined
+            };
+            return {
+                ...offerWithoutDetail,
+                ...offer,
+                itemOffered,
+                seller: { project: project, typeOf: params.seller.typeOf, id: params.seller.id, name: params.seller.name }
+            };
         }));
-    });
+    };
 }
 function checkIfRegistered(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // メンバーシップについては、登録済かどうか確認する
         if (params.product.typeOf === factory.product.ProductType.MembershipService) {
             // プロダクトによって発行されたPermitを所有していれば、登録済
-            const searchOwnershipInfosResult = yield repos.ownershipInfo.projectFields({
+            const searchOwnershipInfosResult = await repos.ownershipInfo.projectFields({
                 limit: 1,
                 page: 1,
                 ownedBy: { id: params.agent.id },
@@ -365,21 +381,31 @@ function checkIfRegistered(params) {
                 throw new factory.errors.Argument('object', exports.ERROR_MESSAGE_ALREADY_REGISTERED);
             }
         }
-    });
+    };
 }
 function createServiceOutputIdentifier(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const publishParams = params.acceptedOffer.map(() => {
             return { project: { id: params.product.project.id } };
         });
-        const publishIdentifierResult = yield Promise.all(publishParams.map(() => __awaiter(this, void 0, void 0, function* () {
-            const identifier = yield repos.serviceOutputIdentifier.issueServiceOutputIdentifier({ startDate: new Date() });
+        const publishIdentifierResult = await Promise.all(publishParams.map(async () => {
+            const identifier = await repos.serviceOutputIdentifier.issueServiceOutputIdentifier({ startDate: new Date() });
             return { identifier };
-        })));
+        }));
         // 識別子を発行
-        return Promise.all(params.acceptedOffer.map((o, key) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            return Object.assign(Object.assign({}, o), { itemOffered: Object.assign(Object.assign({}, o.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput), { project: params.product.project, typeOf: factory.permit.PermitType.Permit, identifier: publishIdentifierResult[key].identifier }) }) });
-        })));
-    });
+        return Promise.all(params.acceptedOffer.map(async (o, key) => {
+            return {
+                ...o,
+                itemOffered: {
+                    ...o.itemOffered,
+                    serviceOutput: {
+                        ...o.itemOffered?.serviceOutput,
+                        project: params.product.project,
+                        typeOf: factory.permit.PermitType.Permit,
+                        identifier: publishIdentifierResult[key].identifier
+                    }
+                }
+            };
+        }));
+    };
 }

package/lib/chevre/service/offer.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.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 exports.addOffers2Seat = addOffers2Seat;
@@ -51,29 +42,33 @@ function addOffers2Seat(params) {
     if (typeof params.availability === 'string') {
         availability = params.availability;
     }
-    return Object.assign(Object.assign({}, params.seat), { offers: [Object.assign({ availability }, (priceSpecification.priceComponent.length > 0) ? { priceSpecification } : undefined // priceComponentの存在する場合のみ追加(2023-11-08~)
-            )] });
+    return {
+        ...params.seat,
+        offers: [{
+                availability,
+                ...(priceSpecification.priceComponent.length > 0) ? { priceSpecification } : undefined // priceComponentの存在する場合のみ追加(2023-11-08~)
+            }]
+    };
 }
 /**
  * イベントに対する座席オファーを検索する
  */
 function searchEventSeatOffersWithPaging(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    return async (repos) => {
         const { includeSectionCodeOnlyFirstElement, useDefaultSection } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
-        const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
+        const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
             let defaultSectionCode;
             if (useDefaultSection) {
-                const defaultSection = (yield repos.section.findSectionsByRoom({
+                const defaultSection = (await repos.section.findSectionsByRoom({
                     limit: 1,
                     page: 1,
                     projectId: event.project.id,
@@ -87,32 +82,39 @@ function searchEventSeatOffersWithPaging(params) {
                 defaultSectionCode = defaultSection.branchCode;
                 // console.log('searchEventSeatOffersWithPaging:defaultSectionCode:', defaultSectionCode);
             }
-            const seats = yield repos.seat.projectSeatsByScreeningRoom(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, screeningRoom: {
+            const seats = await repos.seat.projectSeatsByScreeningRoom({
+                ...params,
+                project: { id: { $eq: event.project.id } },
+                screeningRoom: {
                     branchCode: { $eq: roomBranchCode },
                     containedInPlace: {
                         branchCode: { $eq: movieTheaterBranchCode }
                     }
-                }, containedInPlace: {
-                    branchCode: Object.assign({}, (typeof defaultSectionCode === 'string')
-                        ? { $eq: defaultSectionCode }
-                        : {
-                            $eq: (typeof ((_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq) === 'string')
-                                ? (_k = (_j = params.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq
-                                : undefined
-                        })
-                }, $projection: Object.assign({}, params.$projection) }));
+                },
+                containedInPlace: {
+                    branchCode: {
+                        ...(typeof defaultSectionCode === 'string')
+                            ? { $eq: defaultSectionCode }
+                            : {
+                                $eq: (typeof params.containedInPlace?.branchCode?.$eq === 'string')
+                                    ? params.containedInPlace?.branchCode?.$eq
+                                    : undefined
+                            }
+                    }
+                },
+                $projection: { ...params.$projection }
+            });
             if (seats.length > 0) {
-                const availabilities = yield repos.stockHolder.searchHolders({
+                const availabilities = await repos.stockHolder.searchHolders({
                     project: { id: event.project.id },
                     eventId: params.event.id,
                     startDate: moment(event.startDate)
                         .toDate(),
                     hasTicketedSeat: true,
                     offers: seats.map((s) => {
-                        var _a;
                         return {
                             seatNumber: s.branchCode,
-                            seatSection: (_a = s.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode
+                            seatSection: s.containedInPlace?.branchCode
                         };
                     })
                 });
@@ -132,15 +134,18 @@ function searchEventSeatOffersWithPaging(params) {
                     else {
                         includeSectionCode = true;
                     }
-                    return Object.assign({ branchCode,
+                    return {
+                        branchCode,
                         name,
-                        seatingType, 
+                        seatingType,
                         // ...seat,
                         offers: [{
                                 availability: (typeof availabilities[index] === 'string')
                                     ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
                                     : factory.itemAvailability.InStock
-                            }] }, (includeSectionCode) ? { containedInPlace } : undefined);
+                            }],
+                        ...(includeSectionCode) ? { containedInPlace } : undefined
+                    };
                     // return addOffers2Seat({
                     //     seat,
                     //     availability: (typeof availabilities[index] === 'string')
@@ -152,17 +157,16 @@ function searchEventSeatOffersWithPaging(params) {
             }
         }
         return offers;
-    });
+    };
 }
 /**
  * セクション指定でイベントに対する座席オファーを検索する
  */
 function findEventSeatOffersBySection(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+    return async (repos) => {
         const { limit, page, projectId, sellerId, eventId, sectionCode } = params;
         let offers = [];
-        const event = (yield repos.event.projectEventFields({
+        const event = (await repos.event.projectEventFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: projectId } },
@@ -175,11 +179,11 @@ function findEventSeatOffersBySection(params) {
         }
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
-        const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
+        const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
-            const seats = yield repos.seat.projectSeatsByScreeningRoom({
+            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const seats = await repos.seat.projectSeatsByScreeningRoom({
                 limit,
                 page,
                 project: { id: { $eq: projectId } },
@@ -204,7 +208,7 @@ function findEventSeatOffersBySection(params) {
                 }
             });
             if (seats.length > 0) {
-                const availabilities = yield repos.stockHolder.searchHolders({
+                const availabilities = await repos.stockHolder.searchHolders({
                     project: { id: projectId },
                     eventId,
                     startDate: moment(event.startDate)
@@ -230,5 +234,5 @@ function findEventSeatOffersBySection(params) {
             }
         }
         return offers;
-    });
+    };
 }