@chevre/domain 24.0.0-alpha.8 → 24.0.0-alpha.80

package/lib/chevre/repo/reservation.js

@@ -1,31 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReservationRepo = void 0;
 const reservation_1 = require("./mongoose/schemas/reservation");
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
+const createMongoConditions_1 = require("./factory/reservation/createMongoConditions");
+const minimizeReservationFor_1 = require("./factory/reservation/minimizeReservationFor");
 const settings_1 = require("../settings");
 /**
  * 予約リポジトリ
@@ -36,759 +15,20 @@ class ReservationRepo {
     constructor(connection) {
         this.reservationModel = connection.model(reservation_1.modelName, (0, reservation_1.createSchema)());
     }
-    static CREATE_MONGO_CONDITIONS(params) {
-        // MongoDB検索条件
-        const andConditions = [
-            { typeOf: { $eq: params.typeOf } }
-        ];
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            andConditions.push({ 'project.id': { $eq: projectIdEq } });
-        }
-        const providerIdEq = params.provider?.id?.$eq;
-        if (typeof providerIdEq === 'string') {
-            andConditions.push({ 'provider.id': { $eq: providerIdEq } });
-        }
-        /* istanbul ignore else */
-        if (Array.isArray(params.ids)) {
-            andConditions.push({ _id: { $in: params.ids } });
-        }
-        /* istanbul ignore else */
-        if (params.id !== undefined && params.id !== null) {
-            if (typeof params.id.$eq === 'string') {
-                andConditions.push({ _id: { $eq: params.id.$eq } });
-            }
-            if (typeof params.id.$ne === 'string') {
-                andConditions.push({ _id: { $ne: params.id.$ne } });
-            }
-            if (Array.isArray(params.id.$in)) {
-                andConditions.push({ _id: { $in: params.id.$in } });
-            }
-            if (Array.isArray(params.id.$nin)) {
-                andConditions.push({ _id: { $nin: params.id.$nin } });
-            }
-        }
-        /* istanbul ignore else */
-        if (Array.isArray(params.reservationNumbers)) {
-            andConditions.push({
-                reservationNumber: {
-                    $in: params.reservationNumbers
-                }
-            });
-        }
-        /* istanbul ignore else */
-        if (params.reservationNumber !== undefined && params.reservationNumber !== null) {
-            if (typeof params.reservationNumber === 'string') {
-                if (params.reservationNumber.length > 0) {
-                    andConditions.push({
-                        reservationNumber: {
-                            $regex: new RegExp(params.reservationNumber)
-                        }
-                    });
-                }
-            }
-            else {
-                if (typeof params.reservationNumber.$eq === 'string') {
-                    andConditions.push({
-                        reservationNumber: {
-                            $eq: params.reservationNumber.$eq
-                        }
-                    });
-                }
-                if (typeof params.reservationNumber.$ne === 'string') {
-                    andConditions.push({
-                        reservationNumber: {
-                            $ne: params.reservationNumber.$ne
-                        }
-                    });
-                }
-                if (Array.isArray(params.reservationNumber.$in)) {
-                    andConditions.push({
-                        reservationNumber: {
-                            $in: params.reservationNumber.$in
-                        }
-                    });
-                }
-                if (Array.isArray(params.reservationNumber.$nin)) {
-                    andConditions.push({
-                        reservationNumber: {
-                            $nin: params.reservationNumber.$nin
-                        }
-                    });
-                }
-            }
-        }
-        /* istanbul ignore else */
-        if (params.additionalTicketText !== undefined && params.additionalTicketText !== null) {
-            if (typeof params.additionalTicketText === 'string') {
-                if (params.additionalTicketText.length > 0) {
-                    andConditions.push({
-                        additionalTicketText: {
-                            $exists: true,
-                            $regex: new RegExp(params.additionalTicketText)
-                        }
-                    });
-                }
-            }
-            else {
-                if (typeof params.additionalTicketText.$eq === 'string') {
-                    andConditions.push({
-                        additionalTicketText: {
-                            $exists: true,
-                            $eq: params.additionalTicketText.$eq
-                        }
-                    });
-                }
-                if (typeof params.additionalTicketText.$ne === 'string') {
-                    andConditions.push({
-                        additionalTicketText: {
-                            $ne: params.additionalTicketText.$ne
-                        }
-                    });
-                }
-                if (Array.isArray(params.additionalTicketText.$in)) {
-                    andConditions.push({
-                        additionalTicketText: {
-                            $exists: true,
-                            $in: params.additionalTicketText.$in
-                        }
-                    });
-                }
-                if (Array.isArray(params.additionalTicketText.$nin)) {
-                    andConditions.push({
-                        additionalTicketText: {
-                            $nin: params.additionalTicketText.$nin
-                        }
-                    });
-                }
-                const additionalTicketTextRegex = params.additionalTicketText?.$regex;
-                if (typeof additionalTicketTextRegex === 'string' && additionalTicketTextRegex.length > 0) {
-                    const additionalTicketTextOptions = params.additionalTicketText?.$options;
-                    andConditions.push({
-                        additionalTicketText: {
-                            $exists: true,
-                            $regex: new RegExp(additionalTicketTextRegex),
-                            ...(typeof additionalTicketTextOptions === 'string') ? { $options: additionalTicketTextOptions } : undefined
-                        }
-                    });
-                }
-            }
-        }
-        const reservationStatusEq = params.reservationStatus?.$eq;
-        if (typeof reservationStatusEq === 'string') {
-            andConditions.push({ reservationStatus: { $eq: reservationStatusEq } });
-        }
-        const reservationStatusNe = params.reservationStatus?.$ne;
-        if (typeof reservationStatusNe === 'string') {
-            andConditions.push({ reservationStatus: { $ne: reservationStatusNe } });
-        }
-        const reservationStatusIn = params.reservationStatus?.$in;
-        if (Array.isArray(reservationStatusIn)) {
-            andConditions.push({ reservationStatus: { $in: reservationStatusIn } });
-        }
-        /* istanbul ignore else */
-        if (Array.isArray(params.reservationStatuses)) {
-            andConditions.push({ reservationStatus: { $in: params.reservationStatuses } });
-        }
-        /* istanbul ignore else */
-        if (params.modifiedFrom instanceof Date) {
-            andConditions.push({
-                modifiedTime: { $gte: params.modifiedFrom }
-            });
-        }
-        /* istanbul ignore else */
-        if (params.modifiedThrough instanceof Date) {
-            andConditions.push({
-                modifiedTime: { $lte: params.modifiedThrough }
-            });
-        }
-        /* istanbul ignore else */
-        if (params.bookingFrom instanceof Date) {
-            andConditions.push({
-                bookingTime: {
-                    $exists: true,
-                    $gte: params.bookingFrom
-                }
-            });
-        }
-        /* istanbul ignore else */
-        if (params.bookingThrough instanceof Date) {
-            andConditions.push({
-                bookingTime: {
-                    $exists: true,
-                    $lte: params.bookingThrough
-                }
-            });
-        }
-        switch (params.typeOf) {
-            case factory.reservationType.BusReservation:
-                const reservationForTypeOfEq = params.reservationFor?.typeOf;
-                if (typeof reservationForTypeOfEq === 'string') {
-                    andConditions.push({
-                        'reservationFor.typeOf': {
-                            $exists: true,
-                            $eq: reservationForTypeOfEq
-                        }
-                    });
-                }
-                const reservationForIdEq = params.reservationFor?.id?.$eq;
-                if (typeof reservationForIdEq === 'string') {
-                    andConditions.push({
-                        'reservationFor.id': {
-                            $exists: true,
-                            $eq: reservationForIdEq
-                        }
-                    });
-                }
-                const reservationForIdIn = params.reservationFor?.id?.$in;
-                if (Array.isArray(reservationForIdIn)) {
-                    andConditions.push({
-                        'reservationFor.id': {
-                            $exists: true,
-                            $in: reservationForIdIn
-                        }
-                    });
-                }
-                break;
-            case factory.reservationType.EventReservation:
-                if (typeof params.reservationFor?.id === 'string') {
-                    andConditions.push({
-                        'reservationFor.id': {
-                            $exists: true,
-                            $eq: params.reservationFor.id
-                        }
-                    });
-                }
-                else {
-                    const reservationForIdEq4eventReservation = params.reservationFor?.id?.$eq;
-                    if (typeof reservationForIdEq4eventReservation === 'string') {
-                        andConditions.push({
-                            'reservationFor.id': {
-                                $exists: true,
-                                $eq: reservationForIdEq4eventReservation
-                            }
-                        });
-                    }
-                }
-                /* istanbul ignore else */
-                if (params.reservationFor !== undefined) {
-                    /* istanbul ignore else */
-                    if (params.reservationFor.typeOf !== undefined) {
-                        andConditions.push({
-                            'reservationFor.typeOf': {
-                                $exists: true,
-                                $eq: params.reservationFor.typeOf
-                            }
-                        });
-                    }
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.reservationFor.ids)) {
-                        andConditions.push({
-                            'reservationFor.id': {
-                                $exists: true,
-                                $in: params.reservationFor.ids
-                            }
-                        });
-                    }
-                    /* istanbul ignore else */
-                    if (params.reservationFor.location !== undefined) {
-                        /* istanbul ignore else */
-                        if (Array.isArray(params.reservationFor.location.ids)) {
-                            andConditions.push({
-                                'reservationFor.location.id': {
-                                    $exists: true,
-                                    $in: params.reservationFor.location.ids
-                                }
-                            });
-                        }
-                        /* istanbul ignore else */
-                        if (Array.isArray(params.reservationFor.location.branchCodes)) {
-                            andConditions.push({
-                                'reservationFor.location.branchCode': {
-                                    $exists: true,
-                                    $in: params.reservationFor.location.branchCodes
-                                }
-                            });
-                        }
-                    }
-                    /* istanbul ignore else */
-                    if (params.reservationFor.startFrom instanceof Date) {
-                        andConditions.push({
-                            'reservationFor.startDate': {
-                                $exists: true,
-                                $gte: params.reservationFor.startFrom
-                            }
-                        });
-                    }
-                    /* istanbul ignore else */
-                    if (params.reservationFor.startThrough instanceof Date) {
-                        andConditions.push({
-                            'reservationFor.startDate': {
-                                $exists: true,
-                                $lte: params.reservationFor.startThrough
-                            }
-                        });
-                    }
-                    /* istanbul ignore else */
-                    if (params.reservationFor.endFrom instanceof Date) {
-                        andConditions.push({
-                            'reservationFor.endDate': {
-                                $exists: true,
-                                $gte: params.reservationFor.endFrom
-                            }
-                        });
-                    }
-                    /* istanbul ignore else */
-                    if (params.reservationFor.endThrough instanceof Date) {
-                        andConditions.push({
-                            'reservationFor.endDate': {
-                                $exists: true,
-                                $lte: params.reservationFor.endThrough
-                            }
-                        });
-                    }
-                    /* istanbul ignore else */
-                    if (params.reservationFor.superEvent !== undefined) {
-                        /* istanbul ignore else */
-                        if (params.reservationFor.superEvent.id !== undefined) {
-                            andConditions.push({
-                                'reservationFor.superEvent.id': {
-                                    $exists: true,
-                                    $eq: params.reservationFor.superEvent.id
-                                }
-                            });
-                        }
-                        /* istanbul ignore else */
-                        if (Array.isArray(params.reservationFor.superEvent.ids)) {
-                            andConditions.push({
-                                'reservationFor.superEvent.id': {
-                                    $exists: true,
-                                    $in: params.reservationFor.superEvent.ids
-                                }
-                            });
-                        }
-                        /* istanbul ignore else */
-                        if (params.reservationFor.superEvent.location !== undefined) {
-                            /* istanbul ignore else */
-                            if (Array.isArray(params.reservationFor.superEvent.location.ids)) {
-                                andConditions.push({
-                                    'reservationFor.superEvent.location.id': {
-                                        $exists: true,
-                                        $in: params.reservationFor.superEvent.location.ids
-                                    }
-                                });
-                            }
-                            /* istanbul ignore else */
-                            if (Array.isArray(params.reservationFor.superEvent.location.branchCodes)) {
-                                andConditions.push({
-                                    'reservationFor.superEvent.location.branchCode': {
-                                        $exists: true,
-                                        $in: params.reservationFor.superEvent.location.branchCodes
-                                    }
-                                });
-                            }
-                        }
-                        /* istanbul ignore else */
-                        if (params.reservationFor.superEvent.workPerformed !== undefined) {
-                            /* istanbul ignore else */
-                            if (Array.isArray(params.reservationFor.superEvent.workPerformed.ids)) {
-                                andConditions.push({
-                                    'reservationFor.superEvent.workPerformed.id': {
-                                        $exists: true,
-                                        $in: params.reservationFor.superEvent.workPerformed.ids
-                                    }
-                                });
-                            }
-                            /* istanbul ignore else */
-                            if (Array.isArray(params.reservationFor.superEvent.workPerformed.identifiers)) {
-                                andConditions.push({
-                                    'reservationFor.superEvent.workPerformed.identifier': {
-                                        $exists: true,
-                                        $in: params.reservationFor.superEvent.workPerformed.identifiers
-                                    }
-                                });
-                            }
-                        }
-                    }
-                }
-                break;
-            case factory.reservationType.ReservationPackage:
-                break;
-            default:
-        }
-        /* istanbul ignore else */
-        if (params.reservedTicket !== undefined) {
-            /* istanbul ignore else */
-            if (params.reservedTicket.ticketType !== undefined) {
-                /* istanbul ignore else */
-                if (Array.isArray(params.reservedTicket.ticketType.ids)) {
-                    andConditions.push({
-                        'reservedTicket.ticketType.id': {
-                            $exists: true,
-                            $in: params.reservedTicket.ticketType.ids
-                        }
-                    });
-                }
-                /* istanbul ignore else */
-                if (params.reservedTicket.ticketType.category !== undefined) {
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.reservedTicket.ticketType.category.ids)) {
-                        andConditions.push({
-                            'reservedTicket.ticketType.category.id': {
-                                $exists: true,
-                                $in: params.reservedTicket.ticketType.category.ids
-                            }
-                        });
-                    }
-                    /* istanbul ignore else */
-                    if (params.reservedTicket.ticketType.category.codeValue !== undefined
-                        && params.reservedTicket.ticketType.category !== null) {
-                        if (Array.isArray(params.reservedTicket.ticketType.category.codeValue.$in)) {
-                            andConditions.push({
-                                'reservedTicket.ticketType.category.codeValue': {
-                                    $exists: true,
-                                    $in: params.reservedTicket.ticketType.category.codeValue.$in
-                                }
-                            });
-                        }
-                    }
-                }
-            }
-            /* istanbul ignore else */
-            if (params.reservedTicket.ticketedSeat !== undefined) {
-                /* istanbul ignore else */
-                if (Array.isArray(params.reservedTicket.ticketedSeat.seatNumbers)) {
-                    andConditions.push({
-                        'reservedTicket.ticketedSeat.seatNumber': {
-                            $exists: true,
-                            $in: params.reservedTicket.ticketedSeat.seatNumbers
-                        }
-                    });
-                }
-                /* istanbul ignore else */
-                if (Array.isArray(params.reservedTicket.ticketedSeat.seatRows)) {
-                    andConditions.push({
-                        'reservedTicket.ticketedSeat.seatRow': {
-                            $exists: true,
-                            $in: params.reservedTicket.ticketedSeat.seatRows
-                        }
-                    });
-                }
-                /* istanbul ignore else */
-                if (Array.isArray(params.reservedTicket.ticketedSeat.seatSections)) {
-                    andConditions.push({
-                        'reservedTicket.ticketedSeat.seatSection': {
-                            $exists: true,
-                            $in: params.reservedTicket.ticketedSeat.seatSections
-                        }
-                    });
-                }
-                /* istanbul ignore else */
-                const ticketedSeatSeatingTypeIn = params.reservedTicket.ticketedSeat?.seatingType?.$in;
-                if (Array.isArray(ticketedSeatSeatingTypeIn)) {
-                    andConditions.push({
-                        'reservedTicket.ticketedSeat.seatingType': {
-                            $exists: true,
-                            $in: ticketedSeatSeatingTypeIn
-                        }
-                    });
-                }
-            }
-        }
-        const brokerIdRegex = params.broker?.id;
-        if (typeof brokerIdRegex === 'string' && brokerIdRegex.length > 0) {
-            andConditions.push({
-                'broker.id': {
-                    $exists: true,
-                    $regex: new RegExp(brokerIdRegex)
-                }
-            });
-        }
-        const brokerIdentifierAll = params.broker?.identifier?.$all;
-        if (Array.isArray(brokerIdentifierAll)) {
-            andConditions.push({
-                'broker.identifier': {
-                    $exists: true,
-                    $all: brokerIdentifierAll
-                }
-            });
-        }
-        const brokerIdentifierIn = params.broker?.identifier?.$in;
-        if (Array.isArray(brokerIdentifierIn)) {
-            andConditions.push({
-                'broker.identifier': {
-                    $exists: true,
-                    $in: brokerIdentifierIn
-                }
-            });
-        }
-        const brokerIdentifierNin = params.broker?.identifier?.$nin;
-        if (Array.isArray(brokerIdentifierNin)) {
-            andConditions.push({
-                'broker.identifier': {
-                    $nin: brokerIdentifierNin
-                }
-            });
-        }
-        const brokerIdentifierElemMatch = params.broker?.identifier?.$elemMatch;
-        if (brokerIdentifierElemMatch !== undefined && brokerIdentifierElemMatch !== null) {
-            andConditions.push({
-                'broker.identifier': {
-                    $exists: true,
-                    $elemMatch: brokerIdentifierElemMatch
-                }
-            });
-        }
-        /* istanbul ignore else */
-        if (params.underName !== undefined) {
-            /* istanbul ignore else */
-            if (typeof params.underName.id === 'string' && params.underName.id.length > 0) {
-                andConditions.push({
-                    'underName.id': {
-                        $exists: true,
-                        $regex: new RegExp(params.underName.id)
-                    }
-                });
-            }
-            /* istanbul ignore else */
-            if (typeof params.underName.email === 'string') {
-                if (params.underName.email.length > 0) {
-                    andConditions.push({
-                        'underName.email': {
-                            $exists: true,
-                            $regex: new RegExp(params.underName.email)
-                        }
-                    });
-                }
-            }
-            else {
-                const emailRegex = params.underName.email?.$regex;
-                if (typeof emailRegex === 'string' && emailRegex.length > 0) {
-                    const emailOptions = params.underName.email?.$options;
-                    andConditions.push({
-                        'underName.email': {
-                            $exists: true,
-                            $regex: new RegExp(emailRegex),
-                            ...(typeof emailOptions === 'string') ? { $options: emailOptions } : undefined
-                        }
-                    });
-                }
-            }
-            /* istanbul ignore else */
-            if (typeof params.underName.name === 'string') {
-                if (params.underName.name.length > 0) {
-                    andConditions.push({
-                        'underName.name': {
-                            $exists: true,
-                            $regex: new RegExp(params.underName.name)
-                        }
-                    });
-                }
-            }
-            else {
-                const underNameNameRegex = params.underName.name?.$regex;
-                if (typeof underNameNameRegex === 'string' && underNameNameRegex.length > 0) {
-                    const underNameNameOptions = params.underName.name?.$options;
-                    andConditions.push({
-                        'underName.name': {
-                            $exists: true,
-                            $regex: new RegExp(underNameNameRegex),
-                            ...(typeof underNameNameOptions === 'string') ? { $options: underNameNameOptions } : undefined
-                        }
-                    });
-                }
-            }
-            /* istanbul ignore else */
-            if (typeof params.underName.telephone === 'string' && params.underName.telephone.length > 0) {
-                andConditions.push({
-                    'underName.telephone': {
-                        $exists: true,
-                        $regex: new RegExp(params.underName.telephone)
-                    }
-                });
-            }
-            /* istanbul ignore else */
-            if (typeof params.underName.givenName === 'string') {
-                if (params.underName.givenName.length > 0) {
-                    andConditions.push({
-                        'underName.givenName': {
-                            $exists: true,
-                            $regex: new RegExp(params.underName.givenName)
-                        }
-                    });
-                }
-            }
-            else {
-                const givenNameRegex = params.underName.givenName?.$regex;
-                if (typeof givenNameRegex === 'string' && givenNameRegex.length > 0) {
-                    const givenNameOptions = params.underName.givenName?.$options;
-                    andConditions.push({
-                        'underName.givenName': {
-                            $exists: true,
-                            $regex: new RegExp(givenNameRegex),
-                            ...(typeof givenNameOptions === 'string') ? { $options: givenNameOptions } : undefined
-                        }
-                    });
-                }
-            }
-            /* istanbul ignore else */
-            if (typeof params.underName.familyName === 'string') {
-                if (params.underName.familyName.length > 0) {
-                    andConditions.push({
-                        'underName.familyName': {
-                            $exists: true,
-                            $regex: new RegExp(params.underName.familyName)
-                        }
-                    });
-                }
-            }
-            else {
-                const familyNameRegex = params.underName.familyName?.$regex;
-                if (typeof familyNameRegex === 'string' && familyNameRegex.length > 0) {
-                    const familyNameOptions = params.underName.familyName?.$options;
-                    andConditions.push({
-                        'underName.familyName': {
-                            $exists: true,
-                            $regex: new RegExp(familyNameRegex),
-                            ...(typeof familyNameOptions === 'string') ? { $options: familyNameOptions } : undefined
-                        }
-                    });
-                }
-            }
-            /* istanbul ignore else */
-            if (params.underName.identifier !== undefined) {
-                if (Array.isArray(params.underName.identifier.$all)) {
-                    andConditions.push({
-                        'underName.identifier': {
-                            $exists: true,
-                            $all: params.underName.identifier.$all
-                        }
-                    });
-                }
-                if (Array.isArray(params.underName.identifier.$in)) {
-                    andConditions.push({
-                        'underName.identifier': {
-                            $exists: true,
-                            $in: params.underName.identifier.$in
-                        }
-                    });
-                }
-                if (Array.isArray(params.underName.identifier.$nin)) {
-                    andConditions.push({
-                        'underName.identifier': {
-                            $nin: params.underName.identifier.$nin
-                        }
-                    });
-                }
-                if (params.underName.identifier.$elemMatch !== undefined) {
-                    andConditions.push({
-                        'underName.identifier': {
-                            $exists: true,
-                            $elemMatch: params.underName.identifier.$elemMatch
-                        }
-                    });
-                }
-            }
-            /* istanbul ignore else */
-            if (Array.isArray(params.underName.identifiers)) {
-                andConditions.push({
-                    'underName.identifier': {
-                        $exists: true,
-                        $in: params.underName.identifiers
-                    }
-                });
-            }
-        }
-        /* istanbul ignore else */
-        if (typeof params.attended === 'boolean') {
-            andConditions.push({
-                attended: params.attended
-            });
-        }
-        /* istanbul ignore else */
-        if (typeof params.checkedIn === 'boolean') {
-            andConditions.push({
-                checkedIn: params.checkedIn
-            });
-        }
-        /* istanbul ignore else */
-        if (params.additionalProperty !== undefined) {
-            if (Array.isArray(params.additionalProperty.$all)) {
-                andConditions.push({
-                    additionalProperty: {
-                        $exists: true,
-                        $all: params.additionalProperty.$all
-                    }
-                });
-            }
-            if (Array.isArray(params.additionalProperty.$in)) {
-                andConditions.push({
-                    additionalProperty: {
-                        $exists: true,
-                        $in: params.additionalProperty.$in
-                    }
-                });
-            }
-            if (Array.isArray(params.additionalProperty.$nin)) {
-                andConditions.push({
-                    additionalProperty: {
-                        $nin: params.additionalProperty.$nin
-                    }
-                });
-            }
-            if (params.additionalProperty.$elemMatch !== undefined) {
-                andConditions.push({
-                    additionalProperty: {
-                        $exists: true,
-                        $elemMatch: params.additionalProperty.$elemMatch
-                    }
-                });
-            }
-        }
-        const programMembershipUsedIdentifierEq = params.programMembershipUsed?.identifier?.$eq;
-        if (typeof programMembershipUsedIdentifierEq === 'string') {
-            andConditions.push({
-                'programMembershipUsed.identifier': {
-                    $exists: true,
-                    $eq: programMembershipUsedIdentifierEq
-                }
-            });
-        }
-        const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = params.programMembershipUsed?.issuedThrough?.serviceType?.codeValue?.$eq;
-        if (typeof programMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
-            andConditions.push({
-                'programMembershipUsed.issuedThrough.serviceType.codeValue': {
-                    $exists: true,
-                    $eq: programMembershipUsedIssuedThroughServiceTypeCodeValueEq
-                }
-            });
-        }
-        const appliesToMovieTicketIdentifierEq = params.price?.priceComponent?.appliesToMovieTicket?.identifier?.$eq;
-        if (typeof appliesToMovieTicketIdentifierEq === 'string') {
-            andConditions.push({
-                'price.priceComponent.appliesToMovieTicket.identifier': {
-                    $exists: true,
-                    $eq: appliesToMovieTicketIdentifierEq
-                }
-            });
-        }
-        return andConditions;
-    }
     /**
      * 汎用予約カウント
      */
     async count(params) {
-        const conditions = ReservationRepo.CREATE_MONGO_CONDITIONS(params);
+        const conditions = (0, createMongoConditions_1.CREATE_MONGO_CONDITIONS)(params);
         return this.reservationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
             .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
     }
     /**
      * 予約検索
-     * migrate from search(2024-08-08~)
      */
-    async projectFields(params, inclusion) {
-        const conditions = ReservationRepo.CREATE_MONGO_CONDITIONS(params);
+    async findReservations(params, inclusion) {
+        const conditions = (0, createMongoConditions_1.CREATE_MONGO_CONDITIONS)(params);
         let projection;
         if (inclusion !== undefined && inclusion !== null) {
             projection = {
@@ -844,7 +84,7 @@ class ReservationRepo {
             .lean()
             .exec();
     }
-    async projectFieldsById(params) {
+    async findReservationById(params) {
         let projection = {};
         if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
             projection = {
@@ -859,13 +99,13 @@ class ReservationRepo {
         }
         else {
             // discontinue(2024-08-08~)
-            throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            throw new factory_1.factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
         }
         const doc = await this.reservationModel.findById(params.id, projection)
-            .lean() // 2024-08-08~
+            .lean()
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(this.reservationModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.reservationModel.modelName);
         }
         return doc;
     }
@@ -874,49 +114,36 @@ class ReservationRepo {
         const bulkWriteOps = [];
         if (Array.isArray(params.subReservation)) {
             params.subReservation.forEach((subReservation) => {
-                let setOnInsert;
-                switch (subReservation.typeOf) {
-                    case factory.reservationType.BusReservation:
-                        setOnInsert = {
-                            ...subReservation,
-                            _id: subReservation.id,
-                            bookingTime: params.bookingTime,
-                            checkedIn: false,
-                            attended: false,
-                            issuedThrough: params.issuedThrough,
-                            project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                            reservationFor: params.reservationFor,
-                            reservationNumber: params.reservationNumber,
-                            reservationStatus: factory.reservationStatusType.ReservationConfirmed,
-                            modifiedTime,
-                            // providerを追加(2023-07-19~)
-                            provider: params.provider,
-                            ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
-                            ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
-                        };
-                        break;
-                    case factory.reservationType.EventReservation:
-                        setOnInsert = {
-                            ...subReservation,
-                            _id: subReservation.id,
-                            bookingTime: params.bookingTime,
-                            checkedIn: false,
-                            attended: false,
-                            issuedThrough: params.issuedThrough,
-                            project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                            reservationFor: params.reservationFor,
-                            reservationNumber: params.reservationNumber,
-                            reservationStatus: factory.reservationStatusType.ReservationConfirmed,
-                            modifiedTime,
-                            // providerを追加(2023-07-19~)
-                            provider: params.provider,
-                            ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
-                            ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
-                        };
-                        break;
-                    default:
-                        throw new factory.errors.NotImplemented(`${subReservation.typeOf} not implemented`);
-                }
+                const { price: _discontinuePrice, reservedTicket, ...subReservationWithoutPrice } = subReservation;
+                const { ticketType, ...reservedTicketWithoutTicketType } = reservedTicket;
+                // 予約ドキュメントのticketTypeを最小化(2026-04-03~)
+                const savingReservedTicket = {
+                    ...reservedTicketWithoutTicketType,
+                    ticketType: {
+                        ...((typeof ticketType.id === 'string') && { id: ticketType.id })
+                    }
+                };
+                // reservationFor最小化(2026-04-06~)
+                const { minimizedReservationFor } = (0, minimizeReservationFor_1.minimizeReservationFor)(params.reservationFor);
+                const setOnInsert = {
+                    ...subReservationWithoutPrice,
+                    typeOf: factory_1.factory.reservationType.EventReservation,
+                    _id: subReservation.id,
+                    bookingTime: params.bookingTime,
+                    checkedIn: false,
+                    attended: false,
+                    issuedThrough: params.issuedThrough,
+                    project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+                    reservationFor: minimizedReservationFor,
+                    reservationNumber: params.reservationNumber,
+                    reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed,
+                    modifiedTime,
+                    provider: params.provider,
+                    reservedTicket: savingReservedTicket,
+                    ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
+                    ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
+                    // discontinue price(2026-03-31~)
+                };
                 bulkWriteOps.push({
                     updateOne: {
                         filter: { _id: { $eq: subReservation.id } },
@@ -931,6 +158,7 @@ class ReservationRepo {
         if (bulkWriteOps.length > 0) {
             return this.reservationModel.bulkWrite(bulkWriteOps, { ordered: false });
         }
+        return;
     }
     /**
      * 予約取消
@@ -945,7 +173,7 @@ class ReservationRepo {
         };
         const update = {
             $set: {
-                reservationStatus: factory.reservationStatusType.ReservationCancelled,
+                reservationStatus: factory_1.factory.reservationStatusType.ReservationCancelled,
                 modifiedTime: params.modifiedTime,
                 ...(typeof params.previousReservationStatus === 'string')
                     ? { previousReservationStatus: params.previousReservationStatus }
@@ -958,14 +186,14 @@ class ReservationRepo {
             .exec();
         // NotFoundであれば状態確認
         if (doc === null) {
-            const { reservationStatus } = await this.projectFieldsById({ id: String(params.id), inclusion: ['reservationStatus'] });
-            if (reservationStatus === factory.reservationStatusType.ReservationCancelled) {
+            const { reservationStatus } = await this.findReservationById({ id: String(params.id), inclusion: ['reservationStatus'] });
+            if (reservationStatus === factory_1.factory.reservationStatusType.ReservationCancelled) {
                 // すでに取消済の場合
                 return;
                 // return reservation;
             }
             else {
-                throw new factory.errors.Argument('id', `Reservation ${params.id} already changed -> ${reservationStatus}`);
+                throw new factory_1.factory.errors.Argument('id', `Reservation ${params.id} already changed -> ${reservationStatus}`);
             }
         }
     }
@@ -982,7 +210,7 @@ class ReservationRepo {
         };
         const update = {
             $set: {
-                reservationStatus: factory.reservationStatusType.ReservationCancelled,
+                reservationStatus: factory_1.factory.reservationStatusType.ReservationCancelled,
                 modifiedTime: params.modifiedTime,
                 ...(typeof params.previousReservationStatus === 'string')
                     ? { previousReservationStatus: params.previousReservationStatus }
@@ -998,7 +226,7 @@ class ReservationRepo {
     async checkInIfNot(params) {
         const { now } = params;
         if (!(now instanceof Date)) {
-            throw new factory.errors.Argument('now', 'must be Date');
+            throw new factory_1.factory.errors.Argument('now', 'must be Date');
         }
         const conditions = [];
         if (typeof params.id === 'string') {
@@ -1070,7 +298,7 @@ class ReservationRepo {
             // .select({ __v: 0, createdAt: 0, updatedAt: 0 })
             .exec();
         if (doc === null) {
-            return this.projectFieldsById({
+            return this.findReservationById({
                 id: params.id,
                 inclusion: [
                     'typeOf', 'project', 'modifiedTime', 'reservedTicket.dateUsed', 'reservationFor.id', 'reservationFor.typeOf'
@@ -1089,7 +317,7 @@ class ReservationRepo {
             .exec()
             .then((doc) => {
             if (doc === null) {
-                throw new factory.errors.ArgumentNull(this.reservationModel.modelName);
+                throw new factory_1.factory.errors.ArgumentNull(this.reservationModel.modelName);
             }
         });
     }
@@ -1138,7 +366,7 @@ class ReservationRepo {
     }
     getCursor(conditions, projection) {
         return this.reservationModel.find(conditions, projection)
-            .sort({ bookingTime: factory.sortType.Descending })
+            .sort({ bookingTime: factory_1.factory.sortType.Descending })
             .cursor();
     }
     async unsetUnnecessaryFields(params) {