@chevre/domain 24.1.0-alpha.30 → 24.1.0-alpha.32

package/lib/chevre/repo/factory/reservation/createMongoConditions.d.ts

@@ -1,3 +1,3 @@
 import type { FilterQuery } from 'mongoose';
 import { factory } from '../../../factory';
-export declare function CREATE_MONGO_CONDITIONS(params: factory.reservation.eventReservation.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/reservation/event").IReservation>[];
+export declare function createMongoConditions(params: factory.reservation.eventReservation.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/reservation/event").IReservation>[];

package/lib/chevre/repo/factory/reservation/createMongoConditions.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CREATE_MONGO_CONDITIONS = CREATE_MONGO_CONDITIONS;
-const factory_1 = require("../../../factory");
-function CREATE_MONGO_CONDITIONS(params) {
+exports.createMongoConditions = createMongoConditions;
+function createMongoConditions(params) {
     // MongoDB検索条件
     const andConditions = [
-        { typeOf: { $eq: params.typeOf } }
+    // { typeOf: { $eq: params.typeOf } } // EventReservationしかコレクションに存在しない前提のため、不要(2026-05-24~)
     ];
     const projectIdEq = params.project?.id?.$eq;
     if (typeof projectIdEq === 'string') {
@@ -24,15 +23,15 @@ function CREATE_MONGO_CONDITIONS(params) {
         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 (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 } });
-        }
+        // if (Array.isArray(params.id.$nin)) {
+        //     andConditions.push({ _id: { $nin: params.id.$nin } });
+        // }
     }
     /* istanbul ignore else */
     if (Array.isArray(params.reservationNumbers)) {
@@ -61,13 +60,13 @@ function CREATE_MONGO_CONDITIONS(params) {
                     }
                 });
             }
-            if (typeof params.reservationNumber.$ne === 'string') {
-                andConditions.push({
-                    reservationNumber: {
-                        $ne: params.reservationNumber.$ne
-                    }
-                });
-            }
+            // if (typeof params.reservationNumber.$ne === 'string') {
+            //     andConditions.push({
+            //         reservationNumber: {
+            //             $ne: params.reservationNumber.$ne
+            //         }
+            //     });
+            // }
             if (Array.isArray(params.reservationNumber.$in)) {
                 andConditions.push({
                     reservationNumber: {
@@ -75,13 +74,13 @@ function CREATE_MONGO_CONDITIONS(params) {
                     }
                 });
             }
-            if (Array.isArray(params.reservationNumber.$nin)) {
-                andConditions.push({
-                    reservationNumber: {
-                        $nin: params.reservationNumber.$nin
-                    }
-                });
-            }
+            // if (Array.isArray(params.reservationNumber.$nin)) {
+            //     andConditions.push({
+            //         reservationNumber: {
+            //             $nin: params.reservationNumber.$nin
+            //         }
+            //     });
+            // }
         }
     }
     /* istanbul ignore else */
@@ -105,13 +104,13 @@ function CREATE_MONGO_CONDITIONS(params) {
                     }
                 });
             }
-            if (typeof params.additionalTicketText.$ne === 'string') {
-                andConditions.push({
-                    additionalTicketText: {
-                        $ne: params.additionalTicketText.$ne
-                    }
-                });
-            }
+            // if (typeof params.additionalTicketText.$ne === 'string') {
+            //     andConditions.push({
+            //         additionalTicketText: {
+            //             $ne: params.additionalTicketText.$ne
+            //         }
+            //     });
+            // }
             if (Array.isArray(params.additionalTicketText.$in)) {
                 andConditions.push({
                     additionalTicketText: {
@@ -120,21 +119,21 @@ function CREATE_MONGO_CONDITIONS(params) {
                     }
                 });
             }
-            if (Array.isArray(params.additionalTicketText.$nin)) {
-                andConditions.push({
-                    additionalTicketText: {
-                        $nin: params.additionalTicketText.$nin
-                    }
-                });
-            }
+            // 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;
+                // const additionalTicketTextOptions = params.additionalTicketText?.$options;
                 andConditions.push({
                     additionalTicketText: {
                         $exists: true,
                         $regex: new RegExp(additionalTicketTextRegex),
-                        ...(typeof additionalTicketTextOptions === 'string') ? { $options: additionalTicketTextOptions } : undefined
+                        // ...(typeof additionalTicketTextOptions === 'string') ? { $options: additionalTicketTextOptions } : undefined
                     }
                 });
             }
@@ -156,237 +155,186 @@ function CREATE_MONGO_CONDITIONS(params) {
     if (Array.isArray(params.reservationStatuses)) {
         andConditions.push({ reservationStatus: { $in: params.reservationStatuses } });
     }
-    /* istanbul ignore else */
-    if (params.modifiedFrom instanceof Date) {
+    // if (params.modifiedFrom instanceof Date) {
+    //     andConditions.push({
+    //         modifiedTime: { $gte: params.modifiedFrom }
+    //     });
+    // }
+    // if (params.modifiedThrough instanceof Date) {
+    //     andConditions.push({
+    //         modifiedTime: { $lte: params.modifiedThrough }
+    //     });
+    // }
+    if (params.bookingFrom instanceof Date) {
         andConditions.push({
-            modifiedTime: { $gte: params.modifiedFrom }
+            bookingTime: { $gte: params.bookingFrom }
         });
     }
-    /* istanbul ignore else */
-    if (params.modifiedThrough instanceof Date) {
+    if (params.bookingThrough instanceof Date) {
         andConditions.push({
-            modifiedTime: { $lte: params.modifiedThrough }
+            bookingTime: { $lte: params.bookingThrough }
         });
     }
-    /* istanbul ignore else */
-    if (params.bookingFrom instanceof Date) {
+    if (typeof params.reservationFor?.id === 'string') {
         andConditions.push({
-            bookingTime: {
+            'reservationFor.id': {
                 $exists: true,
-                $gte: params.bookingFrom
+                $eq: params.reservationFor.id
             }
         });
     }
-    /* istanbul ignore else */
-    if (params.bookingThrough instanceof Date) {
-        andConditions.push({
-            bookingTime: {
-                $exists: true,
-                $lte: params.bookingThrough
-            }
-        });
+    else {
+        const reservationForIdEq4eventReservation = params.reservationFor?.id?.$eq;
+        if (typeof reservationForIdEq4eventReservation === 'string') {
+            andConditions.push({
+                'reservationFor.id': {
+                    $exists: true,
+                    $eq: reservationForIdEq4eventReservation
+                }
+            });
+        }
     }
-    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
-        //                 }
+    /* istanbul ignore else */
+    if (params.reservationFor !== undefined) {
+        // if (params.reservationFor.typeOf !== undefined) {
+        //     andConditions.push(
+        //         {
+        //             'reservationFor.typeOf': {
+        //                 $exists: true,
+        //                 $eq: params.reservationFor.typeOf
         //             }
-        //         );
-        //     }
-        //     break;
-        case factory_1.factory.reservationType.EventReservation:
-            if (typeof params.reservationFor?.id === 'string') {
+        //         }
+        //     );
+        // }
+        /* 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.id': {
+                    'reservationFor.location.id': {
                         $exists: true,
-                        $eq: params.reservationFor.id
+                        $in: params.reservationFor.location.ids
                     }
                 });
             }
-            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
-                        }
-                    });
+            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 (Array.isArray(params.reservationFor.ids)) {
-                    andConditions.push({
-                        'reservationFor.id': {
-                            $exists: true,
-                            $in: params.reservationFor.ids
-                        }
-                    });
+            });
+        }
+        /* 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.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 (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.location.branchCodes)) {
-                        andConditions.push({
-                            'reservationFor.location.branchCode': {
-                                $exists: true,
-                                $in: params.reservationFor.location.branchCodes
-                            }
-                        });
+                });
+            }
+            /* 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 (params.reservationFor.startFrom instanceof Date) {
+                if (Array.isArray(params.reservationFor.superEvent.location.ids)) {
                     andConditions.push({
-                        'reservationFor.startDate': {
+                        'reservationFor.superEvent.location.id': {
                             $exists: true,
-                            $gte: params.reservationFor.startFrom
+                            $in: params.reservationFor.superEvent.location.ids
                         }
                     });
                 }
                 /* istanbul ignore else */
-                if (params.reservationFor.startThrough instanceof Date) {
+                if (Array.isArray(params.reservationFor.superEvent.location.branchCodes)) {
                     andConditions.push({
-                        'reservationFor.startDate': {
+                        'reservationFor.superEvent.location.branchCode': {
                             $exists: true,
-                            $lte: params.reservationFor.startThrough
+                            $in: params.reservationFor.superEvent.location.branchCodes
                         }
                     });
                 }
+            }
+            /* istanbul ignore else */
+            if (params.reservationFor.superEvent.workPerformed !== undefined) {
                 /* istanbul ignore else */
-                if (params.reservationFor.endFrom instanceof Date) {
+                if (Array.isArray(params.reservationFor.superEvent.workPerformed.ids)) {
                     andConditions.push({
-                        'reservationFor.endDate': {
+                        'reservationFor.superEvent.workPerformed.id': {
                             $exists: true,
-                            $gte: params.reservationFor.endFrom
+                            $in: params.reservationFor.superEvent.workPerformed.ids
                         }
                     });
                 }
                 /* istanbul ignore else */
-                if (params.reservationFor.endThrough instanceof Date) {
+                if (Array.isArray(params.reservationFor.superEvent.workPerformed.identifiers)) {
                     andConditions.push({
-                        'reservationFor.endDate': {
+                        'reservationFor.superEvent.workPerformed.identifier': {
                             $exists: true,
-                            $lte: params.reservationFor.endThrough
+                            $in: params.reservationFor.superEvent.workPerformed.identifiers
                         }
                     });
                 }
-                /* 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) {
@@ -455,41 +403,6 @@ function CREATE_MONGO_CONDITIONS(params) {
             }
         });
     }
-    // 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 */
@@ -606,49 +519,6 @@ function CREATE_MONGO_CONDITIONS(params) {
                 });
             }
         }
-        // /* 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') {
@@ -662,67 +532,5 @@ function CREATE_MONGO_CONDITIONS(params) {
             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;
 }