@chevre/domain 22.11.0-alpha.8 → 22.11.0-alpha.9

package/example/src/chevre/roles/removePermissionFromAPIRoles.ts

@@ -0,0 +1,46 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    const permissions = [
+        'categoryCodes.read',
+        'creativeWorks.read',
+        'events.read',
+        'places.read',
+        'products.read',
+        'sellers.read'
+    ];
+    for (const permission of permissions) {
+        const roles = await roleRepo.projectFields(
+            {
+                permissions: { $eq: permission },
+                roleName: {
+                    $in: [
+                        chevre.factory.role.organizationRole.RoleName.Customer,
+                        chevre.factory.role.organizationRole.RoleName.POS,
+                        chevre.factory.role.organizationRole.RoleName.EventsViewer
+                    ]
+                }
+            },
+            ['roleName']
+        );
+        console.log('roles found.', roles, permission);
+        for (const { roleName } of roles) {
+            const result = await roleRepo.removePermissionIfExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission removed.', permission, result, roleName);
+        }
+    }
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/roles/removePermissionIfExists.ts

@@ -0,0 +1,39 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    const permissions = [
+        'tokens',
+        'authorizations.create',
+        'permits.read',
+        'tasks.read',
+        'transactionNumbers.write',
+        'chevre.admin'
+    ];
+    for (const permission of permissions) {
+        const roles = await roleRepo.projectFields(
+            {
+                permissions: { $eq: permission }
+            },
+            ['roleName']
+        );
+        console.log(roles, permission);
+        for (const { roleName } of roles) {
+            const result = await roleRepo.removePermissionIfExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission removed.', permission, result, roleName);
+        }
+    }
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -1,6 +1,8 @@
 import { Connection, FilterQuery, QueryOptions } from 'mongoose';
 import * as factory from '../factory';
-export type ISavingIdentity = Pick<factory.creativeWork.certification.webApplication.ICertification, 'about' | 'project' | 'typeOf'> & {
+type ISavingSoftwareApplicationIdentity = Pick<factory.creativeWork.certification.softwareApplication.ICertification, 'about' | 'project' | 'typeOf'>;
+type ISavingWebApplicationIdentity = Pick<factory.creativeWork.certification.webApplication.ICertification, 'about' | 'project' | 'typeOf'>;
+export type ISavingIdentity = (ISavingSoftwareApplicationIdentity | ISavingWebApplicationIdentity) & {
     id?: never;
     dateCreated?: never;
     dateModified?: never;
@@ -11,7 +13,7 @@ interface IUnset {
         [key: string]: 1;
     };
 }
-type IIdentityWithId = factory.creativeWork.certification.webApplication.ICertification & {
+type IIdentityWithId = (factory.creativeWork.certification.softwareApplication.ICertification | factory.creativeWork.certification.webApplication.ICertification) & {
     id: string;
 };
 type IKeyOfProjection = keyof factory.creativeWork.certification.webApplication.ICertification;
@@ -35,39 +37,15 @@ export declare class IdentityRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.creativeWorkType.Certification;
-        about: import("@chevre/factory/lib/creativeWork/certification/webApplication").IAbout;
-        dateCreated?: Date | undefined;
-        dateModified?: Date | undefined;
-        issuedBy: import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy | import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy[];
-    }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.creativeWorkType.Certification;
-        about: import("@chevre/factory/lib/creativeWork/certification/webApplication").IAbout;
-        dateCreated?: Date | undefined;
-        dateModified?: Date | undefined;
-        issuedBy: import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy | import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy[];
-    } & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/creativeWork/certification/softwareApplication").ICertification, "id"> | Omit<import("@chevre/factory/lib/creativeWork/certification/webApplication").ICertification, "id">> & ((Omit<import("@chevre/factory/lib/creativeWork/certification/softwareApplication").ICertification, "id"> & {
         _id: import("mongoose").Types.ObjectId;
-    }, QueryOptions<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.creativeWorkType.Certification;
-        about: import("@chevre/factory/lib/creativeWork/certification/webApplication").IAbout;
-        dateCreated?: Date | undefined;
-        dateModified?: Date | undefined;
-        issuedBy: import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy | import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy[];
-    }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.creativeWorkType.Certification;
-        about: import("@chevre/factory/lib/creativeWork/certification/webApplication").IAbout;
-        dateCreated?: Date | undefined;
-        dateModified?: Date | undefined;
-        issuedBy: import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy | import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy[];
-    } & {
+    }) | (Omit<import("@chevre/factory/lib/creativeWork/certification/webApplication").ICertification, "id"> & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    })), QueryOptions<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/creativeWork/certification/softwareApplication").ICertification, "id"> | Omit<import("@chevre/factory/lib/creativeWork/certification/webApplication").ICertification, "id">> & ((Omit<import("@chevre/factory/lib/creativeWork/certification/softwareApplication").ICertification, "id"> & {
+        _id: import("mongoose").Types.ObjectId;
+    }) | (Omit<import("@chevre/factory/lib/creativeWork/certification/webApplication").ICertification, "id"> & {
+        _id: import("mongoose").Types.ObjectId;
+    }))>>;
     updateIssuedBy2array(params: Pick<ISavingIdentity, 'issuedBy'> & {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/identity.js

@@ -8,17 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdentityRepo = void 0;
 const factory = require("../factory");
@@ -76,12 +65,15 @@ class IdentityRepo {
                     throw new factory.errors.ArgumentNull('id');
                 }
                 // issuedByのみ更新可能
-                const _c = params.attributes, { id, dateCreated, about, project, typeOf, $unset } = _c, updateFields = __rest(_c, ["id", "dateCreated", "about", "project", "typeOf", "$unset"]);
+                const { project, $unset, issuedBy } = params.attributes;
                 const filter = {
                     _id: { $eq: savingId },
                     'project.id': { $eq: project.id }
                 };
-                const update = Object.assign({ $set: Object.assign(Object.assign({}, updateFields), { dateModified: new Date() }) }, ($unset !== undefined && $unset !== null) ? { $unset } : undefined);
+                const update = Object.assign({ $set: {
+                        issuedBy,
+                        dateModified: new Date()
+                    } }, ($unset !== undefined && $unset !== null) ? { $unset } : undefined);
                 const options = {
                     upsert: false,
                     new: true,
@@ -96,8 +88,11 @@ class IdentityRepo {
                 savedId = savingId;
             }
             else {
-                const _d = params.attributes, { $unset, id, dateModified } = _d, createParams = __rest(_d, ["$unset", "id", "dateModified"]);
-                const result = yield this.identityModel.insertMany(Object.assign(Object.assign({}, createParams), { dateCreated: new Date() }), { rawResult: true });
+                const { typeOf, about, project, issuedBy } = params.attributes;
+                const result = yield this.identityModel.insertMany({
+                    typeOf, about, project, issuedBy,
+                    dateCreated: new Date()
+                }, { rawResult: true });
                 const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
                 if (typeof insertedId !== 'string') {
                     throw new factory.errors.Internal(`seller not saved unexpectedly. result:${JSON.stringify(result)}`);

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

@@ -1,6 +1,6 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = Omit<factory.creativeWork.certification.webApplication.ICertification, 'id'>;
+type IDocType = Omit<factory.creativeWork.certification.softwareApplication.ICertification, 'id'> | Omit<factory.creativeWork.certification.webApplication.ICertification, 'id'>;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;

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

@@ -26,6 +26,14 @@ export declare class RoleRepo {
     }): Promise<(import("mongoose").FlattenMaps<IDocType> & {
         _id: import("mongoose").Types.ObjectId;
     }) | null>;
+    removePermissionIfExists(params: {
+        roleName: {
+            $eq: factory.role.organizationRole.RoleName;
+        };
+        permission: string;
+    }): Promise<(import("mongoose").FlattenMaps<IDocType> & {
+        _id: import("mongoose").Types.ObjectId;
+    }) | null>;
     addMember(params: Pick<IRole, 'member' | 'memberOf' | 'roleName'>): Promise<(import("mongoose").FlattenMaps<IDocType> & {
         _id: import("mongoose").Types.ObjectId;
     }) | null>;

package/lib/chevre/repo/role.js

@@ -133,6 +133,23 @@ class RoleRepo {
                 .exec();
         });
     }
+    removePermissionIfExists(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.roleModel.findOneAndUpdate({
+                roleName: { $eq: params.roleName.$eq },
+                permissions: { $eq: params.permission }
+            }, {
+                $pull: {
+                    permissions: params.permission
+                }
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
+                .lean()
+                .exec();
+        });
+    }
     addMember(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { roleName, member, memberOf } = params;

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.395.0-alpha.3",
-    "@cinerino/sdk": "11.0.0-alpha.4",
+    "@chevre/factory": "4.395.0-alpha.5",
+    "@cinerino/sdk": "11.0.0-alpha.6",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/client": "8.1.4",
@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.8"
+  "version": "22.11.0-alpha.9"
 }

package/example/src/chevre/roles/addRoleMembers.ts

@@ -1,75 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
-
-    let roleNames = [
-        chevre.factory.role.organizationRole.RoleName.Customer,
-        chevre.factory.role.organizationRole.RoleName.EventsViewer,
-        chevre.factory.role.organizationRole.RoleName.POS
-    ];
-    for (const roleName of roleNames) {
-        const result = await roleRepo.addMember({
-            roleName,
-            member: { typeOf: chevre.factory.creativeWorkType.WebApplication },
-            memberOf: { typeOf: chevre.factory.organizationType.Project }
-        });
-        console.log(result, roleName);
-    }
-
-    roleNames = [
-        chevre.factory.role.organizationRole.RoleName.Server
-    ];
-    for (const roleName of roleNames) {
-        const result = await roleRepo.addMember({
-            roleName,
-            member: { typeOf: chevre.factory.creativeWorkType.SoftwareApplication },
-            memberOf: { typeOf: chevre.factory.organizationType.Project }
-        });
-        console.log(result, roleName);
-    }
-
-    roleNames = [
-        chevre.factory.role.organizationRole.RoleName.Accountant,
-        chevre.factory.role.organizationRole.RoleName.IAMRoleAdmin,
-        chevre.factory.role.organizationRole.RoleName.InventoryManager,
-        chevre.factory.role.organizationRole.RoleName.MemberAdmin,
-        chevre.factory.role.organizationRole.RoleName.Owner,
-        chevre.factory.role.organizationRole.RoleName.PaymentServiceAdmin,
-        chevre.factory.role.organizationRole.RoleName.SellerAdmin,
-        chevre.factory.role.organizationRole.RoleName.TicketClerk,
-        chevre.factory.role.organizationRole.RoleName.TicketCollector,
-        chevre.factory.role.organizationRole.RoleName.User
-    ];
-    for (const roleName of roleNames) {
-        const result = await roleRepo.addMember({
-            roleName,
-            member: { typeOf: chevre.factory.personType.Person },
-            memberOf: { typeOf: chevre.factory.organizationType.Project }
-        });
-        console.log(result, roleName);
-    }
-
-    roleNames = [
-        chevre.factory.role.organizationRole.RoleName.SellersIAMRoleAdmin,
-        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager,
-        chevre.factory.role.organizationRole.RoleName.SellersOwner
-    ];
-    for (const roleName of roleNames) {
-        const result = await roleRepo.addMember({
-            roleName,
-            member: { typeOf: chevre.factory.personType.Person },
-            memberOf: { typeOf: chevre.factory.organizationType.Corporation }
-        });
-        console.log(result, roleName);
-    }
-}
-
-main()
-    .then()
-    .catch(console.error);