@chevre/domain 22.11.0-alpha.3 → 22.11.0-alpha.30

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

@@ -13,6 +13,20 @@ interface IOnReservationStatusChanged {
      */
     informReservation?: factory.project.IInformParams[];
 }
+interface IOnTaskStatusChanged {
+    /**
+     * AggService通知先
+     */
+    informTask?: factory.project.IInformParams[];
+    /**
+     * 分析連携するtaskNameリスト
+     */
+    informTaskNames?: factory.taskName[];
+    /**
+     * 分析連携するtaskStatusリスト
+     */
+    informTaskStatuses?: factory.taskStatus[];
+}
 interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];
 }
@@ -102,6 +116,7 @@ export interface ISetting {
     onEventChanged?: IOnEventChanged;
     onOrderStatusChanged: IOnOrderStatusChanged;
     onReservationStatusChanged?: IOnReservationStatusChanged;
+    onTaskStatusChanged?: IOnTaskStatusChanged;
     onResourceUpdated?: {
         informResource?: factory.project.IInformParams[];
     };

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

@@ -14,6 +14,7 @@ const schemaDefinition = {
     onEventChanged: mongoose_1.SchemaTypes.Mixed,
     onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
+    onTaskStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onResourceUpdated: mongoose_1.SchemaTypes.Mixed,
     onTransactionStatusChanged: mongoose_1.SchemaTypes.Mixed,
     quota: mongoose_1.SchemaTypes.Mixed,

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

@@ -186,6 +186,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { status: 1, lastTriedAt: 1, remainingNumberOfTries: 1, name: 1 },
+        {
+            name: 'abortMany',
+            partialFilterExpression: {
+                lastTriedAt: { $type: 'date' }
+            }
+        }
+    ],
     [
         { status: 1, expires: 1 },
         {

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

@@ -1,14 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
-import { ISetting } from './mongoose/schemas/setting';
 /**
  * 注文番号リポジトリ
  */
 export declare class OrderNumberRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -23,11 +19,4 @@ export declare class OrderNumberRepo {
          */
         orderDate: Date;
     }): Promise<string>;
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4orderNumberFrom(params: {
-        useMongo4orderNumberFrom: Date;
-    }): Promise<Pick<ISetting, "useMongo4orderNumberFrom"> | null>;
-    private useMongoBySettings;
 }

package/lib/chevre/repo/orderNumber.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
+// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
-const setting_1 = require("./mongoose/schemas/setting");
+// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const ORDER_NUMBER_SEPARATOR = '-';
@@ -23,8 +24,8 @@ const ORDER_NUMBER_SEPARATOR = '-';
  */
 class OrderNumberRepo {
     constructor(params) {
-        const { connection } = params;
-        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        // const { connection } = params;
+        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     // private static createKey(params: {
@@ -52,27 +53,15 @@ class OrderNumberRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
             let incrReply;
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
-                    expires: dataFeedExpires
-                });
-            }
-            else {
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            dataFeedExpires = moment(params.orderDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
+                expires: dataFeedExpires
+            });
             let orderNumber = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(orderNumber);
@@ -90,32 +79,5 @@ class OrderNumberRepo {
             return orderNumber;
         });
     }
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4orderNumberFrom(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { useMongo4orderNumberFrom } = params;
-            return this.settingModel.findOneAndUpdate({ 'project.id': { $eq: '*' } }, {
-                $set: { useMongo4orderNumberFrom }
-            }, { projection: { _id: 0, useMongo4orderNumberFrom: 1 } })
-                .lean()
-                .exec();
-        });
-    }
-    useMongoBySettings(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongo4orderNumberFrom: 1
-            })
-                .lean()
-                .exec();
-            const useMongo4orderNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4orderNumberFrom;
-            return useMongo4orderNumberFrom instanceof Date
-                && moment(params.orderDate)
-                    .isSameOrAfter(moment(useMongo4orderNumberFrom));
-        });
-    }
 }
 exports.OrderNumberRepo = OrderNumberRepo;

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

@@ -11,13 +11,14 @@ export declare class RoleRepo {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.role.organizationRole.ISearchConditions): FilterQuery<IDocType>[];
     projectFields(params: factory.role.organizationRole.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IRole[]>;
-    aggregatePermissions(params: {
+    /**
+     * distinctコマンドを使用して、ロールから権限を検索する
+     */
+    findUniquePermissionsByRoleName(params: {
         roleName: {
             $in: string[];
         };
-    }): Promise<{
-        _id: string;
-    }[]>;
+    }): Promise<string[]>;
     addPermissionIfNotExists(params: {
         roleName: {
             $eq: factory.role.organizationRole.RoleName;
@@ -26,8 +27,19 @@ 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>;
+    create(params: Pick<IRole, 'member' | 'memberOf' | 'permissions' | 'roleName'>): Promise<{
+        id: string;
+    }>;
 }
 export {};

package/lib/chevre/repo/role.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleRepo = void 0;
+const factory = require("../factory");
 const settings_1 = require("../settings");
 const role_1 = require("./mongoose/schemas/role");
 const AVAILABLE_PROJECT_FIELDS = [
@@ -76,39 +77,42 @@ class RoleRepo {
                 .exec();
         });
     }
-    aggregatePermissions(params) {
+    // migrate to findDistinctPermissionsByRoleName(2025-07-21~)
+    // public async aggregatePermissions(params: {
+    //     roleName: { $in: string[] };
+    // }): Promise<{ _id: string }[]> {
+    //     const matchStages: IMatchStage[] = [
+    //         { $match: { roleName: { $in: params.roleName.$in } } }
+    //     ];
+    //     const aggregate = this.roleModel.aggregate([
+    //         ...matchStages,
+    //         {
+    //             $unwind: {
+    //                 path: '$permissions'
+    //             }
+    //         },
+    //         {
+    //             $project: {
+    //                 _id: 0,
+    //                 permission: '$permissions'
+    //             }
+    //         },
+    //         {
+    //             $group: {
+    //                 _id: '$permission'
+    //             }
+    //         }
+    //     ]);
+    //     return aggregate.option({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    // }
+    /**
+     * distinctコマンドを使用して、ロールから権限を検索する
+     */
+    findUniquePermissionsByRoleName(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [
-                { $match: { roleName: { $in: params.roleName.$in } } }
-            ];
-            const aggregate = this.roleModel.aggregate([
-                // ...(typeof params.sort?.productID === 'number')
-                //     ? [{ $sort: { productID: params.sort.productID } }]
-                //     : [],
-                ...matchStages,
-                {
-                    $unwind: {
-                        path: '$permissions'
-                    }
-                },
-                {
-                    $project: {
-                        _id: 0,
-                        permission: '$permissions'
-                    }
-                },
-                {
-                    $group: {
-                        _id: '$permission'
-                    }
-                }
-            ]);
-            // if (typeof params.limit === 'number' && params.limit > 0) {
-            //     const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            //     aggregate.limit(params.limit * page)
-            //         .skip(params.limit * (page - 1));
-            // }
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            return this.roleModel.distinct('permissions', { roleName: { $in: params.roleName.$in } })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -132,6 +136,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;
@@ -148,5 +169,23 @@ class RoleRepo {
                 .exec();
         });
     }
+    create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            let savedId;
+            const { member, memberOf, permissions, roleName } = params;
+            const creatingRole = {
+                member, memberOf, permissions, roleName,
+                typeOf: factory.role.RoleType.OrganizationRole
+            };
+            const result = yield this.roleModel.insertMany(creatingRole, { 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(`role not saved unexpectedly. result:${JSON.stringify(result)}`);
+            }
+            savedId = insertedId;
+            return { id: savedId };
+        });
+    }
 }
 exports.RoleRepo = RoleRepo;

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

@@ -1,13 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
 /**
  * サービスアウトプット識別子リポジトリ
  */
 export declare class ServiceOutputIdentifierRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -16,5 +13,4 @@ export declare class ServiceOutputIdentifierRepo {
     publishByTimestamp(params: {
         startDate: Date;
     }): Promise<string>;
-    private useMongoBySettings;
 }

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceOutputIdentifierRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
+// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
-const setting_1 = require("./mongoose/schemas/setting");
+// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
@@ -22,8 +23,8 @@ const transactionNumberCounter_1 = require("./transactionNumberCounter");
  */
 class ServiceOutputIdentifierRepo {
     constructor(params) {
-        const { connection } = params;
-        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        // const { connection } = params;
+        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     // private static createKey(params: {
@@ -47,27 +48,15 @@ class ServiceOutputIdentifierRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = timestamp;
             let incrReply;
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                dataFeedExpires = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
-                    expires: dataFeedExpires
-                });
-            }
-            else {
-                dataFeedExpires = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            dataFeedExpires = moment(params.startDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
+                expires: dataFeedExpires
+            });
             let identifier = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(identifier);
@@ -77,19 +66,5 @@ class ServiceOutputIdentifierRepo {
             return identifier;
         });
     }
-    useMongoBySettings(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongo4transactionNumberFrom: 1
-            })
-                .lean()
-                .exec();
-            const useMongo4transactionNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4transactionNumberFrom;
-            return useMongo4transactionNumberFrom instanceof Date
-                && moment(params.startDate)
-                    .isSameOrAfter(moment(useMongo4transactionNumberFrom));
-        });
-    }
 }
 exports.ServiceOutputIdentifierRepo = ServiceOutputIdentifierRepo;

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 };
@@ -22,14 +22,9 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
-    updateByProject4migration(filter: {
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-    }, update: {
-        $set: any;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<ISetting>;
+        $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

@@ -49,19 +49,16 @@ class SettingRepo {
     }
     updateByProject(filter, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter } = update;
+            const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter } = update;
             return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined)
+                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined)
             })
                 .exec();
         });
     }
-    updateByProject4migration(filter, update) {
+    unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { $set } = update;
-            return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set
-            })
+            return this.settingModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
                 .exec();
         });
     }

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) {