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

package/lib/chevre/repo/customer.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.CustomerRepo = void 0;
 const customer_1 = require("./mongoose/schemas/customer");
@@ -39,25 +19,25 @@ const AVAILABLE_PROJECT_FIELDS = [
  * 顧客リポジトリ
  */
 class CustomerRepo {
+    customerModel;
     constructor(connection) {
         this.customerModel = connection.model(customer_1.modelName, (0, customer_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f;
         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 branchCodeRegex = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$regex;
+        const branchCodeRegex = params.branchCode?.$regex;
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
             andConditions.push({ branchCode: { $regex: new RegExp(branchCodeRegex) } });
         }
-        const idEq = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        const idEq = params.id?.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
-        const nameRegex = (_e = params.name) === null || _e === void 0 ? void 0 : _e.$regex;
+        const nameRegex = params.name?.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
                 $or: [
@@ -66,7 +46,7 @@ class CustomerRepo {
                 ]
             });
         }
-        const additionalPropertyElemMatch = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
+        const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -77,81 +57,77 @@ class CustomerRepo {
         }
         return andConditions;
     }
-    save(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            let savedId;
-            if (params.id === undefined) {
-                const _c = params.attributes, { id, $unset } = _c, creatingDoc = __rest(_c, ["id", "$unset"]);
-                const result = yield this.customerModel.insertMany(creatingDoc, { 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(`customer not saved unexpectedly. result:${JSON.stringify(result)}`);
-                }
-                savedId = insertedId;
+    async save(params) {
+        let savedId;
+        if (params.id === undefined) {
+            const { id, $unset, ...creatingDoc } = params.attributes;
+            const result = await this.customerModel.insertMany(creatingDoc, { rawResult: true });
+            const insertedId = result.insertedIds?.[0]?.toHexString();
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`customer not saved unexpectedly. result:${JSON.stringify(result)}`);
             }
-            else {
-                const _d = params.attributes, { id, branchCode, project, typeOf, $unset } = _d, updateFields = __rest(_d, ["id", "branchCode", "project", "typeOf", "$unset"]);
-                const doc = yield this.customerModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
-                    .lean()
-                    .exec();
-                if (doc === null) {
-                    throw new factory.errors.NotFound(this.customerModel.modelName);
-                }
-                savedId = params.id;
+            savedId = insertedId;
+        }
+        else {
+            const { id, branchCode, project, typeOf, $unset, ...updateFields } = params.attributes;
+            const doc = await this.customerModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+                $set: updateFields,
+                ...($unset !== undefined) ? { $unset } : undefined
+            }, { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                .lean()
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.customerModel.modelName);
             }
-            return { id: savedId };
-        });
+            savedId = params.id;
+        }
+        return { id: savedId };
     }
     /**
      * 顧客検索
      */
-    projectFields(conditions, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const andConditions = CustomerRepo.CREATE_MONGO_CONDITIONS(conditions);
-            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
-            }
-            else {
-                // if (Array.isArray(exclusion) && exclusion.length > 0) {
-                //     positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                // }
-            }
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            const query = this.customerModel.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));
-            }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
-                query.sort({ branchCode: conditions.sort.branchCode });
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // 2024-09-03~
-                .exec();
-        });
+    async projectFields(conditions, inclusion) {
+        const andConditions = CustomerRepo.CREATE_MONGO_CONDITIONS(conditions);
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        else {
+            // if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //     positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
+            // }
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.customerModel.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));
+        }
+        /* istanbul ignore else */
+        if (conditions.sort?.branchCode !== undefined) {
+            query.sort({ branchCode: conditions.sort.branchCode });
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean() // 2024-09-03~
+            .exec();
     }
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.customerModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
-                .exec();
-        });
+    async deleteById(params) {
+        await this.customerModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
+            .exec();
     }
     getCursor(conditions, projection) {
         return this.customerModel.find(conditions, projection)
             .sort({ branchCode: factory.sortType.Ascending })
             .cursor();
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.customerModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.customerModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
 }
 exports.CustomerRepo = CustomerRepo;

package/lib/chevre/repo/customerType.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.CustomerTypeRepo = void 0;
 const customerType_1 = require("./mongoose/schemas/customerType");
@@ -21,18 +12,17 @@ const AVAILABLE_PROJECT_FIELDS = [
  * カスタマータイプリポジトリ
  */
 class CustomerTypeRepo {
+    customerTypeModel;
     constructor(connection) {
         this.customerTypeModel = connection.model(customerType_1.modelName, (0, customerType_1.createSchema)());
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b;
         const andConditions = [];
-        const codeValueEq = (_a = params.codeValue) === null || _a === void 0 ? void 0 : _a.$eq;
+        const codeValueEq = params.codeValue?.$eq;
         if (typeof codeValueEq === 'string') {
             andConditions.push({ codeValue: { $eq: codeValueEq } });
         }
-        const codeValueIn = (_b = params.codeValue) === null || _b === void 0 ? void 0 : _b.$in;
+        const codeValueIn = params.codeValue?.$in;
         if (Array.isArray(codeValueIn)) {
             andConditions.push({ codeValue: { $in: codeValueIn } });
         }
@@ -41,58 +31,58 @@ class CustomerTypeRepo {
     /**
      * 検索
      */
-    projectFields(params, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = CustomerTypeRepo.CREATE_MONGO_CONDITIONS(params);
-            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
-            }
-            else {
-                // no op
-            }
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            const query = this.customerTypeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
-            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));
-            }
-            if (params.sort !== undefined) {
-                query.sort(params.sort);
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-        });
+    async projectFields(params, inclusion) {
+        const conditions = CustomerTypeRepo.CREATE_MONGO_CONDITIONS(params);
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        else {
+            // no op
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.customerTypeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+        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));
+        }
+        if (params.sort !== undefined) {
+            query.sort(params.sort);
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
     }
-    saveManyByCodeValue(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const bulkWriteOps = [];
-            if (Array.isArray(params)) {
-                params.forEach((p) => {
-                    const $set = Object.assign({}, p.attributes);
-                    if (typeof $set.id === 'string') {
-                        delete $set.id;
+    async saveManyByCodeValue(params) {
+        const bulkWriteOps = [];
+        if (Array.isArray(params)) {
+            params.forEach((p) => {
+                const $set = { ...p.attributes };
+                if (typeof $set.id === 'string') {
+                    delete $set.id;
+                }
+                bulkWriteOps.push({
+                    updateOne: {
+                        filter: {
+                            codeValue: { $eq: p.attributes.codeValue }
+                        },
+                        update: {
+                            $set
+                            // $setOnInsert: {}
+                        },
+                        upsert: (p.upsert !== undefined) ? p.upsert : false
                     }
-                    bulkWriteOps.push({
-                        updateOne: {
-                            filter: {
-                                codeValue: { $eq: p.attributes.codeValue }
-                            },
-                            update: {
-                                $set
-                                // $setOnInsert: {}
-                            },
-                            upsert: (p.upsert !== undefined) ? p.upsert : false
-                        }
-                    });
                 });
-            }
-            if (bulkWriteOps.length > 0) {
-                return this.customerTypeModel.bulkWrite(bulkWriteOps, { ordered: false });
-            }
-        });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            return this.customerTypeModel.bulkWrite(bulkWriteOps, { ordered: false });
+        }
     }
 }
 exports.CustomerTypeRepo = CustomerTypeRepo;

package/lib/chevre/repo/emailMessage.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.EmailMessageRepo = void 0;
 const emailMessages_1 = require("./mongoose/schemas/emailMessages");
@@ -28,26 +8,26 @@ const settings_1 = require("../settings");
  * Eメールメッセージリポジトリ
  */
 class EmailMessageRepo {
+    emailMessageModel;
     constructor(connection) {
         this.emailMessageModel = connection.model(emailMessages_1.modelName, (0, emailMessages_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e;
         // MongoDB検索条件
         const andConditions = [{ typeOf: factory.creativeWorkType.EmailMessage }];
-        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 identifierEq = (_c = params.identifier) === null || _c === void 0 ? void 0 : _c.$eq;
+        const identifierEq = params.identifier?.$eq;
         if (typeof identifierEq === 'string') {
             andConditions.push({
                 identifier: { $eq: identifierEq }
             });
         }
-        const aboutIdentifierEq = (_e = (_d = params.about) === null || _d === void 0 ? void 0 : _d.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        const aboutIdentifierEq = params.about?.identifier?.$eq;
         if (typeof aboutIdentifierEq === 'string') {
             andConditions.push({
                 'about.identifier': {
@@ -58,66 +38,57 @@ class EmailMessageRepo {
         }
         return andConditions;
     }
-    save(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let doc;
-            if (typeof params.id !== 'string') {
-                doc = yield this.emailMessageModel.create(params);
-            }
-            else {
-                // 上書き禁止属性を除外(2022-08-24~)
-                const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
-                doc = yield this.emailMessageModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
-                    .exec();
-            }
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.emailMessageModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.emailMessageModel.findOne({ _id: params.id }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
+    async save(params) {
+        let doc;
+        if (typeof params.id !== 'string') {
+            doc = await this.emailMessageModel.create(params);
+        }
+        else {
+            // 上書き禁止属性を除外(2022-08-24~)
+            const { id, identifier, project, typeOf, ...updateFields } = params;
+            doc = await this.emailMessageModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
                 .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.emailMessageModel.modelName);
-            }
-            return doc.toObject();
-        });
+        }
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.emailMessageModel.modelName);
+        }
+        return doc.toObject();
     }
-    search(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = EmailMessageRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.emailMessageModel.find({ $and: conditions }, {
-                __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 (params.sort !== undefined) {
-                query.sort(params.sort);
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
-        });
+    async findById(params) {
+        const doc = await this.emailMessageModel.findOne({ _id: params.id }, {
+            __v: 0,
+            createdAt: 0,
+            updatedAt: 0
+        })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.emailMessageModel.modelName);
+        }
+        return doc.toObject();
     }
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.emailMessageModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
-                .exec();
+    async search(params) {
+        const conditions = EmailMessageRepo.CREATE_MONGO_CONDITIONS(params);
+        const query = this.emailMessageModel.find({ $and: conditions }, {
+            __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 !== undefined) {
+            query.sort(params.sort);
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec()
+            .then((docs) => docs.map((doc) => doc.toObject()));
+    }
+    async deleteById(params) {
+        await this.emailMessageModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
+            .exec();
     }
 }
 exports.EmailMessageRepo = EmailMessageRepo;