@chevre/domain 21.2.0-alpha.15 → 21.2.0-alpha.151

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregatePayMovieTicketAction = exports.aggregateEvent = exports.aggregateCheckMovieTicketAction = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
+exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregateReserveAction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregatePayMovieTicketAction = exports.aggregateOrderAction = exports.aggregateEvent = exports.aggregateCheckMovieTicketAction = exports.aggregateCancelReservationAction = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
@@ -19,22 +19,22 @@ function aggregateEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.event.aggregateEvent({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -45,6 +45,7 @@ function aggregateEvent(params) {
             debug('aggregateEvent:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesRemainingCapacityRate, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateEvent, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregateEvent = aggregateEvent;
@@ -55,22 +56,22 @@ function aggregatePlaceOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.transaction.aggregatePlaceOrder({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -98,6 +99,7 @@ function aggregatePlaceOrder(params) {
             }
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregatePlaceOrder, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate, aggregationByClient: aggregateResultsByClientId }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregatePlaceOrder = aggregatePlaceOrder;
@@ -108,22 +110,22 @@ function aggregateAuthorizeEventServiceOfferAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.action.aggregateAuthorizeEventServiceOfferAction({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -134,6 +136,7 @@ function aggregateAuthorizeEventServiceOfferAction(params) {
             debug('aggregateAuthorizeEventServiceOfferAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateAuthorizeEventServiceOfferAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregateAuthorizeEventServiceOfferAction = aggregateAuthorizeEventServiceOfferAction;
@@ -144,22 +147,22 @@ function aggregateAuthorizePaymentAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.action.aggregateAuthorizePaymentAction({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -170,6 +173,7 @@ function aggregateAuthorizePaymentAction(params) {
             debug('aggregateAuthorizePaymentAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateAuthorizePaymentAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregateAuthorizePaymentAction = aggregateAuthorizePaymentAction;
@@ -177,22 +181,22 @@ function aggregateAuthorizeOrderAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.action.aggregateAuthorizeOrderAction({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -203,6 +207,7 @@ function aggregateAuthorizeOrderAction(params) {
             debug('aggregateAuthorizeOrderAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateAuthorizeOrderAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregateAuthorizeOrderAction = aggregateAuthorizeOrderAction;
@@ -213,24 +218,24 @@ function aggregateUseAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = yield repos.action.aggregateUseAction({
+            const aggregateResult = yield repos.action.aggregateByTypeOf({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -239,29 +244,140 @@ function aggregateUseAction(params) {
             debug('aggregateUseAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateUseAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregateUseAction = aggregateUseAction;
+/**
+ * 予約アクション集計
+ */
+function aggregateReserveAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationCount) {
+            i += 1;
+            const startFrom = moment(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
+                .toDate();
+            const startThrough = moment(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateByTypeOf({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.actionType.ReserveAction
+            });
+            debug('aggregateReserveAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateReserveAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+        return { aggregationCount: i, aggregateDuration };
+    });
+}
+exports.aggregateReserveAction = aggregateReserveAction;
+/**
+ * 注文アクション集計
+ */
+function aggregateOrderAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationCount) {
+            i += 1;
+            const startFrom = moment(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
+                .toDate();
+            const startThrough = moment(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateByTypeOf({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.actionType.OrderAction
+            });
+            debug('aggregateOrderAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateOrderAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+        return { aggregationCount: i, aggregateDuration };
+    });
+}
+exports.aggregateOrderAction = aggregateOrderAction;
+/**
+ * 予約取消アクション集計
+ */
+function aggregateCancelReservationAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationCount) {
+            i += 1;
+            const startFrom = moment(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
+                .toDate();
+            const startThrough = moment(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateCancelReservationAction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough
+            });
+            debug('aggregateCancelReservationAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateCancelReservationAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+        return { aggregationCount: i, aggregateDuration };
+    });
+}
+exports.aggregateCancelReservationAction = aggregateCancelReservationAction;
 function aggregateCheckMovieTicketAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.action.aggregateCheckMovieTicketAction({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -271,6 +387,7 @@ function aggregateCheckMovieTicketAction(params) {
             debug('aggregateCheckMovieTicketAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateCheckMovieTicketAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregateCheckMovieTicketAction = aggregateCheckMovieTicketAction;
@@ -278,22 +395,22 @@ function aggregatePayMovieTicketAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.action.aggregatePayMovieTicketAction({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -303,6 +420,7 @@ function aggregatePayMovieTicketAction(params) {
             debug('aggregatePayMovieTicketAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregatePayMovieTicketAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregatePayMovieTicketAction = aggregatePayMovieTicketAction;
@@ -310,22 +428,22 @@ function aggregatePayTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.assetTransaction.aggregateAssetTransaction({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -336,6 +454,7 @@ function aggregatePayTransaction(params) {
             debug('aggregatePayTransaction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregatePay, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregatePayTransaction = aggregatePayTransaction;
@@ -346,22 +465,22 @@ function aggregateReserveTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const startFrom = moment()
+            const startFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const startThrough = moment()
+            const startThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.assetTransaction.aggregateAssetTransaction({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -372,6 +491,7 @@ function aggregateReserveTransaction(params) {
             debug('aggregateReserveTransaction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation, startFrom);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateReserve, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
         }
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregateReserveTransaction = aggregateReserveTransaction;
@@ -379,31 +499,33 @@ function aggregateTask(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const aggregateDate = new Date();
-        const aggregateDuration = moment.duration(1, 'days')
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
             .toISOString();
         let i = -1;
-        while (i < params.aggregationDays) {
+        while (i < params.aggregationCount) {
             i += 1;
-            const runsFrom = moment()
+            const runsFrom = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .startOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
                 .toDate();
-            const runsThrough = moment()
+            const runsThrough = moment(aggregateDate)
                 .utc()
                 // .tz('Asia/Tokyo')
-                .add(-i, 'days')
-                .endOf('day')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
                 .toDate();
             const aggregateResult = yield repos.task.aggregateTask({
                 project: { id: { $ne: params.excludedProjectId } },
                 runsFrom,
                 runsThrough
             });
-            debug('aggregateTask:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation, runsFrom);
+            debug('aggregateTask:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation, runsFrom, runsThrough);
             yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateTask, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: runsFrom, aggregateDate }, aggregateResult));
         }
+        debug(i, 'aggregations saved');
+        return { aggregationCount: i, aggregateDuration };
     });
 }
 exports.aggregateTask = aggregateTask;

package/lib/chevre/service/assetTransaction/cancelReservation.js

@@ -13,13 +13,9 @@ exports.exportTasksById = exports.startAndConfirm = exports.confirm = exports.st
 /**
  * 予約取消取引サービス
  */
-const createDebug = require("debug");
-const moment = require("moment");
 const mongoose = require("mongoose");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
 const factory_1 = require("./cancelReservation/factory");
-const debug = createDebug('chevre-domain:service');
 function validateStartParams(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -169,27 +165,6 @@ function exportTasksById(params) {
         });
         const potentialActions = transaction.potentialActions;
         const taskAttributes = [];
-        // 資産取引削除タスクを作成
-        const deleteTransactionTask = {
-            project: transaction.project,
-            name: factory.taskName.DeleteAssetTransaction,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(transaction.endDate)
-                .add(settings_1.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 3,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: {
-                    project: transaction.project,
-                    id: transaction.id,
-                    transactionNumber: transaction.transactionNumber,
-                    typeOf: transaction.typeOf
-                }
-            }
-        };
-        taskAttributes.push(deleteTransactionTask);
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
                 // tslint:disable-next-line:no-single-line-block-comment
@@ -235,9 +210,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        debug('taskAttributes prepared', taskAttributes);
-        return repos.task.saveMany(taskAttributes);
-        // return Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/moneyTransfer.js

@@ -15,7 +15,6 @@ exports.exportTasksById = exports.cancel = exports.confirm = exports.start = voi
  */
 const moment = require("moment");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
 const pecorinoapi = require("../../pecorinoapi");
 // import { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
 const MoneyTransferService = require("../moneyTransfer");
@@ -35,7 +34,7 @@ function start(params) {
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory.product.ProductType.PaymentCard },
             id: { $eq: issuedThroughId }
-        });
+        }, [], []);
         const product = products.shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
@@ -360,27 +359,6 @@ function exportTasksById(params) {
         });
         const potentialActions = transaction.potentialActions;
         const taskAttributes = [];
-        // 資産取引削除タスクを作成
-        const deleteTransactionTask = {
-            project: transaction.project,
-            name: factory.taskName.DeleteAssetTransaction,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(transaction.endDate)
-                .add(settings_1.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 3,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: {
-                    project: transaction.project,
-                    id: transaction.id,
-                    transactionNumber: transaction.transactionNumber,
-                    typeOf: transaction.typeOf
-                }
-            }
-        };
-        taskAttributes.push(deleteTransactionTask);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {
@@ -430,7 +408,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;