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

package/example/src/chevre/migrateIAMMemberMemberOf.ts

@@ -0,0 +1,59 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+
+    const memberRepo = new chevre.repository.Member(mongoose.connection);
+
+    const cursor = memberRepo.getCursor(
+        {},
+        {
+            // _id: 1,
+        }
+    );
+    console.log('members found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const iamMember: chevre.factory.iam.IMember = doc.toObject();
+
+        const memberOfId = iamMember.member.memberOf?.id;
+        const alreadyMigrated = typeof memberOfId === 'string';
+
+        if (alreadyMigrated) {
+            console.log('already exist...', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, memberOfId, i);
+        } else {
+            console.log(
+                'updating reservation...', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, memberOfId, i);
+            await memberRepo.updateByMemberId({
+                project: { id: iamMember.project.id },
+                member: {
+                    id: iamMember.member.id,
+                    memberOf: {
+                        id: iamMember.project.id,
+                        typeOf: chevre.factory.organizationType.Project
+                    }
+                }
+            });
+            updateCount += 1;
+            console.log('updated.', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, memberOfId, i);
+        }
+    });
+
+    console.log(i, 'members checked');
+    console.log(updateCount, 'members updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/migrateReservationProvider.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 reservationRepo = new chevre.repository.Reservation(mongoose.connection);
     const placeRepo = new chevre.repository.Place(mongoose.connection);
@@ -22,9 +22,11 @@ async function main() {
                 ]
             },
             // bookingTime: {
-            //     $gte: moment('2023-06-09T00:00:00Z')
+            //     $gte: moment('2022-07-01T00:00:00Z')
+            //         .toDate(),
+            //     $lte: moment('2022-03-01T00:00:00Z')
             //         .toDate()
-            // }
+            // },
             'provider.id': { $exists: false }
         },
         {

package/example/src/chevre/searchPermissions.ts

@@ -15,24 +15,16 @@ async function main() {
 
     let now: Date;
 
-    // let now = new Date();
-    // const aggregateRoleNamesResult = await memberRepo.aggregateRoleNames({
-    //     project: { id: { $eq: PROJECT_ID } },
-    //     member: { id: { $eq: memberId } }
-    // });
-
-    // const aggregatePermissionsResult = await roleRepo.aggregatePermissions({
-    //     roleName: {
-    //         $in: aggregateRoleNamesResult.map((r) => r.roleName)
-    //     }
-    // });
-    // console.log('time cost:', moment()
-    //     .diff(now));
-
     now = new Date();
     const searchPermissionsResult = await chevre.service.iam.searchPermissions({
         project: { id: PROJECT_ID },
-        member: { id: memberId }
+        member: {
+            id: memberId,
+            memberOf: {
+                id: PROJECT_ID,
+                typeOf: chevre.factory.organizationType.Project
+            }
+        }
     })({
         member: memberRepo,
         role: roleRepo

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 /**
@@ -19,6 +43,14 @@ export declare class MongoRepository {
             id: {
                 $eq: string;
             };
+            memberOf: {
+                id: {
+                    $eq: string;
+                };
+                typeOf: {
+                    $eq: factory.organizationType.Project;
+                };
+            };
         };
     }): Promise<{
         roleName: string;
@@ -47,6 +79,10 @@ export declare class MongoRepository {
             id: string;
             image?: string;
             name?: string;
+            memberOf?: {
+                id: string;
+                typeOf: factory.organizationType.Project;
+            };
         };
     }): Promise<void>;
     /**
@@ -75,4 +111,5 @@ export declare class MongoRepository {
         limit: number;
         page: number;
     }): Promise<string[]>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/member.js

@@ -22,7 +22,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -48,6 +48,14 @@ class MongoRepository {
                 }
             }
         }
+        const memberMemberOfTypeOfEq = (_c = (_b = (_a = params.member) === null || _a === void 0 ? void 0 : _a.memberOf) === null || _b === void 0 ? void 0 : _b.typeOf) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof memberMemberOfTypeOfEq === 'string') {
+            andConditions.push({ 'member.memberOf.typeOf': { $eq: memberMemberOfTypeOfEq } });
+        }
+        const memberMemberOfIdEq = (_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.$eq;
+        if (typeof memberMemberOfIdEq === 'string') {
+            andConditions.push({ 'member.memberOf.id': { $eq: memberMemberOfIdEq } });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.member !== undefined && params.member !== null) {
@@ -71,7 +79,7 @@ class MongoRepository {
                 }
             }
         }
-        const memberIdIn = (_b = (_a = params.member) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$in;
+        const memberIdIn = (_h = (_g = params.member) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$in;
         if (Array.isArray(memberIdIn)) {
             andConditions.push({
                 'member.id': {
@@ -79,7 +87,7 @@ class MongoRepository {
                 }
             });
         }
-        const memberNameRegex = (_d = (_c = params.member) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.$regex;
+        const memberNameRegex = (_k = (_j = params.member) === null || _j === void 0 ? void 0 : _j.name) === null || _k === void 0 ? void 0 : _k.$regex;
         if (typeof memberNameRegex === 'string' && memberNameRegex.length > 0) {
             andConditions.push({
                 'member.name': {
@@ -88,7 +96,7 @@ class MongoRepository {
                 }
             });
         }
-        const memberHasRoleRoleNameEq = (_g = (_f = (_e = params.member) === null || _e === void 0 ? void 0 : _e.hasRole) === null || _f === void 0 ? void 0 : _f.roleName) === null || _g === void 0 ? void 0 : _g.$eq;
+        const memberHasRoleRoleNameEq = (_o = (_m = (_l = params.member) === null || _l === void 0 ? void 0 : _l.hasRole) === null || _m === void 0 ? void 0 : _m.roleName) === null || _o === void 0 ? void 0 : _o.$eq;
         if (typeof memberHasRoleRoleNameEq === 'string') {
             andConditions.push({
                 'member.hasRole.roleName': {
@@ -136,7 +144,9 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [
                 { $match: { 'project.id': { $eq: params.project.id.$eq } } },
-                { $match: { 'member.id': { $eq: params.member.id.$eq } } }
+                { $match: { 'member.id': { $eq: params.member.id.$eq } } },
+                { $match: { 'member.memberOf.id': { $eq: params.member.memberOf.id.$eq } } },
+                { $match: { 'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf.$eq } } }
             ];
             const aggregate = this.memberModel.aggregate([
                 // ...(typeof params.sort?.productID === 'number')
@@ -212,11 +222,12 @@ 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 }
-            }, 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))
+            }, 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))
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.memberModel.modelName);
@@ -261,5 +272,10 @@ class MongoRepository {
             return projectMembers.map((m) => m.project.id);
         });
     }
+    getCursor(conditions, projection) {
+        return this.memberModel.find(conditions, projection)
+            .sort({ 'member.id': factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -25,7 +25,7 @@
 import { Schema } from 'mongoose';
 declare const modelName = "Member";
 /**
- * プロジェクトメンバースキーマ
+ * IAMメンバースキーマ
  */
 declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
@@ -53,16 +53,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
-    project?: any;
-    member?: any;
+    project: any;
+    member: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
-    project?: any;
-    member?: any;
+    project: any;
+    member: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
-    project?: any;
-    member?: any;
+    project: any;
+    member: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

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

@@ -6,15 +6,21 @@ const writeConcern_1 = require("../writeConcern");
 const modelName = 'Member';
 exports.modelName = modelName;
 /**
- * プロジェクトメンバースキーマ
+ * IAMメンバースキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true
     },
-    member: mongoose_1.SchemaTypes.Mixed
+    member: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    }
 }, {
     collection: 'members',
     id: true,
@@ -43,9 +49,7 @@ const schema = new mongoose_1.Schema({
 exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
-schema.index({ 'member.id': 1 }, {
-    name: 'searchByMemberId'
-});
+schema.index({ 'member.id': 1 }, { name: 'searchByMemberId' });
 schema.index({ 'project.id': 1, 'member.id': 1 }, {
     name: 'uniqueProjectMember',
     unique: true
@@ -62,3 +66,5 @@ schema.index({ 'member.hasRole.roleName': 1, 'member.id': 1 }, {
         'member.hasRole.roleName': { $exists: true }
     }
 });
+schema.index({ 'member.memberOf.typeOf': 1, 'member.id': 1 }, { name: 'searchByMemberMemberOfTypeOf' });
+schema.index({ 'member.memberOf.id': 1, 'member.id': 1 }, { name: 'searchByMemberMemberOfId' });

package/lib/chevre/service/iam.d.ts

@@ -3,6 +3,7 @@
  */
 import { MongoRepository as MemberRepo } from '../repo/member';
 import { MongoRepository as RoleRepo } from '../repo/role';
+import * as factory from '../factory';
 export type IPermission = string;
 /**
  * プロジェクトメンバーの権限を検索する
@@ -13,6 +14,10 @@ export declare function searchPermissions(params: {
     };
     member: {
         id: string;
+        memberOf: {
+            id: string;
+            typeOf: factory.organizationType.Project;
+        };
     };
 }): (repos: {
     member: MemberRepo;

package/lib/chevre/service/iam.js

@@ -18,30 +18,18 @@ function searchPermissions(params) {
         let permissions = [];
         const hasRole = yield repos.member.aggregateRoleNames({
             project: { id: { $eq: params.project.id } },
-            member: { id: { $eq: params.member.id } }
+            member: {
+                id: { $eq: params.member.id },
+                memberOf: {
+                    id: { $eq: params.member.memberOf.id },
+                    typeOf: { $eq: params.member.memberOf.typeOf }
+                }
+            }
         });
         if (hasRole.length > 0) {
             permissions = yield repos.role.aggregatePermissions({ roleName: { $in: hasRole.map((r) => r.roleName) } });
         }
         return { hasRole, permissions };
-        // let permissions: IPermission[] = [];
-        // const projectMembers = await repos.member.search({
-        //     project: { id: { $eq: params.project.id } },
-        //     member: { id: { $eq: params.member.id } }
-        // });
-        // // 持っているロールを検索
-        // const roleNames = projectMembers.reduce<string[]>(
-        //     (a, b) => [...a, ...(Array.isArray(b.member.hasRole)) ? b.member.hasRole.map((r) => r.roleName) : []],
-        //     []
-        // );
-        // const roles = await repos.role.search({ roleName: { $in: roleNames } });
-        // // 権限をまとめる
-        // permissions = roles.reduce<string[]>(
-        //     (a, b) => [...a, ...b.permissions],
-        //     []
-        // );
-        // permissions = [...new Set(permissions)];
-        // return { roleNames, permissions };
     });
 }
 exports.searchPermissions = searchPermissions;

package/lib/chevre/service/reserve/confirmReservation.js

@@ -116,8 +116,10 @@ function reserveIfNotYet(params, options) {
                         }
                     }
                     else {
+                        // 旧予約取引に対して本処理が走る可能性がなくはないが、
+                        // それらについては実質Confirmedの予約はすでに存在するはずなので、何もしない
                         // 完全廃止(2023-07-19~)
-                        throw new factory.errors.NotImplemented('disablePendingReservations must be true');
+                        // throw new factory.errors.NotImplemented('disablePendingReservations must be true');
                     }
                 }
                 else {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.316.0-alpha.4",
-    "@cinerino/sdk": "3.161.0-alpha.0",
+    "@chevre/factory": "4.316.0-alpha.5",
+    "@cinerino/sdk": "3.162.0-alpha.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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.23"
+  "version": "21.4.0-alpha.25"
 }