@chevre/domain 20.2.0-alpha.4 → 20.2.0-alpha.41

package/lib/chevre/repo/task.js

@@ -29,29 +29,24 @@ class MongoRepository {
     }
     // 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;
-        const andConditions = [{
-                name: { $exists: true }
-            }];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        const andConditions = [];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.name !== undefined) {
-            andConditions.push({
-                name: params.name
-            });
+        if (typeof params.name === 'string') {
+            andConditions.push({ name: { $eq: params.name } });
+        }
+        else {
+            const nameIn = (_c = params.name) === null || _c === void 0 ? void 0 : _c.$in;
+            if (Array.isArray(nameIn)) {
+                andConditions.push({ name: { $in: nameIn } });
+            }
+            const nameNin = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$nin;
+            if (Array.isArray(nameNin)) {
+                andConditions.push({ name: { $nin: nameNin } });
+            }
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -94,7 +89,7 @@ class MongoRepository {
                 }
             });
         }
-        const dateAbortedGte = (_a = params.dateAborted) === null || _a === void 0 ? void 0 : _a.$gte;
+        const dateAbortedGte = (_e = params.dateAborted) === null || _e === void 0 ? void 0 : _e.$gte;
         if (dateAbortedGte instanceof Date) {
             andConditions.push({
                 dateAborted: {
@@ -103,7 +98,7 @@ class MongoRepository {
                 }
             });
         }
-        const dateAbortedLte = (_b = params.dateAborted) === null || _b === void 0 ? void 0 : _b.$lte;
+        const dateAbortedLte = (_f = params.dateAborted) === null || _f === void 0 ? void 0 : _f.$lte;
         if (dateAbortedLte instanceof Date) {
             andConditions.push({
                 dateAborted: {
@@ -112,7 +107,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTransactionNumberEq = (_e = (_d = (_c = params.data) === null || _c === void 0 ? void 0 : _c.object) === null || _d === void 0 ? void 0 : _d.transactionNumber) === null || _e === void 0 ? void 0 : _e.$eq;
+        const objectTransactionNumberEq = (_j = (_h = (_g = params.data) === null || _g === void 0 ? void 0 : _g.object) === null || _h === void 0 ? void 0 : _h.transactionNumber) === null || _j === void 0 ? void 0 : _j.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({
                 'data.object.transactionNumber': {
@@ -121,7 +116,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPurposeIdEq = (_h = (_g = (_f = params.data) === null || _f === void 0 ? void 0 : _f.purpose) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        const objectPurposeIdEq = (_m = (_l = (_k = params.data) === null || _k === void 0 ? void 0 : _k.purpose) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
         if (typeof objectPurposeIdEq === 'string') {
             andConditions.push({
                 'data.purpose.id': {
@@ -130,7 +125,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPurposeOrderNumberEq = (_l = (_k = (_j = params.data) === null || _j === void 0 ? void 0 : _j.purpose) === null || _k === void 0 ? void 0 : _k.orderNumber) === null || _l === void 0 ? void 0 : _l.$eq;
+        const objectPurposeOrderNumberEq = (_q = (_p = (_o = params.data) === null || _o === void 0 ? void 0 : _o.purpose) === null || _p === void 0 ? void 0 : _p.orderNumber) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({
                 'data.purpose.orderNumber': {
@@ -312,5 +307,124 @@ class MongoRepository {
                 .exec();
         });
     }
+    aggregateTask(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.taskStatus.Executed,
+                factory.taskStatus.Aborted
+            ].map((taskStatus) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const matchConditions = Object.assign({ runsAt: {
+                        $gte: params.runsFrom,
+                        $lte: params.runsThrough
+                    }, status: { $eq: taskStatus } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
+                    ? { 'project.id': { $ne: params.project.id.$ne } }
+                    : undefined);
+                return this.agggregateByStatus({ matchConditions, status: taskStatus });
+            })));
+            return { statuses };
+        });
+    }
+    // tslint:disable-next-line:max-func-body-length
+    agggregateByStatus(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchConditions = params.matchConditions;
+            const taskStatus = params.status;
+            const aggregations = yield this.taskModel.aggregate([
+                {
+                    $match: matchConditions
+                },
+                {
+                    $project: {
+                        latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
+                        status: '$status',
+                        runsAt: '$runsAt',
+                        lastTriedAt: '$lastTriedAt'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$status',
+                        taskCount: { $sum: 1 },
+                        maxLatency: { $max: '$latency' },
+                        minLatency: { $min: '$latency' },
+                        avgLatency: { $avg: '$latency' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        taskCount: '$taskCount',
+                        avgLatency: '$avgLatency',
+                        maxLatency: '$maxLatency',
+                        minLatency: '$minLatency'
+                    }
+                }
+            ])
+                .exec();
+            // tslint:disable-next-line:no-magic-numbers
+            const percents = [50, 95, 99];
+            if (aggregations.length === 0) {
+                return {
+                    status: taskStatus,
+                    aggregation: {
+                        taskCount: 0,
+                        avgLatency: 0,
+                        maxLatency: 0,
+                        minLatency: 0,
+                        percentilesLatency: percents.map((percent) => {
+                            return {
+                                name: String(percent),
+                                value: 0
+                            };
+                        })
+                    }
+                };
+            }
+            const ranks4percentile = percents.map((percentile) => {
+                return {
+                    percentile,
+                    // tslint:disable-next-line:no-magic-numbers
+                    rank: Math.floor(aggregations[0].taskCount * percentile / 100)
+                };
+            });
+            const aggregations2 = yield this.taskModel.aggregate([
+                {
+                    $match: matchConditions
+                },
+                {
+                    $project: {
+                        latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
+                        status: '$status',
+                        runsAt: '$runsAt',
+                        lastTriedAt: '$lastTriedAt'
+                    }
+                },
+                { $sort: { latency: 1 } },
+                {
+                    $group: {
+                        _id: '$status',
+                        latencies: { $push: '$latency' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        percentilesLatency: ranks4percentile.map((rank) => {
+                            return {
+                                name: String(rank.percentile),
+                                value: { $arrayElemAt: ['$latencies', rank.rank] }
+                            };
+                        })
+                    }
+                }
+            ])
+                .exec();
+            return {
+                status: taskStatus,
+                aggregation: Object.assign(Object.assign({}, aggregations[0]), aggregations2[0])
+            };
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -2,6 +2,29 @@ import { Connection } from 'mongoose';
 import * as factory from '../factory';
 import { modelName } from './mongoose/model/transaction';
 export { modelName };
+interface IAggregationByStatus {
+    transactionCount: number;
+    avgDuration: number;
+    maxDuration: number;
+    minDuration: number;
+    percentilesDuration: {
+        name: string;
+        value: number;
+    }[];
+    acceptedOfferCount: number;
+    avgAcceptedOfferCount: number;
+    totalPrice: number;
+    maxPrice: number;
+    minPrice: number;
+    avgPrice: number;
+}
+interface IStatus {
+    status: factory.transactionStatusType;
+    aggregation: IAggregationByStatus;
+}
+export interface IAggregatePlaceOrder {
+    statuses: IStatus[];
+}
 /**
  * 取引リポジトリ
  */
@@ -66,7 +89,7 @@ export declare class MongoRepository {
         authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
         result: factory.transaction.IResult<T>;
         potentialActions: factory.transaction.IPotentialActions<T>;
-    }): Promise<factory.transaction.ITransaction<T>>;
+    }): Promise<void>;
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
@@ -105,7 +128,7 @@ export declare class MongoRepository {
     cancel<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-    }): Promise<factory.transaction.ITransaction<T>>;
+    }): Promise<void>;
     count<T extends factory.transactionType>(params: factory.transaction.ISearchConditions<T>): Promise<number>;
     /**
      * 取引を検索する
@@ -114,10 +137,15 @@ export declare class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate<T extends factory.transactionType>(params: {
+    findByIdAndUpdate(params: {
         id: string;
-        update: any;
-    }): Promise<factory.transaction.ITransaction<T>>;
+        update: {
+            $set?: any;
+            $unset?: any;
+            $pull?: any;
+            $push?: any;
+        };
+    }): Promise<void>;
     saveOrderNumberIfNotExist(params: {
         id: string;
         orderNumber: string;
@@ -129,4 +157,16 @@ export declare class MongoRepository {
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
+    aggregatePlaceOrder(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        startFrom: Date;
+        startThrough: Date;
+        typeOf: factory.transactionType;
+        clientId?: string;
+    }): Promise<IAggregatePlaceOrder>;
+    private agggregateByStatus;
 }

package/lib/chevre/repo/transaction.js

@@ -313,6 +313,8 @@ class MongoRepository {
                 status: factory.transactionStatusType.InProgress
             }, {
                 $set: Object.assign(Object.assign({ 'agent.id': params.agent.id }, (typeof params.agent.name === 'string') ? { 'agent.name': params.agent.name } : undefined), (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.customer) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { 'object.customer': params.object.customer } : undefined)
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -333,6 +335,8 @@ class MongoRepository {
                 $set: {
                     expires: params.expires
                 }
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -353,6 +357,8 @@ class MongoRepository {
                 status: factory.transactionStatusType.InProgress
             }, {
                 $set: Object.assign({}, (typeof ((_a = params.object) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? { 'object.name': params.object.name } : undefined)
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -375,7 +381,10 @@ class MongoRepository {
                 'object.authorizeActions': params.authorizeActions,
                 result: params.result,
                 potentialActions: params.potentialActions // resultを更新
-            }, { new: true })
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
@@ -384,7 +393,7 @@ class MongoRepository {
                 /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Confirmed) {
                     // すでに確定済の場合
-                    return transaction;
+                    return;
                     // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore next */
                 }
@@ -402,7 +411,7 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            // return doc.toObject();
         });
     }
     /**
@@ -485,7 +494,10 @@ class MongoRepository {
             }, {
                 status: factory.transactionStatusType.Canceled,
                 endDate: endDate
-            }, { new: true })
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
@@ -494,7 +506,7 @@ class MongoRepository {
                 /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Canceled) {
                     // すでに中止済の場合
-                    return transaction;
+                    return;
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
@@ -506,7 +518,7 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            // return doc.toObject();
         });
     }
     count(params) {
@@ -542,43 +554,26 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    // public stream<T extends factory.transactionType>(
-    //     params: factory.transaction.ISearchConditions<T>
-    // ): QueryCursor<Document> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
-    //         .select({ __v: 0, createdAt: 0, updatedAt: 0 });
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.limit !== undefined && params.page !== undefined) {
-    //         query.limit(params.limit)
-    //             .skip(params.limit * (params.page - 1));
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.sort !== undefined) {
-    //         query.sort(params.sort);
-    //     }
-    //     return query.cursor();
-    // }
     /**
      * 特定の取引を更新する(汎用)
      */
     findByIdAndUpdate(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, { new: true })
+            yield this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, {
+                // new: true,
+                projection: { _id: 1 }
+            })
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
                     throw new factory.errors.ArgumentNull(this.transactionModel.modelName);
                 }
-                return doc.toObject();
             });
         });
     }
     saveOrderNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({
+            yield this.transactionModel.updateOne({
                 _id: params.id,
                 'object.orderNumber': { $exists: false }
             }, { 'object.orderNumber': params.orderNumber })
@@ -587,7 +582,7 @@ class MongoRepository {
     }
     saveConfirmationNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({
+            yield this.transactionModel.updateOne({
                 _id: params.id,
                 'object.confirmationNumber': { $exists: false }
             }, { 'object.confirmationNumber': params.confirmationNumber })
@@ -600,5 +595,168 @@ class MongoRepository {
                 .exec();
         });
     }
+    aggregatePlaceOrder(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.transactionStatusType.Confirmed,
+                factory.transactionStatusType.Canceled,
+                factory.transactionStatusType.Expired
+            ].map((transactionStatus) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const matchConditions = Object.assign(Object.assign({ startDate: {
+                        $gte: params.startFrom,
+                        $lte: params.startThrough
+                    }, typeOf: { $eq: params.typeOf }, status: { $eq: transactionStatus } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
+                    ? { 'project.id': { $ne: params.project.id.$ne } }
+                    : undefined), (typeof params.clientId === 'string')
+                    // customerIdentifierAll.push();
+                    ? {
+                        'agent.identifier': {
+                            $exists: true,
+                            $all: [{ name: 'clientId', value: params.clientId }]
+                        }
+                    }
+                    : undefined);
+                return this.agggregateByStatus({ matchConditions, status: transactionStatus });
+            })));
+            return { statuses };
+        });
+    }
+    // tslint:disable-next-line:max-func-body-length
+    agggregateByStatus(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchConditions = params.matchConditions;
+            const transactionStatus = params.status;
+            const aggregations = yield this.transactionModel.aggregate([
+                {
+                    $match: matchConditions
+                },
+                {
+                    $project: {
+                        duration: { $subtract: ['$endDate', '$startDate'] },
+                        status: '$status',
+                        startDate: '$startDate',
+                        endDate: '$endDate',
+                        typeOf: '$typeOf'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        transactionCount: { $sum: 1 },
+                        maxDuration: { $max: '$duration' },
+                        minDuration: { $min: '$duration' },
+                        avgDuration: { $avg: '$duration' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        transactionCount: '$transactionCount',
+                        avgDuration: '$avgDuration',
+                        maxDuration: '$maxDuration',
+                        minDuration: '$minDuration'
+                    }
+                }
+            ])
+                .exec();
+            // tslint:disable-next-line:no-magic-numbers
+            const percents = [50, 95, 99];
+            if (aggregations.length === 0) {
+                return {
+                    status: transactionStatus,
+                    aggregation: {
+                        transactionCount: 0,
+                        avgDuration: 0,
+                        maxDuration: 0,
+                        minDuration: 0,
+                        percentilesDuration: percents.map((percent) => {
+                            return {
+                                name: String(percent),
+                                value: 0
+                            };
+                        }),
+                        acceptedOfferCount: 0,
+                        avgAcceptedOfferCount: 0,
+                        totalPrice: 0,
+                        maxPrice: 0,
+                        minPrice: 0,
+                        avgPrice: 0
+                    }
+                };
+            }
+            const ranks4percentile = percents.map((percentile) => {
+                return {
+                    percentile,
+                    // tslint:disable-next-line:no-magic-numbers
+                    rank: Math.floor(aggregations[0].transactionCount * percentile / 100)
+                };
+            });
+            const aggregations2 = yield this.transactionModel.aggregate([
+                {
+                    $match: matchConditions
+                },
+                {
+                    $project: {
+                        duration: { $subtract: ['$endDate', '$startDate'] },
+                        status: '$status',
+                        startDate: '$startDate',
+                        endDate: '$endDate',
+                        typeOf: '$typeOf',
+                        // result: '$result',
+                        acceptedOffers: {
+                            $cond: {
+                                if: { $isArray: '$result.order.acceptedOffers' },
+                                then: '$result.order.acceptedOffers',
+                                else: []
+                            }
+                        },
+                        price: {
+                            $cond: {
+                                if: { $isNumber: '$result.order.price' },
+                                then: '$result.order.price',
+                                else: 0
+                            }
+                        }
+                    }
+                },
+                { $sort: { duration: 1 } },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        durations: { $push: '$duration' },
+                        acceptedOfferCount: { $sum: { $size: '$acceptedOffers' } },
+                        avgAcceptedOfferCount: { $avg: { $size: '$acceptedOffers' } },
+                        totalPrice: { $sum: '$price' },
+                        maxPrice: { $max: '$price' },
+                        minPrice: { $min: '$price' },
+                        avgPrice: { $avg: '$price' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        percentilesDuration: ranks4percentile.map((rank) => {
+                            return {
+                                name: String(rank.percentile),
+                                value: { $arrayElemAt: ['$durations', rank.rank] }
+                            };
+                        }),
+                        acceptedOfferCount: '$acceptedOfferCount',
+                        avgAcceptedOfferCount: '$avgAcceptedOfferCount',
+                        totalPrice: '$totalPrice',
+                        maxPrice: '$maxPrice',
+                        minPrice: '$minPrice',
+                        avgPrice: '$avgPrice'
+                    }
+                }
+            ])
+                .exec();
+            return {
+                status: transactionStatus,
+                aggregation: Object.assign(Object.assign({}, aggregations[0]), aggregations2[0])
+            };
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;