@chevre/domain 21.2.0-alpha.14 → 21.2.0-alpha.141

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

@@ -25,6 +25,9 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export type IProduct = factory.product.IProduct | factory.service.paymentService.IService;
+export type IPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'additionalProperty'> & {
+    provider?: Pick<factory.service.paymentService.IProvider, 'credentials'>;
+};
 /**
  * プロダクトリポジトリ
  */
@@ -37,9 +40,7 @@ export declare class MongoRepository {
     }, projection?: {
         [key: string]: number;
     }): Promise<IProduct>;
-    search(conditions: factory.product.ISearchConditions, projection?: {
-        [key: string]: number;
-    }): Promise<IProduct[]>;
+    search(conditions: factory.product.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<IProduct[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;
@@ -53,6 +54,20 @@ export declare class MongoRepository {
         typeOf: factory.service.paymentService.PaymentServiceType;
         id: string;
     }): Promise<factory.product.IAvailableChannel>;
+    searchPaymentServicesByProvider(params: Pick<factory.product.ISearchConditions, 'limit' | 'page' | 'sort' | 'project' | 'provider' | 'typeOf'>): Promise<IPaymentServiceByProvider[]>;
+    /**
+     * 決済サービスのプロバイダー検索
+     */
+    searchProviders(params: {
+        limit?: number;
+        page?: number;
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        id: string;
+    }): Promise<factory.service.paymentService.IProvider[]>;
     /**
      * プロダクトを保管する
      * 作成 or 更新

package/lib/chevre/repo/product.js

@@ -21,8 +21,10 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const product_1 = require("./mongoose/schemas/product");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * プロダクトリポジトリ
  */
@@ -32,7 +34,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -143,6 +145,11 @@ class MongoRepository {
                 ]
             });
         }
+        // プロバイダー条件を追加(2023-06-21~)
+        const providerIdEq = (_x = (_w = params.provider) === null || _w === void 0 ? void 0 : _w.id) === null || _x === void 0 ? void 0 : _x.$eq;
+        if (typeof providerIdEq === 'string') {
+            andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
+        }
         return andConditions;
     }
     findById(conditions, projection) {
@@ -155,11 +162,31 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    search(conditions, projection) {
+    search(conditions, 
+    // projection?: { [key: string]: number }
+    inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
-            const query = this.productModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const query = this.productModel.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)
@@ -170,7 +197,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()));
         });
@@ -192,7 +219,7 @@ class MongoRepository {
                 project: { id: { $eq: params.project.id } },
                 typeOf: { $eq: params.typeOf },
                 id: { $eq: params.id }
-            });
+            }, [], []);
             const paymentServiceSetting = paymentServices.shift();
             if (paymentServiceSetting === undefined) {
                 throw new factory.errors.NotFound('PaymentService');
@@ -204,6 +231,113 @@ class MongoRepository {
             return availableChannel;
         });
     }
+    searchPaymentServicesByProvider(params) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function* () {
+            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 typeOfEq = (_c = params.typeOf) === null || _c === void 0 ? void 0 : _c.$eq;
+            if (typeof typeOfEq === 'string') {
+                matchStages.push({ $match: { typeOf: { $eq: typeOfEq } } });
+            }
+            const providerIdEq = (_e = (_d = params.provider) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
+            if (typeof providerIdEq === 'string') {
+                matchStages.push({ $match: { 'provider.id': { $exists: true, $eq: providerIdEq } } });
+            }
+            const aggregate = this.productModel.aggregate([
+                ...(typeof ((_f = params.sort) === null || _f === void 0 ? void 0 : _f.productID) === 'number')
+                    ? [{ $sort: { productID: params.sort.productID } }]
+                    : [],
+                {
+                    $unwind: {
+                        path: '$provider'
+                    }
+                },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        typeOf: '$typeOf',
+                        productID: '$productID',
+                        description: '$description',
+                        name: '$name',
+                        // provider: [ [Object] ],
+                        additionalProperty: '$additionalProperty',
+                        serviceType: '$serviceType',
+                        id: { $toString: '$_id' },
+                        // ↓セキュアな情報を隠蔽するように
+                        provider: {
+                            credentials: {
+                                shopId: '$provider.credentials.shopId',
+                                tokenizationCode: '$provider.credentials.tokenizationCode',
+                                paymentUrl: {
+                                    expiresInSeconds: '$provider.credentials.paymentUrl.expiresInSeconds',
+                                    useCallback: '$provider.credentials.paymentUrl.useCallback',
+                                    useWebhook: '$provider.credentials.paymentUrl.useWebhook'
+                                }
+                            }
+                        }
+                    }
+                }
+            ]);
+            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();
+        });
+    }
+    /**
+     * 決済サービスのプロバイダー検索
+     */
+    searchProviders(params) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            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 } } });
+            }
+            matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.id) } } });
+            const aggregate = this.productModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$provider'
+                    }
+                },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        // ↓セキュアな情報を隠蔽するように
+                        credentials: {
+                            shopId: '$provider.credentials.shopId',
+                            tokenizationCode: '$provider.credentials.tokenizationCode',
+                            paymentUrl: {
+                                expiresInSeconds: '$provider.credentials.paymentUrl.expiresInSeconds',
+                                useCallback: '$provider.credentials.paymentUrl.useCallback',
+                                useWebhook: '$provider.credentials.paymentUrl.useWebhook'
+                            }
+                        },
+                        id: '$provider.id',
+                        name: '$provider.name'
+                    }
+                }
+            ]);
+            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();
+        });
+    }
     /**
      * プロダクトを保管する
      * 作成 or 更新

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

@@ -1,3 +1,4 @@
+import { BulkWriteResult as BulkWriteOpResultObject } from 'mongodb';
 import { Connection, UpdateWriteOpResult } from 'mongoose';
 import * as factory from '../factory';
 export interface IUpdatePartiallyParams {
@@ -23,20 +24,35 @@ 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>;
+    confirmManyIfNotExist(params: {
+        subReservation: 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<BulkWriteOpResultObject | void>;
     /**
      * 予約取消
      */

package/lib/chevre/repo/reservation.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const reservation_1 = require("./mongoose/schemas/reservation");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 予約リポジトリ
  */
@@ -811,18 +812,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 +838,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 +866,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 +899,53 @@ 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* () {
+            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();
+        });
+    }
+    confirmManyIfNotExist(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const modifiedTime = new Date();
+            const bulkWriteOps = [];
+            if (Array.isArray(params.subReservation)) {
+                params.subReservation.forEach((subReservation) => {
+                    var _a, _b;
+                    bulkWriteOps.push({
+                        updateOne: {
+                            filter: { _id: { $eq: subReservation.id } },
+                            update: {
+                                $setOnInsert: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, subReservation), { _id: subReservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime }), (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
+                        }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                return this.reservationModel.bulkWrite(bulkWriteOps, { ordered: false });
+            }
+        });
+    }
     /**
      * 予約取消
      */
@@ -1174,7 +1155,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.d.ts

@@ -37,7 +37,7 @@ export declare class MongoRepository {
      */
     findById(conditions: {
         id: string;
-    }, projection?: any): Promise<ISeller>;
+    }, inclusion: string[], exclusion: string[]): Promise<ISeller>;
     /**
      * 販売者を保管する
      */

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,14 +110,43 @@ 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;
     }
     /**
      * 特定販売者検索
      */
-    findById(conditions, projection) {
+    findById(conditions, 
+    // projection?: any
+    inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.organizationModel.findOne({ _id: conditions.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.organizationModel.findOne({ _id: conditions.id }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.organizationModel.modelName);
@@ -160,7 +181,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 +203,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()));
         });

package/lib/chevre/repo/serviceOutput.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const serviceOutput_1 = require("./mongoose/schemas/serviceOutput");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * サービスアウトプットリポジトリ
  */
@@ -128,7 +129,7 @@ class MongoRepository {
             // if (params.sort !== undefined) {
             //     query.sort(params.sort);
             // }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });