@chevre/domain 21.2.0-alpha.15 → 21.2.0-alpha.150

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()));
         });

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

@@ -1,4 +1,6 @@
+import { Connection } from 'mongoose';
 import { RedisClientType } from 'redis';
+import * as factory from '../factory';
 export interface IOffer {
     itemOffered?: {
         serviceOutput?: {
@@ -12,18 +14,70 @@ export interface IOffer {
     seatNumber: string;
 }
 export interface ILockKey {
+    project: {
+        id: string;
+    };
     eventId: string;
     startDate: Date;
+    hasTicketedSeat: boolean;
     offers: IOffer[];
     expires: Date;
     holder: string;
 }
 export interface IUnlockKey {
+    project: {
+        id: string;
+    };
     eventId: string;
     startDate: Date;
+    hasTicketedSeat: boolean;
     offer: IOffer;
+    holder: string;
 }
 export type IGetHolderResult = string | null;
+export interface ISubReservation {
+    id?: string;
+    identifier: string;
+    reservedTicket?: {
+        ticketedSeat?: Pick<factory.reservation.ISeat<factory.reservationType>, 'seatNumber' | 'seatSection'>;
+    };
+}
+export interface IReservationPackage {
+    reservationNumber: string;
+    subReservation: ISubReservation[];
+}
+export interface IAggregateReservation {
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+    typeOf: 'AggregateReservation';
+    reservationCount: number;
+    reservationFor: {
+        id: string;
+        startDate: Date;
+    };
+    reservations: IReservationPackage[];
+}
+export interface ISearchSubReservationResult {
+    reservationNumber: string;
+    identifier: string;
+}
+export interface ISearchResult {
+    reservationNumber: string;
+    identifier: string;
+    reservationFor: {
+        id: string;
+        startDate: Date;
+        aggregateReservation: {
+            reservationCount: number;
+        };
+    };
+    reservedTicket?: {
+        ticketedSeat?: Pick<factory.reservation.ISeat<factory.reservationType>, 'seatNumber' | 'seatSection'>;
+    };
+    objectSize?: number;
+}
 /**
  * イベントストックホルダーリポジトリ
  */
@@ -31,9 +85,15 @@ export declare class StockHolderRepository {
     static KEY_PREFIX_NEW: string;
     static KEY_PREFIX: string;
     private readonly redisClient;
-    constructor(redisClient: RedisClientType);
+    private readonly holdReservationModel;
+    constructor(redisClient: RedisClientType, connection: Connection);
     private static offer2field;
+    private static offer2subReservation;
     private static createKey;
+    /**
+     * 新リポジトリを使用するかどうか
+     */
+    private static useMongoose;
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
@@ -41,7 +101,12 @@ export declare class StockHolderRepository {
     /**
      * 座席をロックする
      */
-    lock(lockKey: ILockKey): Promise<void>;
+    lock(lockKey: ILockKey & {
+        /**
+         * テスト目的の強制オプション
+         */
+        useMongooseForcibly?: boolean;
+    }): Promise<void>;
     /**
      * 座席ロックを解除する
      */
@@ -49,10 +114,6 @@ export declare class StockHolderRepository {
     /**
      * 空席でない座席を検索する
      */
-    findUnavailableOffersByEventId(params: {
-        eventId: string;
-        startDate: Date;
-    }): Promise<IOffer[]>;
     /**
      * 空席でない座席をカウントする
      */
@@ -60,20 +121,95 @@ export declare class StockHolderRepository {
         event: {
             id: string;
             startDate: Date;
+            hasTicketedSeat: boolean;
         };
     }): Promise<number>;
     /**
      * 保持者を取得する
      */
-    getHolder(params: IUnlockKey): Promise<string | null | undefined>;
+    getHolder(params: Omit<IUnlockKey, 'holder'>): Promise<string | null | undefined>;
     /**
      * 在庫状況を検索する
      * offers.lengthが0だと"ERR wrong number of arguments for 'hmget' command"となるので注意
      */
     searchHolders(params: {
+        project: {
+            id: string;
+        };
         eventId: string;
         startDate: Date;
+        hasTicketedSeat: boolean;
         offers: IOffer[];
     }): Promise<IGetHolderResult[]>;
+    /**
+     * 汎用的な検索(mongooseのみ対応)
+     */
+    search(params: {
+        limit?: number;
+        page?: number;
+        sort?: {
+            'reservationFor.startDate': factory.sortType;
+        };
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        reservationFor?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        reservationNumber?: {
+            $eq?: string;
+        };
+        id?: {
+            $eq?: string;
+        };
+        identifier?: {
+            $eq?: string;
+        };
+        reservedTicket?: {
+            ticketedSeat?: {
+                seatNumber?: {
+                    $eq?: string;
+                };
+                seatSection?: {
+                    $eq?: string;
+                };
+            };
+        };
+    }): Promise<ISearchResult[]>;
+    /**
+     * 汎用的な集計(mongooseのみ対応)
+     */
+    aggregateByReservationFor(params: {
+        limit?: number;
+        page?: number;
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        reservationFor?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+    }): Promise<{
+        typeOf: 'AggregateReservation';
+        reservationCount: number;
+        reservationFor: {
+            id: string;
+            startDate: Date;
+        };
+        reservationPackageCount: number;
+        objectSize: number;
+    }[]>;
     private checkIfConflicted;
+    private initializeHoldReservation;
+    /**
+     * 仮で追加したholdReservationsが重複していないかどうか検証する
+     */
+    private checkIfAlreadyInUse;
 }