@chevre/domain 23.2.0-alpha.8 → 23.2.0

package/lib/chevre/repo/additionalProperty.js

@@ -1,27 +1,30 @@
 "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;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdditionalPropertyRepo = void 0;
-const factory = require("../factory");
+const factory = __importStar(require("../factory"));
 const settings_1 = require("../settings");
 const additionalProperty_1 = require("./mongoose/schemas/additionalProperty");
 const AVAILABLE_PROJECT_FIELDS = [
@@ -35,22 +38,21 @@ const AVAILABLE_PROJECT_FIELDS = [
  * 追加特性リポジトリ
  */
 class AdditionalPropertyRepo {
+    additionalPropertyModel;
     constructor(connection) {
         this.additionalPropertyModel = connection.model(additionalProperty_1.modelName, (0, additionalProperty_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, _h, _j, _k;
         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 idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        const idEq = params.id?.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
-        const nameRegex = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$regex;
+        const nameRegex = params.name?.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
                 $or: [
@@ -59,19 +61,19 @@ class AdditionalPropertyRepo {
                 ]
             });
         }
-        const codeValueEq = (_e = params.codeValue) === null || _e === void 0 ? void 0 : _e.$eq;
+        const codeValueEq = params.codeValue?.$eq;
         if (typeof codeValueEq === 'string') {
             andConditions.push({ codeValue: { $exists: true, $eq: codeValueEq } });
         }
-        const codeValueIn = (_f = params.codeValue) === null || _f === void 0 ? void 0 : _f.$in;
+        const codeValueIn = params.codeValue?.$in;
         if (Array.isArray(codeValueIn)) {
             andConditions.push({ codeValue: { $exists: true, $in: codeValueIn } });
         }
-        const inCodeSetIdentifierEq = (_h = (_g = params.inCodeSet) === null || _g === void 0 ? void 0 : _g.identifier) === null || _h === void 0 ? void 0 : _h.$eq;
+        const inCodeSetIdentifierEq = params.inCodeSet?.identifier?.$eq;
         if (typeof inCodeSetIdentifierEq === 'string') {
             andConditions.push({ 'inCodeSet.identifier': { $exists: true, $eq: inCodeSetIdentifierEq } });
         }
-        const inCodeSetIdentifierIn = (_k = (_j = params.inCodeSet) === null || _j === void 0 ? void 0 : _j.identifier) === null || _k === void 0 ? void 0 : _k.$in;
+        const inCodeSetIdentifierIn = params.inCodeSet?.identifier?.$in;
         if (Array.isArray(inCodeSetIdentifierIn)) {
             andConditions.push({ 'inCodeSet.identifier': { $exists: true, $in: inCodeSetIdentifierIn } });
         }
@@ -80,79 +82,72 @@ class AdditionalPropertyRepo {
     /**
      * 検索
      */
-    projectFields(params, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = AdditionalPropertyRepo.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 {
-                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
-            }
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            const query = this.additionalPropertyModel.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));
-            }
-            // 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 })
-                .lean() // 2024-09-19~
-                .exec();
-        });
+    async projectFields(params, inclusion) {
+        const conditions = AdditionalPropertyRepo.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 {
+            throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.additionalPropertyModel.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));
+        }
+        /* istanbul ignore else */
+        if (params.sort !== undefined) {
+            query.sort(params.sort);
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean() // 2024-09-19~
+            .exec();
     }
-    save(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let savedId;
-            let doc;
-            if (typeof params.id !== 'string') {
-                const _a = params.attributes, { id } = _a, createParams = __rest(_a, ["id"]);
-                doc = yield this.additionalPropertyModel.create(createParams);
-                savedId = doc.id;
-            }
-            else {
-                const _b = params.attributes, { id, codeValue, inCodeSet, project, typeOf } = _b, updateFields = __rest(_b, ["id", "codeValue", "inCodeSet", "project", "typeOf"]);
-                doc = yield this.additionalPropertyModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
-                    .exec();
-                savedId = params.id;
-            }
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.additionalPropertyModel.modelName);
-            }
-            return { id: savedId };
-        });
+    async save(params) {
+        let savedId;
+        let doc;
+        if (typeof params.id !== 'string') {
+            const { id, ...createParams } = params.attributes;
+            doc = await this.additionalPropertyModel.create(createParams);
+            savedId = doc.id;
+        }
+        else {
+            const { id, codeValue, inCodeSet, project, typeOf, ...updateFields } = params.attributes;
+            doc = await this.additionalPropertyModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
+                .exec();
+            savedId = params.id;
+        }
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.additionalPropertyModel.modelName);
+        }
+        return { id: savedId };
     }
     /**
      * 削除する
      */
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.additionalPropertyModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
-                .exec();
-        });
+    async deleteById(params) {
+        await this.additionalPropertyModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
+            .exec();
     }
     /**
      * プロジェクト指定で削除する
      */
-    deleteByProject(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.additionalPropertyModel.deleteMany({
-                'project.id': { $eq: params.project.id }
-            })
-                .exec();
-        });
+    async deleteByProject(params) {
+        await this.additionalPropertyModel.deleteMany({
+            'project.id': { $eq: params.project.id }
+        })
+            .exec();
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.additionalPropertyModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.additionalPropertyModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
 }
 exports.AdditionalPropertyRepo = AdditionalPropertyRepo;

package/lib/chevre/repo/advanceBookingRequirement.js

@@ -1,130 +1,131 @@
 "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;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdvanceBookingRequirementRepo = void 0;
-const factory = require("../factory");
+const factory = __importStar(require("../factory"));
 const settings_1 = require("../settings");
 const advanceBookingRequirement_1 = require("./mongoose/schemas/advanceBookingRequirement");
 /**
  * 事前予約要件リポジトリ
  */
 class AdvanceBookingRequirementRepo {
+    advanceBookingRequirementModel;
     constructor(connection) {
         this.advanceBookingRequirementModel = connection.model(advanceBookingRequirement_1.modelName, (0, advanceBookingRequirement_1.createSchema)());
     }
-    // tslint:disable-next-line:max-func-body-length
     static CREATE_FILTER_QUERY(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 idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        const idEq = params.id?.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
-        const idIn = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$in;
+        const idIn = params.id?.$in;
         if (Array.isArray(idIn)) {
             andConditions.push({ _id: { $in: idIn } });
         }
-        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        const identifierEq = params.identifier?.$eq;
         if (typeof identifierEq === 'string') {
             andConditions.push({ identifier: { $eq: identifierEq } });
         }
-        const identifierRegex = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$regex;
+        const identifierRegex = params.identifier?.$regex;
         if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
             andConditions.push({ identifier: { $regex: new RegExp(identifierRegex) } });
         }
         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, identifier, project, typeOf, $unset } = _c, updateFields = __rest(_c, ["id", "identifier", "project", "typeOf", "$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.advanceBookingRequirementModel.findOneAndUpdate(filter, update, options)
-                    .lean()
-                    .exec();
-                if (doc === null) {
-                    throw new factory.errors.NotFound(this.advanceBookingRequirementModel.modelName);
-                }
-                savedId = savingId;
-            }
-            else {
-                const _d = params.attributes, { $unset, id } = _d, createParams = __rest(_d, ["$unset", "id"]);
-                const result = yield this.advanceBookingRequirementModel.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 = AdvanceBookingRequirementRepo.CREATE_FILTER_QUERY(conditions);
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(inclusion.map((key) => ([key, 1]))));
-            const query = this.advanceBookingRequirementModel.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));
+    async save(params) {
+        let doc;
+        let savedId;
+        const savingId = params.id;
+        if (typeof savingId === 'string') {
+            if (savingId === '') {
+                throw new factory.errors.ArgumentNull('id');
             }
-            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, identifier, project, typeOf, $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.advanceBookingRequirementModel.findOneAndUpdate(filter, update, options)
                 .lean()
                 .exec();
-        });
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.advanceBookingRequirementModel.modelName);
+            }
+            savedId = savingId;
+        }
+        else {
+            const { $unset, id, ...createParams } = params.attributes;
+            const result = await this.advanceBookingRequirementModel.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 };
     }
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.advanceBookingRequirementModel.findOneAndDelete({
-                _id: { $eq: params.id },
-                'project.id': { $eq: params.project.id }
-            }, { projection: { _id: 1 } })
-                .exec();
-        });
+    async projectFields(conditions, inclusion) {
+        const andConditions = AdvanceBookingRequirementRepo.CREATE_FILTER_QUERY(conditions);
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(inclusion.map((key) => ([key, 1])))
+        };
+        const query = this.advanceBookingRequirementModel.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();
+    }
+    async deleteById(params) {
+        await this.advanceBookingRequirementModel.findOneAndDelete({
+            _id: { $eq: params.id },
+            'project.id': { $eq: params.project.id }
+        }, { projection: { _id: 1 } })
+            .exec();
     }
 }
 exports.AdvanceBookingRequirementRepo = AdvanceBookingRequirementRepo;

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

@@ -74,7 +74,12 @@ export declare class AggregateOfferRepo {
     /**
      * コードをキーにして冪等置換(2023-12-13~)
      */
-    upsertByIdentifier(params: Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>[]): Promise<{
+    upsertByIdentifier(params: Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>[], options: {
+        /**
+         * プロダクトタイプでfilter(2026-01-30~)
+         */
+        productType: factory.product.ProductType;
+    }): Promise<{
         bulkWriteResult: BulkWriteResult;
         modifiedOffers: {
             id: string;