@chevre/domain 22.11.0-alpha.8 → 22.11.0

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

@@ -120,6 +120,15 @@ const indexes = [
                 'name.en': { $exists: true }
             }
         }
+    ],
+    [
+        { additionalProperty: 1, productID: 1 },
+        {
+            name: 'additionalProperty',
+            partialFilterExpression: {
+                additionalProperty: { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;

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/order.d.ts

@@ -204,8 +204,8 @@ export declare class OrderRepo {
             emailCount?: number;
         };
     }>;
-    aggregateOrderOfCustomer(params: {
-        project: {
+    aggregateOrderOfCustomerByProject(params: {
+        project?: {
             id: {
                 $eq: string;
             };
@@ -225,5 +225,20 @@ export declare class OrderRepo {
             emailCount?: number;
         };
     }>;
+    aggregateOrderOfCustomerGlobally(params: {
+        orderDate: {
+            $gte: Date;
+            $lte: Date;
+        };
+        customer: {
+            email: {
+                $eq: string;
+            };
+        };
+    }): Promise<{
+        aggregation: Pick<IAggregation, 'orderCount'> & {
+            sumGraceTime?: never;
+        };
+    }>;
 }
 export {};

package/lib/chevre/repo/order.js

@@ -1198,17 +1198,13 @@ class OrderRepo {
             };
         });
     }
-    aggregateOrderOfCustomer(params) {
+    aggregateOrderOfCustomerByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchConditions = {
-                orderDate: {
+            var _a;
+            const matchConditions = Object.assign(Object.assign({ orderDate: {
                     $gte: params.orderDate.$gte,
                     $lte: params.orderDate.$lte
-                },
-                typeOf: { $eq: factory.order.OrderType.Order },
-                'project.id': { $eq: params.project.id.$eq },
-                'customer.email': { $exists: true, $eq: params.customer.email.$eq }
-            };
+                }, typeOf: { $eq: factory.order.OrderType.Order } }, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string') ? { 'project.id': { $eq: params.project.id.$eq } } : undefined), { 'customer.email': { $exists: true, $eq: params.customer.email.$eq } });
             const aggregations = yield this.orderModel.aggregate([
                 { $match: matchConditions },
                 {
@@ -1250,5 +1246,48 @@ class OrderRepo {
             };
         });
     }
+    aggregateOrderOfCustomerGlobally(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchConditions = {
+                orderDate: {
+                    $gte: params.orderDate.$gte,
+                    $lte: params.orderDate.$lte
+                },
+                typeOf: { $eq: factory.order.OrderType.Order },
+                'customer.email': { $exists: true, $eq: params.customer.email.$eq }
+            };
+            const aggregations = yield this.orderModel.aggregate([
+                { $match: matchConditions },
+                {
+                    $project: {
+                        typeOf: '$typeOf'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        orderCount: { $sum: 1 }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        orderCount: '$orderCount'
+                    }
+                }
+            ])
+                .exec();
+            if (aggregations.length === 0) {
+                return {
+                    aggregation: {
+                        orderCount: 0
+                    }
+                };
+            }
+            return {
+                aggregation: Object.assign({}, aggregations[0])
+            };
+        });
+    }
 }
 exports.OrderRepo = OrderRepo;

package/lib/chevre/repo/pendingReservation.js

@@ -587,6 +587,7 @@ class PendingReservationRepo {
                         throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
                     }
                 }
+                throw error;
             }
         });
     }

package/lib/chevre/repo/product.js

@@ -48,7 +48,7 @@ class ProductRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -151,25 +151,20 @@ class ProductRepo {
             const nameRegexExp = new RegExp(nameRegex);
             andConditions.push({
                 $or: [
-                    {
-                        'name.ja': {
-                            $exists: true,
-                            $regex: nameRegexExp
-                        }
-                    },
-                    {
-                        'name.en': {
-                            $exists: true,
-                            $regex: nameRegexExp
-                        }
-                    }
+                    { 'name.ja': { $exists: true, $regex: nameRegexExp } },
+                    { 'name.en': { $exists: true, $regex: nameRegexExp } }
                 ]
             });
         }
-        // const providerIdEq = params.provider?.id?.$eq;
-        // if (typeof providerIdEq === 'string') {
-        //     andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
-        // }
+        const additionalPropertyElemMatchNameEq = (_w = params.additionalPropertyMatch) === null || _w === void 0 ? void 0 : _w.nameEq;
+        if (typeof additionalPropertyElemMatchNameEq === 'string') {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: { name: { $eq: additionalPropertyElemMatchNameEq } }
+                }
+            });
+        }
         return andConditions;
     }
     /**

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,6 +27,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

@@ -77,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();
         });
     }
@@ -133,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;

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

@@ -22,16 +22,7 @@ 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;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, 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;

package/lib/chevre/repo/setting.js

@@ -49,18 +49,9 @@ 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)
-            })
-                .exec();
-        });
-    }
-    updateByProject4migration(filter, update) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { $set } = update;
-            return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set
+                $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();
         });

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

@@ -1,17 +1,14 @@
 import type { Connection } from 'mongoose';
-import type { RedisClientType } from 'redis';
 import { AbstractStockHolderRepo, IGetHolderResult, ILockKey, IOffer, IUnlockKey } from './stockHolderAbstract';
 export { ILockKey, IOffer, IUnlockKey };
 /**
- * イベントストックホルダーリポジトリ
+ * 保留予約リポジトリ
  */
 export declare class StockHolderRepo implements AbstractStockHolderRepo {
-    static KEY_PREFIX_NEW: string;
-    private readonly redisClient;
     private readonly pendingReservationRepo;
-    constructor(redisClient: RedisClientType, connection: Connection);
-    private static offer2field;
-    private static createKey;
+    constructor(params: {
+        connection: Connection;
+    });
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
@@ -50,26 +47,6 @@ export declare class StockHolderRepo implements AbstractStockHolderRepo {
         hasTicketedSeat: boolean;
         offers: IOffer[];
     }): Promise<IGetHolderResult[]>;
-    redisKeyExists(params: {
-        eventId: string;
-        startDate: Date;
-    }): Promise<boolean>;
-    checkIfConflicted(params: {
-        eventId: string;
-        startDate: Date;
-    }): Promise<void>;
-    /**
-     * 万が一に備えて、保留予約をredis->mongo移行
-     */
-    migrate2mongoJustInCase(params: {
-        eventId: string;
-        startDate: Date;
-    }): Promise<{
-        expireTime: number;
-        hash: {
-            [x: string]: string;
-        };
-    }>;
     /**
      * 新リポジトリを使用するかどうか
      */