@chevre/domain 24.0.0-alpha.5 → 24.0.0-alpha.52

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

@@ -75,7 +75,7 @@ function cancelPengindIfNotYet(params) {
         let actionId;
         const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
         // 冪等性を担保(2023-06-05~)
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
@@ -115,9 +115,7 @@ function cancelPengindIfNotYet(params) {
                                             subReservation: cancelingSubReservation.subReservation,
                                             reservationFor: {
                                                 id: String(reservationFor.id),
-                                                startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                    ? reservationFor.startDate
-                                                    : reservationFor.departureTime
+                                                startDate: reservationFor.startDate
                                             }
                                         },
                                         // holder:取引番号に対応(2023-06-05~)
@@ -220,9 +218,7 @@ function cancelReservation(actionAttributesList) {
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
                                             id: String(reservationFor.id),
-                                            startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                ? reservationFor.startDate
-                                                : reservationFor.departureTime
+                                            startDate: reservationFor.startDate
                                         }
                                     },
                                     // holder:取引番号に対応(2023-06-05~)
@@ -248,7 +244,7 @@ function cancelReservation(actionAttributesList) {
                         });
                     }
                     else {
-                        const reservation = await repos.reservation.projectFieldsById({
+                        const reservation = await repos.reservation.findReservationById({
                             id: actionAttributes.object.id,
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
@@ -280,14 +276,18 @@ function cancelReservation(actionAttributesList) {
                                 expectedHolder
                             })(repos);
                         }
-                        await processUnlockOfferRateLimit({
-                            project: { id: reservation.project.id },
-                            reservation: {
-                                reservationNumber: reservation.reservationNumber,
-                                reservedTicket: reservation.reservedTicket
-                            },
-                            reservationFor: reservation.reservationFor
-                        })(repos);
+                        const subReservationByTransaction = reserveTransaction?.object.subReservation?.find((s) => s.id === reservation.id);
+                        if (subReservationByTransaction !== undefined) {
+                            await processUnlockOfferRateLimit({
+                                project: { id: reservation.project.id },
+                                reservation: {
+                                    reservationNumber: reservation.reservationNumber,
+                                    // reservedTicket: reservation.reservedTicket
+                                    reservedTicket: subReservationByTransaction.reservedTicket
+                                },
+                                reservationFor: reservation.reservationFor
+                            })(repos);
+                        }
                         // 予約をキャンセル状態に変更する
                         await repos.reservation.cancelById({
                             id: reservation.id,
@@ -323,10 +323,11 @@ function cancelReservation(actionAttributesList) {
                     const reservationNumber = actionAttributes.object.reservationNumber;
                     if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                         // 最新のconfirmedReservationsを検索
-                        canceledReservations = await repos.reservation.projectFields({
+                        canceledReservations = await repos.reservation.findReservations({
                             reservationNumber: { $eq: reservationNumber },
                             typeOf: factory.reservationType.EventReservation
-                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 });
+                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 } // 廃止属性の影響なし(2026-03-25~)
+                        );
                         canceledReservations = canceledReservations.map((r) => {
                             // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                             delete r._id;
@@ -335,7 +336,7 @@ function cancelReservation(actionAttributesList) {
                     }
                 }
                 else {
-                    const canceledReservation = await repos.reservation.projectFieldsById({
+                    const canceledReservation = await repos.reservation.findReservationById({
                         id: actionAttributes.object.id,
                         inclusion: ['project', 'typeOf', 'modifiedTime', 'reservationNumber']
                     });
@@ -425,8 +426,8 @@ function processUnlockSeat(params) {
 function processUnlockOfferRateLimit(params) {
     return async (repos) => {
         const reservation = params.reservation;
-        const scope = reservation.reservedTicket.ticketType.validRateLimit?.scope;
-        const unitInSeconds = reservation.reservedTicket.ticketType.validRateLimit?.unitInSeconds;
+        const scope = reservation.reservedTicket.ticketType?.validRateLimit?.scope;
+        const unitInSeconds = reservation.reservedTicket.ticketType?.validRateLimit?.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
                 project: { id: params.project.id },
@@ -439,11 +440,8 @@ function processUnlockOfferRateLimit(params) {
                     }
                 },
                 reservationFor: {
-                    startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                        ? (0, moment_1.default)(params.reservationFor.startDate)
-                            .toDate()
-                        : (0, moment_1.default)(params.reservationFor.departureTime)
-                            .toDate()
+                    startDate: (0, moment_1.default)(params.reservationFor.startDate)
+                        .toDate()
                 },
                 reservationNumber: reservation.reservationNumber
             };

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

@@ -45,7 +45,7 @@ function confirmReservation(params) {
         //         await onReservationConfirmedByAction(actionAttributes)({ task: repos.task });
         //     }
         // }));
-        const actionAttributes = await reserveIfNotYet(params.potentialReserveAction, { byTask: params.byTask })(repos);
+        const { actionAttributes, reserveTransaction } = await reserveIfNotYet(params.potentialReserveAction, { byTask: params.byTask })(repos);
         if (params.useOnReservationConfirmed) {
             await (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
         }
@@ -55,13 +55,34 @@ function confirmReservation(params) {
             const reservationNumber = params.potentialReserveAction.object.reservationNumber;
             if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                 // 最新のconfirmedReservationsを検索
-                confirmedReservations = await repos.reservation.projectFields({
+                const rawReservations = await repos.reservation.findReservations({
                     reservationNumber: { $eq: reservationNumber },
                     typeOf: factory.reservationType.EventReservation
                 }
                 // project all fields
                 // {}
                 );
+                // price,underName,ticketTypeは予約取引から補完する(2026-03-25~)
+                confirmedReservations = rawReservations.map((rawReservation) => {
+                    const subReservationByTransaction = reserveTransaction.object.subReservation?.find((s) => s.id === rawReservation.id);
+                    // 予約取引内にsubReservationは必ず存在するはず
+                    if (subReservationByTransaction === undefined) {
+                        throw new factory.errors.NotFound('reserveTransaction.object.subReservation');
+                    }
+                    const priceByTransaction = subReservationByTransaction.price;
+                    const underNameByTransaction = reserveTransaction.object.underName;
+                    const ticketTypeByTransaction = subReservationByTransaction.reservedTicket.ticketType;
+                    // console.log('creating confirmedReservation...', rawReservation, priceByTransaction, underNameByTransaction, ticketTypeByTransaction);
+                    return {
+                        ...rawReservation,
+                        price: priceByTransaction,
+                        underName: underNameByTransaction,
+                        reservedTicket: {
+                            ...rawReservation.reservedTicket,
+                            ticketType: ticketTypeByTransaction
+                        }
+                    };
+                });
                 confirmedReservations = confirmedReservations.map((r) => {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete r._id;
@@ -117,6 +138,25 @@ function reserveTransaction2action(params) {
         ...(Array.isArray(transaction.instrument)) ? { instrument: transaction.instrument } : undefined // add(2025-02-17~)
     };
 }
+/**
+ * 予約取引に保管されたunderNameから予約のunderNameを生成する
+ */
+function createReservationUnderName(params) {
+    const { underNameByTransaction } = params;
+    // 予約のunderNameを最適化(2026-03-27~)
+    // return underNameByTransaction;
+    const { id, identifier, typeOf, name, givenName, familyName, email, telephone } = underNameByTransaction;
+    return {
+        typeOf,
+        name,
+        ...((Array.isArray(identifier)) && { identifier }),
+        ...((typeof email === 'string') && { email }),
+        ...((typeof familyName === 'string') && { familyName }),
+        ...((typeof givenName === 'string') && { givenName }),
+        ...((typeof id === 'string') && { id }),
+        ...((typeof telephone === 'string') && { telephone })
+    };
+}
 function reserveIfNotYet(
 // params: factory.action.reserve.IAttributes,
 params, options) {
@@ -134,7 +174,7 @@ params, options) {
         const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
@@ -153,12 +193,11 @@ params, options) {
             const action = await repos.action.start(actionAttributes);
             try {
                 let underName;
+                const underNameByTransaction = reserveTransaction.object.underName;
                 // 予約取引に保管されたunderNameを使用する(2023-05-30~)
-                if (typeof reserveTransaction.object.underName?.typeOf === 'string') {
-                    underName = reserveTransaction.object.underName;
-                    // 廃止(2023-05-31~)→予約取引から取得に変更
-                    // } else if (typeof reservationPackage.underName?.typeOf === 'string') {
-                    //     underName = reservationPackage.underName;
+                if (typeof underNameByTransaction?.typeOf === 'string') {
+                    // 予約のunderNameを最適化(2026-03-27~)
+                    underName = createReservationUnderName({ underNameByTransaction });
                 }
                 // ReservationPackageに対応(2022-12-22~)
                 if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
@@ -211,6 +250,6 @@ params, options) {
             const actionResult = {};
             await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
-        return actionAttributes;
+        return { actionAttributes, reserveTransaction };
     };
 }

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

@@ -1,14 +1,14 @@
 import * as factory from '../../factory';
 export declare function optimizeUnderName4inform(params: {
-    underName: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName: Pick<factory.reservation.IUnderName, 'id' | 'typeOf'>;
 }): factory.notification.reservation.IMaskedUnderName;
 export type IPotentialInformReservationAction = factory.task.triggerWebhook.IPotentialInformReservationAction;
-export declare const NUM_TRY_INFORM_RESERVATION: number;
+export declare const NUM_TRY_INFORM_RESERVATION = 10;
 export declare function createMoneyTransferActions(params: {
     acceptedOffer?: factory.assetTransaction.reserve.IAcceptedOffer4object;
     reservation: Pick<factory.assetTransaction.reserve.IObjectSubReservation, 'reservedTicket'>;
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName?: Pick<factory.reservation.IUnderName, 'id' | 'typeOf' | 'name'>;
 }): import("@chevre/factory/lib/action/transfer/moneyTransfer").IAttributes[];
 export interface IPotentialCancelAction extends factory.action.cancel.reservation.IAttributes {
     purpose: {

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

@@ -1,11 +1,11 @@
 import * as factory from '../../factory';
+import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;
-type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
+type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier'> & {
+        ticketType: Pick<factory.reservation.eventReservation.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };
@@ -28,6 +28,7 @@ declare function findByCode(params: {
         id?: string;
     };
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     authorization: AuthorizationRepo;
     order: OrderRepo;
     reservation: ReservationRepo;

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

@@ -38,8 +38,9 @@ function findByCode(params) {
             project: { id: params.project.id },
             code: params.code
         });
+        let ticketType;
         switch (authorization.object.typeOf) {
-            case factory.order.OrderType.Order:
+            case factory.order.OrderType.Order: {
                 const { orderNumber } = authorization.object;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                     // reservationIdを含む注文の存在を確認するだけでよい
@@ -49,23 +50,55 @@ function findByCode(params) {
                         reservationId,
                         seller: params.seller
                     });
+                    const acceptedOffer = (await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                        limit: 1,
+                        page: 1,
+                        // $slice?: [number, number];
+                        orderNumber: { $eq: orderNumber },
+                        project: { id: { $eq: params.project.id } },
+                        acceptedOffers: {
+                            itemOffered: {
+                                id: { $eq: reservationId }
+                                // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
+                            }
+                        }
+                    }, ['itemOffered'])).shift();
+                    if (acceptedOffer === undefined) {
+                        throw new factory.errors.NotFound('acceptedOffer');
+                    }
+                    if (acceptedOffer.itemOffered.typeOf !== factory.reservationType.EventReservation) {
+                        throw new factory.errors.Argument('id', `itemOffered.typeOf must be ${factory.reservationType.EventReservation}`);
+                    }
+                    ticketType = {
+                        identifier: acceptedOffer.itemOffered.reservedTicket.ticketType.identifier,
+                        name: { ja: acceptedOffer.itemOffered.reservedTicket.ticketType.name?.ja }
+                    };
+                }
+                else {
+                    throw new factory.errors.NotFound('orderNumber');
                 }
                 break;
+            }
             default:
                 throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
         }
-        const reservationFromRepo = await repos.reservation.projectFieldsById({
+        const reservationFromRepo = await repos.reservation.findReservationById({
             id: reservationId,
-            inclusion: ['additionalTicketText', 'checkedIn', 'reservationStatus', 'reservedTicket']
+            inclusion: [
+                'additionalTicketText', 'checkedIn', 'reservationStatus',
+                // 'reservedTicket'
+            ]
         });
-        const { id, additionalTicketText, checkedIn, reservationStatus, reservedTicket } = reservationFromRepo;
+        const { id, additionalTicketText, checkedIn, reservationStatus } = reservationFromRepo;
         const reservation = {
             id, reservationStatus,
             reservedTicket: {
-                ticketType: {
-                    identifier: reservedTicket.ticketType.identifier,
-                    name: { ja: reservedTicket.ticketType.name?.ja }
-                }
+                // ticketTypeは注文を参照する(2026-03-25~)
+                // ticketType: {
+                //     identifier: reservedTicket.ticketType.identifier,
+                //     name: { ja: reservedTicket.ticketType.name?.ja }
+                // },
+                ticketType
             },
             ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
             ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined

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

@@ -0,0 +1,19 @@
+import * as factory from '../../factory';
+import type { ReserveTransactionRepo } from '../../repo/assetTransaction/reserve';
+import type { IDeprecatedField, IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
+type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price'> & {
+    price?: factory.reservation.eventReservation.IPrice;
+};
+/**
+ * 予約を検索する
+ */
+export declare function findReservations(params: factory.reservation.eventReservation.ISearchConditions, options: {
+    inclusion: Partial<Record<IKeyOfProjection | IDeprecatedField, 1>>;
+    useReserveTransaction: boolean;
+}): (repos: {
+    assetTransaction: {
+        reserve: ReserveTransactionRepo;
+    };
+    reservation: ReservationRepo;
+}) => Promise<IReservationAsFindResult[]>;
+export {};

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

@@ -0,0 +1,74 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findReservations = findReservations;
+const debug_1 = __importDefault(require("debug"));
+const util_1 = require("util");
+const debug = (0, debug_1.default)('chevre-domain:service:reserve:findReservations');
+/**
+ * 予約を検索する
+ */
+function findReservations(params, options) {
+    return async (repos) => {
+        const { inclusion, useReserveTransaction } = options;
+        let reservations = await repos.reservation.findReservations(params, inclusion);
+        if (useReserveTransaction) {
+            if (reservations.length > 0) {
+                const requirePrice = Object.keys(inclusion).includes('price');
+                const requireUnderName = Object.keys(inclusion).includes('underName');
+                const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
+                const reservationIds = reservations.map(({ id }) => id);
+                const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
+                    ids: reservationIds
+                });
+                // 予約取引から参照した予約数と同じはず
+                debug('useReserveTransaction: true. reservations.length === subReservations.length?', reservations.length === subReservations.length);
+                reservations = reservations.map((reservation) => {
+                    const subReservationByTransaction = subReservations.find((s) => s.id === reservation.id);
+                    const priceByTransaction = subReservationByTransaction?.price;
+                    const underNameByTransaction = subReservationByTransaction?.underName;
+                    const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
+                    // 予約取引から参照した属性と全く等しいはず
+                    if (requirePrice) {
+                        const priceMatched = (0, util_1.isDeepStrictEqual)(reservation.price, priceByTransaction);
+                        debug('requirePrice. priceMatched?', priceMatched);
+                        if (!priceMatched) {
+                            console.error('priceMatched: false!!!', reservation.id);
+                        }
+                    }
+                    if (requireUnderName) {
+                        const underNameMatched = (0, util_1.isDeepStrictEqual)(reservation.underName, underNameByTransaction);
+                        debug('requireUnderName. underNameMatched?', underNameMatched);
+                        if (!underNameMatched) {
+                            console.error('underNameMatched: false!!!', reservation.id);
+                        }
+                    }
+                    if (requireReservedTicket) {
+                        const ticketTypeMatched = (0, util_1.isDeepStrictEqual)(reservation.reservedTicket.ticketType, ticketTypeByTransaction);
+                        debug('requireReservedTicket. ticketTypeMatched?', ticketTypeMatched);
+                        if (!ticketTypeMatched) {
+                            console.error('ticketTypeMatched: false!!!', reservation.id);
+                        }
+                    }
+                    return {
+                        ...reservation, // 予約ドキュメントはそのまま返す
+                        ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
+                        ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
+                        ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
+                            ? {
+                                reservedTicket: {
+                                    ...reservation.reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
+                                    ticketType: ticketTypeByTransaction
+                                }
+                            }
+                            : undefined
+                    };
+                });
+            }
+            ;
+        }
+        return reservations;
+    };
+}

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

@@ -4,13 +4,12 @@
 import * as factory from '../../../factory';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-export type ICanceledEventReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
-export type ICanceledBusReservation = Pick<factory.reservation.IReservation<factory.reservationType.BusReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
+export type ICanceledEventReservation = Pick<factory.reservation.eventReservation.IReservation, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
 export declare function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
-canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[], 
+canceledReservations: ICanceledEventReservation[], 
 /**
  * 集計対象イベント
  */

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

@@ -34,6 +34,7 @@ function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
+// canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[],
 canceledReservations, 
 // useInformReservation: boolean,
 /**

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

@@ -5,16 +5,21 @@ import * as factory from '../../../factory';
 import { AuthorizationRepo } from '../../../repo/authorization';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
+export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket'> & {
+    price?: factory.reservation.eventReservation.IPrice;
+    underName?: Pick<factory.reservation.IUnderName, 'id' | 'typeOf'>;
+    reservedTicket: Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
+        ticketType: factory.reservation.eventReservation.ITicketType;
+    };
+};
 /**
  * 予約確定後のアクション
  */
 export declare function onReservationConfirmedByAction(actionAttributes: Pick<factory.action.reserve.IAttributes, 'potentialActions'>): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
-export declare function onReservationConfirmed(confirmedReservations: IEventReservation[], reserveAction: Pick<factory.action.reserve.IAttributes, 'instrument'>): (repos: {
+export declare function onReservationConfirmed(confirmedReservations: IConfirmedReservation[], reserveAction: Pick<factory.action.reserve.IAttributes, 'instrument'>): (repos: {
     code: AuthorizationRepo;
     setting: SettingRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export {};

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

@@ -3,11 +3,11 @@ import * as factory from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-type IReservationResult = Pick<factory.reservation.IReservation<factory.reservationType>, 'id' | 'additionalTicketText' | 'reservationStatus'>;
+type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'reservationStatus'>;
 declare function searchByOrder(params: {
     limit: number;
     page: number;
-    typeOf: factory.reservationType.BusReservation | factory.reservationType.EventReservation;
+    typeOf: factory.reservationType.EventReservation;
     project: {
         id: string;
     };

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

@@ -52,7 +52,7 @@ function searchByOrder(params) {
         if (reservationIds.length > 0) {
             switch (offeredThroughIdentifier) {
                 // COA対応
-                case factory.service.webAPI.Identifier.COA:
+                case factory.service.webAPI.Identifier.COA: {
                     const order = (await repos.order.projectFields({
                         limit: 1,
                         page: 1,
@@ -102,12 +102,14 @@ function searchByOrder(params) {
                         });
                     }
                     break;
+                }
                 default:
-                    reservations = await repos.reservation.projectFields({
+                    reservations = await repos.reservation.findReservations({
                         project: { id: { $eq: params.project.id } },
                         typeOf: reservationType,
                         id: { $in: reservationIds }
-                    }, { id: 1, additionalTicketText: 1, reservationStatus: 1 });
+                    }, { id: 1, additionalTicketText: 1, reservationStatus: 1 } // 廃止属性の影響なし(2026-03-25~)
+                    );
             }
         }
         return { reservations };

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

@@ -55,7 +55,7 @@ function useReservation(params) {
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
         await reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
-        const reservation = await repos.reservation.projectFieldsById({
+        const reservation = await repos.reservation.findReservationById({
             id: reservationId,
             inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
@@ -73,11 +73,12 @@ function useReservation(params) {
             reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
             reservedTicket: {
                 typeOf: reservedTicket.typeOf,
-                ticketType: {
-                    identifier: reservedTicket.ticketType.identifier,
-                    typeOf: reservedTicket.ticketType.typeOf,
-                    ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
-                },
+                // discontinue ticketType(2026-03-25~)
+                // ticketType: {
+                //     identifier: reservedTicket.ticketType.identifier,
+                //     typeOf: reservedTicket.ticketType.typeOf,
+                //     ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
+                // },
                 ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
                 ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
             }

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

@@ -44,7 +44,7 @@ function verifyToken4reservation(params) {
             throw new factory.errors.ArgumentNull('ticket.token or ticket.ticketToken');
         }
         switch (payload.typeOf) {
-            case factory.order.OrderType.Order:
+            case factory.order.OrderType.Order: {
                 orderNumber = payload.orderNumber;
                 if (typeof orderNumber !== 'string' || orderNumber.length === 0) {
                     throw new factory.errors.NotFound('payload.orderNumber');
@@ -66,6 +66,7 @@ function verifyToken4reservation(params) {
                         throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
                 }
                 break;
+            }
             default:
                 throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
         }

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

@@ -5,6 +5,7 @@ import { cancelPendingReservation, cancelReservation } from './reserve/cancelRes
 import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { findByCode } from './reserve/findByCode';
+import { findReservations } from './reserve/findReservations';
 import { searchByOrder } from './reserve/searchByOrder';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, searchByOrder, verifyToken4reservation };
+export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, findReservations, searchByOrder, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
+exports.verifyToken4reservation = exports.searchByOrder = exports.findReservations = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
 /**
  * 予約サービス
  */
@@ -13,6 +13,8 @@ const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const findByCode_1 = require("./reserve/findByCode");
 Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
+const findReservations_1 = require("./reserve/findReservations");
+Object.defineProperty(exports, "findReservations", { enumerable: true, get: function () { return findReservations_1.findReservations; } });
 const searchByOrder_1 = require("./reserve/searchByOrder");
 Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
 const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");