@chevre/domain 20.2.0-alpha.10 → 20.2.0-alpha.11

package/example/src/chevre/migrateEventOffersItemOfferedAvailableChannel.ts

@@ -21,7 +21,8 @@ async function main() {
             typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
             startDate: {
                 $gte: moment()
-                    .add(-1, 'month')
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-6, 'months')
                     .toDate()
             }
             // _id: { $eq: 'al6aff83w' }

package/lib/chevre/repo/place.d.ts

@@ -7,6 +7,7 @@ declare type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.scre
 export declare class MongoRepository {
     private readonly placeModel;
     constructor(connection: Connection);
+    static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): any[];
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): any[];
     /**
      * 施設を保管する
@@ -19,7 +20,6 @@ export declare class MongoRepository {
         };
         branchCode: string;
     }): Promise<factory.place.movieTheater.IPlace>;
-    countMovieTheaters(params: factory.place.movieTheater.ISearchConditions): Promise<number>;
     /**
      * 施設検索
      */
@@ -114,6 +114,20 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    saveBusStop(params: factory.place.busStop.IPlace): Promise<factory.place.busStop.IPlace>;
+    findBusStopByBranchCode(params: {
+        project: {
+            id: string;
+        };
+        branchCode: string;
+    }): Promise<factory.place.movieTheater.IPlace>;
+    searchBusStops(params: factory.place.busStop.ISearchConditions): Promise<factory.place.busStop.IPlace[]>;
+    findBusStopById(params: {
+        id: string;
+    }, projection?: any): Promise<factory.place.busStop.IPlace>;
+    deleteBusStopById(params: {
+        id: string;
+    }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }
 export {};

package/lib/chevre/repo/place.js

@@ -32,6 +32,82 @@ class MongoRepository {
         this.placeModel = connection.model(place_1.modelName);
     }
     // tslint:disable-next-line:max-func-body-length
+    static CREATE_BUS_STOP_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const andConditions = [{ typeOf: { $eq: factory.placeType.BusStop } }];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof branchCodeEq === 'string') {
+            andConditions.push({
+                branchCode: {
+                    $exists: true,
+                    $eq: branchCodeEq
+                }
+            });
+        }
+        const branchCodeRegex = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$regex;
+        if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
+            andConditions.push({
+                branchCode: {
+                    $exists: true,
+                    $regex: new RegExp(branchCodeRegex)
+                }
+            });
+        }
+        const branchCodeIn = (_e = params.branchCode) === null || _e === void 0 ? void 0 : _e.$in;
+        if (Array.isArray(branchCodeIn)) {
+            andConditions.push({
+                branchCode: {
+                    $exists: true,
+                    $in: branchCodeIn
+                }
+            });
+        }
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        const idEq = (_f = params.id) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({
+                _id: {
+                    $eq: idEq
+                }
+            });
+        }
+        const idIn = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({
+                _id: {
+                    $in: idIn
+                }
+            });
+        }
+        const nameRegex = (_h = params.name) === null || _h === void 0 ? void 0 : _h.$regex;
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        if (typeof nameRegex === 'string' && nameRegex.length > 0) {
+            andConditions.push({
+                $or: [
+                    {
+                        'name.ja': {
+                            $exists: true,
+                            $regex: new RegExp(nameRegex)
+                        }
+                    },
+                    {
+                        'name.en': {
+                            $exists: true,
+                            $regex: new RegExp(nameRegex)
+                        }
+                    }
+                ]
+            });
+        }
+        return andConditions;
+    }
+    // tslint:disable-next-line:max-func-body-length
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // MongoDB検索条件
@@ -171,6 +247,7 @@ class MongoRepository {
     findMovieTheaterByBranchCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: params.project.id },
                 branchCode: { $eq: params.branchCode }
             })
@@ -183,14 +260,12 @@ class MongoRepository {
             });
         });
     }
-    countMovieTheaters(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
-            return this.placeModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
-                .exec();
-        });
-    }
+    // public async countMovieTheaters(params: factory.place.movieTheater.ISearchConditions): Promise<number> {
+    //     const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
+    //     return this.placeModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
+    //         .setOptions({ maxTimeMS: 10000 })
+    //         .exec();
+    // }
     /**
      * 施設検索
      */
@@ -224,7 +299,10 @@ class MongoRepository {
      */
     findById(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOne({ _id: params.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            const doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                _id: { $eq: params.id }
+            }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.placeModel.modelName);
@@ -235,7 +313,8 @@ class MongoRepository {
     deleteMovieTheaterById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.placeModel.findOneAndDelete({
-                _id: params.id
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                _id: { $eq: params.id }
             })
                 .exec()
                 .then((doc) => {
@@ -1066,6 +1145,92 @@ class MongoRepository {
                 .exec();
         });
     }
+    saveBusStop(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let doc;
+            if (typeof params.id !== 'string' || params.id.length === 0) {
+                doc = yield this.placeModel.create(params);
+            }
+            else {
+                // 上書き禁止属性を除外(2022-08-24~)
+                const { id, branchCode, project, typeOf } = params, updateFields = __rest(params, ["id", "branchCode", "project", "typeOf"]);
+                doc = yield this.placeModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                    .exec();
+            }
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.placeModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    findBusStopByBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.BusStop },
+                'project.id': { $eq: params.project.id },
+                branchCode: { $eq: params.branchCode }
+            })
+                .exec()
+                .then((doc) => {
+                if (doc === null) {
+                    throw new factory.errors.NotFound(`${factory.placeType.BusStop} ${params.branchCode}`);
+                }
+                return doc.toObject();
+            });
+        });
+    }
+    searchBusStops(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_BUS_STOP_MONGO_CONDITIONS(params);
+            // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
+            const query = this.placeModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0,
+                containsPlace: 0
+            });
+            if (typeof params.limit === 'number') {
+                const page = (typeof params.page === 'number') ? 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 (params.sort !== undefined) {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: 10000 })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+    findBusStopById(params, projection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.BusStop },
+                _id: { $eq: params.id }
+            }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.placeModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    deleteBusStopById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.placeModel.findOneAndDelete({
+                typeOf: { $eq: factory.placeType.BusStop },
+                _id: { $eq: params.id }
+            })
+                .exec()
+                .then((doc) => {
+                if (doc === null) {
+                    throw new factory.errors.NotFound(this.placeModel.modelName);
+                }
+            });
+        });
+    }
     getCursor(conditions, projection) {
         return this.placeModel.find(conditions, projection)
             .sort({ branchCode: factory.sortType.Ascending })

package/lib/chevre/repo/reservation.js

@@ -21,7 +21,7 @@ class MongoRepository {
     }
     // 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;
+        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;
         // MongoDB検索条件
         const andConditions = [
             { typeOf: params.typeOf }
@@ -242,7 +242,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForIdEq = (_j = params.reservationFor) === null || _j === void 0 ? void 0 : _j.id;
+                const reservationForIdEq = (_k = (_j = params.reservationFor) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
                 if (typeof reservationForIdEq === 'string') {
                     andConditions.push({
                         'reservationFor.id': {
@@ -251,7 +251,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForIdIn = (_k = params.reservationFor) === null || _k === void 0 ? void 0 : _k.ids;
+                const reservationForIdIn = (_m = (_l = params.reservationFor) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$in;
                 if (Array.isArray(reservationForIdIn)) {
                     andConditions.push({
                         'reservationFor.id': {
@@ -262,6 +262,25 @@ class MongoRepository {
                 }
                 break;
             case factory.reservationType.EventReservation:
+                if (typeof ((_o = params.reservationFor) === null || _o === void 0 ? void 0 : _o.id) === 'string') {
+                    andConditions.push({
+                        'reservationFor.id': {
+                            $exists: true,
+                            $eq: params.reservationFor.id
+                        }
+                    });
+                }
+                else {
+                    const reservationForIdEq4eventReservation = (_q = (_p = params.reservationFor) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$eq;
+                    if (typeof reservationForIdEq4eventReservation === 'string') {
+                        andConditions.push({
+                            'reservationFor.id': {
+                                $exists: true,
+                                $eq: reservationForIdEq4eventReservation
+                            }
+                        });
+                    }
+                }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (params.reservationFor !== undefined) {
@@ -277,16 +296,6 @@ class MongoRepository {
                     }
                     // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
-                    if (params.reservationFor.id !== undefined) {
-                        andConditions.push({
-                            'reservationFor.id': {
-                                $exists: true,
-                                $eq: params.reservationFor.id
-                            }
-                        });
-                    }
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore else */
                     if (Array.isArray(params.reservationFor.ids)) {
                         andConditions.push({
                             'reservationFor.id': {
@@ -516,7 +525,7 @@ class MongoRepository {
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const ticketedSeatSeatingTypeIn = (_m = (_l = params.reservedTicket.ticketedSeat) === null || _l === void 0 ? void 0 : _l.seatingType) === null || _m === void 0 ? void 0 : _m.$in;
+                const ticketedSeatSeatingTypeIn = (_s = (_r = params.reservedTicket.ticketedSeat) === null || _r === void 0 ? void 0 : _r.seatingType) === null || _s === void 0 ? void 0 : _s.$in;
                 if (Array.isArray(ticketedSeatSeatingTypeIn)) {
                     andConditions.push({
                         'reservedTicket.ticketedSeat.seatingType': {
@@ -527,7 +536,7 @@ class MongoRepository {
                 }
             }
         }
-        const brokerIdRegex = (_o = params.broker) === null || _o === void 0 ? void 0 : _o.id;
+        const brokerIdRegex = (_t = params.broker) === null || _t === void 0 ? void 0 : _t.id;
         if (typeof brokerIdRegex === 'string' && brokerIdRegex.length > 0) {
             andConditions.push({
                 'broker.id': {
@@ -536,7 +545,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierAll = (_q = (_p = params.broker) === null || _p === void 0 ? void 0 : _p.identifier) === null || _q === void 0 ? void 0 : _q.$all;
+        const brokerIdentifierAll = (_v = (_u = params.broker) === null || _u === void 0 ? void 0 : _u.identifier) === null || _v === void 0 ? void 0 : _v.$all;
         if (Array.isArray(brokerIdentifierAll)) {
             andConditions.push({
                 'broker.identifier': {
@@ -545,7 +554,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierIn = (_s = (_r = params.broker) === null || _r === void 0 ? void 0 : _r.identifier) === null || _s === void 0 ? void 0 : _s.$in;
+        const brokerIdentifierIn = (_x = (_w = params.broker) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$in;
         if (Array.isArray(brokerIdentifierIn)) {
             andConditions.push({
                 'broker.identifier': {
@@ -554,7 +563,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierNin = (_u = (_t = params.broker) === null || _t === void 0 ? void 0 : _t.identifier) === null || _u === void 0 ? void 0 : _u.$nin;
+        const brokerIdentifierNin = (_z = (_y = params.broker) === null || _y === void 0 ? void 0 : _y.identifier) === null || _z === void 0 ? void 0 : _z.$nin;
         if (Array.isArray(brokerIdentifierNin)) {
             andConditions.push({
                 'broker.identifier': {
@@ -562,7 +571,7 @@ class MongoRepository {
                 }
             });
         }
-        const brokerIdentifierElemMatch = (_w = (_v = params.broker) === null || _v === void 0 ? void 0 : _v.identifier) === null || _w === void 0 ? void 0 : _w.$elemMatch;
+        const brokerIdentifierElemMatch = (_1 = (_0 = params.broker) === null || _0 === void 0 ? void 0 : _0.identifier) === null || _1 === void 0 ? void 0 : _1.$elemMatch;
         if (brokerIdentifierElemMatch !== undefined && brokerIdentifierElemMatch !== null) {
             andConditions.push({
                 'broker.identifier': {
@@ -597,9 +606,9 @@ class MongoRepository {
                 }
             }
             else {
-                const emailRegex = (_x = params.underName.email) === null || _x === void 0 ? void 0 : _x.$regex;
+                const emailRegex = (_2 = params.underName.email) === null || _2 === void 0 ? void 0 : _2.$regex;
                 if (typeof emailRegex === 'string' && emailRegex.length > 0) {
-                    const emailOptions = (_y = params.underName.email) === null || _y === void 0 ? void 0 : _y.$options;
+                    const emailOptions = (_3 = params.underName.email) === null || _3 === void 0 ? void 0 : _3.$options;
                     andConditions.push({
                         'underName.email': Object.assign({ $exists: true, $regex: new RegExp(emailRegex) }, (typeof emailOptions === 'string') ? { $options: emailOptions } : undefined)
                     });
@@ -618,9 +627,9 @@ class MongoRepository {
                 }
             }
             else {
-                const underNameNameRegex = (_z = params.underName.name) === null || _z === void 0 ? void 0 : _z.$regex;
+                const underNameNameRegex = (_4 = params.underName.name) === null || _4 === void 0 ? void 0 : _4.$regex;
                 if (typeof underNameNameRegex === 'string' && underNameNameRegex.length > 0) {
-                    const underNameNameOptions = (_0 = params.underName.name) === null || _0 === void 0 ? void 0 : _0.$options;
+                    const underNameNameOptions = (_5 = params.underName.name) === null || _5 === void 0 ? void 0 : _5.$options;
                     andConditions.push({
                         'underName.name': Object.assign({ $exists: true, $regex: new RegExp(underNameNameRegex) }, (typeof underNameNameOptions === 'string') ? { $options: underNameNameOptions } : undefined)
                     });
@@ -649,9 +658,9 @@ class MongoRepository {
                 }
             }
             else {
-                const givenNameRegex = (_1 = params.underName.givenName) === null || _1 === void 0 ? void 0 : _1.$regex;
+                const givenNameRegex = (_6 = params.underName.givenName) === null || _6 === void 0 ? void 0 : _6.$regex;
                 if (typeof givenNameRegex === 'string' && givenNameRegex.length > 0) {
-                    const givenNameOptions = (_2 = params.underName.givenName) === null || _2 === void 0 ? void 0 : _2.$options;
+                    const givenNameOptions = (_7 = params.underName.givenName) === null || _7 === void 0 ? void 0 : _7.$options;
                     andConditions.push({
                         'underName.givenName': Object.assign({ $exists: true, $regex: new RegExp(givenNameRegex) }, (typeof givenNameOptions === 'string') ? { $options: givenNameOptions } : undefined)
                     });
@@ -670,9 +679,9 @@ class MongoRepository {
                 }
             }
             else {
-                const familyNameRegex = (_3 = params.underName.familyName) === null || _3 === void 0 ? void 0 : _3.$regex;
+                const familyNameRegex = (_8 = params.underName.familyName) === null || _8 === void 0 ? void 0 : _8.$regex;
                 if (typeof familyNameRegex === 'string' && familyNameRegex.length > 0) {
-                    const familyNameOptions = (_4 = params.underName.familyName) === null || _4 === void 0 ? void 0 : _4.$options;
+                    const familyNameOptions = (_9 = params.underName.familyName) === null || _9 === void 0 ? void 0 : _9.$options;
                     andConditions.push({
                         'underName.familyName': Object.assign({ $exists: true, $regex: new RegExp(familyNameRegex) }, (typeof familyNameOptions === 'string') ? { $options: familyNameOptions } : undefined)
                     });
@@ -773,7 +782,7 @@ class MongoRepository {
                 });
             }
         }
-        const programMembershipUsedIdentifierEq = (_6 = (_5 = params.programMembershipUsed) === null || _5 === void 0 ? void 0 : _5.identifier) === null || _6 === void 0 ? void 0 : _6.$eq;
+        const programMembershipUsedIdentifierEq = (_11 = (_10 = params.programMembershipUsed) === null || _10 === void 0 ? void 0 : _10.identifier) === null || _11 === void 0 ? void 0 : _11.$eq;
         if (typeof programMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'programMembershipUsed.identifier': {
@@ -782,7 +791,7 @@ class MongoRepository {
                 }
             });
         }
-        const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_10 = (_9 = (_8 = (_7 = params.programMembershipUsed) === null || _7 === void 0 ? void 0 : _7.issuedThrough) === null || _8 === void 0 ? void 0 : _8.serviceType) === null || _9 === void 0 ? void 0 : _9.codeValue) === null || _10 === void 0 ? void 0 : _10.$eq;
+        const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_15 = (_14 = (_13 = (_12 = params.programMembershipUsed) === null || _12 === void 0 ? void 0 : _12.issuedThrough) === null || _13 === void 0 ? void 0 : _13.serviceType) === null || _14 === void 0 ? void 0 : _14.codeValue) === null || _15 === void 0 ? void 0 : _15.$eq;
         if (typeof programMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -791,7 +800,7 @@ class MongoRepository {
                 }
             });
         }
-        const appliesToMovieTicketIdentifierEq = (_14 = (_13 = (_12 = (_11 = params.price) === null || _11 === void 0 ? void 0 : _11.priceComponent) === null || _12 === void 0 ? void 0 : _12.appliesToMovieTicket) === null || _13 === void 0 ? void 0 : _13.identifier) === null || _14 === void 0 ? void 0 : _14.$eq;
+        const appliesToMovieTicketIdentifierEq = (_19 = (_18 = (_17 = (_16 = params.price) === null || _16 === void 0 ? void 0 : _16.priceComponent) === null || _17 === void 0 ? void 0 : _17.appliesToMovieTicket) === null || _18 === void 0 ? void 0 : _18.identifier) === null || _19 === void 0 ? void 0 : _19.$eq;
         if (typeof appliesToMovieTicketIdentifierEq === 'string') {
             andConditions.push({
                 'price.priceComponent.appliesToMovieTicket.identifier': {

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -236,20 +236,23 @@ function aggregateReservationByOffer(params) {
         }
         reservationCount4offer = yield repos.reservation.count({
             typeOf: reservationType,
-            reservationFor: { ids: [params.event.id] },
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } }
         });
         attendeeCount4offer = yield repos.reservation.count({
             typeOf: reservationType,
-            reservationFor: { ids: [params.event.id] },
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } },
             attended: true
         });
         checkInCount4offer = yield repos.reservation.count({
             typeOf: reservationType,
-            reservationFor: { ids: [params.event.id] },
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } },
             checkedIn: true
@@ -407,7 +410,8 @@ function aggregateReservationByEvent(params) {
         }
         reservationCount = yield repos.reservation.count({
             typeOf: reservationType,
-            reservationFor: { ids: [params.event.id] },
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
         });
         // maximumAttendeeCapacityを決定
@@ -437,13 +441,15 @@ function aggregateReservationByEvent(params) {
         }
         attendeeCount = yield repos.reservation.count({
             typeOf: reservationType,
-            reservationFor: { ids: [params.event.id] },
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             attended: true
         });
         checkInCount = yield repos.reservation.count({
             typeOf: reservationType,
-            reservationFor: { ids: [params.event.id] },
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             checkedIn: true
         });

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0-alpha.3",
+    "@chevre/factory": "4.281.0-alpha.4",
     "@cinerino/sdk": "3.135.0-alpha.7",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.10"
+  "version": "20.2.0-alpha.11"
 }