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

package/lib/chevre/repo/projectMakesOffer.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.ProjectMakesOfferRepo = void 0;
 const project_1 = require("./mongoose/schemas/project");
@@ -17,119 +8,116 @@ const settings_1 = require("../settings");
  * プロジェクト提供オファーリポジトリ
  */
 class ProjectMakesOfferRepo {
+    projectModel;
     constructor(connection) {
         this.projectModel = connection.model(project_1.modelName, (0, project_1.createSchema)());
     }
-    search(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            const matchStages = [];
-            const offeredByIdEq = (_b = (_a = params.offeredBy) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-            if (typeof offeredByIdEq === 'string') {
-                matchStages.push({ $match: { _id: { $eq: offeredByIdEq } } });
-            }
-            const availableAtOrFromIdEq = (_d = (_c = params.availableAtOrFrom) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
-            if (typeof availableAtOrFromIdEq === 'string') {
-                matchStages.push({ $match: { 'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: availableAtOrFromIdEq } } });
-            }
-            const aggregate = this.projectModel.aggregate([
-                {
-                    $unwind: {
-                        path: '$makesOffer'
-                    }
-                },
-                ...matchStages,
-                // { $sort: { 'makesOffer.availableAtOrFrom.id': factory.sortType.Ascending } },
-                {
-                    $project: {
-                        _id: 0,
-                        typeOf: '$makesOffer.typeOf',
-                        availableAtOrFrom: '$makesOffer.availableAtOrFrom',
-                        eligibleCustomerType: '$makesOffer.eligibleCustomerType',
-                        validForMemberTier: '$makesOffer.validForMemberTier'
-                    }
+    async search(params) {
+        const matchStages = [];
+        const offeredByIdEq = params.offeredBy?.id?.$eq;
+        if (typeof offeredByIdEq === 'string') {
+            matchStages.push({ $match: { _id: { $eq: offeredByIdEq } } });
+        }
+        const availableAtOrFromIdEq = params.availableAtOrFrom?.id?.$eq;
+        if (typeof availableAtOrFromIdEq === 'string') {
+            matchStages.push({ $match: { 'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: availableAtOrFromIdEq } } });
+        }
+        const aggregate = this.projectModel.aggregate([
+            {
+                $unwind: {
+                    path: '$makesOffer'
+                }
+            },
+            ...matchStages,
+            // { $sort: { 'makesOffer.availableAtOrFrom.id': factory.sortType.Ascending } },
+            {
+                $project: {
+                    _id: 0,
+                    typeOf: '$makesOffer.typeOf',
+                    availableAtOrFrom: '$makesOffer.availableAtOrFrom',
+                    eligibleCustomerType: '$makesOffer.eligibleCustomerType',
+                    validForMemberTier: '$makesOffer.validForMemberTier'
                 }
-            ]);
-            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();
-        });
+        ]);
+        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();
     }
-    create(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let doc = yield this.projectModel.findOne({
-                _id: { $eq: params.offeredBy.id }
-            }, { _id: 1 })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(factory.organizationType.Project);
-            }
-            const creatingMakesOffer = {
-                typeOf: factory.offerType.Offer,
-                // availableAtOrFrom: [{ id: params.availableAtOrFrom.id }]
-                availableAtOrFrom: { id: params.availableAtOrFrom.id } // support non-array(2024-10-22~)
-            };
-            doc = yield this.projectModel.findOneAndUpdate({
-                _id: { $eq: params.offeredBy.id },
-                'makesOffer.availableAtOrFrom.id': { $ne: params.availableAtOrFrom.id }
-            }, {
-                $push: { makesOffer: creatingMakesOffer }
-            }, {
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.AlreadyInUse('makesOffer', ['availableAtOrFrom.id']);
-            }
-        });
+    async create(params) {
+        let doc = await this.projectModel.findOne({
+            _id: { $eq: params.offeredBy.id }
+        }, { _id: 1 })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(factory.organizationType.Project);
+        }
+        const creatingMakesOffer = {
+            typeOf: factory.offerType.Offer,
+            // availableAtOrFrom: [{ id: params.availableAtOrFrom.id }]
+            availableAtOrFrom: { id: params.availableAtOrFrom.id } // support non-array(2024-10-22~)
+        };
+        doc = await this.projectModel.findOneAndUpdate({
+            _id: { $eq: params.offeredBy.id },
+            'makesOffer.availableAtOrFrom.id': { $ne: params.availableAtOrFrom.id }
+        }, {
+            $push: { makesOffer: creatingMakesOffer }
+        }, {
+            projection: { _id: 1 }
+        })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.AlreadyInUse('makesOffer', ['availableAtOrFrom.id']);
+        }
     }
-    updateOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const updatingMakesOffer = Object.assign(Object.assign({ typeOf: factory.offerType.Offer, availableAtOrFrom: { id: params.availableAtOrFrom.id } }, (Array.isArray(params.eligibleCustomerType))
+    async updateOne(params) {
+        const updatingMakesOffer = {
+            typeOf: factory.offerType.Offer,
+            availableAtOrFrom: { id: params.availableAtOrFrom.id }, // support non-array(2024-10-22~)
+            ...(Array.isArray(params.eligibleCustomerType))
                 ? {
                     eligibleCustomerType: params.eligibleCustomerType.map(({ codeValue }) => ({
                         codeValue,
                         typeOf: 'CategoryCode'
                     }))
                 }
-                : undefined), (params.validForMemberTier !== undefined) ? { validForMemberTier: params.validForMemberTier } : undefined);
-            const doc = yield this.projectModel.findOneAndUpdate({
-                _id: { $eq: params.offeredBy.id },
-                'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id }
-            }, {
-                $set: { 'makesOffer.$[makesOfferElement]': updatingMakesOffer }
-            }, {
-                new: true,
-                arrayFilters: [
-                    { 'makesOfferElement.availableAtOrFrom.id': { $eq: params.availableAtOrFrom.id } }
-                ],
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(factory.offerType.Offer);
-            }
-        });
+                : undefined,
+            ...(params.validForMemberTier !== undefined) ? { validForMemberTier: params.validForMemberTier } : undefined
+        };
+        const doc = await this.projectModel.findOneAndUpdate({
+            _id: { $eq: params.offeredBy.id },
+            'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id }
+        }, {
+            $set: { 'makesOffer.$[makesOfferElement]': updatingMakesOffer }
+        }, {
+            new: true,
+            arrayFilters: [
+                { 'makesOfferElement.availableAtOrFrom.id': { $eq: params.availableAtOrFrom.id } }
+            ],
+            projection: { _id: 1 }
+        })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(factory.offerType.Offer);
+        }
     }
-    deleteOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.projectModel.findOneAndUpdate({
-                _id: { $eq: params.offeredBy.id },
-                'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id }
-            }, {
-                $pull: { makesOffer: { 'availableAtOrFrom.id': params.availableAtOrFrom.id } }
-            }, {
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(factory.organizationType.Project);
-            }
-        });
+    async deleteOne(params) {
+        const doc = await this.projectModel.findOneAndUpdate({
+            _id: { $eq: params.offeredBy.id },
+            'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id }
+        }, {
+            $pull: { makesOffer: { 'availableAtOrFrom.id': params.availableAtOrFrom.id } }
+        }, {
+            projection: { _id: 1 }
+        })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(factory.organizationType.Project);
+        }
     }
 }
 exports.ProjectMakesOfferRepo = ProjectMakesOfferRepo;

package/lib/chevre/repo/rateLimit/offer.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.OfferRateLimitRepo = void 0;
 const moment = require("moment");
@@ -17,6 +8,9 @@ const concurrentLock_1 = require("../concurrentLock");
  * オファーレート制限リポジトリ
  */
 class OfferRateLimitRepo {
+    static KEY_PREFIX_NEW = 'rateLimit:offer';
+    concurrentLockRepo;
+    redisClient;
     constructor(redisClient) {
         this.concurrentLockRepo = new concurrentLock_1.ConcurrentLockRepo({ redisClient });
         this.redisClient = redisClient;
@@ -33,58 +27,51 @@ class OfferRateLimitRepo {
      * discontinue array params(2025-05-26~)
      */
     // public async lock(ratelimitKeys: IRateLimitKey[]): Promise<void> {
-    lock(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = OfferRateLimitRepo.createKey(params);
-            const value = params.reservationNumber;
-            const ttl = moment(params.reservationFor.startDate)
-                .add(params.reservedTicket.ticketType.validRateLimit.unitInSeconds, 'seconds')
-                .diff(moment(), 'seconds');
-            const expires = moment()
-                .add(ttl, 'seconds')
-                .toDate();
-            // reimplement using concurrentLockRepo(2025-05-27~)
-            try {
-                yield this.concurrentLockRepo.lock({
-                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                    about: { identifier: key, typeOf: 'Thing' },
-                    expires,
-                    audience: { identifier: value, typeOf: 'Audience' }
-                });
-            }
-            catch (error) {
-                throw new factory.errors.RateLimitExceeded('Offer');
-            }
-            // const multi = this.redisClient.multi();
-            // multi.setNX(key, value)
-            //     .expire(key, ttl);
-            // const results = await multi.exec();
-            // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
-            //     return;
-            // } else {
-            //     throw new factory.errors.RateLimitExceeded('Offer');
-            // }
-        });
+    async lock(params) {
+        const key = OfferRateLimitRepo.createKey(params);
+        const value = params.reservationNumber;
+        const ttl = moment(params.reservationFor.startDate)
+            .add(params.reservedTicket.ticketType.validRateLimit.unitInSeconds, 'seconds')
+            .diff(moment(), 'seconds');
+        const expires = moment()
+            .add(ttl, 'seconds')
+            .toDate();
+        // reimplement using concurrentLockRepo(2025-05-27~)
+        try {
+            await this.concurrentLockRepo.lock({
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                about: { identifier: key, typeOf: 'Thing' },
+                expires,
+                audience: { identifier: value, typeOf: 'Audience' }
+            });
+        }
+        catch (error) {
+            throw new factory.errors.RateLimitExceeded('Offer');
+        }
+        // const multi = this.redisClient.multi();
+        // multi.setNX(key, value)
+        //     .expire(key, ttl);
+        // const results = await multi.exec();
+        // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
+        //     return;
+        // } else {
+        //     throw new factory.errors.RateLimitExceeded('Offer');
+        // }
     }
     // discontinue array params(2025-05-26~)
     // public async unlock(ratelimitKeys: IRateLimitKey[]): Promise<void> {
-    unlock(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = OfferRateLimitRepo.createKey(params);
-            // reimplement using concurrentLockRepo(2025-05-27~)
-            yield this.concurrentLockRepo.unlock({
-                about: { identifier: key, typeOf: 'Thing' },
-                audience: { identifier: params.reservationNumber, typeOf: 'Audience' }
-            });
-            // await this.redisClient.del(key);
+    async unlock(params) {
+        const key = OfferRateLimitRepo.createKey(params);
+        // reimplement using concurrentLockRepo(2025-05-27~)
+        await this.concurrentLockRepo.unlock({
+            about: { identifier: key, typeOf: 'Thing' },
+            audience: { identifier: params.reservationNumber, typeOf: 'Audience' }
         });
+        // await this.redisClient.del(key);
     }
-    getHolder(ratelimitKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = OfferRateLimitRepo.createKey(ratelimitKey);
-            return this.redisClient.get(key);
-        });
+    async getHolder(ratelimitKey) {
+        const key = OfferRateLimitRepo.createKey(ratelimitKey);
+        return this.redisClient.get(key);
     }
 }
 exports.OfferRateLimitRepo = OfferRateLimitRepo;
-OfferRateLimitRepo.KEY_PREFIX_NEW = 'rateLimit:offer';