@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/repo/aggregateOrder.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.AggregateOrderRepo = void 0;
 const factory = require("../factory");
@@ -17,64 +8,61 @@ const aggregateOrder_1 = require("./mongoose/schemas/aggregateOrder");
  * 注文集計リポジトリ
  */
 class AggregateOrderRepo {
+    aggregateOrderModel;
     constructor(connection) {
         this.aggregateOrderModel = connection.model(aggregateOrder_1.modelName, (0, aggregateOrder_1.createSchema)());
     }
-    save(filter, update) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { $set } = update;
-            const setOnInsert = {
-                project: { id: filter.project.id, typeOf: factory.organizationType.Project },
-                typeOf: filter.typeOf,
-                identifier: filter.identifier
-            };
-            const doc = yield this.aggregateOrderModel.findOneAndUpdate({
-                'project.id': { $eq: filter.project.id },
-                identifier: { $eq: filter.identifier },
-                typeOf: { $eq: filter.typeOf }
-            }, {
-                $set,
-                $setOnInsert: setOnInsert
-            }, {
-                new: true,
-                upsert: true,
-                projection: {
-                    _id: 0,
-                    id: { $toString: '$_id' }
-                }
-            })
-                .lean()
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.aggregateOrderModel.modelName);
+    async save(filter, update) {
+        const { $set } = update;
+        const setOnInsert = {
+            project: { id: filter.project.id, typeOf: factory.organizationType.Project },
+            typeOf: filter.typeOf,
+            identifier: filter.identifier
+        };
+        const doc = await this.aggregateOrderModel.findOneAndUpdate({
+            'project.id': { $eq: filter.project.id },
+            identifier: { $eq: filter.identifier },
+            typeOf: { $eq: filter.typeOf }
+        }, {
+            $set,
+            $setOnInsert: setOnInsert
+        }, {
+            new: true,
+            upsert: true,
+            projection: {
+                _id: 0,
+                id: { $toString: '$_id' }
             }
-        });
+        })
+            .lean()
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.aggregateOrderModel.modelName);
+        }
     }
-    searchRoyalCustomers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { limit, project, aggregateOrder } = params;
-            const query = this.aggregateOrderModel.find({
-                typeOf: { $eq: factory.personType.Person },
-                'project.id': { $eq: project.id },
-                'aggregateOrder.orderCount': { $exists: true, $gte: aggregateOrder.orderCount.$gte }
-            }, {
-                _id: 0,
-                aggregateOrder: 1,
-                identifier: 1
-            })
-                .sort({ 'aggregateOrder.orderCount': factory.sortType.Descending })
-                .limit(limit);
-            // if (typeof params.limit === 'number' && params.limit > 0) {
-            //     const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            //     aggregate.limit(params.limit * page)
-            //         .skip(params.limit * (page - 1));
-            // }
-            return query
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-        });
+    async searchRoyalCustomers(params) {
+        const { limit, project, aggregateOrder } = params;
+        const query = this.aggregateOrderModel.find({
+            typeOf: { $eq: factory.personType.Person },
+            'project.id': { $eq: project.id },
+            'aggregateOrder.orderCount': { $exists: true, $gte: aggregateOrder.orderCount.$gte }
+        }, {
+            _id: 0,
+            aggregateOrder: 1,
+            identifier: 1
+        })
+            .sort({ 'aggregateOrder.orderCount': factory.sortType.Descending })
+            .limit(limit);
+        // if (typeof params.limit === 'number' && params.limit > 0) {
+        //     const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+        //     aggregate.limit(params.limit * page)
+        //         .skip(params.limit * (page - 1));
+        // }
+        return query
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
     }
 }
 exports.AggregateOrderRepo = AggregateOrderRepo;

package/lib/chevre/repo/aggregateReservation.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.AggregateReservationRepo = void 0;
 const factory = require("../factory");
@@ -17,43 +8,43 @@ const aggregateReservation_1 = require("./mongoose/schemas/aggregateReservation"
  * 予約集計リポジトリ
  */
 class AggregateReservationRepo {
+    aggregateReservationModel;
     constructor(connection) {
         this.aggregateReservationModel = connection.model(aggregateReservation_1.modelName, (0, aggregateReservation_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(conditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const matchStages = [];
-        const projectIdEq = (_b = (_a = conditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        const projectIdEq = conditions.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             matchStages.push({
                 $match: { 'project.id': { $eq: projectIdEq } }
             });
         }
-        const typeOfEq = (_c = conditions.reservationFor) === null || _c === void 0 ? void 0 : _c.typeOf;
+        const typeOfEq = conditions.reservationFor?.typeOf;
         if (typeof typeOfEq === 'string') {
             matchStages.push({
                 $match: { 'reservationFor.typeOf': { $eq: typeOfEq } }
             });
         }
-        const idEq = (_e = (_d = conditions.reservationFor) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
+        const idEq = conditions.reservationFor?.id?.$eq;
         if (typeof idEq === 'string') {
             matchStages.push({
                 $match: { 'reservationFor.id': { $eq: idEq } }
             });
         }
-        const idIn = (_g = (_f = conditions.reservationFor) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$in;
+        const idIn = conditions.reservationFor?.id?.$in;
         if (Array.isArray(idIn)) {
             matchStages.push({
                 $match: { 'reservationFor.id': { $in: idIn } }
             });
         }
-        const reservationForStartDateGte = (_h = conditions.reservationFor) === null || _h === void 0 ? void 0 : _h.startFrom;
+        const reservationForStartDateGte = conditions.reservationFor?.startFrom;
         if (reservationForStartDateGte instanceof Date) {
             matchStages.push({
                 $match: { 'reservationFor.startDate': { $gte: reservationForStartDateGte } }
             });
         }
-        const reservationForStartDateLte = (_j = conditions.reservationFor) === null || _j === void 0 ? void 0 : _j.startThrough;
+        const reservationForStartDateLte = conditions.reservationFor?.startThrough;
         if (reservationForStartDateLte instanceof Date) {
             matchStages.push({
                 $match: { 'reservationFor.startDate': { $lte: reservationForStartDateLte } }
@@ -64,86 +55,82 @@ class AggregateReservationRepo {
     /**
      * 予約集計を検索する
      */
-    searchWithReservationForId(params, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const matchStages = AggregateReservationRepo.CREATE_MONGO_CONDITIONS(params);
-            let projectStage = {
+    async searchWithReservationForId(params, inclusion) {
+        const matchStages = AggregateReservationRepo.CREATE_MONGO_CONDITIONS(params);
+        let projectStage = {
+            _id: 0,
+            id: '$reservationFor.id'
+        };
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            inclusion.forEach((field) => {
+                projectStage[field] = { $ifNull: [`$${field}`, '$false'] };
+                // projectStage[field] = 1;
+            });
+        }
+        else {
+            projectStage = {
                 _id: 0,
-                id: '$reservationFor.id'
+                id: '$reservationFor.id',
+                aggregateOffer: 1
             };
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projectStage[field] = { $ifNull: [`$${field}`, '$false'] };
-                    // projectStage[field] = 1;
-                });
-            }
-            else {
-                projectStage = {
-                    _id: 0,
-                    id: '$reservationFor.id',
-                    aggregateOffer: 1
-                };
-            }
-            const sortByStartDate = (_a = params.sort) === null || _a === void 0 ? void 0 : _a['reservationFor.startDate'];
-            const aggregate = this.aggregateReservationModel.aggregate([
-                ...matchStages,
-                ...(typeof sortByStartDate === 'number')
-                    ? [{ $sort: { 'reservationFor.startDate': sortByStartDate } }]
-                    : [],
-                // 現時点でreservationFor.idへのunique indexがないので、重複ドキュメント対応として、$group
-                {
-                    $group: {
-                        _id: '$reservationFor.id',
-                        reservationFor: { $first: '$reservationFor' },
-                        aggregateOffer: { $first: '$aggregateOffer' }
-                    }
-                },
-                { $project: projectStage }
-            ]);
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
-            return aggregate
-                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
+        }
+        const sortByStartDate = params.sort?.['reservationFor.startDate'];
+        const aggregate = this.aggregateReservationModel.aggregate([
+            ...matchStages,
+            ...(typeof sortByStartDate === 'number')
+                ? [{ $sort: { 'reservationFor.startDate': sortByStartDate } }]
+                : [],
+            // 現時点でreservationFor.idへのunique indexがないので、重複ドキュメント対応として、$group
+            {
+                $group: {
+                    _id: '$reservationFor.id',
+                    reservationFor: { $first: '$reservationFor' },
+                    aggregateOffer: { $first: '$aggregateOffer' }
+                }
+            },
+            { $project: projectStage }
+        ]);
+        if (typeof params.limit === 'number' && params.limit > 0) {
+            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            aggregate.limit(params.limit * page)
+                .skip(params.limit * (page - 1));
+        }
+        return aggregate
+            .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
     }
     /**
      * 予約集計を保管する
      */
-    save(filter, update) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { $set } = update;
-            const setOnInsert = {
-                project: { id: filter.project.id, typeOf: factory.organizationType.Project },
-                typeOf: 'AggregateReservation',
-                reservationFor: filter.reservationFor
-            };
-            const doc = yield this.aggregateReservationModel.findOneAndUpdate({
-                'project.id': { $eq: filter.project.id },
-                'reservationFor.id': { $eq: filter.reservationFor.id }
-            }, {
-                $set: Object.assign({}, $set),
-                $setOnInsert: setOnInsert
-            }, {
-                new: true,
-                upsert: true,
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.aggregateReservationModel.modelName);
-            }
-        });
+    async save(filter, update) {
+        const { $set } = update;
+        const setOnInsert = {
+            project: { id: filter.project.id, typeOf: factory.organizationType.Project },
+            typeOf: 'AggregateReservation',
+            reservationFor: filter.reservationFor
+        };
+        const doc = await this.aggregateReservationModel.findOneAndUpdate({
+            'project.id': { $eq: filter.project.id },
+            'reservationFor.id': { $eq: filter.reservationFor.id }
+        }, {
+            $set: {
+                // updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので // discontinue updatedAt(2024-08-07~)
+                ...$set
+            },
+            $setOnInsert: setOnInsert
+        }, {
+            new: true,
+            upsert: true,
+            projection: { _id: 1 }
+        })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.aggregateReservationModel.modelName);
+        }
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.aggregateReservationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.aggregateReservationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
 }
 exports.AggregateReservationRepo = AggregateReservationRepo;

package/lib/chevre/repo/aggregation.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.AggregationRepo = void 0;
 const factory = require("../factory");
@@ -27,60 +7,59 @@ const aggregation_1 = require("./mongoose/schemas/aggregation");
  * 集計リポジトリ
  */
 class AggregationRepo {
+    aggregationModel;
     constructor(connection) {
         this.aggregationModel = connection.model(aggregation_1.modelName, (0, aggregation_1.createSchema)());
     }
-    saveAggregation(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { typeOf, project, aggregateDuration, aggregateStart } = params, setFields = __rest(params, ["typeOf", "project", "aggregateDuration", "aggregateStart"]);
-            const filter = {
-                typeOf: { $eq: typeOf },
-                'project.id': { $eq: project.id },
-                aggregateStart: { $eq: aggregateStart },
-                aggregateDuration: { $eq: aggregateDuration }
-            };
-            const updateQuery = {
-                $setOnInsert: { typeOf, project, aggregateDuration, aggregateStart },
-                $set: setFields
-            };
-            return this.aggregationModel.updateOne(filter, updateQuery, { upsert: true })
-                .exec();
-        });
+    async saveAggregation(params) {
+        const { typeOf, project, aggregateDuration, aggregateStart, ...setFields } = params;
+        const filter = {
+            typeOf: { $eq: typeOf },
+            'project.id': { $eq: project.id },
+            aggregateStart: { $eq: aggregateStart },
+            aggregateDuration: { $eq: aggregateDuration }
+        };
+        const updateQuery = {
+            $setOnInsert: { typeOf, project, aggregateDuration, aggregateStart },
+            $set: setFields
+        };
+        return this.aggregationModel.updateOne(filter, updateQuery, { upsert: true })
+            .exec();
     }
-    search(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            const limit = Number(params.limit);
-            const page = Number(params.page);
-            const filter = Object.assign(Object.assign(Object.assign({}, (typeof ((_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$eq) === 'string')
+    async search(params) {
+        const limit = Number(params.limit);
+        const page = Number(params.page);
+        const filter = {
+            ...(typeof params.typeOf?.$eq === 'string')
                 ? { typeOf: { $eq: params.typeOf.$eq } }
-                : undefined), (typeof ((_b = params.aggregateDuration) === null || _b === void 0 ? void 0 : _b.$eq) === 'string')
+                : undefined,
+            ...(typeof params.aggregateDuration?.$eq === 'string')
                 ? { aggregateDuration: { $eq: params.aggregateDuration.$eq } }
-                : undefined), { aggregateStart: Object.assign(Object.assign({}, (((_c = params.aggregateStart) === null || _c === void 0 ? void 0 : _c.$gte) instanceof Date) ? { $gte: params.aggregateStart.$gte } : undefined), (((_d = params.aggregateStart) === null || _d === void 0 ? void 0 : _d.$lte) instanceof Date) ? { $lte: params.aggregateStart.$lte } : undefined) });
-            return this.aggregationModel.find(filter)
-                .limit(limit)
-                .skip(limit * (page - 1))
-                .sort({ aggregateStart: factory.sortType.Ascending })
-                .exec();
-        });
+                : undefined,
+            aggregateStart: {
+                ...(params.aggregateStart?.$gte instanceof Date) ? { $gte: params.aggregateStart.$gte } : undefined,
+                ...(params.aggregateStart?.$lte instanceof Date) ? { $lte: params.aggregateStart.$lte } : undefined
+            }
+        };
+        return this.aggregationModel.find(filter)
+            .limit(limit)
+            .skip(limit * (page - 1))
+            .sort({ aggregateStart: factory.sortType.Ascending })
+            .exec();
     }
     /**
      * 不要な集計を削除する
      */
-    deleteAggregateStartPassedCertainPeriod(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const filter = {
-                aggregateStart: { $lt: params.aggregateStart.$lt }
-            };
-            return this.aggregationModel.deleteMany(filter)
-                .exec();
-        });
+    async deleteAggregateStartPassedCertainPeriod(params) {
+        const filter = {
+            aggregateStart: { $lt: params.aggregateStart.$lt }
+        };
+        return this.aggregationModel.deleteMany(filter)
+            .exec();
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.aggregationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.aggregationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
 }
 exports.AggregationRepo = AggregationRepo;