@chevre/domain 21.4.0-alpha.8 → 21.4.0

package/lib/chevre/repo/seller.js

@@ -34,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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         // 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;
@@ -45,6 +45,11 @@ class MongoRepository {
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
+        // メンバー条件追加(2023-07-24~)
+        const memberMemberOfIdIn = (_f = (_e = (_d = params.member) === null || _d === void 0 ? void 0 : _d.memberOf) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
+        if (Array.isArray(memberMemberOfIdIn)) {
+            andConditions.push({ _id: { $in: memberMemberOfIdIn } });
+        }
         const nameRegex = params.name;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
@@ -64,7 +69,7 @@ class MongoRepository {
                 ]
             });
         }
-        const branchCodeEq = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$eq;
+        const branchCodeEq = (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof branchCodeEq === 'string') {
             andConditions.push({
                 branchCode: {
@@ -72,7 +77,7 @@ class MongoRepository {
                 }
             });
         }
-        const branchCodeRegex = (_e = params.branchCode) === null || _e === void 0 ? void 0 : _e.$regex;
+        const branchCodeRegex = (_h = params.branchCode) === null || _h === void 0 ? void 0 : _h.$regex;
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
             andConditions.push({
                 branchCode: {
@@ -80,7 +85,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$all;
+        const additionalPropertyAll = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$all;
         if (Array.isArray(additionalPropertyAll)) {
             andConditions.push({
                 additionalProperty: {
@@ -89,7 +94,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyIn = (_g = params.additionalProperty) === null || _g === void 0 ? void 0 : _g.$in;
+        const additionalPropertyIn = (_k = params.additionalProperty) === null || _k === void 0 ? void 0 : _k.$in;
         if (Array.isArray(additionalPropertyIn)) {
             andConditions.push({
                 additionalProperty: {
@@ -98,7 +103,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyNin = (_h = params.additionalProperty) === null || _h === void 0 ? void 0 : _h.$nin;
+        const additionalPropertyNin = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$nin;
         if (Array.isArray(additionalPropertyNin)) {
             andConditions.push({
                 additionalProperty: {
@@ -106,7 +111,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+        const additionalPropertyElemMatch = (_m = params.additionalProperty) === null || _m === void 0 ? void 0 : _m.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -115,7 +120,7 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyItemConditionIdEq = (_m = (_l = (_k = params.hasMerchantReturnPolicy) === null || _k === void 0 ? void 0 : _k.itemCondition) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
+        const hasMerchantReturnPolicyItemConditionIdEq = (_q = (_p = (_o = params.hasMerchantReturnPolicy) === null || _o === void 0 ? void 0 : _o.itemCondition) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.itemCondition.id': {
@@ -128,37 +133,39 @@ class MongoRepository {
     }
     /**
      * 特定販売者検索
+     * searchに置き換え(2023-07-13~)
      */
-    findById(conditions, 
-    // projection?: any
-    inclusion, exclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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);
-            }
-            return doc.toObject();
-        });
-    }
+    // public async findById(
+    //     conditions: {
+    //         id: string;
+    //     },
+    //     inclusion: string[],
+    //     exclusion: string[]
+    // ): Promise<ISeller> {
+    //     let projection: { [key: string]: number } = {};
+    //     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 = await this.organizationModel.findOne({ _id: conditions.id }, projection)
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.organizationModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     /**
      * 販売者を保管する
      */
@@ -172,7 +179,10 @@ class MongoRepository {
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const _a = params.attributes, { id, branchCode, project, typeOf } = _a, updateFields = __rest(_a, ["id", "branchCode", "project", "typeOf"]);
-                const doc = yield this.organizationModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const doc = yield this.organizationModel.findOneAndUpdate({
+                    _id: params.id,
+                    'project.id': { $eq: project.id }
+                }, updateFields, { upsert: false, new: true })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.organizationModel.modelName);
@@ -182,12 +192,6 @@ class MongoRepository {
             return organization;
         });
     }
-    // public async count(params: factory.seller.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.organizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * 販売者検索
      */
@@ -270,7 +274,10 @@ class MongoRepository {
      */
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.organizationModel.findOneAndRemove({ _id: params.id })
+            yield this.organizationModel.findOneAndRemove({
+                _id: params.id,
+                'project.id': { $eq: params.project.id }
+            })
                 .exec();
         });
     }

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

@@ -85,10 +85,8 @@ export declare class StockHolderRepository {
     static KEY_PREFIX_NEW: string;
     static KEY_PREFIX: string;
     private readonly redisClient;
-    private readonly holdReservationModel;
-    constructor(redisClient: RedisClientType, connection: Connection);
+    constructor(redisClient: RedisClientType, __: Connection);
     private static offer2field;
-    private static offer2subReservation;
     private static createKey;
     /**
      * 新リポジトリを使用するかどうか
@@ -101,12 +99,7 @@ export declare class StockHolderRepository {
     /**
      * 座席をロックする
      */
-    lock(lockKey: ILockKey & {
-        /**
-         * テスト目的の強制オプション
-         */
-        useMongooseForcibly?: boolean;
-    }): Promise<void>;
+    lock(lockKey: ILockKey & {}): Promise<void>;
     /**
      * 座席ロックを解除する
      */
@@ -128,10 +121,6 @@ export declare class StockHolderRepository {
      * 保持者を取得する
      */
     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;
@@ -144,72 +133,8 @@ export declare class StockHolderRepository {
     /**
      * 汎用的な検索(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;
 }