@chevre/domain 26.0.0-alpha.3 → 26.0.0-alpha.4

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

@@ -0,0 +1,32 @@
+import type { Connection } from 'mongoose';
+import { factory } from '../factory';
+interface IAggregationByStatus {
+    taskCount: number;
+    avgLatency: number;
+    maxLatency: number;
+    minLatency: number;
+    percentilesLatency: {
+        name: string;
+        value: number;
+    }[];
+}
+interface IStatus {
+    status: factory.taskStatus;
+    aggregation: IAggregationByStatus;
+}
+interface IAggregateTask {
+    statuses: IStatus[];
+}
+/**
+ * 予定タスク集計リポジトリ
+ */
+export declare class AggregateScheduledTaskRepo {
+    private readonly scheduledTaskModel;
+    constructor(connection: Connection);
+    aggregateScheduledTask(params: {
+        runsFrom: Date;
+        runsThrough: Date;
+    }): Promise<IAggregateTask>;
+    private agggregateByStatus;
+}
+export {};

package/lib/chevre/repo/aggregateScheduledTask.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AggregateScheduledTaskRepo = void 0;
+const factory_1 = require("../factory");
+const scheduledTasks_1 = require("./mongoose/schemas/scheduledTasks");
+/**
+ * 予定タスク集計リポジトリ
+ */
+class AggregateScheduledTaskRepo {
+    scheduledTaskModel;
+    constructor(connection) {
+        this.scheduledTaskModel = connection.model(scheduledTasks_1.modelName, (0, scheduledTasks_1.createSchema)());
+    }
+    async aggregateScheduledTask(params) {
+        const statuses = await Promise.all([
+            factory_1.factory.taskStatus.Executed,
+            factory_1.factory.taskStatus.Aborted
+        ].map(async (taskStatus) => {
+            const matchConditions = {
+                status: { $eq: taskStatus },
+                runsAt: {
+                    $gte: params.runsFrom,
+                    $lte: params.runsThrough
+                },
+                // ...(typeof params.project?.id?.$ne === 'string')
+                //     ? { 'project.id': { $ne: params.project.id.$ne } }
+                //     : undefined
+            };
+            return this.agggregateByStatus({ matchConditions, status: taskStatus });
+        }));
+        return { statuses };
+    }
+    async agggregateByStatus(params) {
+        const matchConditions = params.matchConditions;
+        const taskStatus = params.status;
+        const aggregate1 = this.scheduledTaskModel.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'
+                }
+            }
+        ]);
+        // const explainResult = await aggregate1.explain();
+        // console.dir(explainResult, { depth: null });
+        // return;
+        const aggregations = await aggregate1.exec();
+        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,
+                rank: Math.floor(aggregations[0].taskCount * percentile / 100)
+            };
+        });
+        const aggregate2 = this.scheduledTaskModel.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] }
+                        };
+                    })
+                }
+            }
+        ]);
+        const aggregations2 = await aggregate2.exec();
+        return {
+            status: taskStatus,
+            aggregation: {
+                ...aggregations[0],
+                ...aggregations2[0]
+            }
+        };
+    }
+}
+exports.AggregateScheduledTaskRepo = AggregateScheduledTaskRepo;

package/lib/chevre/repository.d.ts

@@ -24,6 +24,7 @@ import type { AggregateActionRepo } from './repo/aggregateAction';
 import type { AggregateOfferRepo } from './repo/aggregateOffer';
 import type { AggregateOrderRepo } from './repo/aggregateOrder';
 import type { AggregateReservationRepo } from './repo/aggregateReservation';
+import type { AggregateScheduledTaskRepo } from './repo/aggregateScheduledTask';
 import type { AggregateTaskRepo } from './repo/aggregateTask';
 import type { AggregationRepo } from './repo/aggregation';
 import type { AssetTransactionRepo } from './repo/assetTransaction';
@@ -180,6 +181,10 @@ export type AggregateAction = AggregateActionRepo;
 export declare namespace AggregateAction {
     function createInstance(...params: ConstructorParameters<typeof AggregateActionRepo>): Promise<AggregateActionRepo>;
 }
+export type AggregateScheduledTask = AggregateScheduledTaskRepo;
+export declare namespace AggregateScheduledTask {
+    function createInstance(...params: ConstructorParameters<typeof AggregateScheduledTaskRepo>): Promise<AggregateScheduledTaskRepo>;
+}
 export type AggregateTask = AggregateTaskRepo;
 export declare namespace AggregateTask {
     function createInstance(...params: ConstructorParameters<typeof AggregateTaskRepo>): Promise<AggregateTaskRepo>;

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateTask = exports.AggregateAction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = void 0;
+exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateAction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -214,6 +214,17 @@ var AggregateAction;
     }
     AggregateAction.createInstance = createInstance;
 })(AggregateAction || (exports.AggregateAction = AggregateAction = {}));
+var AggregateScheduledTask;
+(function (AggregateScheduledTask) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/aggregateScheduledTask.js')).AggregateScheduledTaskRepo;
+        }
+        return new repo(...params);
+    }
+    AggregateScheduledTask.createInstance = createInstance;
+})(AggregateScheduledTask || (exports.AggregateScheduledTask = AggregateScheduledTask = {}));
 var AggregateTask;
 (function (AggregateTask) {
     let repo;

package/lib/chevre/service/aggregation/system.d.ts

@@ -1,4 +1,5 @@
 import type { AggregateActionRepo } from '../../repo/aggregateAction';
+import type { AggregateScheduledTaskRepo } from '../../repo/aggregateScheduledTask';
 import type { AggregateTaskRepo } from '../../repo/aggregateTask';
 import { AggregationRepo } from '../../repo/aggregation';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -10,7 +11,7 @@ interface IAggregateParams {
     aggregateDate: Date;
     aggregateDurationUnit: AggregateDurationUnit;
     aggregationCount: number;
-    excludedProjectId?: string;
+    excludedProjectId?: never;
 }
 declare function aggregateEvent(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
@@ -146,4 +147,11 @@ declare function aggregateTask(params: IAggregateParams): (repos: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrder, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+declare function aggregateScheduledTask(params: IAggregateParams): (repos: {
+    agregation: AggregationRepo;
+    aggregateScheduledTask: AggregateScheduledTaskRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrder, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateScheduledTask, aggregateUseAction };

package/lib/chevre/service/aggregation/system.js

@@ -17,6 +17,7 @@ exports.aggregatePlaceOrder = aggregatePlaceOrder;
 exports.aggregateReserveAction = aggregateReserveAction;
 exports.aggregateReserveTransaction = aggregateReserveTransaction;
 exports.aggregateTask = aggregateTask;
+exports.aggregateScheduledTask = aggregateScheduledTask;
 exports.aggregateUseAction = aggregateUseAction;
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
@@ -692,3 +693,44 @@ function aggregateTask(params) {
         return { aggregationCount: i, aggregateDuration };
     };
 }
+function aggregateScheduledTask(params) {
+    return async (repos) => {
+        const { aggregateDate } = params;
+        if (!(aggregateDate instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('aggregateDate', 'must be Date');
+        }
+        const aggregateDuration = moment_timezone_1.default.duration(1, params.aggregateDurationUnit)
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationCount) {
+            i += 1;
+            const runsFrom = (0, moment_timezone_1.default)(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
+                .toDate();
+            const runsThrough = (0, moment_timezone_1.default)(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
+                .toDate();
+            const aggregateResult = await repos.aggregateScheduledTask.aggregateScheduledTask({
+                // project: { id: { $ne: params.excludedProjectId } },
+                runsFrom,
+                runsThrough
+            });
+            await repos.agregation.saveAggregation({
+                typeOf: factory_1.factory.aggregation.AggregationType.AggregateScheduledTask,
+                project: { id: '*', typeOf: factory_1.factory.organizationType.Project },
+                aggregateDuration,
+                aggregateStart: runsFrom,
+                aggregateDate,
+                ...aggregateResult
+            });
+        }
+        debug(i, 'aggregations saved');
+        return { aggregationCount: i, aggregateDuration };
+    };
+}

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.1.0-alpha.4",
+    "@chevre/factory": "10.1.0-alpha.5",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.3"
+  "version": "26.0.0-alpha.4"
 }