@chevre/domain 21.2.0-alpha.101 → 21.2.0-alpha.103

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

@@ -22,6 +22,30 @@ async function main() {
 
     let result: { aggregationCount: number; aggregateDuration: string };
 
+    result = await chevre.service.aggregation.system.aggregateReserveAction({
+        aggregateDurationUnit: 'hours',
+        // aggregateDurationUnit: 'days',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
+        // aggregationCount: AGGREGATE_DAYS,
+        excludedProjectId: EXCLUDED_PROJECT_ID
+    })({
+        agregation: aggregationRepo,
+        action: actionRepo
+    });
+    console.log('aggregateReserveAction processed.', result);
+
+    result = await chevre.service.aggregation.system.aggregateOrderAction({
+        aggregateDurationUnit: 'hours',
+        // aggregateDurationUnit: 'days',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
+        // aggregationCount: AGGREGATE_DAYS,
+        excludedProjectId: EXCLUDED_PROJECT_ID
+    })({
+        agregation: aggregationRepo,
+        action: actionRepo
+    });
+    console.log('aggregateReserveAction processed.', result);
+
     result = await chevre.service.aggregation.system.aggregatePlaceOrder({
         aggregateDurationUnit: 'hours',
         aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,

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

@@ -180,7 +180,10 @@ export declare class MongoRepository {
         startThrough: Date;
         typeOf: factory.actionType;
     }): Promise<IAggregateAction>;
-    aggregateUseAction(params: {
+    /**
+     * アクションタイプによる汎用的な集計
+     */
+    aggregateByTypeOf(params: {
         project?: {
             id?: {
                 $ne?: string;

package/lib/chevre/repo/action.js

@@ -801,7 +801,10 @@ class MongoRepository {
             return { statuses };
         });
     }
-    aggregateUseAction(params) {
+    /**
+     * アクションタイプによる汎用的な集計
+     */
+    aggregateByTypeOf(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([
                 factory.actionStatusType.CompletedActionStatus,

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

@@ -6,10 +6,12 @@ export declare enum AggregationType {
     AggregateAuthorizePaymentAction = "AggregateAuthorizePaymentAction",
     AggregateCheckMovieTicketAction = "AggregateCheckMovieTicketAction",
     AggregateEvent = "AggregateEvent",
+    AggregateOrderAction = "AggregateOrderAction",
     AggregatePay = "AggregatePay",
     AggregatePayMovieTicketAction = "AggregatePayMovieTicketAction",
     AggregatePlaceOrder = "AggregatePlaceOrder",
     AggregateReserve = "AggregateReserve",
+    AggregateReserveAction = "AggregateReserveAction",
     AggregateTask = "AggregateTask",
     AggregateUseAction = "AggregateUseAction"
 }

package/lib/chevre/repo/aggregation.js

@@ -29,10 +29,12 @@ var AggregationType;
     AggregationType["AggregateAuthorizePaymentAction"] = "AggregateAuthorizePaymentAction";
     AggregationType["AggregateCheckMovieTicketAction"] = "AggregateCheckMovieTicketAction";
     AggregationType["AggregateEvent"] = "AggregateEvent";
+    AggregationType["AggregateOrderAction"] = "AggregateOrderAction";
     AggregationType["AggregatePay"] = "AggregatePay";
     AggregationType["AggregatePayMovieTicketAction"] = "AggregatePayMovieTicketAction";
     AggregationType["AggregatePlaceOrder"] = "AggregatePlaceOrder";
     AggregationType["AggregateReserve"] = "AggregateReserve";
+    AggregationType["AggregateReserveAction"] = "AggregateReserveAction";
     AggregationType["AggregateTask"] = "AggregateTask";
     AggregationType["AggregateUseAction"] = "AggregateUseAction";
 })(AggregationType = exports.AggregationType || (exports.AggregationType = {}));

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

@@ -84,6 +84,34 @@ declare function aggregateUseAction(params: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
+/**
+ * 予約アクション集計
+ */
+declare function aggregateReserveAction(params: {
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
+/**
+ * 注文アクション集計
+ */
+declare function aggregateOrderAction(params: {
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateCheckMovieTicketAction(params: {
     aggregateDurationUnit: AggregateDurationUnit;
     aggregationCount: number;
@@ -142,4 +170,4 @@ declare function aggregateTask(params: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, 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.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.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
@@ -235,7 +235,7 @@ function aggregateUseAction(params) {
                 .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,
@@ -248,6 +248,80 @@ function aggregateUseAction(params) {
     });
 }
 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 aggregateCheckMovieTicketAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;

package/lib/chevre/service/event.js

@@ -768,7 +768,7 @@ function updateEvent4ttts(params) {
         }
         // アクション完了
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} });
-        yield (0, offer_1.onEventChanged)({ event, isNew: false })({
+        yield (0, offer_1.onEventChanged)({ event, isNew: false, useInform: true })({
             event: repos.event,
             project: repos.project,
             task: repos.task

package/lib/chevre/service/offer.js

@@ -206,7 +206,10 @@ function createInformTasks(params) {
         const events4inform = yield repos.event.search({
             id: { $in: params.ids },
             typeOf: params.typeOf
-        }, { aggregateOffer: 0, aggregateReservation: 0, remainingAttendeeCapacity: 0, checkInCount: 0, attendeeCount: 0 });
+        }, {
+            aggregateEntranceGate: 0, aggregateOffer: 0, aggregateReservation: 0,
+            remainingAttendeeCapacity: 0, checkInCount: 0, attendeeCount: 0
+        });
         if (events4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.101"
+  "version": "21.2.0-alpha.103"
 }