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

package/lib/chevre/repo/potentialAction.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.PotentialActionRepo = void 0;
 const factory = require("../factory");
@@ -35,98 +15,98 @@ const AVAILABLE_PROJECT_FIELDS = [
  * 潜在アクションリポジトリ
  */
 class PotentialActionRepo {
+    potentialActionModel;
     constructor(connection) {
         this.potentialActionModel = connection.model(potentialAction_1.modelName, (0, potentialAction_1.createSchema)());
     }
-    // tslint:disable-next-line:max-func-body-length
     static CREATE_FILTER_QUERY(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         const andConditions = [];
-        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 projectIdIn = (_d = (_c = params.project) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$in;
+        const projectIdIn = params.project?.id?.$in;
         if (Array.isArray(projectIdIn)) {
             andConditions.push({ 'project.id': { $in: projectIdIn } });
         }
-        const idEq = (_e = params.id) === null || _e === void 0 ? void 0 : _e.$eq;
+        const idEq = params.id?.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
-        const typeOfEq = (_f = params.typeOf) === null || _f === void 0 ? void 0 : _f.$eq;
+        const typeOfEq = params.typeOf?.$eq;
         if (typeof typeOfEq === 'string') {
             andConditions.push({ typeOf: { $eq: typeOfEq } });
         }
-        const urlTemplateEq = (_h = (_g = params.target) === null || _g === void 0 ? void 0 : _g.urlTemplate) === null || _h === void 0 ? void 0 : _h.$eq;
+        const urlTemplateEq = params.target?.urlTemplate?.$eq;
         if (typeof urlTemplateEq === 'string') {
             andConditions.push({ 'target.urlTemplate': { $exists: true, $eq: urlTemplateEq } });
         }
         return andConditions;
     }
-    save(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            let doc;
-            let savedId;
-            const savingId = params.id;
-            if (typeof savingId === 'string') {
-                if (savingId === '') {
-                    throw new factory.errors.ArgumentNull('id');
-                }
-                const _c = params.attributes, { id, project, typeOf, identifier, $unset } = _c, updateFields = __rest(_c, ["id", "project", "typeOf", "identifier", "$unset"]);
-                const filter = {
-                    _id: { $eq: savingId },
-                    'project.id': { $eq: project.id }
-                };
-                const update = Object.assign({ $set: updateFields }, ($unset !== undefined && $unset !== null) ? { $unset } : undefined);
-                const options = {
-                    upsert: false,
-                    new: true,
-                    projection: { _id: 1, id: { $toString: '$_id' } }
-                };
-                doc = yield this.potentialActionModel.findOneAndUpdate(filter, update, options)
-                    .lean()
-                    .exec();
-                if (doc === null) {
-                    throw new factory.errors.NotFound(this.potentialActionModel.modelName);
-                }
-                savedId = savingId;
-            }
-            else {
-                const _d = params.attributes, { $unset, id } = _d, createParams = __rest(_d, ["$unset", "id"]);
-                const result = yield this.potentialActionModel.insertMany(createParams, { rawResult: true });
-                const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
-                if (typeof insertedId !== 'string') {
-                    throw new factory.errors.Internal(`not saved unexpectedly. result:${JSON.stringify(result)}`);
-                }
-                savedId = insertedId;
-            }
-            return { id: savedId };
-        });
-    }
-    projectFields(conditions, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const andConditions = PotentialActionRepo.CREATE_FILTER_QUERY(conditions);
-            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+    async save(params) {
+        let doc;
+        let savedId;
+        const savingId = params.id;
+        if (typeof savingId === 'string') {
+            if (savingId === '') {
+                throw new factory.errors.ArgumentNull('id');
             }
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            const query = this.potentialActionModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
-            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
-                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
-                query.limit(conditions.limit)
-                    .skip(conditions.limit * (page - 1));
-            }
-            if (typeof ((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.identifier) === 'number') {
-                query.sort({ identifier: conditions.sort.identifier });
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            const { id, project, typeOf, identifier, $unset, ...updateFields } = params.attributes;
+            const filter = {
+                _id: { $eq: savingId },
+                'project.id': { $eq: project.id }
+            };
+            const update = {
+                $set: updateFields,
+                ...($unset !== undefined && $unset !== null) ? { $unset } : undefined
+            };
+            const options = {
+                upsert: false,
+                new: true,
+                projection: { _id: 1, id: { $toString: '$_id' } }
+            };
+            doc = await this.potentialActionModel.findOneAndUpdate(filter, update, options)
                 .lean()
                 .exec();
-        });
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.potentialActionModel.modelName);
+            }
+            savedId = savingId;
+        }
+        else {
+            const { $unset, id, ...createParams } = params.attributes;
+            const result = await this.potentialActionModel.insertMany(createParams, { rawResult: true });
+            const insertedId = result.insertedIds?.[0]?.toHexString();
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`not saved unexpectedly. result:${JSON.stringify(result)}`);
+            }
+            savedId = insertedId;
+        }
+        return { id: savedId };
+    }
+    async projectFields(conditions, inclusion) {
+        const andConditions = PotentialActionRepo.CREATE_FILTER_QUERY(conditions);
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.potentialActionModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
+        if (typeof conditions.limit === 'number' && conditions.limit > 0) {
+            const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
+            query.limit(conditions.limit)
+                .skip(conditions.limit * (page - 1));
+        }
+        if (typeof conditions.sort?.identifier === 'number') {
+            query.sort({ identifier: conditions.sort.identifier });
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
     }
     getCursor(conditions, projection) {
         return this.potentialActionModel.find(conditions, projection)

package/lib/chevre/repo/priceSpecification.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.PriceSpecificationRepo = void 0;
 const factory = require("../factory");
@@ -28,25 +8,22 @@ const settings_1 = require("../settings");
  * 価格仕様リポジトリ
  */
 class PriceSpecificationRepo {
+    priceSpecificationModel;
     constructor(connection) {
         this.priceSpecificationModel = connection.model(priceSpecification_1.modelName, (0, priceSpecification_1.createSchema)());
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g;
         const andConditions = [];
-        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 } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.id !== undefined && params.id !== null) {
             if (typeof params.id.$eq === 'string') {
                 andConditions.push({ _id: { $eq: params.id.$eq } });
             }
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.typeOf !== undefined) {
             andConditions.push({ typeOf: params.typeOf });
@@ -109,7 +86,7 @@ class PriceSpecificationRepo {
                 }
             });
         }
-        const appliesToMovieTicketServiceTypeIn = (_c = params.appliesToMovieTicket) === null || _c === void 0 ? void 0 : _c.serviceTypes;
+        const appliesToMovieTicketServiceTypeIn = params.appliesToMovieTicket?.serviceTypes;
         if (Array.isArray(appliesToMovieTicketServiceTypeIn)) {
             andConditions.push({
                 'appliesToMovieTicket.serviceType': {
@@ -118,7 +95,7 @@ class PriceSpecificationRepo {
                 }
             });
         }
-        const appliesToMovieTicketServiceOutputTypeOfEq = (_f = (_e = (_d = params.appliesToMovieTicket) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.typeOf) === null || _f === void 0 ? void 0 : _f.$eq;
+        const appliesToMovieTicketServiceOutputTypeOfEq = params.appliesToMovieTicket?.serviceOutput?.typeOf?.$eq;
         if (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string') {
             andConditions.push({
                 'appliesToMovieTicket.serviceOutput.typeOf': {
@@ -127,7 +104,6 @@ class PriceSpecificationRepo {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.validFrom !== undefined) {
             andConditions.push({
@@ -137,7 +113,6 @@ class PriceSpecificationRepo {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.validThrough !== undefined) {
             andConditions.push({
@@ -147,149 +122,130 @@ class PriceSpecificationRepo {
                 }
             });
         }
-        const priceEq = (_g = params.price) === null || _g === void 0 ? void 0 : _g.$eq;
+        const priceEq = params.price?.$eq;
         if (typeof priceEq === 'number') {
             andConditions.push({ price: { $eq: priceEq } });
         }
         return andConditions;
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = PriceSpecificationRepo.CREATE_MONGO_CONDITIONS(params);
-            return this.priceSpecificationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
+    async count(params) {
+        const conditions = PriceSpecificationRepo.CREATE_MONGO_CONDITIONS(params);
+        return this.priceSpecificationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
     }
-    search(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const conditions = PriceSpecificationRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.priceSpecificationModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                _id: 0,
-                id: { $toString: '$_id' },
-                project: 1,
-                typeOf: 1,
-                name: 1,
-                price: 1,
-                priceCurrency: 1,
-                validFrom: 1,
-                validThrough: 1,
-                valueAddedTaxIncluded: 1,
-                appliesToCategoryCode: 1,
-                appliesToMovieTicket: 1,
-                appliesToVideoFormat: 1
-                // __v: 0,
-                // createdAt: 0,
-                // updatedAt: 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.price) !== undefined) {
-                query.sort({ price: params.sort.price });
-            }
-            // const explainResult = await (<any>query).explain();
-            // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            // return;
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // lean(2024-08-06~)
-                .exec();
+    async search(params) {
+        const conditions = PriceSpecificationRepo.CREATE_MONGO_CONDITIONS(params);
+        const query = this.priceSpecificationModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
+            _id: 0,
+            id: { $toString: '$_id' },
+            project: 1,
+            typeOf: 1,
+            name: 1,
+            price: 1,
+            priceCurrency: 1,
+            validFrom: 1,
+            validThrough: 1,
+            valueAddedTaxIncluded: 1,
+            appliesToCategoryCode: 1,
+            appliesToMovieTicket: 1,
+            appliesToVideoFormat: 1
+            // __v: 0,
+            // createdAt: 0,
+            // updatedAt: 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?.price !== undefined) {
+            query.sort({ price: params.sort.price });
+        }
+        // const explainResult = await (<any>query).explain();
+        // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
+        // return;
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean() // lean(2024-08-06~)
+            .exec();
     }
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.priceSpecificationModel.findOne({ _id: { $eq: params.id } }, {
-                _id: 0,
-                id: { $toString: '$_id' },
-                project: 1,
-                typeOf: 1,
-                name: 1,
-                price: 1,
-                priceCurrency: 1,
-                validFrom: 1,
-                validThrough: 1,
-                valueAddedTaxIncluded: 1,
-                appliesToCategoryCode: 1,
-                appliesToMovieTicket: 1,
-                appliesToVideoFormat: 1
-                // __v: 0,
-                // createdAt: 0,
-                // updatedAt: 0
-            })
+    async findById(params) {
+        const doc = await this.priceSpecificationModel.findOne({ _id: { $eq: params.id } }, {
+            _id: 0,
+            id: { $toString: '$_id' },
+            project: 1,
+            typeOf: 1,
+            name: 1,
+            price: 1,
+            priceCurrency: 1,
+            validFrom: 1,
+            validThrough: 1,
+            valueAddedTaxIncluded: 1,
+            appliesToCategoryCode: 1,
+            appliesToMovieTicket: 1,
+            appliesToVideoFormat: 1
+            // __v: 0,
+            // createdAt: 0,
+            // updatedAt: 0
+        })
+            .lean() // lean(2024-08-06~)
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
+        }
+        return doc;
+    }
+    async save(params) {
+        let doc;
+        if (typeof params.id !== 'string') {
+            const { $unset, id, ...creatingDoc } = params.attributes;
+            doc = await this.priceSpecificationModel.create(creatingDoc);
+        }
+        else {
+            // 上書き禁止属性を除外(2022-08-24~)
+            const { $unset, id, project, typeOf, ...updateFields } = params.attributes;
+            doc = await this.priceSpecificationModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+                $set: updateFields
+            }, { upsert: false, new: true, projection: { _id: 1 } })
                 .lean() // lean(2024-08-06~)
                 .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
-            }
-            return doc;
-        });
-    }
-    save(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let doc;
-            if (typeof params.id !== 'string') {
-                const _b = params.attributes, { $unset, id } = _b, creatingDoc = __rest(_b, ["$unset", "id"]);
-                doc = yield this.priceSpecificationModel.create(creatingDoc);
-            }
-            else {
-                // 上書き禁止属性を除外(2022-08-24~)
-                const _c = params.attributes, { $unset, id, project, typeOf } = _c, updateFields = __rest(_c, ["$unset", "id", "project", "typeOf"]);
-                doc = yield this.priceSpecificationModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-                    $set: updateFields
-                }, { upsert: false, new: true, projection: { _id: 1 } })
-                    .lean() // lean(2024-08-06~)
-                    .exec();
-            }
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
-            }
-            return { id: (_a = doc._id) === null || _a === void 0 ? void 0 : _a.toString() };
-        });
+        }
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
+        }
+        return { id: doc._id?.toString() };
     }
     /**
      * 削除する
      */
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.priceSpecificationModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
-                .exec();
-        });
+    async deleteById(params) {
+        await this.priceSpecificationModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
+            .exec();
     }
     /**
      * プロジェクト指定で削除する
      */
-    deleteByProject(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.priceSpecificationModel.deleteMany({
-                'project.id': { $eq: params.project.id }
-            })
-                .exec();
-        });
+    async deleteByProject(params) {
+        await this.priceSpecificationModel.deleteMany({
+            'project.id': { $eq: params.project.id }
+        })
+            .exec();
     }
     getCursor(conditions, projection) {
         return this.priceSpecificationModel.find(conditions, projection)
             .sort({ price: factory.sortType.Ascending })
             .cursor();
     }
-    reIndex() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // return this.priceSpecificationModel.collection.name;
-            return this.priceSpecificationModel.db.db.command({
-                reIndex: this.priceSpecificationModel.collection.name
-            });
+    async reIndex() {
+        // return this.priceSpecificationModel.collection.name;
+        return this.priceSpecificationModel.db.db.command({
+            reIndex: this.priceSpecificationModel.collection.name
         });
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.priceSpecificationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.priceSpecificationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
 }
 exports.PriceSpecificationRepo = PriceSpecificationRepo;