@chevre/domain 21.2.0-alpha.10 → 21.2.0-alpha.101

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 /**
@@ -34,7 +58,9 @@ export declare class MongoRepository {
         additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
         name?: string;
         orderNumber: string;
-    }): Promise<void>;
+    }): Promise<{
+        updatedAt: Date;
+    }>;
     findById(params: {
         id: string;
         inclusion: string[];
@@ -62,7 +88,9 @@ export declare class MongoRepository {
     /**
      * 注文を検索する
      */
-    search(params: factory.order.ISearchConditions, projection?: any): Promise<factory.order.IOrder[]>;
+    search(params: factory.order.ISearchConditions, projection?: {
+        [key: string]: 0 | 1;
+    }): Promise<factory.order.IOrder[]>;
     /**
      * 注文の受入オファーIDリストを検索する
      */
@@ -70,7 +98,11 @@ export declare class MongoRepository {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: any): Promise<factory.order.IOrder[]>;
+    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: {
+        [key: string]: any;
+    }): Promise<Omit<factory.order.IOrder[], 'acceptedOffers'> & {
+        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered> | factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    }>;
     /**
      * 特典口座情報が未保管であれば保管する
      */
@@ -86,4 +118,24 @@ export declare class MongoRepository {
             $in: string[];
         };
     }): Promise<(string)[]>;
+    /**
+     * 注文に含まれるイベントIDを検索する
+     */
+    searchReservationForIdsByOrderNumbers(params: {
+        orderNumber: {
+            $in: string[];
+        };
+    }): Promise<string[]>;
+    /**
+     * 注文に含まれるacceptedOffersを検索する
+     */
+    searchAcceptedOffersByOrderNumbers(params: {
+        orderNumber: {
+            $in: string[];
+        };
+    }): Promise<{
+        id: string;
+        priceSpecification: factory.order.ITicketPriceSpecification;
+    }[]>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/order.js

@@ -14,6 +14,7 @@ const factory = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const errorHandler_1 = require("../errorHandler");
 const order_2 = require("../factory/order");
+const settings_1 = require("../settings");
 /**
  * 注文リポジトリ
  */
@@ -779,14 +780,17 @@ class MongoRepository {
             const doc = yield this.orderModel.findOneAndUpdate({ orderNumber: { $eq: params.orderNumber } }, {
                 $set: Object.assign(Object.assign({}, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (typeof params.name === 'string') ? { name: params.name } : undefined)
             }, {
+                new: true,
                 projection: {
-                    _id: 1
+                    _id: 1,
+                    updatedAt: 1
                 }
             })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
             }
+            return { updatedAt: doc.updatedAt };
         });
     }
     findById(params) {
@@ -885,7 +889,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.orderModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -896,8 +900,15 @@ class MongoRepository {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const projectionSpecified = projection !== undefined && projection !== null;
+            const positiveProjectionExists = (projectionSpecified)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
+                : false;
             const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select(Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+                .select((projectionSpecified && positiveProjectionExists)
+                ? projection
+                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, 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)
@@ -910,7 +921,7 @@ class MongoRepository {
             }
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -925,7 +936,7 @@ class MongoRepository {
                 .select({
                 'acceptedOffers.id': 1
             });
-            const orders = yield query.setOptions({ maxTimeMS: 10000 })
+            const orders = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => {
                 return doc.toObject();
@@ -975,7 +986,7 @@ class MongoRepository {
                     .skip(params.limit * (page - 1));
             }
             return aggregate.allowDiskUse(true)
-                .option({ maxTimeMS: 10000 })
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -1002,13 +1013,54 @@ class MongoRepository {
             if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
                 return [];
             }
-            const reservationNumbers = yield this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
-                orderNumber: params.orderNumber.$in
+            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
+                'acceptedOffers.itemOffered.reservationNumber': { $exists: true },
+                orderNumber: { $in: params.orderNumber.$in }
             })
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
-            return [...new Set(reservationNumbers)];
         });
     }
+    /**
+     * 注文に含まれるイベントIDを検索する
+     */
+    searchReservationForIdsByOrderNumbers(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
+                return [];
+            }
+            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationFor.id', {
+                'acceptedOffers.itemOffered.reservationFor.id': { $exists: true },
+                orderNumber: { $in: params.orderNumber.$in }
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * 注文に含まれるacceptedOffersを検索する
+     */
+    searchAcceptedOffersByOrderNumbers(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
+                return [];
+            }
+            const aggregate = this.orderModel.aggregate();
+            aggregate.unwind('$acceptedOffers');
+            aggregate.match({ orderNumber: { $in: params.orderNumber.$in } });
+            aggregate.project({
+                _id: 0,
+                id: '$acceptedOffers.id',
+                priceSpecification: '$acceptedOffers.priceSpecification'
+            });
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    getCursor(conditions, projection) {
+        return this.orderModel.find(conditions, projection)
+            .sort({ orderDate: factory.sortType.Descending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/ownershipInfo.js

@@ -14,6 +14,7 @@ const uuid = require("uuid");
 const ownershipInfo_1 = require("./mongoose/schemas/ownershipInfo");
 const errorHandler_1 = require("../errorHandler");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 所有権リポジトリ
  */
@@ -276,12 +277,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    // public async count(params: factory.ownershipInfo.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.ownershipInfoModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: 10000 })
-    //         .exec();
-    // }
     /**
      * 所有権を検索する
      */
@@ -300,7 +295,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.ownedFrom) !== undefined) {
                 query.sort({ ownedFrom: params.sort.ownedFrom });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repo/place.js

@@ -24,6 +24,7 @@ exports.MongoRepository = void 0;
 const mongoose_1 = require("mongoose");
 const place_1 = require("./mongoose/schemas/place");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 施設リポジトリ
  */
@@ -283,7 +284,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
                 query.sort({ branchCode: params.sort.branchCode });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -1235,7 +1236,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
                 query.sort({ branchCode: params.sort.branchCode });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repo/priceSpecification.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
 const priceSpecification_1 = require("./mongoose/schemas/priceSpecification");
+const settings_1 = require("../settings");
 /**
  * 価格仕様リポジトリ
  */
@@ -156,7 +157,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.priceSpecificationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -182,7 +183,7 @@ class MongoRepository {
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
             // return;
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repo/product.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const product_1 = require("./mongoose/schemas/product");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * プロダクトリポジトリ
  */
@@ -170,7 +171,7 @@ class MongoRepository {
             if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.productID) !== undefined) {
                 query.sort({ productID: conditions.sort.productID });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repo/project.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const project_1 = require("./mongoose/schemas/project");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * プロジェクトリポジトリ
  */
@@ -89,7 +90,7 @@ class MongoRepository {
             if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a._id) !== undefined) {
                 query.sort({ _id: conditions.sort._id });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

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

@@ -23,19 +23,27 @@ export declare class MongoRepository {
     /**
      * 予約検索
      */
-    search<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, projection?: any): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
+    search<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, projection?: {
+        [key: string]: 0 | 1;
+    }): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
     findById<T extends factory.reservationType>(params: {
         id: string;
         inclusion?: string[];
         exclusion?: string[];
     }): Promise<factory.reservation.IReservation<T>>;
-    /**
-     * 予約確定
-     */
     confirmByReservationNumber(params: {
         reservationNumber: string;
         previousReservationStatus: factory.reservationStatusType;
         underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+        broker?: factory.reservation.IBroker<factory.reservationType>;
+        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
+    }): Promise<void>;
+    confirmByIdIfNotExist(params: {
+        reservation: factory.assetTransaction.reserve.IObjectSubReservation;
+        reservationFor: factory.assetTransaction.reserve.IReservationFor;
+        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+        broker?: factory.reservation.IBroker<factory.reservationType>;
+        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
     }): Promise<void>;
     /**
      * 予約取消

package/lib/chevre/repo/reservation.js

@@ -10,8 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const createDebug = require("debug");
 const reservation_1 = require("./mongoose/schemas/reservation");
 const factory = require("../factory");
+const settings_1 = require("../settings");
+const debug = createDebug('chevre-domain:repo');
 /**
  * 予約リポジトリ
  */
@@ -811,18 +814,6 @@ class MongoRepository {
         }
         return andConditions;
     }
-    // public async distinct<T extends factory.reservationType>(
-    //     field: string,
-    //     params: factory.reservation.ISearchConditions<T>
-    // ): Promise<any[]> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.reservationModel.distinct(
-    //         field,
-    //         (conditions.length > 0) ? { $and: conditions } : {}
-    //     )
-    //         .setOptions({ maxTimeMS: 10000 })
-    //         .exec();
-    // }
     createMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.reservations.length > 0) {
@@ -849,7 +840,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.reservationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -877,7 +868,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.modifiedTime) !== undefined) {
                 query.sort({ modifiedTime: params.sort.modifiedTime });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -910,61 +901,31 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    /**
-     * 予約確定
-     */
-    // public async confirm<T extends factory.reservationType>(params: {
-    //     id: string;
-    //     previousReservationStatus: factory.reservationStatusType;
-    //     underName?: factory.reservation.IUnderName<T>;
-    // }): Promise<factory.reservation.IReservation<T>> {
-    //     const conditions = {
-    //         _id: { $eq: String(params.id) },
-    //         reservationStatus: { $eq: params.previousReservationStatus }
-    //     };
-    //     // 更新属性をwhitelist化(2022-06-13~)
-    //     const update = {
-    //         // previousReservationStatusを保管(2023-01-19~)
-    //         previousReservationStatus: params.previousReservationStatus,
-    //         reservationStatus: factory.reservationStatusType.ReservationConfirmed,
-    //         modifiedTime: new Date(),
-    //         ...(params.underName !== undefined) ? { underName: params.underName } : undefined
-    //     };
-    //     const doc = await this.reservationModel.findOneAndUpdate(
-    //         conditions,
-    //         update,
-    //         { new: true }
-    //     )
-    //         .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-    //         .exec();
-    //     // NotFoundであれば状態確認
-    //     if (doc === null) {
-    //         const reservation = await this.findById<T>({ id: String(params.id) });
-    //         if (reservation.reservationStatus === factory.reservationStatusType.ReservationConfirmed) {
-    //             // すでに確定済の場合
-    //             return reservation;
-    //         } else {
-    //             throw new factory.errors.Argument(
-    //                 'id',
-    //                 `Reservation ${reservation.id} already changed -> ${reservation.reservationStatus}`
-    //             );
-    //         }
-    //     }
-    //     return doc.toObject();
-    // }
     confirmByReservationNumber(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = {
                 reservationNumber: { $eq: String(params.reservationNumber) },
                 reservationStatus: { $eq: params.previousReservationStatus }
             };
-            const update = Object.assign({ 
+            const update = Object.assign(Object.assign(Object.assign({ 
                 // previousReservationStatusを保管(2023-01-19~)
-                previousReservationStatus: params.previousReservationStatus, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined);
+                previousReservationStatus: params.previousReservationStatus, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined);
             yield this.reservationModel.updateMany(conditions, update)
                 .exec();
         });
     }
+    confirmByIdIfNotExist(params) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const confirmedReservation = yield this.reservationModel.findOneAndUpdate({ _id: { $eq: params.reservation.id } }, {
+                $setOnInsert: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, params.reservation), { _id: params.reservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }), (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined)
+            }, { upsert: true, new: true })
+                .select({ _id: 1 })
+                .exec();
+            debug('confirmByIdIfNotExist processed.confirmedReservation:', confirmedReservation);
+        });
+    }
     /**
      * 予約取消
      */
@@ -1174,7 +1135,7 @@ class MongoRepository {
                 }
             })
                 .select({ _id: 1 })
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc._id.toString()));
         });

package/lib/chevre/repo/role.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = exports.RoleType = void 0;
 const factory = require("../factory");
 const role_1 = require("./mongoose/schemas/role");
+const settings_1 = require("../settings");
 var RoleType;
 (function (RoleType) {
     RoleType["OrganizationRole"] = "OrganizationRole";
@@ -67,7 +68,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.roleModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -91,7 +92,7 @@ class MongoRepository {
             }
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repo/seller.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const seller_1 = require("./mongoose/schemas/seller");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 販売者リポジトリ
  */
@@ -32,21 +33,12 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         // MongoDB検索条件
         const andConditions = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        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') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         const nameRegex = params.name;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
@@ -67,7 +59,7 @@ class MongoRepository {
                 ]
             });
         }
-        const branchCodeEq = (_a = params.branchCode) === null || _a === void 0 ? void 0 : _a.$eq;
+        const branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof branchCodeEq === 'string') {
             andConditions.push({
                 branchCode: {
@@ -75,7 +67,7 @@ class MongoRepository {
                 }
             });
         }
-        const branchCodeRegex = (_b = params.branchCode) === null || _b === void 0 ? void 0 : _b.$regex;
+        const branchCodeRegex = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$regex;
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
             andConditions.push({
                 branchCode: {
@@ -83,7 +75,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_c = params.additionalProperty) === null || _c === void 0 ? void 0 : _c.$all;
+        const additionalPropertyAll = (_e = params.additionalProperty) === null || _e === void 0 ? void 0 : _e.$all;
         if (Array.isArray(additionalPropertyAll)) {
             andConditions.push({
                 additionalProperty: {
@@ -92,7 +84,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyIn = (_d = params.additionalProperty) === null || _d === void 0 ? void 0 : _d.$in;
+        const additionalPropertyIn = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(additionalPropertyIn)) {
             andConditions.push({
                 additionalProperty: {
@@ -101,7 +93,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyNin = (_e = params.additionalProperty) === null || _e === void 0 ? void 0 : _e.$nin;
+        const additionalPropertyNin = (_g = params.additionalProperty) === null || _g === void 0 ? void 0 : _g.$nin;
         if (Array.isArray(additionalPropertyNin)) {
             andConditions.push({
                 additionalProperty: {
@@ -109,7 +101,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
+        const additionalPropertyElemMatch = (_h = params.additionalProperty) === null || _h === void 0 ? void 0 : _h.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -118,6 +110,15 @@ class MongoRepository {
                 }
             });
         }
+        const hasMerchantReturnPolicyItemConditionIdEq = (_l = (_k = (_j = params.hasMerchantReturnPolicy) === null || _j === void 0 ? void 0 : _j.itemCondition) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
+            andConditions.push({
+                'hasMerchantReturnPolicy.itemCondition.id': {
+                    $exists: true,
+                    $eq: hasMerchantReturnPolicyItemConditionIdEq
+                }
+            });
+        }
         return andConditions;
     }
     /**
@@ -160,7 +161,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.organizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -182,7 +183,7 @@ class MongoRepository {
             if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
                 query.sort({ branchCode: conditions.sort.branchCode });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });