@chevre/domain 22.11.0-alpha.5 → 22.11.0-alpha.7

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

@@ -0,0 +1,132 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+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: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    let roleNames = [
+        chevre.factory.role.organizationRole.RoleName.InventoryManager
+    ];
+    let permissions = [
+        'admin.creativeWorks.*',
+        'admin.sellers.eventSeries.*',
+        'admin.customers.read',
+        'admin.offers.read',
+        'admin.offers.create',
+        'admin.offerCatalogs.create',
+        'admin.offerCatalogItems.read',
+        'admin.offerCatalogItems.create',
+        'admin.products.create',
+        'admin.sellers.events.create',
+        'admin.sellers.events.update'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+    roleNames = [
+        chevre.factory.role.organizationRole.RoleName.SellersOwner
+    ];
+    permissions = [
+        'admin.sellers.eventSeries.*',
+        'admin.customers.read',
+        'admin.offers.read',
+        'admin.offerCatalogItems.read',
+        'admin.sellers.events.create',
+        'admin.sellers.events.update',
+        'admin.sellers.orders.read',
+        'admin.sellers.reservations.read',
+        'admin.sellers.reservations.useActions.read',
+        'admin.sellers.assetTransactions.cancelReservation.write'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+    roleNames = [
+        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager
+    ];
+    permissions = [
+        'admin.sellers.eventSeries.*',
+        'admin.customers.read',
+        'admin.offers.read',
+        'admin.offerCatalogItems.read',
+        'admin.sellers.events.create',
+        'admin.sellers.events.update'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+    roleNames = [
+        chevre.factory.role.organizationRole.RoleName.TicketClerk
+    ];
+    permissions = [
+        'admin.customers.read',
+        'admin.offers.read',
+        'admin.sellers.notes.create',
+        'admin.sellers.notes.read',
+        'admin.sellers.notes.update',
+        'admin.sellers.orders.read',
+        'admin.sellers.orders.update',
+        'admin.sellers.reservations.read',
+        'admin.sellers.reservations.useActions.read',
+        'admin.sellers.reservations.useActions.create',
+        'admin.sellers.assetTransactions.cancelReservation.write'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+    roleNames = [
+        chevre.factory.role.organizationRole.RoleName.TicketCollector
+    ];
+    permissions = [
+        'admin.sellers.reservations.read',
+        'admin.sellers.reservations.useActions.read',
+        'admin.sellers.reservations.useActions.create'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -0,0 +1,37 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+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: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    const roleNames = [
+        chevre.factory.role.organizationRole.RoleName.Customer,
+        chevre.factory.role.organizationRole.RoleName.InventoryManager,
+        chevre.factory.role.organizationRole.RoleName.POS,
+        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager,
+        chevre.factory.role.organizationRole.RoleName.SellersOwner,
+        chevre.factory.role.organizationRole.RoleName.TicketClerk,
+        chevre.factory.role.organizationRole.RoleName.User
+    ];
+    const permissions = [
+        'db.primary.read'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -8,17 +8,50 @@ async function main() {
 
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
-    const roleNames = [
+    // const roleNames = [
+    //     chevre.factory.role.organizationRole.RoleName.InventoryManager,
+    //     chevre.factory.role.organizationRole.RoleName.SellersOwner,
+    //     chevre.factory.role.organizationRole.RoleName.SellersInventoryManager
+    // ];
+    // for (const roleName of roleNames) {
+    //     const result = await roleRepo.addPermissionIfNotExists({
+    //         roleName: { $eq: roleName },
+    //         permission: 'eventOffers.*'
+    //     });
+    //     console.log(result, roleName);
+    // }
+    let roleNames = [
+        chevre.factory.role.organizationRole.RoleName.InventoryManager
+    ];
+    let permissions = [
+        'admin.creativeWorks.*'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+    roleNames = [
         chevre.factory.role.organizationRole.RoleName.InventoryManager,
         chevre.factory.role.organizationRole.RoleName.SellersOwner,
         chevre.factory.role.organizationRole.RoleName.SellersInventoryManager
     ];
+    permissions = [
+        'admin.sellers.eventSeries.*'
+    ];
     for (const roleName of roleNames) {
-        const result = await roleRepo.addPermissionIfNotExists({
-            roleName: { $eq: roleName },
-            permission: 'eventOffers.*'
-        });
-        console.log(result, roleName);
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
     }
 }
 

package/example/src/chevre/stockHolder/checkRedisKeyCount.ts

@@ -38,7 +38,6 @@ function countRedisKeyByProject(params: {
             {
                 'project.id': {
                     $eq: params.project.id
-                    // $in: useMongoAsStockHolderProjects
                 },
                 // startDate: {
                 //     $gte: params.now
@@ -93,30 +92,22 @@ function countRedisKeyByProject(params: {
 async function main() {
     const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
     const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
-    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
+    // const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
     const stockHolderRepo = await chevre.repository.StockHolder.createInstance(
         client,
         mongoose.connection
     );
 
-    const setting = await settingRepo.findOne(
-        { project: { id: { $eq: '*' } } },
-        ['useMongoAsStockHolderProjects', 'useMongoAsStockHolder']
-    );
-    const useMongoAsStockHolder = setting?.useMongoAsStockHolder === true;
-    let useMongoAsStockHolderProjects =
-        (Array.isArray(setting?.useMongoAsStockHolderProjects)) ? setting?.useMongoAsStockHolderProjects : [];
-    if (useMongoAsStockHolder) {
-        // 全プロジェクト
-        useMongoAsStockHolderProjects = (await projectRepo.projectFields(
-            {
-                // id: { $eq: 'xxx' }
-            },
-            ['id']
-        )).map(({ id }) => id);
-    }
+    let checkingProjects: string[] = [];
+    // 全プロジェクト
+    checkingProjects = (await projectRepo.projectFields(
+        {
+            // id: { $eq: 'xxx' }
+        },
+        ['id']
+    )).map(({ id }) => id);
 
-    useMongoAsStockHolderProjects = useMongoAsStockHolderProjects.filter((id) => id.slice(0, 6) !== 'sskts-');
+    checkingProjects = checkingProjects.filter((id) => id.slice(0, 6) !== 'sskts-');
 
     const results: {
         project: { id: string };
@@ -127,7 +118,7 @@ async function main() {
     const now = moment()
         .add(0, 'days')
         .toDate();
-    for (const projectId of useMongoAsStockHolderProjects) {
+    for (const projectId of checkingProjects) {
         const { checkedCount, redisKeyCount } = await countRedisKeyByProject({
             project: { id: projectId },
             now

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -9,17 +9,20 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const aggregateOfferRepo = await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
+    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
     let updateResult: any;
 
-    updateResult = await aggregateOfferRepo.unsetUnnecessaryFields({
+    updateResult = await settingRepo.unsetUnnecessaryFields({
         filter: {
-            'offers.includedInDataCatalog.id': { $exists: true }
-            // _id: { $eq: 'blj55y1mo' }
+            'project.id': { $eq: '*' }
         },
         $unset: {
-            'offers.0.includedInDataCatalog': 1
+            useMongoAsStockHolder: 1,
+            useMongoAsStockHolderProjects: 1
+            // useMongo4confirmationNumberFrom: 1,
+            // useMongo4orderNumberFrom: 1,
+            // useMongo4transactionNumberFrom: 1
         }
     });
     console.log(updateResult);

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

@@ -1,4 +1,4 @@
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import { ISetting } from './mongoose/schemas/setting';
 type IKeyOfProjection = keyof ISetting;
 export { ISetting };
@@ -32,4 +32,8 @@ export declare class SettingRepo {
     }, update: {
         $set: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<ISetting>;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

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

package/lib/chevre/repo/stockHolder.js

@@ -287,17 +287,6 @@ class StockHolderRepo {
                 throw new factory.errors.Argument('startDate', 'must be Date');
             }
             let useMongoose = false;
-            // useMongoAsStockHolder設定有の場合のみmongo利用(2025-04-18~)
-            // const useMongoAsStockHolderBySettings = await this.useMongoAsStockHolderBySettings({ project: { id: params.project.id } });
-            // if (useMongoAsStockHolderBySettings) {
-            //     const redisKeyExists = await this.redisKeyExists(params);
-            //     if (redisKeyExists) {
-            //         useMongoose = false;
-            //     } else {
-            //         // redis keyが存在しなければmongo利用
-            //         useMongoose = true;
-            //     }
-            // }
             // always use mongo(2025-05-21~)
             const redisKeyExists = yield this.redisKeyExists(params);
             if (redisKeyExists) {

package/lib/chevre/service/validation/validateOrder.js

@@ -12,35 +12,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOrder = validateOrder;
 // import * as createDebug from 'debug';
 const moment = require("moment");
-const util = require("util");
 const factory = require("../../factory");
 const factory_1 = require("../offer/event/authorize/factory");
 const factory_2 = require("../offer/product/factory");
 const validateMovieTicket_1 = require("../transaction/placeOrder/confirm/validation/validateMovieTicket");
-function createCheckEventTasks(params) {
-    const { order, project, reservationForIds } = params;
-    const runsAt = new Date();
-    return reservationForIds.map((reservationForId) => {
-        const object = { id: reservationForId, typeOf: factory.eventType.ScreeningEvent };
-        const data = {
-            object,
-            project: { id: project.id, typeOf: factory.organizationType.Project },
-            typeOf: factory.actionType.CheckAction
-        };
-        const description = util.format('%s:%s:%s:%s', order.typeOf, order.orderNumber, factory.eventType.ScreeningEvent, reservationForId);
-        return {
-            description,
-            project: { id: project.id, typeOf: factory.organizationType.Project },
-            name: factory.taskName.CheckResource,
-            status: factory.taskStatus.Ready,
-            runsAt,
-            remainingNumberOfTries: 3,
-            numberOfTried: 0,
-            executionResults: [],
-            data
-        };
-    });
-}
+// const debug = createDebug('chevre-domain:service:validation');
+// type ICreatingCheckEventTask = Pick<
+//     factory.task.checkResource.IAttributes,
+//     'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'description'
+// > & {
+//     description: string;
+// };
+// function createCheckEventTasks(params: {
+//     order: Pick<factory.order.IOrder, 'orderNumber' | 'typeOf'>;
+//     project: { id: string };
+//     reservationForIds: string[];
+// }): ICreatingCheckEventTask[] {
+//     const { order, project, reservationForIds } = params;
+//     const runsAt = new Date();
+//     return reservationForIds.map((reservationForId) => {
+//         const object: factory.task.checkResource.IResourceAsEvent = { id: reservationForId, typeOf: factory.eventType.ScreeningEvent };
+//         const data: factory.task.checkResource.IData = {
+//             object,
+//             project: { id: project.id, typeOf: factory.organizationType.Project },
+//             typeOf: factory.actionType.CheckAction
+//         };
+//         const description: string = util.format(
+//             '%s:%s:%s:%s',
+//             order.typeOf,
+//             order.orderNumber,
+//             factory.eventType.ScreeningEvent,
+//             reservationForId
+//         );
+//         return {
+//             description,
+//             project: { id: project.id, typeOf: factory.organizationType.Project },
+//             name: factory.taskName.CheckResource,
+//             status: factory.taskStatus.Ready,
+//             runsAt,
+//             remainingNumberOfTries: 3,
+//             numberOfTried: 0,
+//             executionResults: [],
+//             data
+//         };
+//     });
+// }
 function validateOrder(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -216,18 +232,20 @@ function validateOrder(params) {
                 throw new Error(`invalid ticketIdentifiers.length:${reservationReservedTicketIdentifiers.length} [expected:${acceptedOffers.length}]`);
             }
         }
+        // useMongoAsStockHolderProjectsの場合のイベント検証タスク作成を廃止(もう十分検証したので)(2025-07-11~)
         // add check event task(2025-05-01~)
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useMongoAsStockHolderProjects']);
-        const useMongoAsStockHolderProjects = setting === null || setting === void 0 ? void 0 : setting.useMongoAsStockHolderProjects;
-        if (Array.isArray(useMongoAsStockHolderProjects) && useMongoAsStockHolderProjects.includes(params.project.id)) {
-            const creatingCheckResourceTask = createCheckEventTasks({
-                order: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
-                project: { id: params.project.id },
-                reservationForIds
-            });
-            if (creatingCheckResourceTask.length > 0) {
-                yield repos.task.saveMany(creatingCheckResourceTask, { emitImmediately: true });
-            }
-        }
+        // const setting = <Pick<ISetting, 'useMongoAsStockHolderProjects'> | null>
+        //     await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useMongoAsStockHolderProjects']);
+        // const useMongoAsStockHolderProjects = setting?.useMongoAsStockHolderProjects;
+        // if (Array.isArray(useMongoAsStockHolderProjects) && useMongoAsStockHolderProjects.includes(params.project.id)) {
+        //     const creatingCheckResourceTask = createCheckEventTasks({
+        //         order: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
+        //         project: { id: params.project.id },
+        //         reservationForIds
+        //     });
+        //     if (creatingCheckResourceTask.length > 0) {
+        //         await repos.task.saveMany(creatingCheckResourceTask, { emitImmediately: true });
+        //     }
+        // }
     });
 }

package/package.json

@@ -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.5"
+  "version": "22.11.0-alpha.7"
 }