@chevre/domain 21.4.0-alpha.26 → 21.4.0-alpha.28

package/example/src/chevre/iam/searchMemberOfIdsByMemberId.ts

@@ -0,0 +1,31 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+const memberId = String(process.env.MEMBER_ID);
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const memberRepo = new chevre.repository.Member(mongoose.connection);
+
+    const ids = await memberRepo.searchMemberOfIdsByMemberId({
+        member: {
+            id: memberId,
+            memberOf: {
+                // typeOf: chevre.factory.organizationType.Corporation,
+                typeOf: chevre.factory.organizationType.Project
+            }
+        },
+        project: {
+            id: PROJECT_ID
+        }
+    });
+    console.log(ids);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/{searchProjectIdsByMemberId.ts → iam/searchProjectIdsByMemberId.ts}

@@ -1,10 +1,10 @@
 // tslint:disable:no-console
 import * as mongoose from 'mongoose';
 
-import { chevre } from '../../../lib/index';
+import { chevre } from '../../../../lib/index';
 
 // const PROJECT_ID = String(process.env.PROJECT_ID);
-const memberId = 'xxx';
+const memberId = String(process.env.MEMBER_ID);
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);

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

@@ -134,5 +134,20 @@ export declare class MongoRepository {
         limit: number;
         page: number;
     }): Promise<string[]>;
+    /**
+     * member.memberOf.typeOfからmember.memberOf.idのリストを検索する
+     * 権限を持つ販売者IDの検索など
+     */
+    searchMemberOfIdsByMemberId(params: {
+        member: {
+            id: string;
+            memberOf: {
+                typeOf: factory.organizationType.Project | factory.organizationType.Corporation;
+            };
+        };
+        project: {
+            id: string;
+        };
+    }): Promise<string[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/member.js

@@ -302,6 +302,21 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc._id));
         });
     }
+    /**
+     * member.memberOf.typeOfからmember.memberOf.idのリストを検索する
+     * 権限を持つ販売者IDの検索など
+     */
+    searchMemberOfIdsByMemberId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const query = this.memberModel.distinct('member.memberOf.id', {
+                'project.id': { $eq: params.project.id },
+                'member.id': { $eq: params.member.id },
+                'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf }
+            });
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     getCursor(conditions, projection) {
         return this.memberModel.find(conditions, projection)
             .sort({ 'member.id': factory.sortType.Ascending })

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

@@ -25,13 +25,25 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export type ISeller = factory.seller.ISeller;
+export interface IMemberSearchConditions {
+    /**
+     * 販売者メンバーで絞る場合
+     */
+    member?: {
+        memberOf?: {
+            id?: {
+                $in?: string[];
+            };
+        };
+    };
+}
 /**
  * 販売者リポジトリ
  */
 export declare class MongoRepository {
     private readonly organizationModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): any[];
     /**
      * 特定販売者検索
      * searchに置き換え(2023-07-13~)
@@ -46,7 +58,7 @@ export declare class MongoRepository {
     /**
      * 販売者検索
      */
-    search(conditions: factory.seller.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<ISeller[]>;
+    search(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: string[], exclusion: string[]): Promise<ISeller[]>;
     /**
      * 対応決済方法を検索する
      */

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': {

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.26"
+  "version": "21.4.0-alpha.28"
 }