@chevre/domain 20.2.0-alpha.5 → 20.2.0-alpha.51

package/lib/chevre/service/offer.js

@@ -67,34 +67,42 @@ function addOffers2Seat(params) {
  */
 function searchEventSeatOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let offers = [];
-        const screeningEvent = yield repos.event.findById({
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({
+        //     id: params.event.id
+        // });
+        const event = yield repos.event.findMinimizedIndividualEventById({
             id: params.event.id
         });
         // 座席指定利用可能かどうか
-        const eventOffers = screeningEvent.offers;
+        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;
         if (reservedSeatsAvailable) {
             // 座席タイプ価格仕様を検索
             const priceSpecs = yield repos.priceSpecification.search({
-                project: { id: { $eq: screeningEvent.project.id } },
+                project: { id: { $eq: event.project.id } },
                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                 appliesToCategoryCode: {
                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
                 }
             });
+            // const roomBranchCode = event.location.branchCode;
+            // const movieTheaterBranchCode = event.superEvent.location.branchCode;
+            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.place.searchSeats({
-                project: { id: { $eq: screeningEvent.project.id } },
-                branchCode: { $in: (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$in },
+                project: { id: { $eq: event.project.id } },
+                branchCode: { $in: (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in },
                 containedInPlace: {
                     branchCode: {
-                        $in: (_e = (_d = params.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$in
+                        $in: (_j = (_h = params.containedInPlace) === null || _h === void 0 ? void 0 : _h.branchCode) === null || _j === void 0 ? void 0 : _j.$in
                     },
                     containedInPlace: {
-                        branchCode: { $eq: screeningEvent.location.branchCode },
+                        branchCode: { $eq: roomBranchCode },
                         containedInPlace: {
-                            branchCode: { $eq: screeningEvent.superEvent.location.branchCode }
+                            branchCode: { $eq: movieTheaterBranchCode }
                         }
                     }
                 },
@@ -114,7 +122,7 @@ function searchEventSeatOffers(params) {
                 offers = seats.map((seat, index) => {
                     var _a;
                     return addOffers2Seat({
-                        project: screeningEvent.project,
+                        project: event.project,
                         seat: seat,
                         seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
                         unavailableOffers: [],
@@ -133,9 +141,13 @@ exports.searchEventSeatOffers = searchEventSeatOffers;
  */
 function searchEventSeatOffersWithPaging(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let offers = [];
-        const event = yield repos.event.findById({
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({
+        //     id: params.event.id
+        // });
+        const event = yield repos.event.findMinimizedIndividualEventById({
             id: params.event.id
         });
         // 座席指定利用可能かどうか
@@ -152,12 +164,12 @@ function searchEventSeatOffersWithPaging(params) {
             });
             // const roomBranchCode = event.location.branchCode;
             // const movieTheaterBranchCode = event.superEvent.location.branchCode;
-            const roomBranchCode = eventOffers.itemOffered.availableChannel.serviceLocation.branchCode;
-            const movieTheaterBranchCode = eventOffers.itemOffered.availableChannel.serviceLocation.containedInPlace.branchCode;
+            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.place.searchSeats(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, containedInPlace: {
                     branchCode: {
-                        $eq: (typeof ((_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$eq) === 'string')
-                            ? (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$eq
+                        $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
                     },
                     containedInPlace: {
@@ -200,57 +212,71 @@ exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
  */
 function onEventChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const changedEvent = params;
-        // ScreeningEventであれば集計タスク
-        if (changedEvent.typeOf === factory.eventType.ScreeningEvent) {
-            yield createAggregateScreeningEventIfNotExist({
-                project: changedEvent.project,
-                reservationFor: { id: changedEvent.id }
-            })(repos);
-            // const aggregateTask: factory.task.aggregateScreeningEvent.IAttributes = {
-            //     project: event.project,
-            //     name: factory.taskName.AggregateScreeningEvent,
-            //     status: factory.taskStatus.Ready,
-            //     runsAt: new Date(),
-            //     remainingNumberOfTries: 3,
-            //     numberOfTried: 0,
-            //     executionResults: [],
-            //     data: { id: event.id, typeOf: event.typeOf }
-            // };
-            // await repos.task.save(aggregateTask);
-        }
-        else {
-            // イベント通知タスク
-            // const project = await repos.project.findById({ id: event.project.id });
+        const changedEvents = (Array.isArray(params.event)) ? params.event : [params.event];
+        if (changedEvents.length > 0) {
+            // ScreeningEventであれば集計タスク
+            if (changedEvents[0].typeOf === factory.eventType.ScreeningEvent) {
+                yield createAggregateScreeningEventIfNotExist({
+                    project: { id: changedEvents[0].project.id },
+                    reservationFor: changedEvents.map((changedEvent) => {
+                        return { id: changedEvent.id };
+                    }),
+                    // 新規作成の場合は強制的に集計
+                    force: params.isNew
+                })(repos);
+            }
         }
     });
 }
 exports.onEventChanged = onEventChanged;
 function createAggregateScreeningEventIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 冗長な作成を避ける
-        const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
-            'project.id': { $eq: params.project.id },
-            name: { $eq: factory.taskName.AggregateScreeningEvent },
-            status: { $eq: factory.taskStatus.Ready },
-            'data.id': { $exists: true, $eq: params.reservationFor.id }
-        }, { _id: 1 })
-            .exec();
-        if (readyAggregateScreeningEventTaskDoc === null) {
-            const aggregateTask = {
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                name: factory.taskName.AggregateScreeningEvent,
-                status: factory.taskStatus.Ready,
-                runsAt: new Date(),
-                remainingNumberOfTries: 3,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    typeOf: factory.eventType.ScreeningEvent,
-                    id: params.reservationFor.id
+        let aggregateTasks = [];
+        const runsAt = new Date();
+        const remainingNumberOfTries = 2;
+        const project = {
+            id: params.project.id, typeOf: factory.organizationType.Project
+        };
+        if (params.force) {
+            aggregateTasks = params.reservationFor.map((reservationFor) => {
+                return {
+                    project,
+                    name: factory.taskName.AggregateScreeningEvent,
+                    status: factory.taskStatus.Ready,
+                    runsAt,
+                    remainingNumberOfTries,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
+                };
+            });
+        }
+        else {
+            for (const reservationFor of params.reservationFor) {
+                // 冗長な作成を避ける
+                const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
+                    'project.id': { $eq: project.id },
+                    name: { $eq: factory.taskName.AggregateScreeningEvent },
+                    status: { $eq: factory.taskStatus.Ready },
+                    'data.id': { $exists: true, $eq: reservationFor.id }
+                }, { _id: 1 })
+                    .exec();
+                if (readyAggregateScreeningEventTaskDoc === null) {
+                    aggregateTasks.push({
+                        project,
+                        name: factory.taskName.AggregateScreeningEvent,
+                        status: factory.taskStatus.Ready,
+                        runsAt,
+                        remainingNumberOfTries,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
+                    });
                 }
-            };
-            yield repos.task.save(aggregateTask);
+            }
+        }
+        if (aggregateTasks.length > 0) {
+            yield repos.task.saveMany(aggregateTasks);
         }
     });
 }

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -30,34 +30,31 @@ function getOrderWithToken(params) {
             return params.order;
         }
         // 冗長な個人情報をマスク(最低限の情報に)
-        const customer4orderToken = (params.order.customer.typeOf === factory.organizationType.Organization)
-            ? {
-                id: params.order.customer.id,
-                name: '****',
-                // project: params.order.customer.project,
-                typeOf: params.order.customer.typeOf
-            }
-            : {
-                id: params.order.customer.id,
-                typeOf: params.order.customer.typeOf
-            };
-        const seller4orderToken = {
-            id: params.order.seller.id,
-            // 最適化(2022-11-15~)
-            // project: params.order.seller.project,
-            typeOf: params.order.seller.typeOf
-        };
+        // const customer4orderToken: factory.order.ISimpleCustomer =
+        //     (params.order.customer.typeOf === factory.organizationType.Organization)
+        //         ? {
+        //             id: params.order.customer.id,
+        //             name: '****',
+        //             // project: params.order.customer.project,
+        //             typeOf: params.order.customer.typeOf
+        //         }
+        //         : {
+        //             id: params.order.customer.id,
+        //             typeOf: params.order.customer.typeOf
+        //         };
+        // const seller4orderToken: Omit<factory.order.ISeller, 'name'> = {
+        //     id: params.order.seller.id,
+        //     typeOf: params.order.seller.typeOf
+        // };
+        // 最適化(2023-01-31~)
         const order4token = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
-            seller: seller4orderToken,
-            customer: customer4orderToken,
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: params.order.confirmationNumber,
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
+            // seller: seller4orderToken,
+            // customer: customer4orderToken,
+            orderNumber: params.order.orderNumber
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
+            // orderDate: params.order.orderDate
         };
         const token = yield new Promise((resolve, reject) => {
             // 所有権を暗号化する
@@ -184,7 +181,8 @@ function createConfirmReservationActionObject4ChevreByOrder(params) {
     const chevreReservationNumbers = (Array.isArray(params.order.acceptedOffers))
         ? params.order.acceptedOffers.filter((o) => {
             var _a;
-            return o.itemOffered.typeOf === factory.reservationType.EventReservation
+            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
                 && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
         })
             .map((o) => {

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -271,7 +271,8 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
         // 注文アイテムから返却アクションを作成する
         const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
         for (const acceptedOffer of acceptedOffers) {
-            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation) {
+            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
+                || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
                 const reservation = acceptedOffer.itemOffered;
                 const reservationNumber = reservation.reservationNumber;
                 // 予約番号ごとに返却アクションを作成する

package/lib/chevre/service/order/placeOrder.js

@@ -41,6 +41,22 @@ function createOrder(params) {
                         : undefined) });
                 return Object.assign(Object.assign({}, o), { itemOffered });
             }
+            else if (o.itemOffered.typeOf === factory.reservationType.BusReservation) {
+                let itemOffered = o.itemOffered;
+                const reservationFor = itemOffered.reservationFor;
+                itemOffered = Object.assign(Object.assign({}, itemOffered), { reservationFor: Object.assign(Object.assign(Object.assign({}, reservationFor), (reservationFor.arrivalTime !== undefined)
+                        ? {
+                            arrivalTime: moment(reservationFor.arrivalTime)
+                                .toDate()
+                        }
+                        : undefined), (reservationFor.departureTime !== undefined)
+                        ? {
+                            departureTime: moment(reservationFor.departureTime)
+                                .toDate()
+                        }
+                        : undefined) });
+                return Object.assign(Object.assign({}, o), { itemOffered });
+            }
             else {
                 return o;
             }

package/lib/chevre/service/order/returnOrder.js

@@ -21,7 +21,7 @@ function returnOrder(params) {
             ? params.object.dateReturned
             : new Date();
         const returner = params.agent;
-        let order = yield repos.order.findByOrderNumber({ orderNumber });
+        let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
         // プロジェクト条件検証
         if (order.project.id !== params.project.id) {
             throw new factory.errors.NotFound('Order');
@@ -202,8 +202,10 @@ function onReturn(returnActionAttributes) {
             }
         }
         // タスク保管
-        yield Promise.all(taskAttributes.map((taskAttribute) => __awaiter(this, void 0, void 0, function* () {
-            return repos.task.save(taskAttribute);
-        })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
+        //     return repos.task.save(taskAttribute);
+        // }));
     });
 }

package/lib/chevre/service/order/sendOrder.js

@@ -31,7 +31,7 @@ function sendOrder(params) {
                 orderNumber
             })({ transaction: repos.transaction });
             // 注文取得
-            let order = yield repos.order.findByOrderNumber({ orderNumber });
+            let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
             // プロジェクト条件検証
             if (order.project.id !== params.project.id) {
                 throw new factory.errors.NotFound('Order');
@@ -100,7 +100,9 @@ function sendOrder(params) {
             let throwsError = true;
             // すでにOrderReturnedだった場合、OrderDelivered->OrderReturnedの処理自体は成功しているので、後処理を続行する
             const currentOrder = yield repos.order.findByOrderNumber({
-                orderNumber: params.object.orderNumber
+                orderNumber: params.object.orderNumber,
+                inclusion: ['orderStatus'],
+                exclusion: []
             });
             if ((currentOrder === null || currentOrder === void 0 ? void 0 : currentOrder.orderStatus) === factory.orderStatus.OrderReturned) {
                 throwsError = false;

package/lib/chevre/service/payment/any.d.ts

@@ -47,7 +47,12 @@ declare function invalidatePaymentUrl(params: factory.task.IData<factory.taskNam
  */
 declare function processVoidPayTransaction(params: factory.task.IData<factory.taskName.VoidPayTransaction>): (repos: {
     action: ActionRepo;
+    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+    task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
 interface IAuthorizeRepos {

package/lib/chevre/service/payment/any.js

@@ -189,7 +189,7 @@ function publishPaymentUrl(params) {
         };
         yield repos.transaction.findByIdAndUpdate({
             id: transaction.id,
-            update: { 'object.paymentMethods': paymentMethodByPaymentUrl }
+            update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });
         return result;
     });
@@ -288,6 +288,12 @@ function validateFromLocation(params) {
                 agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
             })(repos);
+            if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
+                throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
+            }
+            if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                throw new factory.errors.Argument('fromLocation', 'must be Permit');
+            }
             accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
         }
         return { accountId };

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -1,6 +1,6 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
-import { MongoRepository as EventRepo } from '../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as SellerRepo } from '../../repo/seller';
@@ -50,7 +50,7 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
 declare function checkByIdentifier(params: {
     movieTickets: IMovieTicket[];
     seller: factory.seller.ISeller;
-    screeningEvent: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     paymentServiceId: string;
 }): (repos: {
     product: ProductRepo;

package/lib/chevre/service/payment/movieTicket.js

@@ -53,7 +53,11 @@ function checkMovieTicket(params) {
             }
             // イベント情報取得
             let screeningEvent;
-            screeningEvent = yield repos.event.findById({
+            // イベント取得属性最適化(2023-01-23~)
+            // screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({
+            //     id: eventIds[0]
+            // });
+            screeningEvent = yield repos.event.findMinimizedIndividualEventById({
                 id: eventIds[0]
             });
             // ショップ情報取得
@@ -432,7 +436,9 @@ function payActionParams2seatInfoSyncIn(params) {
         if (eventIds.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
-        const event = yield repos.event.findById({ id: eventIds[0] });
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: eventIds[0] });
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
         const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) });
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);

package/lib/chevre/service/product.js

@@ -77,8 +77,10 @@ function onRegistered(actionAttributes, __) {
             }
         }
         // タスク保管
-        yield Promise.all(taskAttributes.map((taskAttribute) => __awaiter(this, void 0, void 0, function* () {
-            return repos.task.save(taskAttribute);
-        })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
+        //     return repos.task.save(taskAttribute);
+        // }));
     });
 }

package/lib/chevre/service/report/telemetry.js

@@ -181,7 +181,7 @@ function createSellerFlow(measuredFrom, measuredThrough, sellerId) {
         const actionsOnExpiredTransactions = yield repos.action.search({
             typeOf: { $eq: factory.actionType.AuthorizeAction },
             purpose: { id: { $in: expiredTransactionIds } }
-        });
+        }, [], []);
         debug(actionsOnExpiredTransactions.length, 'actionsOnExpiredTransactions found.');
         const numbersOfActionsOnExpired = expiredTransactionIds.map((transactionId) => {
             return actionsOnExpiredTransactions.filter((action) => action.purpose.id === transactionId).length;

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

@@ -17,11 +17,11 @@ function checkInRerservation(params) {
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            yield repos.reservation.checkIn({ id: { $in: params.object.ids }, now });
+            yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
             checkedInReservationIds = params.object.ids;
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-            yield repos.reservation.checkIn({ reservationNumber: { $in: params.object.reservationNumbers }, now });
+            yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
             // 予約番号リストを予約IDリストに変換
             checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
                 reservationNumber: { $in: params.object.reservationNumbers }

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

@@ -37,17 +37,14 @@ function confirmReservation(actionAttributesList) {
                         });
                     }
                     else {
+                        // 廃止(2023-01-18)
+                        throw new factory.errors.Forbidden(`${reservation.typeOf} not acceptable`);
                         // 予約を確定状態に変更する
-                        // reservation = await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                        yield repos.reservation.confirm({
-                            // 更新属性をwhitelist化(2022-06-13~)
-                            // ...actionAttributes.object,
-                            id: reservation.id,
-                            previousReservationStatus: reservation.reservationStatus,
-                            underName: reservation.underName
-                            // issuedThroughは予約取引開始時に確定しているので更新不要(2022-12-21~)
-                            // reservedTicket: reservation.reservedTicket
-                        });
+                        // await repos.reservation.confirm<factory.reservationType.EventReservation>({
+                        //     id: reservation.id,
+                        //     previousReservationStatus: reservation.reservationStatus,
+                        //     underName: reservation.underName
+                        // });
                         // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                         // delete (<any>reservation)._id;
                         // confirmedReservations.push(reservation);

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

@@ -96,7 +96,8 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project,
-                reservationFor: { id: canceledReservations[0].reservationFor.id }
+                reservationFor: [{ id: canceledReservations[0].reservationFor.id }],
+                force: false
             })({ task: repos.task });
         }
     });

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

@@ -116,7 +116,8 @@ function onReservationCheckedIn(params) {
             yield Promise.all(reservationForIds.map((reservationForId) => __awaiter(this, void 0, void 0, function* () {
                 yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                     project: { id: params.project.id },
-                    reservationFor: { id: reservationForId }
+                    reservationFor: [{ id: reservationForId }],
+                    force: false
                 })({ task: repos.task });
             })));
         }

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

@@ -98,7 +98,8 @@ function onReservationConfirmed(confirmedReservations) {
         if (Array.isArray(confirmedReservations) && confirmedReservations.length > 0) {
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project: confirmedReservations[0].project,
-                reservationFor: { id: confirmedReservations[0].reservationFor.id }
+                reservationFor: [{ id: confirmedReservations[0].reservationFor.id }],
+                force: false
             })({ task: repos.task });
             const now = new Date();
             const taskAttributes = [];