@chevre/domain 20.2.0-alpha.19 → 20.2.0-alpha.20

package/example/src/chevre/aggregation/aggregateSystem.ts

@@ -16,12 +16,12 @@ async function main() {
     const orderRepo = new chevre.repository.Order(mongoose.connection);
     const actionRepo = new chevre.repository.Action(mongoose.connection);
 
-    await chevre.service.aggregation.system.aggregatePlaceOrder({
+    await chevre.service.aggregation.system.aggregateAuthorizeOrderAction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        transaction: transactionRepo
+        action: actionRepo
     });
 
     await chevre.service.aggregation.system.aggregateAuthorizeEventServiceOfferAction({
@@ -48,6 +48,14 @@ async function main() {
         action: actionRepo
     });
 
+    await chevre.service.aggregation.system.aggregatePlaceOrder({
+        aggregationDays: AGGREGATE_DAYS,
+        excludedProjectId: EXCLUDED_PROJECT_ID
+    })({
+        agregation: aggregationRepo,
+        transaction: transactionRepo
+    });
+
     await chevre.service.aggregation.system.aggregateOrder({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID

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

@@ -144,6 +144,16 @@ export declare class MongoRepository {
         startThrough: Date;
         typeOf: factory.actionType;
     }): Promise<IAggregateAction>;
+    aggregateAuthorizeOrderAction(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        startFrom: Date;
+        startThrough: Date;
+        typeOf: factory.actionType;
+    }): Promise<IAggregateAction>;
     aggregateUseAction(params: {
         project?: {
             id?: {

package/lib/chevre/repo/action.js

@@ -721,6 +721,28 @@ class MongoRepository {
             return { statuses };
         });
     }
+    aggregateAuthorizeOrderAction(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.actionStatusType.CompletedActionStatus,
+                factory.actionStatusType.CanceledActionStatus,
+                factory.actionStatusType.FailedActionStatus
+            ].map((actionStatus) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const matchConditions = Object.assign({ startDate: {
+                        $gte: params.startFrom,
+                        $lte: params.startThrough
+                    }, typeOf: { $eq: params.typeOf }, actionStatus: { $eq: actionStatus }, 'object.typeOf': {
+                        $exists: true,
+                        $eq: factory.order.OrderType.Order
+                    } }, (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, actionStatus });
+            })));
+            return { statuses };
+        });
+    }
     aggregateUseAction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -3,6 +3,7 @@ import * as factory from '../factory';
 export declare enum AggregationType {
     AggregatePlaceOrder = "AggregatePlaceOrder",
     AggregateAuthorizeEventServiceOfferAction = "AggregateAuthorizeEventServiceOfferAction",
+    AggregateAuthorizeOrderAction = "AggregateAuthorizeOrderAction",
     AggregateAuthorizePaymentAction = "AggregateAuthorizePaymentAction",
     AggregateOrder = "AggregateOrder",
     AggregateReservation = "AggregateReservation",

package/lib/chevre/repo/aggregation.js

@@ -26,6 +26,7 @@ var AggregationType;
 (function (AggregationType) {
     AggregationType["AggregatePlaceOrder"] = "AggregatePlaceOrder";
     AggregationType["AggregateAuthorizeEventServiceOfferAction"] = "AggregateAuthorizeEventServiceOfferAction";
+    AggregationType["AggregateAuthorizeOrderAction"] = "AggregateAuthorizeOrderAction";
     AggregationType["AggregateAuthorizePaymentAction"] = "AggregateAuthorizePaymentAction";
     AggregationType["AggregateOrder"] = "AggregateOrder";
     AggregationType["AggregateReservation"] = "AggregateReservation";

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

@@ -33,6 +33,13 @@ declare function aggregateAuthorizePaymentAction(params: {
     agregation: AggregationRepo;
     action: ActionRepo;
 }) => Promise<void>;
+declare function aggregateAuthorizeOrderAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
 /**
  * 使用アクション集計
  */
@@ -63,4 +70,4 @@ declare function aggregateReservation(params: {
     agregation: AggregationRepo;
     reservation: ReservationRepo;
 }) => Promise<void>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizePaymentAction, aggregateOrder, aggregatePlaceOrder, aggregateReservation, aggregateUseAction };
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateOrder, aggregatePlaceOrder, aggregateReservation, aggregateUseAction };

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.aggregateReservation = exports.aggregatePlaceOrder = exports.aggregateOrder = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
+exports.aggregateUseAction = exports.aggregateReservation = exports.aggregatePlaceOrder = exports.aggregateOrder = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
@@ -117,6 +117,37 @@ function aggregateAuthorizePaymentAction(params) {
     });
 }
 exports.aggregateAuthorizePaymentAction = aggregateAuthorizePaymentAction;
+function aggregateAuthorizeOrderAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateAuthorizeOrderAction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.actionType.AuthorizeAction
+            });
+            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));
+        }
+    });
+}
+exports.aggregateAuthorizeOrderAction = aggregateAuthorizeOrderAction;
 /**
  * 使用アクション集計
  */

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.19"
+  "version": "20.2.0-alpha.20"
 }