@chevre/domain 23.2.0-alpha.8 → 23.2.0

package/lib/chevre/repo/reservation.js

@@ -1,46 +1,58 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+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 = require("../factory");
+const factory = __importStar(require("../factory"));
 const settings_1 = require("../settings");
 /**
  * 予約リポジトリ
  */
 class ReservationRepo {
+    // private化(2022-06-08~)
+    reservationModel;
     constructor(connection) {
         this.reservationModel = connection.model(reservation_1.modelName, (0, reservation_1.createSchema)());
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
         // MongoDB検索条件
         const andConditions = [
             { typeOf: { $eq: params.typeOf } }
         ];
-        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        const providerIdEq = (_d = (_c = params.provider) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        const providerIdEq = params.provider?.id?.$eq;
         if (typeof providerIdEq === 'string') {
             andConditions.push({ 'provider.id': { $eq: providerIdEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(params.ids)) {
             andConditions.push({ _id: { $in: params.ids } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.id !== undefined && params.id !== null) {
             if (typeof params.id.$eq === 'string') {
@@ -56,7 +68,6 @@ class ReservationRepo {
                 andConditions.push({ _id: { $nin: params.id.$nin } });
             }
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(params.reservationNumbers)) {
             andConditions.push({
@@ -65,7 +76,6 @@ class ReservationRepo {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.reservationNumber !== undefined && params.reservationNumber !== null) {
             if (typeof params.reservationNumber === 'string') {
@@ -108,7 +118,6 @@ class ReservationRepo {
                 }
             }
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.additionalTicketText !== undefined && params.additionalTicketText !== null) {
             if (typeof params.additionalTicketText === 'string') {
@@ -152,47 +161,47 @@ class ReservationRepo {
                         }
                     });
                 }
-                const additionalTicketTextRegex = (_e = params.additionalTicketText) === null || _e === void 0 ? void 0 : _e.$regex;
+                const additionalTicketTextRegex = params.additionalTicketText?.$regex;
                 if (typeof additionalTicketTextRegex === 'string' && additionalTicketTextRegex.length > 0) {
-                    const additionalTicketTextOptions = (_f = params.additionalTicketText) === null || _f === void 0 ? void 0 : _f.$options;
+                    const additionalTicketTextOptions = params.additionalTicketText?.$options;
                     andConditions.push({
-                        additionalTicketText: Object.assign({ $exists: true, $regex: new RegExp(additionalTicketTextRegex) }, (typeof additionalTicketTextOptions === 'string') ? { $options: additionalTicketTextOptions } : undefined)
+                        additionalTicketText: {
+                            $exists: true,
+                            $regex: new RegExp(additionalTicketTextRegex),
+                            ...(typeof additionalTicketTextOptions === 'string') ? { $options: additionalTicketTextOptions } : undefined
+                        }
                     });
                 }
             }
         }
-        const reservationStatusEq = (_g = params.reservationStatus) === null || _g === void 0 ? void 0 : _g.$eq;
+        const reservationStatusEq = params.reservationStatus?.$eq;
         if (typeof reservationStatusEq === 'string') {
             andConditions.push({ reservationStatus: { $eq: reservationStatusEq } });
         }
-        const reservationStatusNe = (_h = params.reservationStatus) === null || _h === void 0 ? void 0 : _h.$ne;
+        const reservationStatusNe = params.reservationStatus?.$ne;
         if (typeof reservationStatusNe === 'string') {
             andConditions.push({ reservationStatus: { $ne: reservationStatusNe } });
         }
-        const reservationStatusIn = (_j = params.reservationStatus) === null || _j === void 0 ? void 0 : _j.$in;
+        const reservationStatusIn = params.reservationStatus?.$in;
         if (Array.isArray(reservationStatusIn)) {
             andConditions.push({ reservationStatus: { $in: reservationStatusIn } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(params.reservationStatuses)) {
             andConditions.push({ reservationStatus: { $in: params.reservationStatuses } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.modifiedFrom instanceof Date) {
             andConditions.push({
                 modifiedTime: { $gte: params.modifiedFrom }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.modifiedThrough instanceof Date) {
             andConditions.push({
                 modifiedTime: { $lte: params.modifiedThrough }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.bookingFrom instanceof Date) {
             andConditions.push({
@@ -202,7 +211,6 @@ class ReservationRepo {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.bookingThrough instanceof Date) {
             andConditions.push({
@@ -214,7 +222,7 @@ class ReservationRepo {
         }
         switch (params.typeOf) {
             case factory.reservationType.BusReservation:
-                const reservationForTypeOfEq = (_k = params.reservationFor) === null || _k === void 0 ? void 0 : _k.typeOf;
+                const reservationForTypeOfEq = params.reservationFor?.typeOf;
                 if (typeof reservationForTypeOfEq === 'string') {
                     andConditions.push({
                         'reservationFor.typeOf': {
@@ -223,7 +231,7 @@ class ReservationRepo {
                         }
                     });
                 }
-                const reservationForIdEq = (_m = (_l = params.reservationFor) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
+                const reservationForIdEq = params.reservationFor?.id?.$eq;
                 if (typeof reservationForIdEq === 'string') {
                     andConditions.push({
                         'reservationFor.id': {
@@ -232,7 +240,7 @@ class ReservationRepo {
                         }
                     });
                 }
-                const reservationForIdIn = (_p = (_o = params.reservationFor) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$in;
+                const reservationForIdIn = params.reservationFor?.id?.$in;
                 if (Array.isArray(reservationForIdIn)) {
                     andConditions.push({
                         'reservationFor.id': {
@@ -243,7 +251,7 @@ class ReservationRepo {
                 }
                 break;
             case factory.reservationType.EventReservation:
-                if (typeof ((_q = params.reservationFor) === null || _q === void 0 ? void 0 : _q.id) === 'string') {
+                if (typeof params.reservationFor?.id === 'string') {
                     andConditions.push({
                         'reservationFor.id': {
                             $exists: true,
@@ -252,7 +260,7 @@ class ReservationRepo {
                     });
                 }
                 else {
-                    const reservationForIdEq4eventReservation = (_s = (_r = params.reservationFor) === null || _r === void 0 ? void 0 : _r.id) === null || _s === void 0 ? void 0 : _s.$eq;
+                    const reservationForIdEq4eventReservation = params.reservationFor?.id?.$eq;
                     if (typeof reservationForIdEq4eventReservation === 'string') {
                         andConditions.push({
                             'reservationFor.id': {
@@ -262,10 +270,8 @@ class ReservationRepo {
                         });
                     }
                 }
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (params.reservationFor !== undefined) {
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (params.reservationFor.typeOf !== undefined) {
                         andConditions.push({
@@ -275,7 +281,6 @@ class ReservationRepo {
                             }
                         });
                     }
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (Array.isArray(params.reservationFor.ids)) {
                         andConditions.push({
@@ -285,10 +290,8 @@ class ReservationRepo {
                             }
                         });
                     }
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (params.reservationFor.location !== undefined) {
-                        // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore else */
                         if (Array.isArray(params.reservationFor.location.ids)) {
                             andConditions.push({
@@ -298,7 +301,6 @@ class ReservationRepo {
                                 }
                             });
                         }
-                        // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore else */
                         if (Array.isArray(params.reservationFor.location.branchCodes)) {
                             andConditions.push({
@@ -309,7 +311,6 @@ class ReservationRepo {
                             });
                         }
                     }
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (params.reservationFor.startFrom instanceof Date) {
                         andConditions.push({
@@ -319,7 +320,6 @@ class ReservationRepo {
                             }
                         });
                     }
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (params.reservationFor.startThrough instanceof Date) {
                         andConditions.push({
@@ -329,7 +329,6 @@ class ReservationRepo {
                             }
                         });
                     }
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (params.reservationFor.endFrom instanceof Date) {
                         andConditions.push({
@@ -339,7 +338,6 @@ class ReservationRepo {
                             }
                         });
                     }
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (params.reservationFor.endThrough instanceof Date) {
                         andConditions.push({
@@ -349,10 +347,8 @@ class ReservationRepo {
                             }
                         });
                     }
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (params.reservationFor.superEvent !== undefined) {
-                        // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore else */
                         if (params.reservationFor.superEvent.id !== undefined) {
                             andConditions.push({
@@ -362,7 +358,6 @@ class ReservationRepo {
                                 }
                             });
                         }
-                        // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore else */
                         if (Array.isArray(params.reservationFor.superEvent.ids)) {
                             andConditions.push({
@@ -372,10 +367,8 @@ class ReservationRepo {
                                 }
                             });
                         }
-                        // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore else */
                         if (params.reservationFor.superEvent.location !== undefined) {
-                            // tslint:disable-next-line:no-single-line-block-comment
                             /* istanbul ignore else */
                             if (Array.isArray(params.reservationFor.superEvent.location.ids)) {
                                 andConditions.push({
@@ -385,7 +378,6 @@ class ReservationRepo {
                                     }
                                 });
                             }
-                            // tslint:disable-next-line:no-single-line-block-comment
                             /* istanbul ignore else */
                             if (Array.isArray(params.reservationFor.superEvent.location.branchCodes)) {
                                 andConditions.push({
@@ -396,10 +388,8 @@ class ReservationRepo {
                                 });
                             }
                         }
-                        // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore else */
                         if (params.reservationFor.superEvent.workPerformed !== undefined) {
-                            // tslint:disable-next-line:no-single-line-block-comment
                             /* istanbul ignore else */
                             if (Array.isArray(params.reservationFor.superEvent.workPerformed.ids)) {
                                 andConditions.push({
@@ -409,7 +399,6 @@ class ReservationRepo {
                                     }
                                 });
                             }
-                            // tslint:disable-next-line:no-single-line-block-comment
                             /* istanbul ignore else */
                             if (Array.isArray(params.reservationFor.superEvent.workPerformed.identifiers)) {
                                 andConditions.push({
@@ -427,13 +416,10 @@ class ReservationRepo {
                 break;
             default:
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.reservedTicket !== undefined) {
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (params.reservedTicket.ticketType !== undefined) {
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (Array.isArray(params.reservedTicket.ticketType.ids)) {
                     andConditions.push({
@@ -443,10 +429,8 @@ class ReservationRepo {
                         }
                     });
                 }
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (params.reservedTicket.ticketType.category !== undefined) {
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (Array.isArray(params.reservedTicket.ticketType.category.ids)) {
                         andConditions.push({
@@ -456,7 +440,6 @@ class ReservationRepo {
                             }
                         });
                     }
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (params.reservedTicket.ticketType.category.codeValue !== undefined
                         && params.reservedTicket.ticketType.category !== null) {
@@ -471,10 +454,8 @@ class ReservationRepo {
                     }
                 }
             }
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (params.reservedTicket.ticketedSeat !== undefined) {
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (Array.isArray(params.reservedTicket.ticketedSeat.seatNumbers)) {
                     andConditions.push({
@@ -484,7 +465,6 @@ class ReservationRepo {
                         }
                     });
                 }
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (Array.isArray(params.reservedTicket.ticketedSeat.seatRows)) {
                     andConditions.push({
@@ -494,7 +474,6 @@ class ReservationRepo {
                         }
                     });
                 }
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (Array.isArray(params.reservedTicket.ticketedSeat.seatSections)) {
                     andConditions.push({
@@ -504,9 +483,8 @@ class ReservationRepo {
                         }
                     });
                 }
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const ticketedSeatSeatingTypeIn = (_u = (_t = params.reservedTicket.ticketedSeat) === null || _t === void 0 ? void 0 : _t.seatingType) === null || _u === void 0 ? void 0 : _u.$in;
+                const ticketedSeatSeatingTypeIn = params.reservedTicket.ticketedSeat?.seatingType?.$in;
                 if (Array.isArray(ticketedSeatSeatingTypeIn)) {
                     andConditions.push({
                         'reservedTicket.ticketedSeat.seatingType': {
@@ -517,7 +495,7 @@ class ReservationRepo {
                 }
             }
         }
-        const brokerIdRegex = (_v = params.broker) === null || _v === void 0 ? void 0 : _v.id;
+        const brokerIdRegex = params.broker?.id;
         if (typeof brokerIdRegex === 'string' && brokerIdRegex.length > 0) {
             andConditions.push({
                 'broker.id': {
@@ -526,7 +504,7 @@ class ReservationRepo {
                 }
             });
         }
-        const brokerIdentifierAll = (_x = (_w = params.broker) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$all;
+        const brokerIdentifierAll = params.broker?.identifier?.$all;
         if (Array.isArray(brokerIdentifierAll)) {
             andConditions.push({
                 'broker.identifier': {
@@ -535,7 +513,7 @@ class ReservationRepo {
                 }
             });
         }
-        const brokerIdentifierIn = (_z = (_y = params.broker) === null || _y === void 0 ? void 0 : _y.identifier) === null || _z === void 0 ? void 0 : _z.$in;
+        const brokerIdentifierIn = params.broker?.identifier?.$in;
         if (Array.isArray(brokerIdentifierIn)) {
             andConditions.push({
                 'broker.identifier': {
@@ -544,7 +522,7 @@ class ReservationRepo {
                 }
             });
         }
-        const brokerIdentifierNin = (_1 = (_0 = params.broker) === null || _0 === void 0 ? void 0 : _0.identifier) === null || _1 === void 0 ? void 0 : _1.$nin;
+        const brokerIdentifierNin = params.broker?.identifier?.$nin;
         if (Array.isArray(brokerIdentifierNin)) {
             andConditions.push({
                 'broker.identifier': {
@@ -552,7 +530,7 @@ class ReservationRepo {
                 }
             });
         }
-        const brokerIdentifierElemMatch = (_3 = (_2 = params.broker) === null || _2 === void 0 ? void 0 : _2.identifier) === null || _3 === void 0 ? void 0 : _3.$elemMatch;
+        const brokerIdentifierElemMatch = params.broker?.identifier?.$elemMatch;
         if (brokerIdentifierElemMatch !== undefined && brokerIdentifierElemMatch !== null) {
             andConditions.push({
                 'broker.identifier': {
@@ -561,10 +539,8 @@ class ReservationRepo {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.underName !== undefined) {
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof params.underName.id === 'string' && params.underName.id.length > 0) {
                 andConditions.push({
@@ -574,7 +550,6 @@ class ReservationRepo {
                     }
                 });
             }
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof params.underName.email === 'string') {
                 if (params.underName.email.length > 0) {
@@ -587,15 +562,18 @@ class ReservationRepo {
                 }
             }
             else {
-                const emailRegex = (_4 = params.underName.email) === null || _4 === void 0 ? void 0 : _4.$regex;
+                const emailRegex = params.underName.email?.$regex;
                 if (typeof emailRegex === 'string' && emailRegex.length > 0) {
-                    const emailOptions = (_5 = params.underName.email) === null || _5 === void 0 ? void 0 : _5.$options;
+                    const emailOptions = params.underName.email?.$options;
                     andConditions.push({
-                        'underName.email': Object.assign({ $exists: true, $regex: new RegExp(emailRegex) }, (typeof emailOptions === 'string') ? { $options: emailOptions } : undefined)
+                        'underName.email': {
+                            $exists: true,
+                            $regex: new RegExp(emailRegex),
+                            ...(typeof emailOptions === 'string') ? { $options: emailOptions } : undefined
+                        }
                     });
                 }
             }
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof params.underName.name === 'string') {
                 if (params.underName.name.length > 0) {
@@ -608,15 +586,18 @@ class ReservationRepo {
                 }
             }
             else {
-                const underNameNameRegex = (_6 = params.underName.name) === null || _6 === void 0 ? void 0 : _6.$regex;
+                const underNameNameRegex = params.underName.name?.$regex;
                 if (typeof underNameNameRegex === 'string' && underNameNameRegex.length > 0) {
-                    const underNameNameOptions = (_7 = params.underName.name) === null || _7 === void 0 ? void 0 : _7.$options;
+                    const underNameNameOptions = params.underName.name?.$options;
                     andConditions.push({
-                        'underName.name': Object.assign({ $exists: true, $regex: new RegExp(underNameNameRegex) }, (typeof underNameNameOptions === 'string') ? { $options: underNameNameOptions } : undefined)
+                        'underName.name': {
+                            $exists: true,
+                            $regex: new RegExp(underNameNameRegex),
+                            ...(typeof underNameNameOptions === 'string') ? { $options: underNameNameOptions } : undefined
+                        }
                     });
                 }
             }
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof params.underName.telephone === 'string' && params.underName.telephone.length > 0) {
                 andConditions.push({
@@ -626,7 +607,6 @@ class ReservationRepo {
                     }
                 });
             }
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof params.underName.givenName === 'string') {
                 if (params.underName.givenName.length > 0) {
@@ -639,15 +619,18 @@ class ReservationRepo {
                 }
             }
             else {
-                const givenNameRegex = (_8 = params.underName.givenName) === null || _8 === void 0 ? void 0 : _8.$regex;
+                const givenNameRegex = params.underName.givenName?.$regex;
                 if (typeof givenNameRegex === 'string' && givenNameRegex.length > 0) {
-                    const givenNameOptions = (_9 = params.underName.givenName) === null || _9 === void 0 ? void 0 : _9.$options;
+                    const givenNameOptions = params.underName.givenName?.$options;
                     andConditions.push({
-                        'underName.givenName': Object.assign({ $exists: true, $regex: new RegExp(givenNameRegex) }, (typeof givenNameOptions === 'string') ? { $options: givenNameOptions } : undefined)
+                        'underName.givenName': {
+                            $exists: true,
+                            $regex: new RegExp(givenNameRegex),
+                            ...(typeof givenNameOptions === 'string') ? { $options: givenNameOptions } : undefined
+                        }
                     });
                 }
             }
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof params.underName.familyName === 'string') {
                 if (params.underName.familyName.length > 0) {
@@ -660,15 +643,18 @@ class ReservationRepo {
                 }
             }
             else {
-                const familyNameRegex = (_10 = params.underName.familyName) === null || _10 === void 0 ? void 0 : _10.$regex;
+                const familyNameRegex = params.underName.familyName?.$regex;
                 if (typeof familyNameRegex === 'string' && familyNameRegex.length > 0) {
-                    const familyNameOptions = (_11 = params.underName.familyName) === null || _11 === void 0 ? void 0 : _11.$options;
+                    const familyNameOptions = params.underName.familyName?.$options;
                     andConditions.push({
-                        'underName.familyName': Object.assign({ $exists: true, $regex: new RegExp(familyNameRegex) }, (typeof familyNameOptions === 'string') ? { $options: familyNameOptions } : undefined)
+                        'underName.familyName': {
+                            $exists: true,
+                            $regex: new RegExp(familyNameRegex),
+                            ...(typeof familyNameOptions === 'string') ? { $options: familyNameOptions } : undefined
+                        }
                     });
                 }
             }
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (params.underName.identifier !== undefined) {
                 if (Array.isArray(params.underName.identifier.$all)) {
@@ -703,7 +689,6 @@ class ReservationRepo {
                     });
                 }
             }
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (Array.isArray(params.underName.identifiers)) {
                 andConditions.push({
@@ -714,21 +699,18 @@ class ReservationRepo {
                 });
             }
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof params.attended === 'boolean') {
             andConditions.push({
                 attended: params.attended
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof params.checkedIn === 'boolean') {
             andConditions.push({
                 checkedIn: params.checkedIn
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.additionalProperty !== undefined) {
             if (Array.isArray(params.additionalProperty.$all)) {
@@ -763,7 +745,7 @@ class ReservationRepo {
                 });
             }
         }
-        const programMembershipUsedIdentifierEq = (_13 = (_12 = params.programMembershipUsed) === null || _12 === void 0 ? void 0 : _12.identifier) === null || _13 === void 0 ? void 0 : _13.$eq;
+        const programMembershipUsedIdentifierEq = params.programMembershipUsed?.identifier?.$eq;
         if (typeof programMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'programMembershipUsed.identifier': {
@@ -772,7 +754,7 @@ class ReservationRepo {
                 }
             });
         }
-        const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_17 = (_16 = (_15 = (_14 = params.programMembershipUsed) === null || _14 === void 0 ? void 0 : _14.issuedThrough) === null || _15 === void 0 ? void 0 : _15.serviceType) === null || _16 === void 0 ? void 0 : _16.codeValue) === null || _17 === void 0 ? void 0 : _17.$eq;
+        const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = params.programMembershipUsed?.issuedThrough?.serviceType?.codeValue?.$eq;
         if (typeof programMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -781,7 +763,7 @@ class ReservationRepo {
                 }
             });
         }
-        const appliesToMovieTicketIdentifierEq = (_21 = (_20 = (_19 = (_18 = params.price) === null || _18 === void 0 ? void 0 : _18.priceComponent) === null || _19 === void 0 ? void 0 : _19.appliesToMovieTicket) === null || _20 === void 0 ? void 0 : _20.identifier) === null || _21 === void 0 ? void 0 : _21.$eq;
+        const appliesToMovieTicketIdentifierEq = params.price?.priceComponent?.appliesToMovieTicket?.identifier?.$eq;
         if (typeof appliesToMovieTicketIdentifierEq === 'string') {
             andConditions.push({
                 'price.priceComponent.appliesToMovieTicket.identifier': {
@@ -795,361 +777,373 @@ class ReservationRepo {
     /**
      * 汎用予約カウント
      */
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = ReservationRepo.CREATE_MONGO_CONDITIONS(params);
-            return this.reservationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
+    async count(params) {
+        const conditions = ReservationRepo.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~)
      */
-    projectFields(params, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const conditions = ReservationRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
-            if (inclusion !== undefined && inclusion !== null) {
-                projection = {
-                    _id: 0, // hide _id(2024-08-08~)
-                    id: { $toString: '$_id' }
-                };
-                for (const [field, value] of Object.entries(inclusion)) {
-                    // 厳密に1を指定されたフィールドのみprojectionに追加
-                    if (value === 1 && field !== '_id' && field !== 'id') {
-                        projection[field] = 1;
-                    }
+    async projectFields(params, inclusion) {
+        const conditions = ReservationRepo.CREATE_MONGO_CONDITIONS(params);
+        let projection = {};
+        if (inclusion !== undefined && inclusion !== null) {
+            projection = {
+                _id: 0, // hide _id(2024-08-08~)
+                id: { $toString: '$_id' }
+            };
+            for (const [field, value] of Object.entries(inclusion)) {
+                // 厳密に1を指定されたフィールドのみprojectionに追加
+                if (value === 1 && field !== '_id' && field !== 'id') {
+                    projection[field] = 1;
                 }
             }
-            else {
-                projection = {
-                    _id: 0, // hide _id(2024-08-08~)
-                    id: { $toString: '$_id' },
-                    project: 1,
-                    provider: 1,
-                    typeOf: 1,
-                    additionalTicketText: 1,
-                    bookingTime: 1,
-                    broker: 1,
-                    modifiedTime: 1,
-                    numSeats: 1,
-                    previousReservationStatus: 1,
-                    price: 1,
-                    priceCurrency: 1,
-                    programMembershipUsed: 1,
-                    reservationFor: 1,
-                    reservationNumber: 1,
-                    reservationStatus: 1,
-                    reservedTicket: 1,
-                    subReservation: 1,
-                    underName: 1,
-                    checkedIn: 1,
-                    attended: 1,
-                    additionalProperty: 1,
-                    issuedThrough: 1
-                };
-            }
-            const query = this.reservationModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                query.limit(params.limit)
-                    .skip(params.limit * (page - 1));
-            }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.bookingTime) !== undefined) {
-                query.sort({ bookingTime: params.sort.bookingTime });
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-        });
+        }
+        else {
+            projection = {
+                _id: 0, // hide _id(2024-08-08~)
+                id: { $toString: '$_id' },
+                project: 1,
+                provider: 1,
+                typeOf: 1,
+                additionalTicketText: 1,
+                bookingTime: 1,
+                broker: 1,
+                modifiedTime: 1,
+                numSeats: 1,
+                previousReservationStatus: 1,
+                price: 1,
+                priceCurrency: 1,
+                programMembershipUsed: 1,
+                reservationFor: 1,
+                reservationNumber: 1,
+                reservationStatus: 1,
+                reservedTicket: 1,
+                subReservation: 1,
+                underName: 1,
+                checkedIn: 1,
+                attended: 1,
+                additionalProperty: 1,
+                issuedThrough: 1
+            };
+        }
+        const query = this.reservationModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+        if (typeof params.limit === 'number' && params.limit > 0) {
+            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            query.limit(params.limit)
+                .skip(params.limit * (page - 1));
+        }
+        /* istanbul ignore else */
+        if (params.sort?.bookingTime !== undefined) {
+            query.sort({ bookingTime: params.sort.bookingTime });
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
     }
-    projectFieldsById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
-            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
-                projection = {
-                    _id: 0, // hide _id(2024-08-08~)
-                    id: { $toString: '$_id' }
-                };
-                params.inclusion.forEach((field) => {
-                    if (String(field) !== '_id' && field !== 'id') {
-                        projection[field] = 1;
-                    }
-                });
-            }
-            else {
-                // discontinue(2024-08-08~)
-                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
-            }
-            const doc = yield this.reservationModel.findById(params.id, projection)
-                .lean() // 2024-08-08~
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.reservationModel.modelName);
-            }
-            return doc;
-        });
+    async projectFieldsById(params) {
+        let projection = {};
+        if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+            projection = {
+                _id: 0, // hide _id(2024-08-08~)
+                id: { $toString: '$_id' }
+            };
+            params.inclusion.forEach((field) => {
+                if (String(field) !== '_id' && field !== 'id') {
+                    projection[field] = 1;
+                }
+            });
+        }
+        else {
+            // discontinue(2024-08-08~)
+            throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+        }
+        const doc = await this.reservationModel.findById(params.id, projection)
+            .lean() // 2024-08-08~
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.reservationModel.modelName);
+        }
+        return doc;
     }
-    confirmManyIfNotExist(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const modifiedTime = new Date();
-            const bulkWriteOps = [];
-            if (Array.isArray(params.subReservation)) {
-                params.subReservation.forEach((subReservation) => {
-                    var _a, _b;
-                    let setOnInsert;
-                    switch (subReservation.typeOf) {
-                        case factory.reservationType.BusReservation:
-                            setOnInsert = Object.assign(Object.assign(Object.assign(Object.assign({}, 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 ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined);
-                            break;
-                        case factory.reservationType.EventReservation:
-                            setOnInsert = Object.assign(Object.assign(Object.assign(Object.assign({}, 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 ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined);
-                            break;
-                        default:
-                            throw new factory.errors.NotImplemented(`${subReservation.typeOf} not implemented`);
+    async confirmManyIfNotExist(params) {
+        const modifiedTime = new Date();
+        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`);
+                }
+                bulkWriteOps.push({
+                    updateOne: {
+                        filter: { _id: { $eq: subReservation.id } },
+                        update: {
+                            $setOnInsert: setOnInsert
+                        },
+                        upsert: true
                     }
-                    bulkWriteOps.push({
-                        updateOne: {
-                            filter: { _id: { $eq: subReservation.id } },
-                            update: {
-                                $setOnInsert: setOnInsert
-                            },
-                            upsert: true
-                        }
-                    });
                 });
-            }
-            if (bulkWriteOps.length > 0) {
-                return this.reservationModel.bulkWrite(bulkWriteOps, { ordered: false });
-            }
-        });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            return this.reservationModel.bulkWrite(bulkWriteOps, { ordered: false });
+        }
     }
     /**
      * 予約取消
      */
-    cancelById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = Object.assign({ _id: { $eq: String(params.id) } }, (typeof params.previousReservationStatus === 'string')
+    async cancelById(params) {
+        const conditions = {
+            _id: { $eq: String(params.id) },
+            // 変更前ステータスの指定があれば条件に追加
+            ...(typeof params.previousReservationStatus === 'string')
                 ? { reservationStatus: { $eq: params.previousReservationStatus } }
-                : undefined);
-            const update = {
-                $set: Object.assign({ reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.modifiedTime }, (typeof params.previousReservationStatus === 'string')
+                : undefined
+        };
+        const update = {
+            $set: {
+                reservationStatus: factory.reservationStatusType.ReservationCancelled,
+                modifiedTime: params.modifiedTime,
+                ...(typeof params.previousReservationStatus === 'string')
                     ? { previousReservationStatus: params.previousReservationStatus }
-                    : undefined)
-            };
-            const doc = yield this.reservationModel.findOneAndUpdate(conditions, update, { new: true, projection: { _id: 1 } })
-                .lean() // 2024-08-07~
-                // .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-                .exec();
-            // NotFoundであれば状態確認
-            if (doc === null) {
-                const { reservationStatus } = yield this.projectFieldsById({ id: String(params.id), inclusion: ['reservationStatus'] });
-                if (reservationStatus === factory.reservationStatusType.ReservationCancelled) {
-                    // すでに取消済の場合
-                    return;
-                    // return reservation;
-                }
-                else {
-                    throw new factory.errors.Argument('id', `Reservation ${params.id} already changed -> ${reservationStatus}`);
-                }
+                    : undefined
             }
-        });
+        };
+        const doc = await this.reservationModel.findOneAndUpdate(conditions, update, { new: true, projection: { _id: 1 } })
+            .lean() // 2024-08-07~
+            // .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+            .exec();
+        // NotFoundであれば状態確認
+        if (doc === null) {
+            const { reservationStatus } = await this.projectFieldsById({ id: String(params.id), inclusion: ['reservationStatus'] });
+            if (reservationStatus === factory.reservationStatusType.ReservationCancelled) {
+                // すでに取消済の場合
+                return;
+                // return reservation;
+            }
+            else {
+                throw new factory.errors.Argument('id', `Reservation ${params.id} already changed -> ${reservationStatus}`);
+            }
+        }
     }
     /**
      * 予約取消
      */
-    cancelByReservationNumber(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = Object.assign({ reservationNumber: { $eq: String(params.reservationNumber) } }, (typeof params.previousReservationStatus === 'string')
+    async cancelByReservationNumber(params) {
+        const conditions = {
+            reservationNumber: { $eq: String(params.reservationNumber) },
+            // 変更前ステータスの指定があれば条件に追加
+            ...(typeof params.previousReservationStatus === 'string')
                 ? { reservationStatus: { $eq: params.previousReservationStatus } }
-                : undefined);
-            const update = {
-                $set: Object.assign({ reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.modifiedTime }, (typeof params.previousReservationStatus === 'string')
+                : undefined
+        };
+        const update = {
+            $set: {
+                reservationStatus: factory.reservationStatusType.ReservationCancelled,
+                modifiedTime: params.modifiedTime,
+                ...(typeof params.previousReservationStatus === 'string')
                     ? { previousReservationStatus: params.previousReservationStatus }
-                    : undefined)
-            };
-            return this.reservationModel.updateMany(conditions, update)
-                .exec();
-        });
+                    : undefined
+            }
+        };
+        return this.reservationModel.updateMany(conditions, update)
+            .exec();
     }
     /**
      * 発券する
      */
-    checkInIfNot(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const { now } = params;
-            if (!(now instanceof Date)) {
-                throw new factory.errors.Argument('now', 'must be Date');
+    async checkInIfNot(params) {
+        const { now } = params;
+        if (!(now instanceof Date)) {
+            throw new factory.errors.Argument('now', 'must be Date');
+        }
+        const conditions = [];
+        if (typeof params.id === 'string') {
+            if (params.id.length > 0) {
+                conditions.push({ _id: { $eq: params.id } });
             }
-            const conditions = [];
-            if (typeof params.id === 'string') {
-                if (params.id.length > 0) {
-                    conditions.push({ _id: { $eq: params.id } });
-                }
+        }
+        else {
+            const idIn = params.id?.$in;
+            if (Array.isArray(idIn)) {
+                conditions.push({ _id: { $in: idIn } });
             }
-            else {
-                const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
-                if (Array.isArray(idIn)) {
-                    conditions.push({ _id: { $in: idIn } });
-                }
+        }
+        if (typeof params.reservationNumber === 'string') {
+            if (params.reservationNumber.length > 0) {
+                conditions.push({ reservationNumber: { $eq: params.reservationNumber } });
             }
-            if (typeof params.reservationNumber === 'string') {
-                if (params.reservationNumber.length > 0) {
-                    conditions.push({ reservationNumber: { $eq: params.reservationNumber } });
-                }
+        }
+        else {
+            const reservationNumberIn = params.reservationNumber?.$in;
+            if (Array.isArray(reservationNumberIn)) {
+                conditions.push({ reservationNumber: { $in: reservationNumberIn } });
             }
-            else {
-                const reservationNumberIn = (_b = params.reservationNumber) === null || _b === void 0 ? void 0 : _b.$in;
-                if (Array.isArray(reservationNumberIn)) {
-                    conditions.push({ reservationNumber: { $in: reservationNumberIn } });
+        }
+        // 無条件で実行されないように
+        if (conditions.length > 0) {
+            // false->trueのみ(2023-01-31~)
+            conditions.push({ checkedIn: { $eq: false } });
+            return this.reservationModel.updateMany({ $and: conditions }, {
+                $set: {
+                    checkedIn: true,
+                    modifiedTime: now,
+                    'reservedTicket.dateIssued': now // set reservedTicket.dateIssued(2024-12-03~)
                 }
-            }
-            // 無条件で実行されないように
-            if (conditions.length > 0) {
-                // false->trueのみ(2023-01-31~)
-                conditions.push({ checkedIn: { $eq: false } });
-                return this.reservationModel.updateMany({ $and: conditions }, {
-                    $set: {
-                        checkedIn: true,
-                        modifiedTime: now,
-                        'reservedTicket.dateIssued': now // set reservedTicket.dateIssued(2024-12-03~)
-                    }
-                })
-                    .exec();
-            }
-            else {
-                return;
-            }
-        });
+            })
+                .exec();
+        }
+        else {
+            return;
+        }
     }
     /**
      * 入場する
      */
-    attendIfNotAttended(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.reservationModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                attended: { $eq: false }
-            }, {
-                $set: {
-                    attended: true,
-                    modifiedTime: params.now,
-                    'reservedTicket.dateUsed': params.now
-                }
-            }, {
-                new: true,
-                projection: {
-                    _id: 0,
-                    id: { $toString: '$_id' },
-                    typeOf: 1,
-                    project: 1,
-                    modifiedTime: 1,
-                    'reservedTicket.dateUsed': 1,
-                    'reservationFor.id': 1,
-                    'reservationFor.typeOf': 1
-                }
-            })
-                .lean() // 2024-08-08~
-                // .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-                .exec();
-            if (doc === null) {
-                return this.projectFieldsById({
-                    id: params.id,
-                    inclusion: [
-                        'typeOf', 'project', 'modifiedTime', 'reservedTicket.dateUsed', 'reservationFor.id', 'reservationFor.typeOf'
-                    ] // inclusion(2024-08-08~)
-                });
-                // throw new factory.errors.NotFound(this.reservationModel.modelName);
+    async attendIfNotAttended(params) {
+        const doc = await this.reservationModel.findOneAndUpdate({
+            _id: { $eq: params.id },
+            attended: { $eq: false }
+        }, {
+            $set: {
+                attended: true,
+                modifiedTime: params.now,
+                'reservedTicket.dateUsed': params.now
             }
-            return doc;
-        });
+        }, {
+            new: true,
+            projection: {
+                _id: 0,
+                id: { $toString: '$_id' },
+                typeOf: 1,
+                project: 1,
+                modifiedTime: 1,
+                'reservedTicket.dateUsed': 1,
+                'reservationFor.id': 1,
+                'reservationFor.typeOf': 1
+            }
+        })
+            .lean() // 2024-08-08~
+            // .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+            .exec();
+        if (doc === null) {
+            return this.projectFieldsById({
+                id: params.id,
+                inclusion: [
+                    'typeOf', 'project', 'modifiedTime', 'reservedTicket.dateUsed', 'reservationFor.id', 'reservationFor.typeOf'
+                ] // inclusion(2024-08-08~)
+            });
+            // throw new factory.errors.NotFound(this.reservationModel.modelName);
+        }
+        return doc;
     }
     /**
      * 予約部分更新
      */
-    updatePartiallyById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.reservationModel.findOneAndUpdate({ _id: { $eq: params.id } }, params.update, { new: true })
-                .select({ _id: 1 })
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    throw new factory.errors.ArgumentNull(this.reservationModel.modelName);
-                }
-            });
+    async updatePartiallyById(params) {
+        return this.reservationModel.findOneAndUpdate({ _id: { $eq: params.id } }, params.update, { new: true })
+            .select({ _id: 1 })
+            .exec()
+            .then((doc) => {
+            if (doc === null) {
+                throw new factory.errors.ArgumentNull(this.reservationModel.modelName);
+            }
         });
     }
-    deleteByIds(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.reservationModel.deleteMany({
-                'project.id': { $eq: params.project.id },
-                _id: { $in: params.ids }
-            })
-                .exec();
-        });
+    async deleteByIds(params) {
+        await this.reservationModel.deleteMany({
+            'project.id': { $eq: params.project.id },
+            _id: { $in: params.ids }
+        })
+            .exec();
     }
-    deleteByReservationNumbers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.reservationModel.deleteMany({
-                'project.id': { $eq: params.project.id },
-                reservationNumber: { $in: params.reservationNumbers }
-            })
-                .exec()
-                .then((result) => {
-                return {
-                    // n: result?.n,
-                    // opTime: result.opTime,
-                    // ok: result?.ok,
-                    // operationTime,
-                    deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
-                };
-            });
+    async deleteByReservationNumbers(params) {
+        return this.reservationModel.deleteMany({
+            'project.id': { $eq: params.project.id },
+            reservationNumber: { $in: params.reservationNumbers }
+        })
+            .exec()
+            .then((result) => {
+            return {
+                // n: result?.n,
+                // opTime: result.opTime,
+                // ok: result?.ok,
+                // operationTime,
+                deletedCount: result?.deletedCount
+            };
         });
     }
-    deleteByProject(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.reservationModel.deleteMany({
-                'project.id': { $eq: params.project.id }
-            })
-                .exec();
-        });
+    async deleteByProject(params) {
+        await this.reservationModel.deleteMany({
+            'project.id': { $eq: params.project.id }
+        })
+            .exec();
     }
-    searchIdsByReservationNumber(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.reservationModel.find({
-                reservationNumber: {
-                    $in: params.reservationNumber.$in
-                }
-            }, {
-                _id: 0,
-                id: { $toString: '$_id' }
-            })
-                .lean()
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map(({ id }) => id));
-        });
+    async searchIdsByReservationNumber(params) {
+        return this.reservationModel.find({
+            reservationNumber: {
+                $in: params.reservationNumber.$in
+            }
+        }, {
+            _id: 0,
+            id: { $toString: '$_id' }
+        })
+            .lean()
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec()
+            .then((docs) => docs.map(({ id }) => id));
     }
     getCursor(conditions, projection) {
         return this.reservationModel.find(conditions, projection)
             .sort({ bookingTime: factory.sortType.Descending })
             .cursor();
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.reservationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.reservationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
 }
 exports.ReservationRepo = ReservationRepo;