@chevre/domain 21.2.0-alpha.104 → 21.2.0-alpha.106

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

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

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

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

package/lib/chevre/repo/action.js

@@ -801,6 +801,32 @@ class MongoRepository {
             return { statuses };
         });
     }
+    aggregateCancelReservationAction(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: factory.actionType.CancelAction }, actionStatus: { $eq: actionStatus }, 'object.typeOf': {
+                        $exists: true,
+                        $in: [
+                            factory.reservationType.BusReservation,
+                            factory.reservationType.EventReservation,
+                            factory.reservationType.ReservationPackage
+                        ]
+                    } }, (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 };
+        });
+    }
     /**
      * アクションタイプによる汎用的な集計
      */

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

@@ -4,6 +4,7 @@ export declare enum AggregationType {
     AggregateAuthorizeEventServiceOfferAction = "AggregateAuthorizeEventServiceOfferAction",
     AggregateAuthorizeOrderAction = "AggregateAuthorizeOrderAction",
     AggregateAuthorizePaymentAction = "AggregateAuthorizePaymentAction",
+    AggregateCancelReservationAction = "AggregateCancelReservationAction",
     AggregateCheckMovieTicketAction = "AggregateCheckMovieTicketAction",
     AggregateEvent = "AggregateEvent",
     AggregateOrderAction = "AggregateOrderAction",

package/lib/chevre/repo/aggregation.js

@@ -27,6 +27,7 @@ var AggregationType;
     AggregationType["AggregateAuthorizeEventServiceOfferAction"] = "AggregateAuthorizeEventServiceOfferAction";
     AggregationType["AggregateAuthorizeOrderAction"] = "AggregateAuthorizeOrderAction";
     AggregationType["AggregateAuthorizePaymentAction"] = "AggregateAuthorizePaymentAction";
+    AggregationType["AggregateCancelReservationAction"] = "AggregateCancelReservationAction";
     AggregationType["AggregateCheckMovieTicketAction"] = "AggregateCheckMovieTicketAction";
     AggregationType["AggregateEvent"] = "AggregateEvent";
     AggregationType["AggregateOrderAction"] = "AggregateOrderAction";

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

@@ -112,6 +112,20 @@ declare function aggregateOrderAction(params: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
+/**
+ * 予約取消アクション集計
+ */
+declare function aggregateCancelReservationAction(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;
@@ -170,4 +184,4 @@ declare function aggregateTask(params: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, 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.aggregateReserveAction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregatePayMovieTicketAction = exports.aggregateOrderAction = 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");
@@ -322,6 +322,42 @@ function aggregateOrderAction(params) {
     });
 }
 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;

package/lib/chevre/service/event.js

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

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.104"
+  "version": "21.2.0-alpha.106"
 }