@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/repo/place/busStop.js

@@ -1,24 +1,4 @@
 "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 __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BusStopRepo = void 0;
 const factory = require("../../factory");
@@ -28,18 +8,17 @@ const civicStructure_1 = require("../mongoose/schemas/civicStructure");
  * ターミナルリポジトリ
  */
 class BusStopRepo {
+    civicStructureModel;
     constructor(connection) {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
     }
-    // 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;
+        const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        const branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
+        const branchCodeEq = params.branchCode?.$eq;
         if (typeof branchCodeEq === 'string') {
             andConditions.push({
                 branchCode: {
@@ -48,7 +27,7 @@ class BusStopRepo {
                 }
             });
         }
-        const branchCodeRegex = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$regex;
+        const branchCodeRegex = params.branchCode?.$regex;
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
             andConditions.push({
                 branchCode: {
@@ -57,7 +36,7 @@ class BusStopRepo {
                 }
             });
         }
-        const branchCodeIn = (_e = params.branchCode) === null || _e === void 0 ? void 0 : _e.$in;
+        const branchCodeIn = params.branchCode?.$in;
         if (Array.isArray(branchCodeIn)) {
             andConditions.push({
                 branchCode: {
@@ -66,9 +45,8 @@ class BusStopRepo {
                 }
             });
         }
-        // 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;
+        const idEq = params.id?.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({
                 _id: {
@@ -76,7 +54,7 @@ class BusStopRepo {
                 }
             });
         }
-        const idIn = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$in;
+        const idIn = params.id?.$in;
         if (Array.isArray(idIn)) {
             andConditions.push({
                 _id: {
@@ -84,8 +62,7 @@ class BusStopRepo {
                 }
             });
         }
-        const nameRegex = (_h = params.name) === null || _h === void 0 ? void 0 : _h.$regex;
-        // tslint:disable-next-line:no-single-line-block-comment
+        const nameRegex = params.name?.$regex;
         /* istanbul ignore else */
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
@@ -107,92 +84,85 @@ class BusStopRepo {
         }
         return andConditions;
     }
-    saveBusStop(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let doc;
-            if (typeof params.id !== 'string' || params.id.length === 0) {
-                doc = yield this.civicStructureModel.create(params);
-            }
-            else {
-                // 上書き禁止属性を除外(2022-08-24~)
-                const { id, branchCode, project, typeOf } = params, updateFields = __rest(params, ["id", "branchCode", "project", "typeOf"]);
-                doc = yield this.civicStructureModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
-                    .exec();
-            }
+    async saveBusStop(params) {
+        let doc;
+        if (typeof params.id !== 'string' || params.id.length === 0) {
+            doc = await this.civicStructureModel.create(params);
+        }
+        else {
+            // 上書き禁止属性を除外(2022-08-24~)
+            const { id, branchCode, project, typeOf, ...updateFields } = params;
+            doc = await this.civicStructureModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                .exec();
+        }
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.civicStructureModel.modelName);
+        }
+        return doc.toObject();
+    }
+    async findBusStopByBranchCode(params) {
+        return this.civicStructureModel.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(this.civicStructureModel.modelName);
+                throw new factory.errors.NotFound(`${factory.placeType.BusStop} ${params.branchCode}`);
             }
             return doc.toObject();
         });
     }
-    findBusStopByBranchCode(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.civicStructureModel.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();
-            });
+    async searchBusStops(params) {
+        const conditions = BusStopRepo.CREATE_BUS_STOP_MONGO_CONDITIONS(params);
+        // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
+        const query = this.civicStructureModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
+            __v: 0,
+            createdAt: 0,
+            updatedAt: 0,
+            containsPlace: 0
         });
+        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?.branchCode !== undefined) {
+            query.sort({ branchCode: params.sort.branchCode });
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec()
+            .then((docs) => docs.map((doc) => doc.toObject()));
     }
-    searchBusStops(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const conditions = BusStopRepo.CREATE_BUS_STOP_MONGO_CONDITIONS(params);
-            // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
-            const query = this.civicStructureModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0,
-                containsPlace: 0
-            });
-            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.branchCode) !== undefined) {
-                query.sort({ branchCode: params.sort.branchCode });
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
-        });
+    async findBusStopById(params, projection) {
+        const doc = await this.civicStructureModel.findOne({
+            typeOf: { $eq: factory.placeType.BusStop },
+            _id: { $eq: params.id }
+        }, {
+            __v: 0,
+            createdAt: 0,
+            updatedAt: 0,
+            ...projection
+        })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.civicStructureModel.modelName);
+        }
+        return doc.toObject();
     }
-    findBusStopById(params, projection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.civicStructureModel.findOne({
-                typeOf: { $eq: factory.placeType.BusStop },
-                _id: { $eq: params.id }
-            }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
-                .exec();
+    async deleteBusStopById(params) {
+        await this.civicStructureModel.findOneAndDelete({
+            typeOf: { $eq: factory.placeType.BusStop },
+            _id: { $eq: params.id },
+            'project.id': { $eq: params.project.id }
+        })
+            .exec()
+            .then((doc) => {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.civicStructureModel.modelName);
             }
-            return doc.toObject();
-        });
-    }
-    deleteBusStopById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.civicStructureModel.findOneAndDelete({
-                typeOf: { $eq: factory.placeType.BusStop },
-                _id: { $eq: params.id },
-                'project.id': { $eq: params.project.id }
-            })
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    throw new factory.errors.NotFound(this.civicStructureModel.modelName);
-                }
-            });
         });
     }
 }

package/lib/chevre/repo/place/entranceGate.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntranceGateRepo = void 0;
 const mongoose_1 = require("mongoose");
@@ -18,6 +9,11 @@ const civicStructure_1 = require("../mongoose/schemas/civicStructure");
  * 施設の入場ゲートリポジトリ
  */
 class EntranceGateRepo {
+    /**
+     * 施設
+     */
+    operator;
+    civicStructureModel;
     constructor(connection, operater) {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.operator = operater;
@@ -28,141 +24,140 @@ class EntranceGateRepo {
     setOperatorId(params) {
         this.operator.id = params.id;
     }
-    findEntranceGates(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const aggregate = this.civicStructureModel.aggregate([
-                {
-                    $unwind: {
-                        path: '$hasEntranceGate'
-                    }
-                },
-                ...this.createMatchStages(params),
-                { $sort: { 'hasEntranceGate.identifier': factory.sortType.Ascending } },
-                {
-                    $project: {
-                        _id: 0,
-                        identifier: '$hasEntranceGate.identifier',
-                        name: '$hasEntranceGate.name'
-                    }
+    async findEntranceGates(params) {
+        const aggregate = this.civicStructureModel.aggregate([
+            {
+                $unwind: {
+                    path: '$hasEntranceGate'
+                }
+            },
+            ...this.createMatchStages(params),
+            { $sort: { 'hasEntranceGate.identifier': factory.sortType.Ascending } },
+            {
+                $project: {
+                    _id: 0,
+                    identifier: '$hasEntranceGate.identifier',
+                    name: '$hasEntranceGate.name'
                 }
-            ]);
-            const { limit, page } = params;
-            if (typeof limit === 'number' && limit > 0) {
-                const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
-                aggregate.skip(limit * (pageMustBePositive - 1))
-                    .limit(limit);
             }
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
+        ]);
+        const { limit, page } = params;
+        if (typeof limit === 'number' && limit > 0) {
+            const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
+            aggregate.skip(limit * (pageMustBePositive - 1))
+                .limit(limit);
+        }
+        return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
     }
-    addEntranceGatesByIdentifierIfNotExist(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { project } = options;
-            const movieTheaterId = new mongoose_1.Types.ObjectId(this.operator.id);
-            const bulkWriteOps = [];
-            if (Array.isArray(params)) {
-                params.forEach(({ $set }) => {
-                    const { identifier, name } = $set;
-                    // ゲートを含まない施設があれば
-                    const filter = {
-                        'project.id': { $eq: project.id },
-                        _id: { $eq: movieTheaterId },
-                        'hasEntranceGate.identifier': { $ne: identifier }
-                    };
-                    const creatingEntranceGate = Object.assign({ identifier, typeOf: factory.placeType.Place }, (typeof (name === null || name === void 0 ? void 0 : name.ja) === 'string' || typeof (name === null || name === void 0 ? void 0 : name.en) === 'string') ? { name } : undefined);
-                    // ゲートをpush
-                    const update = {
-                        $push: { hasEntranceGate: creatingEntranceGate }
-                    };
-                    const updateOne = { filter, update };
-                    bulkWriteOps.push({ updateOne });
-                });
-            }
-            if (bulkWriteOps.length > 0) {
-                const bulkWriteResult = yield this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
-                return { bulkWriteResult };
-            }
-            return {};
-        });
+    async addEntranceGatesByIdentifierIfNotExist(params, options) {
+        const { project } = options;
+        const movieTheaterId = new mongoose_1.Types.ObjectId(this.operator.id);
+        const bulkWriteOps = [];
+        if (Array.isArray(params)) {
+            params.forEach(({ $set }) => {
+                const { identifier, name } = $set;
+                // ゲートを含まない施設があれば
+                const filter = {
+                    'project.id': { $eq: project.id },
+                    _id: { $eq: movieTheaterId },
+                    'hasEntranceGate.identifier': { $ne: identifier }
+                };
+                const creatingEntranceGate = {
+                    identifier,
+                    typeOf: factory.placeType.Place,
+                    ...(typeof name?.ja === 'string' || typeof name?.en === 'string') ? { name } : undefined
+                };
+                // ゲートをpush
+                const update = {
+                    $push: { hasEntranceGate: creatingEntranceGate }
+                };
+                const updateOne = { filter, update };
+                bulkWriteOps.push({ updateOne });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            const bulkWriteResult = await this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
+            return { bulkWriteResult };
+        }
+        return {};
     }
-    updateEntranceGatesByIdentifier(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { project } = options;
-            const movieTheaterId = new mongoose_1.Types.ObjectId(this.operator.id);
-            const bulkWriteOps = [];
-            if (Array.isArray(params)) {
-                params.forEach(({ $set }) => {
-                    const { identifier, name } = $set;
-                    // ゲートを含む施設があれば
-                    const filter = {
-                        'project.id': { $eq: project.id },
-                        _id: { $eq: movieTheaterId },
-                        'hasEntranceGate.identifier': { $eq: identifier }
-                    };
-                    const updatingEntranceGate = Object.assign({ identifier, typeOf: factory.placeType.Place }, (typeof (name === null || name === void 0 ? void 0 : name.ja) === 'string' || typeof (name === null || name === void 0 ? void 0 : name.en) === 'string') ? { name } : undefined);
-                    const update = {
-                        $set: {
-                            'hasEntranceGate.$[entranceGate]': updatingEntranceGate
-                        }
-                    };
-                    // ゲートコードで$set
-                    const arrayFilters = [
-                        { 'entranceGate.identifier': { $eq: identifier } }
-                    ];
-                    const updateOne = { filter, update, arrayFilters };
-                    bulkWriteOps.push({ updateOne });
-                });
-            }
-            if (bulkWriteOps.length > 0) {
-                const bulkWriteResult = yield this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
-                return { bulkWriteResult };
-            }
-            return {};
-        });
+    async updateEntranceGatesByIdentifier(params, options) {
+        const { project } = options;
+        const movieTheaterId = new mongoose_1.Types.ObjectId(this.operator.id);
+        const bulkWriteOps = [];
+        if (Array.isArray(params)) {
+            params.forEach(({ $set }) => {
+                const { identifier, name } = $set;
+                // ゲートを含む施設があれば
+                const filter = {
+                    'project.id': { $eq: project.id },
+                    _id: { $eq: movieTheaterId },
+                    'hasEntranceGate.identifier': { $eq: identifier }
+                };
+                const updatingEntranceGate = {
+                    identifier,
+                    typeOf: factory.placeType.Place,
+                    ...(typeof name?.ja === 'string' || typeof name?.en === 'string') ? { name } : undefined
+                };
+                const update = {
+                    $set: {
+                        'hasEntranceGate.$[entranceGate]': updatingEntranceGate
+                    }
+                };
+                // ゲートコードで$set
+                const arrayFilters = [
+                    { 'entranceGate.identifier': { $eq: identifier } }
+                ];
+                const updateOne = { filter, update, arrayFilters };
+                bulkWriteOps.push({ updateOne });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            const bulkWriteResult = await this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
+            return { bulkWriteResult };
+        }
+        return {};
     }
-    deleteEntranceGatesByIdentifier(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { project } = options;
-            const movieTheaterId = new mongoose_1.Types.ObjectId(this.operator.id);
-            const bulkWriteOps = [];
-            if (Array.isArray(params)) {
-                params.forEach(({ identifier }) => {
-                    // ゲートを含む施設があれば
-                    const filter = {
-                        'project.id': { $eq: project.id },
-                        _id: { $eq: movieTheaterId },
-                        'hasEntranceGate.identifier': { $eq: identifier }
-                    };
-                    // ゲートをpull
-                    const update = {
-                        $pull: { hasEntranceGate: { identifier: { $eq: identifier } } }
-                    };
-                    const updateOne = { filter, update };
-                    bulkWriteOps.push({ updateOne });
-                });
-            }
-            if (bulkWriteOps.length > 0) {
-                const bulkWriteResult = yield this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
-                return { bulkWriteResult };
-            }
-            return {};
-        });
+    async deleteEntranceGatesByIdentifier(params, options) {
+        const { project } = options;
+        const movieTheaterId = new mongoose_1.Types.ObjectId(this.operator.id);
+        const bulkWriteOps = [];
+        if (Array.isArray(params)) {
+            params.forEach(({ identifier }) => {
+                // ゲートを含む施設があれば
+                const filter = {
+                    'project.id': { $eq: project.id },
+                    _id: { $eq: movieTheaterId },
+                    'hasEntranceGate.identifier': { $eq: identifier }
+                };
+                // ゲートをpull
+                const update = {
+                    $pull: { hasEntranceGate: { identifier: { $eq: identifier } } }
+                };
+                const updateOne = { filter, update };
+                bulkWriteOps.push({ updateOne });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            const bulkWriteResult = await this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
+            return { bulkWriteResult };
+        }
+        return {};
     }
     createMatchStages(params) {
-        var _a, _b, _c, _d;
         const matchStages = [
             { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) } } }
         ];
-        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') {
             matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
         }
-        const identifierEq = (_c = params.identifier) === null || _c === void 0 ? void 0 : _c.$eq;
+        const identifierEq = params.identifier?.$eq;
         if (typeof identifierEq === 'string') {
             matchStages.push({ $match: { 'hasEntranceGate.identifier': { $eq: identifierEq } } });
         }
-        const identifierIn = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$in;
+        const identifierIn = params.identifier?.$in;
         if (Array.isArray(identifierIn)) {
             matchStages.push({ $match: { 'hasEntranceGate.identifier': { $in: identifierIn } } });
         }