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

package/example/src/chevre/migrateIAMMemberMemberOf.ts

@@ -35,7 +35,7 @@ async function main() {
         } else {
             console.log(
                 'updating reservation...', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, memberOfId, i);
-            await memberRepo.updateByMemberId({
+            await memberRepo.updateByMemberMemberOf({
                 project: { id: iamMember.project.id },
                 member: {
                     id: iamMember.member.id,

package/example/src/chevre/searchProjectIdsByMemberId.ts

@@ -0,0 +1,32 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const PROJECT_ID = String(process.env.PROJECT_ID);
+const memberId = 'xxx';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const memberRepo = new chevre.repository.Member(mongoose.connection);
+
+    const ids = await memberRepo.searchProjectIdsByMemberId({
+        member: {
+            id: memberId
+        },
+        project: {
+            id: {
+                // $regex: 'c'
+            }
+        },
+        limit: 3,
+        page: 1
+
+    });
+    console.log(ids);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -75,11 +75,26 @@ export declare class MongoRepository {
             id: string;
         };
         member: {
-            hasRole?: factory.iam.IMemberHasRole;
             id: string;
+            memberOf: {
+                id: string;
+                typeOf: factory.organizationType.Project;
+            };
+            hasRole?: factory.iam.IMemberHasRole;
             image?: string;
             name?: string;
-            memberOf?: {
+        };
+    }): Promise<void>;
+    /**
+     * 互換性維持プログラム専用
+     */
+    updateByMemberMemberOf(params: {
+        project: {
+            id: string;
+        };
+        member: {
+            id: string;
+            memberOf: {
                 id: string;
                 typeOf: factory.organizationType.Project;
             };
@@ -94,6 +109,14 @@ export declare class MongoRepository {
         };
         member: {
             id: string;
+            memberOf: {
+                id: {
+                    $eq: string;
+                };
+                typeOf: {
+                    $eq: factory.organizationType.Project;
+                };
+            };
         };
     }): Promise<void>;
     /**

package/lib/chevre/repo/member.js

@@ -222,12 +222,30 @@ class MongoRepository {
      * メンバー更新
      */
     updateByMemberId(params) {
-        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.memberModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                'member.id': { $eq: params.member.id },
+                'member.memberOf.id': { $eq: params.member.memberOf.id },
+                'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf }
+            }, Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (Array.isArray(params.member.hasRole)) ? { 'member.hasRole': params.member.hasRole } : undefined), (typeof params.member.image === 'string') ? { 'member.image': params.member.image } : undefined), (typeof params.member.name === 'string') ? { 'member.name': params.member.name } : undefined))
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.memberModel.modelName);
+            }
+        });
+    }
+    /**
+     * 互換性維持プログラム専用
+     */
+    updateByMemberMemberOf(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.memberModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 'member.id': { $eq: params.member.id }
-            }, Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (Array.isArray(params.member.hasRole)) ? { 'member.hasRole': params.member.hasRole } : undefined), (typeof params.member.image === 'string') ? { 'member.image': params.member.image } : undefined), (typeof params.member.name === 'string') ? { 'member.name': params.member.name } : undefined), (typeof ((_a = params.member.memberOf) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { 'member.memberOf': params.member.memberOf } : undefined))
+            }, {
+                'member.memberOf': params.member.memberOf
+            })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.memberModel.modelName);
@@ -241,7 +259,9 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.memberModel.findOneAndDelete({
                 'project.id': { $eq: params.project.id },
-                'member.id': { $eq: params.member.id }
+                'member.id': { $eq: params.member.id },
+                'member.memberOf.id': { $eq: params.member.memberOf.id.$eq },
+                'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf.$eq }
             })
                 .exec();
             if (doc === null) {
@@ -255,21 +275,31 @@ class MongoRepository {
     searchProjectIdsByMemberId(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const searchConditions = Object.assign({ 'member.id': { $eq: params.member.id } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$regex) === 'string' && params.project.id.$regex.length > 0)
-                ? { 'project.id': { $regex: new RegExp(params.project.id.$regex) } }
-                : undefined);
-            const query = this.memberModel.find(searchConditions, { project: 1 })
-                // sortを保証する
-                .sort({ 'project.id': factory.sortType.Ascending });
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                query.limit(params.limit)
-                    .skip(params.limit * (page - 1));
+            if (typeof params.limit !== 'number') {
+                throw new factory.errors.ArgumentNull('limit');
+            }
+            if (typeof params.page !== 'number') {
+                throw new factory.errors.ArgumentNull('page');
+            }
+            const matchStages = [{ $match: { 'member.id': { $eq: params.member.id } } }];
+            if (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$regex) === 'string' && params.project.id.$regex.length > 0) {
+                matchStages.push({ $match: { 'project.id': { $regex: new RegExp(params.project.id.$regex) } } });
             }
-            const projectMembers = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            const aggregate = this.memberModel.aggregate([
+                ...matchStages,
+                {
+                    $group: {
+                        _id: '$project.id'
+                    }
+                },
+                { $sort: { _id: factory.sortType.Ascending } }
+            ])
+                .limit(params.limit * page)
+                .skip(params.limit * (page - 1));
+            return aggregate
                 .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
-            return projectMembers.map((m) => m.project.id);
+                .then((docs) => docs.map((doc) => doc._id));
         });
     }
     getCursor(conditions, projection) {

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.25"
+  "version": "21.4.0-alpha.26"
 }