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

package/lib/chevre/repo/sellerPaymentAccepted.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.SellerPaymentAcceptedRepo = void 0;
 const mongoose_1 = require("mongoose");
@@ -18,115 +9,107 @@ const settings_1 = require("../settings");
  * 販売者対応決済方法リポジトリ
  */
 class SellerPaymentAcceptedRepo {
+    sellerModel;
     constructor(connection) {
         this.sellerModel = connection.model(seller_1.modelName, (0, seller_1.createSchema)());
     }
-    search(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
-            const matchStages = [];
-            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-            if (typeof projectIdEq === 'string') {
-                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
-            }
-            const sellerIdEq = (_d = (_c = params.seller) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
-            if (typeof sellerIdEq === 'string') {
-                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(sellerIdEq) } } });
-            }
-            const codeValueEq = (_e = params.codeValue) === null || _e === void 0 ? void 0 : _e.$eq;
-            if (typeof codeValueEq === 'string') {
-                matchStages.push({ $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: codeValueEq } } });
-            }
-            const aggregate = this.sellerModel.aggregate([
-                {
-                    $unwind: {
-                        path: '$paymentAccepted'
-                    }
-                },
-                ...matchStages,
-                { $sort: { 'paymentAccepted.paymentMethodType': factory.sortType.Ascending } },
-                {
-                    $project: {
-                        _id: 0,
-                        codeValue: '$paymentAccepted.paymentMethodType',
-                        seller: { id: { $toString: '$_id' } }
-                    }
+    async search(params) {
+        const matchStages = [];
+        const projectIdEq = params.project?.id?.$eq;
+        if (typeof projectIdEq === 'string') {
+            matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+        }
+        const sellerIdEq = params.seller?.id?.$eq;
+        if (typeof sellerIdEq === 'string') {
+            matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(sellerIdEq) } } });
+        }
+        const codeValueEq = params.codeValue?.$eq;
+        if (typeof codeValueEq === 'string') {
+            matchStages.push({ $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: codeValueEq } } });
+        }
+        const aggregate = this.sellerModel.aggregate([
+            {
+                $unwind: {
+                    path: '$paymentAccepted'
+                }
+            },
+            ...matchStages,
+            { $sort: { 'paymentAccepted.paymentMethodType': factory.sortType.Ascending } },
+            {
+                $project: {
+                    _id: 0,
+                    codeValue: '$paymentAccepted.paymentMethodType',
+                    seller: { id: { $toString: '$_id' } }
                 }
-            ]);
-            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.sellerModel.findOne({
-                'project.id': { $eq: params.project.id },
-                _id: { $eq: params.seller.id }
-            }, { _id: 1 })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(factory.organizationType.Corporation);
-            }
-            const creatingPaymentAccepted = {
-                paymentMethodType: params.codeValue
-            };
-            doc = yield this.sellerModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                _id: { $eq: params.seller.id },
-                'paymentAccepted.paymentMethodType': { $ne: params.codeValue }
-            }, {
-                $push: { paymentAccepted: creatingPaymentAccepted }
-            }, {
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.AlreadyInUse('paymentAccepted', ['paymentMethodType']);
-            }
-        });
+    async create(params) {
+        let doc = await this.sellerModel.findOne({
+            'project.id': { $eq: params.project.id },
+            _id: { $eq: params.seller.id }
+        }, { _id: 1 })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
+        const creatingPaymentAccepted = {
+            paymentMethodType: params.codeValue
+        };
+        doc = await this.sellerModel.findOneAndUpdate({
+            'project.id': { $eq: params.project.id },
+            _id: { $eq: params.seller.id },
+            'paymentAccepted.paymentMethodType': { $ne: params.codeValue }
+        }, {
+            $push: { paymentAccepted: creatingPaymentAccepted }
+        }, {
+            projection: { _id: 1 }
+        })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.AlreadyInUse('paymentAccepted', ['paymentMethodType']);
+        }
     }
-    deleteOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.sellerModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                _id: { $eq: params.seller.id },
-                'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue }
-            }, {
-                $pull: { paymentAccepted: { paymentMethodType: params.codeValue } }
-            }, {
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(factory.organizationType.Corporation);
-            }
-        });
+    async deleteOne(params) {
+        const doc = await this.sellerModel.findOneAndUpdate({
+            'project.id': { $eq: params.project.id },
+            _id: { $eq: params.seller.id },
+            'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue }
+        }, {
+            $pull: { paymentAccepted: { paymentMethodType: params.codeValue } }
+        }, {
+            projection: { _id: 1 }
+        })
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
     }
-    isAcceptedBySeller(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const aggregate = this.sellerModel.aggregate([
-                {
-                    $unwind: { path: '$paymentAccepted' }
-                },
-                { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.seller.id) } } },
-                { $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue } } },
-                {
-                    $project: {
-                        _id: 0,
-                        codeValue: '$paymentAccepted.paymentMethodType'
-                    }
+    async isAcceptedBySeller(params) {
+        const aggregate = this.sellerModel.aggregate([
+            {
+                $unwind: { path: '$paymentAccepted' }
+            },
+            { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.seller.id) } } },
+            { $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue } } },
+            {
+                $project: {
+                    _id: 0,
+                    codeValue: '$paymentAccepted.paymentMethodType'
                 }
-            ])
-                .limit(1)
-                .skip(0);
-            return (yield aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()).length > 0;
-        });
+            }
+        ])
+            .limit(1)
+            .skip(0);
+        return (await aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec()).length > 0;
     }
 }
 exports.SellerPaymentAcceptedRepo = SellerPaymentAcceptedRepo;

package/lib/chevre/repo/sellerReturnPolicy.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.SellerReturnPolicyRepo = void 0;
 const sellerReturnPolicy_1 = require("./mongoose/schemas/sellerReturnPolicy");
@@ -28,38 +8,38 @@ const settings_1 = require("../settings");
  * 販売者返品ポリシーリポジトリ
  */
 class SellerReturnPolicyRepo {
+    sellerReturnPolicyModel;
     constructor(connection) {
         this.sellerReturnPolicyModel = connection.model(sellerReturnPolicy_1.modelName, (0, sellerReturnPolicy_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_FILTER_QUERY(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         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 identifierIn = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$in;
+        const identifierIn = params.identifier?.$in;
         if (Array.isArray(identifierIn)) {
             andConditions.push({ identifier: { $in: identifierIn } });
         }
-        const identifierRegex = (_g = params.identifier) === null || _g === void 0 ? void 0 : _g.$regex;
+        const identifierRegex = params.identifier?.$regex;
         if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
             andConditions.push({ identifier: { $regex: new RegExp(identifierRegex) } });
         }
-        const nameRegex = (_h = params.name) === null || _h === void 0 ? void 0 : _h.$regex;
+        const nameRegex = params.name?.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
                 $or: [
@@ -68,66 +48,67 @@ class SellerReturnPolicyRepo {
                 ]
             });
         }
-        const restockingFeeValueEq = (_k = (_j = params.restockingFee) === null || _j === void 0 ? void 0 : _j.value) === null || _k === void 0 ? void 0 : _k.$eq;
+        const restockingFeeValueEq = params.restockingFee?.value?.$eq;
         if (typeof restockingFeeValueEq === 'number') {
             andConditions.push({ 'restockingFee.value': { $eq: restockingFeeValueEq } });
         }
-        const applicablePaymentMethodEq = (_l = params.applicablePaymentMethod) === null || _l === void 0 ? void 0 : _l.$eq;
+        const applicablePaymentMethodEq = params.applicablePaymentMethod?.$eq;
         if (typeof applicablePaymentMethodEq === 'string') {
             andConditions.push({ applicablePaymentMethod: { $exists: true, $eq: applicablePaymentMethodEq } });
         }
-        const itemConditionIdEq = (_o = (_m = params.itemCondition) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        const itemConditionIdEq = params.itemCondition?.id?.$eq;
         if (typeof itemConditionIdEq === 'string') {
             andConditions.push({ 'itemCondition.id': { $exists: true, $eq: itemConditionIdEq } });
         }
         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.sellerReturnPolicyModel.findOneAndUpdate(filter, update, options)
-                    .lean()
-                    .exec();
-                if (doc === null) {
-                    throw new factory.errors.NotFound(this.sellerReturnPolicyModel.modelName);
-                }
-                savedId = savingId;
+    async save(params) {
+        let doc;
+        let savedId;
+        const savingId = params.id;
+        if (typeof savingId === 'string') {
+            if (savingId === '') {
+                throw new factory.errors.ArgumentNull('id');
             }
-            else {
-                const _d = params.attributes, { $unset, id } = _d, createParams = __rest(_d, ["$unset", "id"]);
-                const result = yield this.sellerReturnPolicyModel.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(`seller not saved unexpectedly. result:${JSON.stringify(result)}`);
-                }
-                savedId = insertedId;
+            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.sellerReturnPolicyModel.findOneAndUpdate(filter, update, options)
+                .lean()
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.sellerReturnPolicyModel.modelName);
             }
-            return { id: savedId };
-        });
+            savedId = savingId;
+        }
+        else {
+            const { $unset, id, ...createParams } = params.attributes;
+            const result = await this.sellerReturnPolicyModel.insertMany(createParams, { rawResult: true });
+            const insertedId = result.insertedIds?.[0]?.toHexString();
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`seller 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 = SellerReturnPolicyRepo.CREATE_FILTER_QUERY(conditions);
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(inclusion.map((key) => ([key, 1])))
+    async projectFields(conditions, inclusion) {
+        const andConditions = SellerReturnPolicyRepo.CREATE_FILTER_QUERY(conditions);
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(inclusion.map((key) => ([key, 1])))
             // applicablePaymentMethod: 1,
             // identifier: 1,
             // itemCondition: 1,
@@ -136,29 +117,26 @@ class SellerReturnPolicyRepo {
             // project: 1,
             // restockingFee: 1,
             // typeOf: 1
-            );
-            const query = this.sellerReturnPolicyModel.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 })
-                .lean()
-                .exec();
-        });
+        };
+        const query = this.sellerReturnPolicyModel.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();
     }
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.sellerReturnPolicyModel.findOneAndDelete({
-                _id: { $eq: params.id },
-                'project.id': { $eq: params.project.id }
-            }, { projection: { _id: 1 } })
-                .exec();
-        });
+    async deleteById(params) {
+        await this.sellerReturnPolicyModel.findOneAndDelete({
+            _id: { $eq: params.id },
+            'project.id': { $eq: params.project.id }
+        }, { projection: { _id: 1 } })
+            .exec();
     }
 }
 exports.SellerReturnPolicyRepo = SellerReturnPolicyRepo;

package/lib/chevre/repo/service/availableHour.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.ServiceAvailableHourRepo = void 0;
 const availableHour_1 = require("../mongoose/schemas/service/availableHour");
@@ -15,39 +6,37 @@ const availableHour_1 = require("../mongoose/schemas/service/availableHour");
  * サービス利用可能時間リポジトリ
  */
 class ServiceAvailableHourRepo {
+    availableHoursModel;
     constructor(connection) {
         this.availableHoursModel = connection.model(availableHour_1.modelName, (0, availableHour_1.createSchema)());
     }
-    saveOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.availableHoursModel.create(params);
-        });
+    async saveOne(params) {
+        await this.availableHoursModel.create(params);
     }
-    findValidOne(filter, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const andQuery = [];
-            const now = filter.now;
-            andQuery.push({ validFrom: { $lte: now } }, { validThrough: { $gte: now } });
-            const filterQuery = Object.assign({}, (andQuery.length > 0) ? { $and: andQuery } : undefined);
-            // eslint-disable-next-line no-magic-numbers
-            const projection = {
-                // const projection: { [key: string]: AnyExpression } = {
-                _id: 0
-                // id: { $toString: '$_id' },
-            };
-            if (Array.isArray(inclusion)) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
-            }
-            const doc = yield this.availableHoursModel.findOne(filterQuery, projection, { sort: { validFrom: 1 } })
-                .lean()
-                .exec();
-            if (doc !== null) {
-                return doc;
-            }
-            return;
-        });
+    async findValidOne(filter, inclusion) {
+        const andQuery = [];
+        const now = filter.now;
+        andQuery.push({ validFrom: { $lte: now } }, { validThrough: { $gte: now } });
+        const filterQuery = {
+            ...(andQuery.length > 0) ? { $and: andQuery } : undefined
+        };
+        const projection = {
+            // const projection: { [key: string]: AnyExpression } = {
+            _id: 0
+            // id: { $toString: '$_id' },
+        };
+        if (Array.isArray(inclusion)) {
+            inclusion.forEach((field) => {
+                projection[field] = 1;
+            });
+        }
+        const doc = await this.availableHoursModel.findOne(filterQuery, projection, { sort: { validFrom: 1 } })
+            .lean()
+            .exec();
+        if (doc !== null) {
+            return doc;
+        }
+        return;
     }
 }
 exports.ServiceAvailableHourRepo = ServiceAvailableHourRepo;