@chevre/domain 21.30.0 → 21.31.0-alpha.0

package/example/src/chevre/migrateMembers2.ts

@@ -0,0 +1,74 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+const NEW_ROLE_NAME = 'sellerAdmin';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
+
+    const cursor = memberRepo.getCursor(
+        {
+            'member.memberOf.typeOf': { $eq: chevre.factory.organizationType.Project },
+            'member.hasRole.roleName': { $eq: 'inventoryManager' }
+        },
+        {
+        }
+    );
+    console.log('members found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const inventoryManager: chevre.factory.iam.IMember = doc.toObject();
+        const alreadyMigrated = inventoryManager.member.hasRole.some(({ roleName }) => roleName === NEW_ROLE_NAME);
+        if (alreadyMigrated) {
+            console.log(
+                'already exist.',
+                inventoryManager.project.id,
+                inventoryManager.member.memberOf.typeOf, inventoryManager.member.memberOf.id, i, updateCount
+            );
+        } else {
+            updateCount += 1;
+            const newHasRole: chevre.factory.iam.IMemberRole[] = [
+                ...inventoryManager.member.hasRole.map(({ roleName }) => {
+                    return { typeOf: chevre.factory.iam.RoleType.OrganizationRole, roleName };
+                }),
+                { typeOf: chevre.factory.iam.RoleType.OrganizationRole, roleName: NEW_ROLE_NAME }
+            ].sort((a, b) => (a.roleName > b.roleName) ? 1 : -1);
+            console.log(
+                'updating...',
+                inventoryManager.project.id,
+                inventoryManager.member.memberOf.typeOf, inventoryManager.member.memberOf.id, i, updateCount, newHasRole
+            );
+            await memberRepo.updateByMemberId({
+                project: { id: inventoryManager.project.id },
+                member: {
+                    id: inventoryManager.member.id,
+                    memberOf: inventoryManager.member.memberOf,
+                    hasRole: newHasRole
+                },
+                $unset: {}
+            });
+            console.log(
+                'updated.',
+                inventoryManager.project.id,
+                inventoryManager.member.memberOf.typeOf, inventoryManager.member.memberOf.id, i, updateCount
+            );
+        }
+    });
+
+    console.log(i, 'members checked');
+    console.log(updateCount, 'members updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -8,22 +8,10 @@ async function main() {
 
     let updateResult: any;
 
-    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
-    const noteRepo = await chevre.repository.Note.createInstance(mongoose.connection);
-    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
-    updateResult = await memberRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            __v: 1,
-            createdAt: 1,
-            updatedAt: 1
-        }
-    });
-    console.log('unset processed.', updateResult);
+    const messageRepo = await chevre.repository.Message.createInstance(mongoose.connection);
+    const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
 
-    updateResult = await noteRepo.unsetUnnecessaryFields({
+    updateResult = await messageRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },
@@ -35,7 +23,7 @@ async function main() {
     });
     console.log('unset processed.', updateResult);
 
-    updateResult = await ownershipInfoRepo.unsetUnnecessaryFields({
+    updateResult = await paymentServiceRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },

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

@@ -88,21 +88,6 @@ export declare class MongoRepository {
             'member.member'?: 1;
         };
     }): Promise<void>;
-    /**
-     * 互換性維持プログラム専用
-     */
-    updateByMemberMemberOf(params: {
-        project: {
-            id: string;
-        };
-        member: {
-            id: string;
-            memberOf: {
-                id: string;
-                typeOf: factory.organizationType.Project;
-            };
-        };
-    }): Promise<void>;
     /**
      * メンバー削除
      */

package/lib/chevre/repo/member.js

@@ -194,24 +194,6 @@ class MongoRepository {
             }
         });
     }
-    /**
-     * 互換性維持プログラム専用
-     */
-    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 },
-                'member.memberOf': { $exists: false }
-            }, {
-                'member.memberOf': params.member.memberOf
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.memberModel.modelName);
-            }
-        });
-    }
     /**
      * メンバー削除
      */

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

@@ -86,5 +86,9 @@ export declare class MessageRepo {
         ok?: number;
         deletedCount?: number;
     } | null>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/message.js

@@ -179,5 +179,11 @@ class MessageRepo {
             });
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.messageModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.MessageRepo = MessageRepo;

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

@@ -39,6 +39,9 @@ const schemaDefinition = {
         required: true
     },
     toRecipient: mongoose_1.SchemaTypes.Mixed
+    // __v: SchemaTypes.Mixed,
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -49,10 +52,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -67,14 +68,6 @@ const schemaOptions = {
     }
 };
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { datePublished: 1 },
         { name: 'searchByDatePublished' }

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

@@ -17,6 +17,9 @@ const schemaDefinition = {
     provider: [mongoose_1.SchemaTypes.Mixed],
     serviceOutput: mongoose_1.SchemaTypes.Mixed,
     serviceType: mongoose_1.SchemaTypes.Mixed
+    // __v: SchemaTypes.Mixed,
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -27,10 +30,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -45,14 +46,6 @@ const schemaOptions = {
     }
 };
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { productID: 1 },
         {

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

@@ -51,5 +51,9 @@ export declare class MongoRepository {
         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
         id: string;
     }): Promise<factory.product.IAvailableChannel>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/paymentService.js

@@ -264,5 +264,11 @@ class MongoRepository {
             return availableChannel;
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.paymentServiceModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.30.0"
+  "version": "21.31.0-alpha.0"
 }