@chevre/domain 21.4.0-alpha.31 → 21.4.0-alpha.33

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

@@ -7,7 +7,7 @@ import { chevre } from '../../../../lib/index';
 const memberId = String(process.env.MEMBER_ID);
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
 
     const memberRepo = new chevre.repository.Member(mongoose.connection);
 

package/example/src/chevre/importEventsFromCOA.ts

@@ -8,7 +8,7 @@ import { chevre } from '../../../lib/index';
 const project = { id: String(process.env.PROJECT_ID) };
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const actionRepo = new chevre.repository.Action(mongoose.connection);
     const categoryCodeRepo = new chevre.repository.CategoryCode(mongoose.connection);
@@ -21,10 +21,11 @@ async function main() {
             id: project.id,
             typeOf: chevre.factory.organizationType.Project
         },
-        locationBranchCode: '018',
-        importFrom: moment('2023-05-17T02:45:00.214Z')
+        locationBranchCode: '022',
+        importFrom: moment()
             .toDate(),
-        importThrough: moment('2023-05-20T02:45:00.214Z')
+        importThrough: moment()
+            .add(1, 'day')
             .toDate(),
         saveMovieTheater: false,
         saveScreeningEventSeries: false

package/example/src/chevre/migrateEventOrganizer.ts

@@ -9,7 +9,7 @@ import { chevre } from '../../../lib/index';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const eventRepo = new chevre.repository.Event(mongoose.connection);
     const placeRepo = new chevre.repository.Place(mongoose.connection);

package/example/src/chevre/migrateIAMMemberMemberOf.ts

@@ -9,7 +9,7 @@ import { chevre } from '../../../lib/index';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const memberRepo = new chevre.repository.Member(mongoose.connection);
 

package/example/src/chevre/migrateScreeningRoomOrganizer.ts

@@ -9,7 +9,7 @@ import { chevre } from '../../../lib/index';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const placeRepo = new chevre.repository.Place(mongoose.connection);
 

package/example/src/chevre/searchActions.ts

@@ -6,7 +6,7 @@ import * as  mongoose from 'mongoose';
 // const project = { id: String(process.env.PROJECT_ID) };
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const actionRepo = new chevre.repository.Action(mongoose.connection);
     const actions = await actionRepo.search(

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

@@ -128,6 +128,7 @@ export declare class MongoRepository {
         };
         project?: {
             id?: {
+                $eq?: string;
                 $regex?: string;
             };
         };

package/lib/chevre/repo/member.js

@@ -274,7 +274,7 @@ class MongoRepository {
      * メンバーの権限を持つプロジェクト検索
      */
     searchProjectIdsByMemberId(params) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             if (typeof params.limit !== 'number') {
                 throw new factory.errors.ArgumentNull('limit');
@@ -283,7 +283,10 @@ class MongoRepository {
                 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) {
+            if (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq) === 'string') {
+                matchStages.push({ $match: { 'project.id': { $eq: params.project.id.$eq } } });
+            }
+            if (typeof ((_d = (_c = params.project) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$regex) === 'string' && params.project.id.$regex.length > 0) {
                 matchStages.push({ $match: { 'project.id': { $regex: new RegExp(params.project.id.$regex) } } });
             }
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;

package/lib/chevre/repo/mongoose/schemas/member.js

@@ -50,8 +50,16 @@ exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ 'member.id': 1 }, { name: 'searchByMemberId' });
-schema.index({ 'project.id': 1, 'member.id': 1 }, {
-    name: 'uniqueProjectMember',
+// uniqueIndex再設定(2023-07-25~)
+// schema.index(
+//     { 'project.id': 1, 'member.id': 1 },
+//     {
+//         name: 'uniqueProjectMember',
+//         unique: true
+//     }
+// );
+schema.index({ 'project.id': 1, 'member.id': 1, 'member.memberOf.id': 1 }, {
+    name: 'uniqueIAMMember',
     unique: true
 });
 schema.index({ 'member.typeOf': 1, 'member.id': 1 }, {

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