@chevre/domain 20.2.0-alpha.2 → 20.2.0-alpha.21

package/lib/chevre/repo/place.js

@@ -32,15 +32,89 @@ 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検索条件
         const andConditions = [{ typeOf: { $eq: factory.placeType.MovieTheater } }];
         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 }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         const branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof branchCodeEq === 'string') {
@@ -173,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 }
             })
@@ -185,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();
+    // }
     /**
      * 施設検索
      */
@@ -226,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);
@@ -237,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) => {
@@ -435,22 +512,17 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [];
-            if (searchConditions.project !== undefined) {
-                if (searchConditions.project.id !== undefined) {
-                    if (typeof searchConditions.project.id.$eq === 'string') {
-                        matchStages.push({
-                            $match: {
-                                'project.id': { $eq: searchConditions.project.id.$eq }
-                            }
-                        });
-                    }
-                }
+            const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.MovieTheater } } }];
+            const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof projectIdEq === 'string') {
+                matchStages.push({
+                    $match: { 'project.id': { $eq: projectIdEq } }
+                });
             }
             // 施設コード
-            const movieTheaterBranchCodeEq = (_c = (_b = (_a = searchConditions.containedInPlace) === null || _a === void 0 ? void 0 : _a.containedInPlace) === null || _b === void 0 ? void 0 : _b.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
+            const movieTheaterBranchCodeEq = (_e = (_d = (_c = searchConditions.containedInPlace) === null || _c === void 0 ? void 0 : _c.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
             if (typeof movieTheaterBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -462,7 +534,7 @@ class MongoRepository {
                 });
             }
             // スクリーンコード
-            const containedInPlaceBranchCodeEq = (_e = (_d = searchConditions.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
+            const containedInPlaceBranchCodeEq = (_g = (_f = searchConditions.containedInPlace) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
             if (typeof containedInPlaceBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -474,7 +546,7 @@ class MongoRepository {
                 });
             }
             // セクションコード
-            const sectionBranchCodeEq = (_f = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _f === void 0 ? void 0 : _f.$eq;
+            const sectionBranchCodeEq = (_h = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$eq;
             if (typeof sectionBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -485,7 +557,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameCodeRegex = (_g = searchConditions.name) === null || _g === void 0 ? void 0 : _g.$regex;
+            const nameCodeRegex = (_j = searchConditions.name) === null || _j === void 0 ? void 0 : _j.$regex;
             if (typeof nameCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -506,7 +578,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_h = searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$regex;
+            const branchCodeRegex = (_k = searchConditions.branchCode) === null || _k === void 0 ? void 0 : _k.$regex;
             if (typeof branchCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -517,7 +589,7 @@ class MongoRepository {
                     }
                 });
             }
-            const additionalPropertyElemMatch = (_j = searchConditions.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            const additionalPropertyElemMatch = (_l = searchConditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -543,7 +615,7 @@ class MongoRepository {
                                 branchCode: '$branchCode',
                                 name: '$name'
                             }
-                        }, additionalProperty: '$containsPlace.containsPlace.additionalProperty' }, (((_k = searchConditions.$projection) === null || _k === void 0 ? void 0 : _k.seatCount) === 1)
+                        }, additionalProperty: '$containsPlace.containsPlace.additionalProperty' }, (((_m = searchConditions.$projection) === null || _m === void 0 ? void 0 : _m.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {
@@ -595,7 +667,7 @@ class MongoRepository {
     searchScreeningRooms(searchConditions) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [];
+            const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.MovieTheater } } }];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
             if (typeof projectIdEq === 'string') {
                 matchStages.push({
@@ -855,21 +927,16 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchSeats(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [];
-            if (params.project !== undefined) {
-                if (params.project.id !== undefined) {
-                    if (typeof params.project.id.$eq === 'string') {
-                        matchStages.push({
-                            $match: {
-                                'project.id': { $eq: params.project.id.$eq }
-                            }
-                        });
-                    }
-                }
+            const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.MovieTheater } } }];
+            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') {
+                matchStages.push({
+                    $match: { 'project.id': { $eq: projectIdEq } }
+                });
             }
-            const containedInPlaceBranchCodeEq = (_b = (_a = params.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === null || _b === void 0 ? void 0 : _b.$eq;
+            const containedInPlaceBranchCodeEq = (_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$eq;
             if (typeof containedInPlaceBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -880,7 +947,7 @@ class MongoRepository {
                     }
                 });
             }
-            const containedInPlaceBranchCodeIn = (_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$in;
+            const containedInPlaceBranchCodeIn = (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$in;
             if (Array.isArray(containedInPlaceBranchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -934,7 +1001,7 @@ class MongoRepository {
                     });
                 }
             }
-            const branchCodeIn = (_e = params.branchCode) === null || _e === void 0 ? void 0 : _e.$in;
+            const branchCodeIn = (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in;
             if (Array.isArray(branchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -945,7 +1012,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_f = params.branchCode) === null || _f === void 0 ? void 0 : _f.$regex;
+            const branchCodeRegex = (_h = params.branchCode) === null || _h === void 0 ? void 0 : _h.$regex;
             if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
                 matchStages.push({
                     $match: {
@@ -956,7 +1023,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameRegex = (_g = params.name) === null || _g === void 0 ? void 0 : _g.$regex;
+            const nameRegex = (_j = params.name) === null || _j === void 0 ? void 0 : _j.$regex;
             if (typeof nameRegex === 'string' && nameRegex.length > 0) {
                 matchStages.push({
                     $match: {
@@ -977,7 +1044,7 @@ class MongoRepository {
                     }
                 });
             }
-            const seatingTypeEq = (_h = params.seatingType) === null || _h === void 0 ? void 0 : _h.$eq;
+            const seatingTypeEq = (_k = params.seatingType) === null || _k === void 0 ? void 0 : _k.$eq;
             if (typeof seatingTypeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -993,7 +1060,7 @@ class MongoRepository {
                 && params.$projection['containedInPlace.containedInPlace'] === 0) {
                 includeScreeningRooms = false;
             }
-            const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -1078,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/product.d.ts

@@ -52,4 +52,5 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }

package/lib/chevre/repo/product.js

@@ -251,5 +251,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.productModel.find(conditions, projection)
+            .sort({ productID: factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -30,12 +30,6 @@ export declare class MongoRepository {
     /**
      * 予約確定
      */
-    confirm<T extends factory.reservationType>(params: {
-        id: string;
-        previousReservationStatus: factory.reservationStatusType;
-        underName?: factory.reservation.IUnderName<T>;
-        reservedTicket?: factory.reservation.ITicket;
-    }): Promise<factory.reservation.IReservation<T>>;
     confirmByReservationNumber(params: {
         reservationNumber: string;
         previousReservationStatus: factory.reservationStatusType;