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

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/event.js

@@ -34,7 +34,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
-        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;
+        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, _22, _23, _24, _25, _26;
         const andConditions = [{ typeOf: { $eq: conditions.typeOf } }];
         const projectIdEq = (_b = (_a = conditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -131,8 +131,96 @@ class MongoRepository {
         let params;
         switch (conditions.typeOf) {
             case factory.eventType.Event:
-                // no op
-                // params = conditions;
+                params = conditions;
+                // tslint:disable-next-line:no-single-line-block-comment
+                /* istanbul ignore else */
+                if (params.offers !== undefined) {
+                    const itemOfferedIdIn = (_k = (_j = params.offers.itemOffered) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$in;
+                    if (Array.isArray(itemOfferedIdIn)) {
+                        andConditions.push({
+                            'offers.itemOffered.id': {
+                                $exists: true,
+                                $in: itemOfferedIdIn
+                            }
+                        });
+                    }
+                    // tslint:disable-next-line:no-single-line-block-comment
+                    /* istanbul ignore else */
+                    if (params.offers.itemOffered !== undefined) {
+                        // tslint:disable-next-line:no-single-line-block-comment
+                        /* istanbul ignore else */
+                        if (params.offers.itemOffered.serviceOutput !== undefined) {
+                            // tslint:disable-next-line:no-single-line-block-comment
+                            /* istanbul ignore else */
+                            if (params.offers.itemOffered.serviceOutput.reservedTicket !== undefined) {
+                                // tslint:disable-next-line:no-single-line-block-comment
+                                /* istanbul ignore else */
+                                if (params.offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat !== undefined) {
+                                    // tslint:disable-next-line:no-single-line-block-comment
+                                    /* istanbul ignore else */
+                                    if (Array.isArray(params.offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOfs)) {
+                                        andConditions.push({
+                                            'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
+                                                $exists: true,
+                                                $in: params.offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOfs
+                                            }
+                                        });
+                                    }
+                                }
+                            }
+                        }
+                        // tslint:disable-next-line:no-single-line-block-comment
+                        /* istanbul ignore else */
+                        if (params.offers.itemOffered.serviceType !== undefined) {
+                            // tslint:disable-next-line:no-single-line-block-comment
+                            /* istanbul ignore else */
+                            if (Array.isArray(params.offers.itemOffered.serviceType.ids)) {
+                                andConditions.push({
+                                    'offers.itemOffered.serviceType.id': {
+                                        $exists: true,
+                                        $in: params.offers.itemOffered.serviceType.ids
+                                    }
+                                });
+                            }
+                        }
+                    }
+                }
+                const sellerMakesOfferElemMatch4event = (_o = (_m = (_l = params.offers) === null || _l === void 0 ? void 0 : _l.seller) === null || _m === void 0 ? void 0 : _m.makesOffer) === null || _o === void 0 ? void 0 : _o.$elemMatch;
+                if (typeof ((_p = sellerMakesOfferElemMatch4event === null || sellerMakesOfferElemMatch4event === void 0 ? void 0 : sellerMakesOfferElemMatch4event['availableAtOrFrom.id']) === null || _p === void 0 ? void 0 : _p.$eq) === 'string') {
+                    andConditions.push({
+                        'offers.seller.makesOffer': {
+                            $exists: true,
+                            $elemMatch: sellerMakesOfferElemMatch4event
+                        }
+                    });
+                }
+                const reservationForIdentifierEq = (_u = (_t = (_s = (_r = (_q = params.offers) === null || _q === void 0 ? void 0 : _q.itemOffered) === null || _r === void 0 ? void 0 : _r.serviceOutput) === null || _s === void 0 ? void 0 : _s.reservationFor) === null || _t === void 0 ? void 0 : _t.identifier) === null || _u === void 0 ? void 0 : _u.$eq;
+                if (typeof reservationForIdentifierEq === 'string') {
+                    andConditions.push({
+                        'offers.itemOffered.serviceOutput.reservationFor.identifier': {
+                            $exists: true,
+                            $eq: reservationForIdentifierEq
+                        }
+                    });
+                }
+                const reservationForArrivalBusStopBranchCodeEq = (_0 = (_z = (_y = (_x = (_w = (_v = params.offers) === null || _v === void 0 ? void 0 : _v.itemOffered) === null || _w === void 0 ? void 0 : _w.serviceOutput) === null || _x === void 0 ? void 0 : _x.reservationFor) === null || _y === void 0 ? void 0 : _y.arrivalBusStop) === null || _z === void 0 ? void 0 : _z.branchCode) === null || _0 === void 0 ? void 0 : _0.$eq;
+                if (typeof reservationForArrivalBusStopBranchCodeEq === 'string') {
+                    andConditions.push({
+                        'offers.itemOffered.serviceOutput.reservationFor.arrivalBusStop.branchCode': {
+                            $exists: true,
+                            $eq: reservationForArrivalBusStopBranchCodeEq
+                        }
+                    });
+                }
+                const reservationForDepartureBusStopBranchCodeEq = (_6 = (_5 = (_4 = (_3 = (_2 = (_1 = params.offers) === null || _1 === void 0 ? void 0 : _1.itemOffered) === null || _2 === void 0 ? void 0 : _2.serviceOutput) === null || _3 === void 0 ? void 0 : _3.reservationFor) === null || _4 === void 0 ? void 0 : _4.departureBusStop) === null || _5 === void 0 ? void 0 : _5.branchCode) === null || _6 === void 0 ? void 0 : _6.$eq;
+                if (typeof reservationForDepartureBusStopBranchCodeEq === 'string') {
+                    andConditions.push({
+                        'offers.itemOffered.serviceOutput.reservationFor.departureBusStop.branchCode': {
+                            $exists: true,
+                            $eq: reservationForDepartureBusStopBranchCodeEq
+                        }
+                    });
+                }
                 break;
             case factory.eventType.ScreeningEvent:
                 params = conditions;
@@ -158,7 +246,7 @@ class MongoRepository {
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const superEventLocationIdEq = (_l = (_k = (_j = params.superEvent) === null || _j === void 0 ? void 0 : _j.location) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+                const superEventLocationIdEq = (_9 = (_8 = (_7 = params.superEvent) === null || _7 === void 0 ? void 0 : _7.location) === null || _8 === void 0 ? void 0 : _8.id) === null || _9 === void 0 ? void 0 : _9.$eq;
                 if (typeof superEventLocationIdEq === 'string') {
                     andConditions.push({
                         'superEvent.location.id': {
@@ -246,7 +334,7 @@ class MongoRepository {
                             });
                         }
                     }
-                    const itemOfferedIdIn = (_o = (_m = params.offers.itemOffered) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$in;
+                    const itemOfferedIdIn = (_11 = (_10 = params.offers.itemOffered) === null || _10 === void 0 ? void 0 : _10.id) === null || _11 === void 0 ? void 0 : _11.$in;
                     if (Array.isArray(itemOfferedIdIn)) {
                         andConditions.push({
                             'offers.itemOffered.id': {
@@ -296,8 +384,8 @@ class MongoRepository {
                         }
                     }
                 }
-                const sellerMakesOfferElemMatch = (_r = (_q = (_p = params.offers) === null || _p === void 0 ? void 0 : _p.seller) === null || _q === void 0 ? void 0 : _q.makesOffer) === null || _r === void 0 ? void 0 : _r.$elemMatch;
-                if (typeof ((_s = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _s === void 0 ? void 0 : _s.$eq) === 'string') {
+                const sellerMakesOfferElemMatch = (_14 = (_13 = (_12 = params.offers) === null || _12 === void 0 ? void 0 : _12.seller) === null || _13 === void 0 ? void 0 : _13.makesOffer) === null || _14 === void 0 ? void 0 : _14.$elemMatch;
+                if (typeof ((_15 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _15 === void 0 ? void 0 : _15.$eq) === 'string') {
                     andConditions.push({
                         'offers.seller.makesOffer': {
                             $exists: true,
@@ -334,7 +422,7 @@ class MongoRepository {
                         ]
                     });
                 }
-                const locationIdEq = (_u = (_t = params.location) === null || _t === void 0 ? void 0 : _t.id) === null || _u === void 0 ? void 0 : _u.$eq;
+                const locationIdEq = (_17 = (_16 = params.location) === null || _16 === void 0 ? void 0 : _16.id) === null || _17 === void 0 ? void 0 : _17.$eq;
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (typeof locationIdEq === 'string') {
@@ -356,7 +444,7 @@ class MongoRepository {
                         });
                     }
                 }
-                const workPerformedIdentifierIn = (_v = params.workPerformed) === null || _v === void 0 ? void 0 : _v.identifiers;
+                const workPerformedIdentifierIn = (_18 = params.workPerformed) === null || _18 === void 0 ? void 0 : _18.identifiers;
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (Array.isArray(workPerformedIdentifierIn)) {
@@ -367,7 +455,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const videoFormatTypeOfEq = (_x = (_w = params.videoFormat) === null || _w === void 0 ? void 0 : _w.typeOf) === null || _x === void 0 ? void 0 : _x.$eq;
+                const videoFormatTypeOfEq = (_20 = (_19 = params.videoFormat) === null || _19 === void 0 ? void 0 : _19.typeOf) === null || _20 === void 0 ? void 0 : _20.$eq;
                 if (typeof videoFormatTypeOfEq === 'string') {
                     andConditions.push({
                         'videoFormat.typeOf': {
@@ -376,7 +464,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const videoFormatTypeOfIn = (_z = (_y = params.videoFormat) === null || _y === void 0 ? void 0 : _y.typeOf) === null || _z === void 0 ? void 0 : _z.$in;
+                const videoFormatTypeOfIn = (_22 = (_21 = params.videoFormat) === null || _21 === void 0 ? void 0 : _21.typeOf) === null || _22 === void 0 ? void 0 : _22.$in;
                 if (Array.isArray(videoFormatTypeOfIn)) {
                     andConditions.push({
                         'videoFormat.typeOf': {
@@ -385,7 +473,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const soundFormatTypeOfEq = (_1 = (_0 = params.soundFormat) === null || _0 === void 0 ? void 0 : _0.typeOf) === null || _1 === void 0 ? void 0 : _1.$eq;
+                const soundFormatTypeOfEq = (_24 = (_23 = params.soundFormat) === null || _23 === void 0 ? void 0 : _23.typeOf) === null || _24 === void 0 ? void 0 : _24.$eq;
                 if (typeof soundFormatTypeOfEq === 'string') {
                     andConditions.push({
                         'soundFormat.typeOf': {
@@ -394,7 +482,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const soundFormatTypeOfIn = (_3 = (_2 = params.soundFormat) === null || _2 === void 0 ? void 0 : _2.typeOf) === null || _3 === void 0 ? void 0 : _3.$in;
+                const soundFormatTypeOfIn = (_26 = (_25 = params.soundFormat) === null || _25 === void 0 ? void 0 : _25.typeOf) === null || _26 === void 0 ? void 0 : _26.$in;
                 if (Array.isArray(soundFormatTypeOfIn)) {
                     andConditions.push({
                         'soundFormat.typeOf': {

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 })